diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
new file mode 100644
index 00000000000..9f7a1f135d7
--- /dev/null
+++ b/.github/CONTRIBUTING.md
@@ -0,0 +1,7 @@
+# Contributing Guidelines
+
+We love pull requests from everyone! Bug reports are also welcome.
+
+However if you've got a question or would like to start a discussion, please post to the
+[bitcoinj google group](https://groups.google.com/forum/#!forum/bitcoinj) or the
+[Bitcoin stack exchange](https://bitcoin.stackexchange.com/questions/tagged/bitcoinj).
diff --git a/.gitignore b/.gitignore
index 7a2b0042e96..2c21d5cc6d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,15 @@
 target
+build
+.gradle
+gradlew
+gradlew.bat
+gradle/wrapper
 .project
 .classpath
 .settings
+bin/
 .idea
 *.iml
+out/
 *.chain
 *.spvchain
diff --git a/.travis.yml b/.travis.yml
index 2ead96e7fed..8ed5d348396 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,15 @@
 # configuration for https://travis-ci.org/bitcoinj/bitcoinj
 sudo: false
+dist: xenial
 language: java
-jdk: oraclejdk8
-install: true # remove default
+jdk:
+  - openjdk8
+  - openjdk11
+install: true
+before_script:
+  - gradle wrapper --gradle-version=4.10.3
 script:
-  - 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
+  - ./gradlew clean build
 
 notifications:
   irc:
diff --git a/AUTHORS b/AUTHORS
index 96ec32613df..8e0c740e720 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,36 +4,55 @@ Aaron Voisine
 Adam Mackler
 Alexander Lolis
 Alex Taylor
+Alex Voloshko
+Alok Menghrajani
 Alon Muroch
 Amichai Rothman
 Andreas Schildbach
 andrewtoth
+Bas van Schaik
 Bennett Hoffman
+BigAdam2005
+Bo-Ye
 Carlos Lopez-Camey
 Carsten Otto
+Chang Ming
 Chris
 cyberzac
+Daniel James
 Dave Collins
+David Kingsbury
+David Wilson (dcw312)
 dexX7
 Diego Basch
 elbandi
 eleetas
 En-Ran Zhou
+Eric Winer
 Erik Tierney
 Fireduck
 freak
 Gary Rowe
 Giannis Dzegoutanis
+Gitju
+Giuseppe Raveduto
 Glenn Marien
 GreenAddress
+Greg Laun
 gubatron
 Harald Hoyer
 Jakob Stuber
 Jameson Lopp
+Jan Vornberger
 Jarl Fransson
+Jean-Pierre Rupp
 Jim Burton
 Jiri Peinlich
 Johnathan
+John L. Jegutanis
+Johny George
+Jonathan Cross
+Jon Griffiths
 Jonny Heggheim
 Justas Dobiliauskas
 Kalpesh Parmar
@@ -50,6 +69,8 @@ Martin Zachrison
 matija.mazi@gmail.com
 Matt Bogosian
 Matt Corallo
+Matthew Leon
+Matthew Shaylor
 Michael Bell
 Michael Bumann
 Mike Hearn
@@ -58,6 +79,8 @@ Miron Cuperman
 monk
 Mora Zyx
 mruddy
+Nelson Melina
+Nicola Atzei
 ollekullberg
 Oscar Guindzberg
 Pavol Rusnak
@@ -65,15 +88,21 @@ peacekeeper
 Peter Dettman
 Peter Stockli
 Peter Todd
+Philip Whitehouse
 Piotr Włodarek
-Richard Green
+Richard Green (ragmondo)
 Robin Owens
+Ronald Hoffman (ScripterRon)
 Ross Nicoll
+Saulius Beinorius
 Sean Gilligan
 Sebastian Ortega
 Simon de la Rouviere
 Simon Vermeersch
+Stephan Oeste
 Stephen Reed
+Thomas König
+Tomasz Ludek
 troggy
 Tyler Houlihan
 Willem Noort
@@ -81,3 +110,4 @@ Will Shackleton
 Wojciech Langiewicz
 Xiaofeng Guo
 Ximo Guanter
+zkejid
diff --git a/README.md b/README.md
index 76b95d1be30..cc4beff025d 100644
--- a/README.md
+++ b/README.md
@@ -8,51 +8,49 @@ The bitcoinj library is a Java implementation of the Bitcoin protocol, which all
 
 ### Technologies
 
-* 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
+* Java 7+ and Gradle 3.4+ for the `core` module
+* Java 8+ and Gradle 3.4+ for `tools` and `examples`
+* Java 11+ and Gradle 4.10+ for the JavaFX-based `wallettemplate`
+* [Gradle](https://gradle.org/) - for building the project
+* [Google Protocol Buffers](https://github.com/google/protobuf) - for use with serialization and hardware communications
 
 ### Getting started
 
-To get started, it is best to have the latest JDK and Maven installed. The HEAD of the `master` branch contains the latest development code and various production releases are provided on feature branches.
+To get started, it is best to have the latest JDK and Gradle installed. The HEAD of the `master` branch contains the latest development code and various production releases are provided on feature branches.
 
 #### Building from the command line
 
-To perform a full build use
+Official builds are currently using with JDK 8, even though the `core` module is compatible with JDK 7 and later.
+
+To perform a full build (*including* JavaDocs and unit/integration *tests*) use JDK 8+
 ```
-mvn clean package
+gradle clean build
 ```
-You can also run
+If you are running JDK 11 or later and Gradle 4.10 or later, the build will automatically include the JavaFX-based `wallettemplate` module. The outputs are under the `build` directory.
+
+To perform a full build *without* unit/integration *tests* use:
 ```
-mvn site:site
+gradle clean assemble
 ```
-to generate a website with useful information like JavaDocs.
-
-The outputs are under the `target` directory.
 
 #### Building from an IDE
 
-Alternatively, just import the project using your IDE. [IntelliJ](http://www.jetbrains.com/idea/download/) has Maven integration built-in and has a free Community Edition. Simply use `File | Import Project` and locate the `pom.xml` in the root of the cloned project source tree.
+Alternatively, just import the project using your IDE. [IntelliJ](http://www.jetbrains.com/idea/download/) has Gradle integration built-in and has a free Community Edition. Simply use `File | New | Project from Existing Sources` and locate the `build.gradle` in the root of the cloned project source tree.
 
 ### Example applications
 
 These are found in the `examples` module.
 
-#### Forwarding service
+### Where next?
 
-This will download the block chain and eventually print a Bitcoin address that it has generated.
+Now you are ready to [follow the tutorial](https://bitcoinj.github.io/getting-started).
 
-If you send coins to that address, it will forward them on to the address you specified.
+### Testing a SNAPSHOT build
 
-```
-  cd examples
-  mvn exec:java -Dexec.mainClass=org.bitcoinj.examples.ForwardingService -Dexec.args="<insert a bitcoin address here>"
-```
+Building apps with official releases of **bitcoinj** is covered in the [tutorial](https://bitcoinj.github.io/getting-started).
 
-Note that this example app *does not use checkpointing*, so the initial chain sync will be pretty slow. You can make an app that starts up and does the initial sync much faster by including a checkpoints file; see the documentation for
-more info on this technique.
+If you want to develop or test your app with a [Jitpack](https://jitpack.io)-powered build of the latest `master` or `release-0.15` branch of **bitcoinj** follow the dynamically-generated instructions for that branch by following the correct link.
 
-### Where next?
 
-Now you are ready to [follow the tutorial](https://bitcoinj.github.io/getting-started).
+* [master](https://jitpack.io/#bitcoinj/bitcoinj/master-SNAPSHOT) branch
+* [release-0.15](https://jitpack.io/#bitcoinj/bitcoinj/release-0.15-SNAPSHOT) branch
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 00000000000..d6a86ac222d
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,17 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+
+    group = 'org.bitcoinj'
+}
diff --git a/core/build.gradle b/core/build.gradle
new file mode 100644
index 00000000000..cf9a6428fd3
--- /dev/null
+++ b/core/build.gradle
@@ -0,0 +1,62 @@
+apply plugin: 'java'
+apply plugin: 'com.google.protobuf'
+apply plugin: 'maven'
+apply plugin: 'eclipse'
+
+version = '0.15.8.bisq.14'
+archivesBaseName = 'bitcoinj-core'
+eclipse.project.name = 'bitcoinj-core'
+
+dependencies {
+    compile 'org.bouncycastle:bcprov-jdk15to18:1.63'
+    implementation 'com.google.guava:guava:28.2-android'
+    compile 'com.google.protobuf:protobuf-java:3.6.1'
+    implementation 'com.squareup.okhttp3:okhttp:3.12.8'
+    implementation 'org.slf4j:slf4j-api:1.7.30'
+    implementation 'net.jcip:jcip-annotations:1.0'
+    compileOnly 'org.fusesource.leveldbjni:leveldbjni-all:1.8'
+    testImplementation 'junit:junit:4.13'
+    testImplementation 'org.easymock:easymock:3.2'
+    testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.5.2'
+    testImplementation 'org.slf4j:slf4j-jdk14:1.7.30'
+    testImplementation 'com.h2database:h2:1.3.167'
+    testImplementation 'org.fusesource.leveldbjni:leveldbjni-all:1.8'
+}
+
+sourceCompatibility = 1.7
+compileJava.options.encoding = 'UTF-8'
+compileTestJava.options.encoding = 'UTF-8'
+javadoc.options.encoding = 'UTF-8'
+
+protobuf {
+    protoc {
+        artifact = 'com.google.protobuf:protoc:3.6.1'
+    }
+    generatedFilesBaseDir = new File(projectDir, '/src') // workaround for '$projectDir/src'
+}
+
+test {
+    exclude 'org/bitcoinj/core/PeerTest*'
+    exclude 'org/bitcoinj/core/TransactionBroadcastTest*'
+    exclude 'org/bitcoinj/net/NetworkAbstractionTests*'
+    exclude 'org/bitcoinj/protocols/channels/ChannelConnectionTest*'
+    testLogging {
+        events "failed"
+        exceptionFormat "full"
+    }
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+task sourcesJar(type: Jar, dependsOn: classes) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+}
+
+artifacts {
+    archives sourcesJar
+    archives javadocJar
+}
diff --git a/core/pom.xml b/core/pom.xml
deleted file mode 100644
index 6e4f536edd9..00000000000
--- a/core/pom.xml
+++ /dev/null
@@ -1,441 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2012 Google Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.bitcoinj</groupId>
-        <artifactId>bitcoinj-parent</artifactId>
-        <version>0.14-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>bitcoinj-core</artifactId>
-
-    <name>bitcoinj</name>
-    <description>A Java Bitcoin library</description>
-
-    <packaging>jar</packaging>
-
-    <url>https://bitcoinj.github.io</url>
-
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <!-- Dummy block to make Maven Central happy: authors list is in AUTHORS -->
-    <developers>
-        <developer>
-            <name>The bitcoinj team</name>
-            <email>bitcoinj@googlegroups.com</email>
-        </developer>
-    </developers>
-
-    <profiles>
-        <profile>
-            <id>update-protobuf</id>
-            <activation>
-                <property>
-                    <name>updateProtobuf</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>compile-protoc</id>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <tasks>
-                                        <path id="proto.path">
-                                            <fileset dir="src">
-                                                <include name="**/*.proto"/>
-                                            </fileset>
-                                        </path>
-                                        <pathconvert pathsep=" " property="proto.files" refid="proto.path"/>
-                                        <exec executable="protoc" failonerror="true">
-                                            <arg value="--java_out=${project.basedir}/src/main/java"/>
-                                            <arg value="-I${project.basedir}/src"/>
-                                            <arg line="${proto.files}"/>
-                                        </exec>
-                                    </tasks>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>no-network</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludes>
-                                <exclude>**/core/PeerTest.java</exclude>
-                                <exclude>**/core/TransactionBroadcastTest.java</exclude>
-                            </excludes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <build>
-        <plugins>
-            <!-- Ensure compilation is done under Java 6 for backwards compatibility -->
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-
-            <!-- Generate source and javadoc jars: Maven Central requires this -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <detectLinks/>
-                    <links>
-                        <link>http://docs.guava-libraries.googlecode.com/git-history/release/javadoc/</link>
-                    </links>
-                    <detectJavaApiLink/>
-                    <quiet>true</quiet>
-                </configuration>
-            </plugin>
-
-            <!-- Verify the dependency chain: see https://github.com/gary-rowe/BitcoinjEnforcerRules for
-               more information on this.
-            -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>enforce</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <DependencyConvergence/>
-                                <digestRule implementation="uk.co.froot.maven.enforcer.DigestRule">
-
-                                    <!-- Create a snapshot to build the list of URNs below -->
-                                    <buildSnapshot>true</buildSnapshot>
-
-                                    <!-- List of required hashes -->
-                                    <!-- Format is URN of groupId:artifactId:version:type:classifier:scope:hash -->
-                                    <!-- classifier is "null" if not present -->
-                                    <urns>
-                                        <urn>cglib:cglib-nodep:2.2:jar:null:test:59afed7ab65e7ec6585d5bc60556c3cbd203532b</urn>
-                                        <urn>com.fasterxml.jackson.core:jackson-annotations:2.5.0:jar:null:test:a2a55a3375bc1cef830ca426d68d2ea22961190e</urn>
-                                        <urn>com.fasterxml.jackson.core:jackson-core:2.5.1:jar:null:test:e2a00ad1d7e540ec395e9296a34da484c8888d4d</urn>
-                                        <urn>com.fasterxml.jackson.core:jackson-databind:2.5.2:jar:null:test:2b4dd13fbe6f8c6b146d4c3b7fd70862f136802d</urn>
-                                        <urn>com.google.code.findbugs:jsr305:2.0.1:jar:null:compile:516c03b21d50a644d538de0f0369c620989cd8f0</urn>
-                                        <urn>com.google.guava:guava:18.0:jar:null:compile:cce0823396aa693798f8882e64213b1772032b09</urn>
-                                        <urn>com.google.protobuf:protobuf-java:2.6.1:jar:null:compile:d9521f2aecb909835746b7a5facf612af5e890e8</urn>
-                                        <urn>com.h2database:h2:1.3.167:jar:null:compile:d3867d586f087e53eb12fc65e5693d8ee9a5da17</urn>
-                                        <urn>com.lambdaworks:scrypt:1.4.0:jar:null:compile:906506b74f30c8c20bccd9ed4a11112d8941fe87</urn>
-                                        <urn>com.madgag.spongycastle:core:1.51.0.0:jar:null:compile:0f642963312ea0e615ad65f28adc5a5b3a2a0862</urn>
-                                        <urn>junit:junit:4.12:jar:null:test:2973d150c0dc1fefe998f834810d68f278ea58ec</urn>
-                                        <urn>mysql:mysql-connector-java:5.1.33:jar:null:compile:8af455a9a3267e6664cafc87ace71a4e4ef02837</urn>
-                                        <urn>net.jcip:jcip-annotations:1.0:jar:null:compile:afba4942caaeaf46aab0b976afd57cc7c181467e</urn>
-                                        <urn>org.apache.maven.plugins:maven-clean-plugin:2.6.1:maven-plugin:null:runtime:bfdf7d6c2f8fc8759457e9d54f458ba56ac7b30f</urn>
-                                        <urn>org.apache.maven.plugins:maven-compiler-plugin:3.2:maven-plugin:null:runtime:aec10f274ac07fafab8906cb1aa69669d753b2c2</urn>
-                                        <urn>org.apache.maven.plugins:maven-deploy-plugin:2.8.2:maven-plugin:null:runtime:3c2d83ecd387e9843142ae92a0439792c1500319</urn>
-                                        <urn>org.apache.maven.plugins:maven-enforcer-plugin:1.0:maven-plugin:null:runtime:ad032b7593576e9fe9305c73865633e163895b29</urn>
-                                        <urn>org.apache.maven.plugins:maven-install-plugin:2.5.2:maven-plugin:null:runtime:8a67631619fc3c1d1f036e59362ddce71e1e496f</urn>
-                                        <urn>org.apache.maven.plugins:maven-jar-plugin:2.6:maven-plugin:null:runtime:618f08d0fcdd3929af846ef1b65503b5904f93e3</urn>
-                                        <urn>org.apache.maven.plugins:maven-javadoc-plugin:2.10.2:maven-plugin:null:runtime:5f391697fa85cecc7e5bac7ce5a6f9d056a58ba3</urn>
-                                        <urn>org.apache.maven.plugins:maven-resources-plugin:2.7:maven-plugin:null:runtime:94af11389943a480ecec7db01b4ded1b9cdf57c5</urn>
-                                        <urn>org.apache.maven.plugins:maven-shade-plugin:2.3:maven-plugin:null:runtime:d136adc7abccc9c12adcad6ae7a9bc51b2b7184b</urn>
-                                        <urn>org.apache.maven.plugins:maven-site-plugin:3.4:maven-plugin:null:runtime:659cd5f1dd8bff554cf52603339494cbf7f283c5</urn>
-                                        <urn>org.apache.maven.plugins:maven-source-plugin:2.4:maven-plugin:null:runtime:46f0d7f7823d729ba300d3f8929900c7e9cb5ac0</urn>
-                                        <urn>org.apache.maven.plugins:maven-surefire-plugin:2.19.1:maven-plugin:null:runtime:e2ee016ce9183ffa9e86c543690cadda7b3aea15</urn>
-                                        <urn>org.easymock:easymock:3.2:jar:null:test:00c82f7fa3ef377d8954b1db25123944b5af2ba4</urn>
-                                        <urn>org.eluder.coveralls:coveralls-maven-plugin:3.1.0:maven-plugin:null:runtime:ca9d2915e2b1e99f15c9f54ad653eda893d42a69</urn>
-                                        <urn>org.fusesource.leveldbjni:leveldbjni-all:1.8:jar:null:compile:707350a2eeb1fa2ed77a32ddb3893ed308e941db</urn>
-                                        <urn>org.hamcrest:hamcrest-core:1.3:jar:null:test:42a25dc3219429f0e5d060061f71acb49bf010a0</urn>
-                                        <urn>org.jacoco:jacoco-maven-plugin:0.7.5.201505241946:maven-plugin:null:runtime:0a5e4dbbcd9b00e5ee42d928e10ab84f6f0b0835</urn>
-                                        <urn>org.objenesis:objenesis:1.2:jar:null:test:bfcb0539a071a4c5a30690388903ac48c0667f2a</urn>
-                                        <urn>com.squareup.okhttp:okhttp:2.7.2:jar:null:runtime:20f6463eb19ac61960c5d91a094c2f4f0727dc2e</urn>
-                                        <urn>com.squareup.okio:okio:1.6.0:jar:null:runtime:98476622f10715998eacf9240d6b479f12c66143</urn>
-                                        <urn>org.slf4j:slf4j-api:1.7.20:jar:null:compile:867d63093eff0a0cb527bf13d397d850af3dcae3</urn>
-                                        <urn>org.slf4j:slf4j-jdk14:1.7.20:jar:null:test:b568c92eec50edc922c52b3e759982579170c2be</urn>
-                                        <urn>org.sonatype.plugins:nexus-staging-maven-plugin:1.6.5:maven-plugin:null:runtime:455ca2aa8cd14a06608f1538bd6a1efd09561563</urn>
-                                        <urn>postgresql:postgresql:9.1-901.jdbc4:jar:null:compile:153f2f92a786f12fc111d0111f709012df87c808</urn>
-                                        <!-- A check for the rules themselves -->
-                                        <urn>uk.co.froot.maven.enforcer:digest-enforcer-rules:0.0.1:jar:null:runtime:16a9e04f3fe4bb143c42782d07d5faf65b32106f</urn>
-                                    </urns>
-                                </digestRule>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-
-                <!-- Ensure we download the enforcer rules -->
-                <dependencies>
-                    <dependency>
-                        <groupId>uk.co.froot.maven.enforcer</groupId>
-                        <artifactId>digest-enforcer-rules</artifactId>
-                        <version>0.0.1</version>
-                    </dependency>
-                </dependencies>
-
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <!-- Create the bundled JAR, it's easier for some people -->
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <minimizeJar>false</minimizeJar>
-                            <filters>
-                                <filter>
-                                    <!-- exclude signatures, the bundling process breaks them for some reason -->
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            <shadedArtifactAttached>true</shadedArtifactAttached>
-                            <shadedClassifierName>bundled</shadedClassifierName>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- Code coverage plugin, generates coverage report to target/site/jacoco/
-                To skip coverage generation add -Djacoco.skip=true
-             -->
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.5.201505241946</version>
-                <configuration>
-                    <excludes>
-                        <exclude>**/Protos*.class</exclude> <!-- Exclude generated protobuf classes -->
-                        <exclude>org/bitcoinj/jni/*</exclude> <!-- Exclude JNI classes -->
-                        <exclude>org/bitcoin/*</exclude> <!-- Exclude native classes -->
-                    </excludes>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>pre-unit-test</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
-                            <propertyName>surefireArgLine</propertyName>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>post-unit-test</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <dataFile>${project.build.directory}/coverage-reports/jacoco.exec</dataFile>
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>default-report</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- Unit tests plugin, to skip runing test add -Dmaven.test.skip -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Xmx1024m ${surefireArgLine}</argLine><!-- Last argument is required for code coverage to work. -->
-                    <runOrder>alphabetical</runOrder>
-                    <systemProperties>
-                        <property>
-                            <name>java.util.logging.config.file</name>
-                            <value>src/test/resources/logging.properties</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-
-            <!-- Coveralls is a online code coverage tool, you can track code coverage here: https://coveralls.io/r/bitcoinj/bitcoinj -->
-            <plugin>
-                <groupId>org.eluder.coveralls</groupId>
-                <artifactId>coveralls-maven-plugin</artifactId>
-                <version>3.1.0</version>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>3.2</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- bitcoinj consumers are expected to provide their own SLF4J adapters
-             such as logback, slf4j-log4j12, slf4j-jcl and so on
-             see http://www.slf4j.org/faq.html -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <version>1.7.20</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.5.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>1.3.167</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>com.madgag.spongycastle</groupId>
-            <artifactId>core</artifactId>
-            <version>1.51.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-            <version>2.6.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>18.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>2.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>net.jcip</groupId>
-            <artifactId>jcip-annotations</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.lambdaworks</groupId>
-            <artifactId>scrypt</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <!-- Note this is an optional dependency: Postgres blockstore -->
-        <!-- To Test remove optional -->
-        <dependency>
-          <groupId>postgresql</groupId>
-          <artifactId>postgresql</artifactId>
-          <version>9.1-901.jdbc4</version>
-          <optional>true</optional>
-        </dependency>
-        <!-- Note this is an optional dependency: MySQL blockstore -->
-        <!-- To Test remove optional -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.33</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.fusesource.leveldbjni</groupId>
-            <artifactId>leveldbjni-all</artifactId>
-            <version>1.8</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.bitcoinj</groupId>
-            <artifactId>orchid</artifactId>
-            <version>1.2</version>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.okhttp</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>2.7.2</version>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/core/src/main/java/org/bitcoin/NativeSecp256k1.java b/core/src/main/java/org/bitcoin/NativeSecp256k1.java
index 40ae76d7ce0..2b271bd9c26 100644
--- a/core/src/main/java/org/bitcoin/NativeSecp256k1.java
+++ b/core/src/main/java/org/bitcoin/NativeSecp256k1.java
@@ -42,7 +42,7 @@ public class NativeSecp256k1 {
     private static final ReentrantReadWriteLock rwl = new ReentrantReadWriteLock();
     private static final Lock r = rwl.readLock();
     private static final Lock w = rwl.writeLock();
-    private static ThreadLocal<ByteBuffer> nativeECDSABuffer = new ThreadLocal<ByteBuffer>();
+    private static ThreadLocal<ByteBuffer> nativeECDSABuffer = new ThreadLocal<>();
 
     /**
      * Verifies the given secp256k1 signature in native code. Calling when enabled == false is undefined (probably
@@ -78,7 +78,7 @@ public static boolean verify(byte[] data, byte[] signature, byte[] pub) throws A
      * libsecp256k1 Create an ECDSA signature.
      *
      * @param data Message hash, 32 bytes
-     * @param key Secret key, 32 bytes
+     * @param sec Secret key, 32 bytes
      * @return sig byte array of signature
      */
     public static byte[] sign(byte[] data, byte[] sec) throws AssertFailException {
@@ -200,7 +200,7 @@ public static long cloneContext() {
      * libsecp256k1 PrivKey Tweak-Mul - Tweak privkey by multiplying to it
      *
      * @param tweak some bytes to tweak with
-     * @param seckey 32-byte seckey
+     * @param privkey 32-byte seckey
      */
     public static byte[] privKeyTweakMul(byte[] privkey, byte[] tweak) throws AssertFailException {
         Preconditions.checkArgument(privkey.length == 32);
@@ -239,7 +239,7 @@ public static byte[] privKeyTweakMul(byte[] privkey, byte[] tweak) throws Assert
      * libsecp256k1 PrivKey Tweak-Add - Tweak privkey by adding to it
      *
      * @param tweak some bytes to tweak with
-     * @param seckey 32-byte seckey
+     * @param privkey 32-byte seckey
      */
     public static byte[] privKeyTweakAdd(byte[] privkey, byte[] tweak) throws AssertFailException {
         Preconditions.checkArgument(privkey.length == 32);
diff --git a/core/src/main/java/org/bitcoin/Secp256k1Context.java b/core/src/main/java/org/bitcoin/Secp256k1Context.java
index c1d6484e4da..f545f7c64bd 100644
--- a/core/src/main/java/org/bitcoin/Secp256k1Context.java
+++ b/core/src/main/java/org/bitcoin/Secp256k1Context.java
@@ -19,6 +19,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.security.AccessControlException;
+
 /**
  * This class holds the context reference used in native methods to handle ECDSA operations.
  */
@@ -35,8 +37,8 @@ public class Secp256k1Context {
         try {
             System.loadLibrary("secp256k1");
             contextRef = secp256k1_init_context();
-        } catch (UnsatisfiedLinkError e) {
-            log.info(e.toString());
+        } catch (UnsatisfiedLinkError | AccessControlException e) {
+            log.debug(e.toString());
             isEnabled = false;
         }
         enabled = isEnabled;
diff --git a/core/src/main/java/org/bitcoin/crawler/PeerSeedProtos.java b/core/src/main/java/org/bitcoin/crawler/PeerSeedProtos.java
index cb38034fbfc..8788a2a4818 100644
--- a/core/src/main/java/org/bitcoin/crawler/PeerSeedProtos.java
+++ b/core/src/main/java/org/bitcoin/crawler/PeerSeedProtos.java
@@ -5,8 +5,14 @@
 
 public final class PeerSeedProtos {
   private PeerSeedProtos() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   public interface PeerSeedDataOrBuilder extends
       // @@protoc_insertion_point(interface_extends:org.bitcoin.crawler.PeerSeedData)
@@ -47,37 +53,34 @@ public interface PeerSeedDataOrBuilder extends
   /**
    * Protobuf type {@code org.bitcoin.crawler.PeerSeedData}
    */
-  public static final class PeerSeedData extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class PeerSeedData extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.bitcoin.crawler.PeerSeedData)
       PeerSeedDataOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use PeerSeedData.newBuilder() to construct.
-    private PeerSeedData(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private PeerSeedData(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private PeerSeedData(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final PeerSeedData defaultInstance;
-    public static PeerSeedData getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public PeerSeedData getDefaultInstanceForType() {
-      return defaultInstance;
+    private PeerSeedData() {
+      ipAddress_ = "";
+      port_ = 0;
+      services_ = 0;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private PeerSeedData(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -89,13 +92,6 @@ private PeerSeedData(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               com.google.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
@@ -112,13 +108,20 @@ private PeerSeedData(
               services_ = input.readUInt32();
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -129,31 +132,17 @@ private PeerSeedData(
       return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeedData_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeedData_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoin.crawler.PeerSeedProtos.PeerSeedData.class, org.bitcoin.crawler.PeerSeedProtos.PeerSeedData.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<PeerSeedData> PARSER =
-        new com.google.protobuf.AbstractParser<PeerSeedData>() {
-      public PeerSeedData parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new PeerSeedData(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<PeerSeedData> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int IP_ADDRESS_FIELD_NUMBER = 1;
-    private java.lang.Object ipAddress_;
+    private volatile java.lang.Object ipAddress_;
     /**
      * <code>required string ip_address = 1;</code>
      */
@@ -224,12 +213,8 @@ public int getServices() {
       return services_;
     }
 
-    private void initFields() {
-      ipAddress_ = "";
-      port_ = 0;
-      services_ = 0;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -251,11 +236,11 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeBytes(1, getIpAddressBytes());
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, ipAddress_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeUInt32(2, port_);
@@ -263,18 +248,17 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         output.writeUInt32(3, services_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(1, getIpAddressBytes());
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, ipAddress_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
@@ -284,18 +268,76 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(3, services_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoin.crawler.PeerSeedProtos.PeerSeedData)) {
+        return super.equals(obj);
+      }
+      org.bitcoin.crawler.PeerSeedProtos.PeerSeedData other = (org.bitcoin.crawler.PeerSeedProtos.PeerSeedData) obj;
+
+      boolean result = true;
+      result = result && (hasIpAddress() == other.hasIpAddress());
+      if (hasIpAddress()) {
+        result = result && getIpAddress()
+            .equals(other.getIpAddress());
+      }
+      result = result && (hasPort() == other.hasPort());
+      if (hasPort()) {
+        result = result && (getPort()
+            == other.getPort());
+      }
+      result = result && (hasServices() == other.hasServices());
+      if (hasServices()) {
+        result = result && (getServices()
+            == other.getServices());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
     }
 
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasIpAddress()) {
+        hash = (37 * hash) + IP_ADDRESS_FIELD_NUMBER;
+        hash = (53 * hash) + getIpAddress().hashCode();
+      }
+      if (hasPort()) {
+        hash = (37 * hash) + PORT_FIELD_NUMBER;
+        hash = (53 * hash) + getPort();
+      }
+      if (hasServices()) {
+        hash = (37 * hash) + SERVICES_FIELD_NUMBER;
+        hash = (53 * hash) + getServices();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static org.bitcoin.crawler.PeerSeedProtos.PeerSeedData parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoin.crawler.PeerSeedProtos.PeerSeedData parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoin.crawler.PeerSeedProtos.PeerSeedData parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -319,46 +361,59 @@ public static org.bitcoin.crawler.PeerSeedProtos.PeerSeedData parseFrom(
     }
     public static org.bitcoin.crawler.PeerSeedProtos.PeerSeedData parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.crawler.PeerSeedProtos.PeerSeedData parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.crawler.PeerSeedProtos.PeerSeedData parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoin.crawler.PeerSeedProtos.PeerSeedData parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.crawler.PeerSeedProtos.PeerSeedData parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.crawler.PeerSeedProtos.PeerSeedData parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoin.crawler.PeerSeedProtos.PeerSeedData prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -366,7 +421,7 @@ protected Builder newBuilderForType(
      * Protobuf type {@code org.bitcoin.crawler.PeerSeedData}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:org.bitcoin.crawler.PeerSeedData)
         org.bitcoin.crawler.PeerSeedProtos.PeerSeedDataOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -374,7 +429,8 @@ public static final class Builder extends
         return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeedData_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeedData_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -387,18 +443,16 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         ipAddress_ = "";
@@ -410,19 +464,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeedData_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoin.crawler.PeerSeedProtos.PeerSeedData getDefaultInstanceForType() {
         return org.bitcoin.crawler.PeerSeedProtos.PeerSeedData.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoin.crawler.PeerSeedProtos.PeerSeedData build() {
         org.bitcoin.crawler.PeerSeedProtos.PeerSeedData result = buildPartial();
         if (!result.isInitialized()) {
@@ -431,6 +484,7 @@ public org.bitcoin.crawler.PeerSeedProtos.PeerSeedData build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoin.crawler.PeerSeedProtos.PeerSeedData buildPartial() {
         org.bitcoin.crawler.PeerSeedProtos.PeerSeedData result = new org.bitcoin.crawler.PeerSeedProtos.PeerSeedData(this);
         int from_bitField0_ = bitField0_;
@@ -452,6 +506,39 @@ public org.bitcoin.crawler.PeerSeedProtos.PeerSeedData buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoin.crawler.PeerSeedProtos.PeerSeedData) {
           return mergeFrom((org.bitcoin.crawler.PeerSeedProtos.PeerSeedData)other);
@@ -474,26 +561,26 @@ public Builder mergeFrom(org.bitcoin.crawler.PeerSeedProtos.PeerSeedData other)
         if (other.hasServices()) {
           setServices(other.getServices());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasIpAddress()) {
-          
           return false;
         }
         if (!hasPort()) {
-          
           return false;
         }
         if (!hasServices()) {
-          
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -503,7 +590,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoin.crawler.PeerSeedProtos.PeerSeedData) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -652,16 +739,57 @@ public Builder clearServices() {
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:org.bitcoin.crawler.PeerSeedData)
     }
 
+    // @@protoc_insertion_point(class_scope:org.bitcoin.crawler.PeerSeedData)
+    private static final org.bitcoin.crawler.PeerSeedProtos.PeerSeedData DEFAULT_INSTANCE;
     static {
-      defaultInstance = new PeerSeedData(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoin.crawler.PeerSeedProtos.PeerSeedData();
+    }
+
+    public static org.bitcoin.crawler.PeerSeedProtos.PeerSeedData getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<PeerSeedData>
+        PARSER = new com.google.protobuf.AbstractParser<PeerSeedData>() {
+      @java.lang.Override
+      public PeerSeedData parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new PeerSeedData(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<PeerSeedData> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<PeerSeedData> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoin.crawler.PeerSeedProtos.PeerSeedData getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:org.bitcoin.crawler.PeerSeedData)
   }
 
   public interface PeerSeedsOrBuilder extends
@@ -693,19 +821,19 @@ org.bitcoin.crawler.PeerSeedProtos.PeerSeedDataOrBuilder getSeedOrBuilder(
         int index);
 
     /**
-     * <code>required uint64 timestamp = 2;</code>
-     *
      * <pre>
      * seconds since UNIX epoch
      * </pre>
+     *
+     * <code>required uint64 timestamp = 2;</code>
      */
     boolean hasTimestamp();
     /**
-     * <code>required uint64 timestamp = 2;</code>
-     *
      * <pre>
      * seconds since UNIX epoch
      * </pre>
+     *
+     * <code>required uint64 timestamp = 2;</code>
      */
     long getTimestamp();
 
@@ -726,37 +854,34 @@ org.bitcoin.crawler.PeerSeedProtos.PeerSeedDataOrBuilder getSeedOrBuilder(
   /**
    * Protobuf type {@code org.bitcoin.crawler.PeerSeeds}
    */
-  public static final class PeerSeeds extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class PeerSeeds extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.bitcoin.crawler.PeerSeeds)
       PeerSeedsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use PeerSeeds.newBuilder() to construct.
-    private PeerSeeds(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private PeerSeeds(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private PeerSeeds(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final PeerSeeds defaultInstance;
-    public static PeerSeeds getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public PeerSeeds getDefaultInstanceForType() {
-      return defaultInstance;
+    private PeerSeeds() {
+      seed_ = java.util.Collections.emptyList();
+      timestamp_ = 0L;
+      net_ = "";
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private PeerSeeds(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -768,19 +893,13 @@ private PeerSeeds(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                 seed_ = new java.util.ArrayList<org.bitcoin.crawler.PeerSeedProtos.PeerSeedData>();
                 mutable_bitField0_ |= 0x00000001;
               }
-              seed_.add(input.readMessage(org.bitcoin.crawler.PeerSeedProtos.PeerSeedData.PARSER, extensionRegistry));
+              seed_.add(
+                  input.readMessage(org.bitcoin.crawler.PeerSeedProtos.PeerSeedData.PARSER, extensionRegistry));
               break;
             }
             case 16: {
@@ -794,13 +913,20 @@ private PeerSeeds(
               net_ = bs;
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
           seed_ = java.util.Collections.unmodifiableList(seed_);
@@ -814,28 +940,14 @@ private PeerSeeds(
       return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeeds_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeeds_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoin.crawler.PeerSeedProtos.PeerSeeds.class, org.bitcoin.crawler.PeerSeedProtos.PeerSeeds.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<PeerSeeds> PARSER =
-        new com.google.protobuf.AbstractParser<PeerSeeds>() {
-      public PeerSeeds parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new PeerSeeds(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<PeerSeeds> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int SEED_FIELD_NUMBER = 1;
     private java.util.List<org.bitcoin.crawler.PeerSeedProtos.PeerSeedData> seed_;
@@ -875,28 +987,28 @@ public org.bitcoin.crawler.PeerSeedProtos.PeerSeedDataOrBuilder getSeedOrBuilder
     public static final int TIMESTAMP_FIELD_NUMBER = 2;
     private long timestamp_;
     /**
-     * <code>required uint64 timestamp = 2;</code>
-     *
      * <pre>
      * seconds since UNIX epoch
      * </pre>
+     *
+     * <code>required uint64 timestamp = 2;</code>
      */
     public boolean hasTimestamp() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required uint64 timestamp = 2;</code>
-     *
      * <pre>
      * seconds since UNIX epoch
      * </pre>
+     *
+     * <code>required uint64 timestamp = 2;</code>
      */
     public long getTimestamp() {
       return timestamp_;
     }
 
     public static final int NET_FIELD_NUMBER = 3;
-    private java.lang.Object net_;
+    private volatile java.lang.Object net_;
     /**
      * <code>required string net = 3;</code>
      */
@@ -937,12 +1049,8 @@ public java.lang.String getNet() {
       }
     }
 
-    private void initFields() {
-      seed_ = java.util.Collections.emptyList();
-      timestamp_ = 0L;
-      net_ = "";
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -966,9 +1074,9 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       for (int i = 0; i < seed_.size(); i++) {
         output.writeMessage(1, seed_.get(i));
       }
@@ -976,14 +1084,14 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         output.writeUInt64(2, timestamp_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeBytes(3, getNetBytes());
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, net_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -996,21 +1104,76 @@ public int getSerializedSize() {
           .computeUInt64Size(2, timestamp_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(3, getNetBytes());
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, net_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoin.crawler.PeerSeedProtos.PeerSeeds)) {
+        return super.equals(obj);
+      }
+      org.bitcoin.crawler.PeerSeedProtos.PeerSeeds other = (org.bitcoin.crawler.PeerSeedProtos.PeerSeeds) obj;
+
+      boolean result = true;
+      result = result && getSeedList()
+          .equals(other.getSeedList());
+      result = result && (hasTimestamp() == other.hasTimestamp());
+      if (hasTimestamp()) {
+        result = result && (getTimestamp()
+            == other.getTimestamp());
+      }
+      result = result && (hasNet() == other.hasNet());
+      if (hasNet()) {
+        result = result && getNet()
+            .equals(other.getNet());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (getSeedCount() > 0) {
+        hash = (37 * hash) + SEED_FIELD_NUMBER;
+        hash = (53 * hash) + getSeedList().hashCode();
+      }
+      if (hasTimestamp()) {
+        hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getTimestamp());
+      }
+      if (hasNet()) {
+        hash = (37 * hash) + NET_FIELD_NUMBER;
+        hash = (53 * hash) + getNet().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoin.crawler.PeerSeedProtos.PeerSeeds parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoin.crawler.PeerSeedProtos.PeerSeeds parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoin.crawler.PeerSeedProtos.PeerSeeds parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -1034,46 +1197,59 @@ public static org.bitcoin.crawler.PeerSeedProtos.PeerSeeds parseFrom(
     }
     public static org.bitcoin.crawler.PeerSeedProtos.PeerSeeds parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.crawler.PeerSeedProtos.PeerSeeds parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.crawler.PeerSeedProtos.PeerSeeds parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoin.crawler.PeerSeedProtos.PeerSeeds parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.crawler.PeerSeedProtos.PeerSeeds parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.crawler.PeerSeedProtos.PeerSeeds parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoin.crawler.PeerSeedProtos.PeerSeeds prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -1081,7 +1257,7 @@ protected Builder newBuilderForType(
      * Protobuf type {@code org.bitcoin.crawler.PeerSeeds}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:org.bitcoin.crawler.PeerSeeds)
         org.bitcoin.crawler.PeerSeedProtos.PeerSeedsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -1089,7 +1265,8 @@ public static final class Builder extends
         return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeeds_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeeds_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -1102,19 +1279,17 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
           getSeedFieldBuilder();
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (seedBuilder_ == null) {
@@ -1130,19 +1305,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_PeerSeeds_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoin.crawler.PeerSeedProtos.PeerSeeds getDefaultInstanceForType() {
         return org.bitcoin.crawler.PeerSeedProtos.PeerSeeds.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoin.crawler.PeerSeedProtos.PeerSeeds build() {
         org.bitcoin.crawler.PeerSeedProtos.PeerSeeds result = buildPartial();
         if (!result.isInitialized()) {
@@ -1151,6 +1325,7 @@ public org.bitcoin.crawler.PeerSeedProtos.PeerSeeds build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoin.crawler.PeerSeedProtos.PeerSeeds buildPartial() {
         org.bitcoin.crawler.PeerSeedProtos.PeerSeeds result = new org.bitcoin.crawler.PeerSeedProtos.PeerSeeds(this);
         int from_bitField0_ = bitField0_;
@@ -1177,6 +1352,39 @@ public org.bitcoin.crawler.PeerSeedProtos.PeerSeeds buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoin.crawler.PeerSeedProtos.PeerSeeds) {
           return mergeFrom((org.bitcoin.crawler.PeerSeedProtos.PeerSeeds)other);
@@ -1207,7 +1415,7 @@ public Builder mergeFrom(org.bitcoin.crawler.PeerSeedProtos.PeerSeeds other) {
               seed_ = other.seed_;
               bitField0_ = (bitField0_ & ~0x00000001);
               seedBuilder_ = 
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getSeedFieldBuilder() : null;
             } else {
               seedBuilder_.addAllMessages(other.seed_);
@@ -1222,28 +1430,28 @@ public Builder mergeFrom(org.bitcoin.crawler.PeerSeedProtos.PeerSeeds other) {
           net_ = other.net_;
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasTimestamp()) {
-          
           return false;
         }
         if (!hasNet()) {
-          
           return false;
         }
         for (int i = 0; i < getSeedCount(); i++) {
           if (!getSeed(i).isInitialized()) {
-            
             return false;
           }
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1253,7 +1461,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoin.crawler.PeerSeedProtos.PeerSeeds) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -1272,7 +1480,7 @@ private void ensureSeedIsMutable() {
          }
       }
 
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.bitcoin.crawler.PeerSeedProtos.PeerSeedData, org.bitcoin.crawler.PeerSeedProtos.PeerSeedData.Builder, org.bitcoin.crawler.PeerSeedProtos.PeerSeedDataOrBuilder> seedBuilder_;
 
       /**
@@ -1488,11 +1696,11 @@ public org.bitcoin.crawler.PeerSeedProtos.PeerSeedData.Builder addSeedBuilder(
            getSeedBuilderList() {
         return getSeedFieldBuilder().getBuilderList();
       }
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.bitcoin.crawler.PeerSeedProtos.PeerSeedData, org.bitcoin.crawler.PeerSeedProtos.PeerSeedData.Builder, org.bitcoin.crawler.PeerSeedProtos.PeerSeedDataOrBuilder> 
           getSeedFieldBuilder() {
         if (seedBuilder_ == null) {
-          seedBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+          seedBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               org.bitcoin.crawler.PeerSeedProtos.PeerSeedData, org.bitcoin.crawler.PeerSeedProtos.PeerSeedData.Builder, org.bitcoin.crawler.PeerSeedProtos.PeerSeedDataOrBuilder>(
                   seed_,
                   ((bitField0_ & 0x00000001) == 0x00000001),
@@ -1505,31 +1713,31 @@ public org.bitcoin.crawler.PeerSeedProtos.PeerSeedData.Builder addSeedBuilder(
 
       private long timestamp_ ;
       /**
-       * <code>required uint64 timestamp = 2;</code>
-       *
        * <pre>
        * seconds since UNIX epoch
        * </pre>
+       *
+       * <code>required uint64 timestamp = 2;</code>
        */
       public boolean hasTimestamp() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>required uint64 timestamp = 2;</code>
-       *
        * <pre>
        * seconds since UNIX epoch
        * </pre>
+       *
+       * <code>required uint64 timestamp = 2;</code>
        */
       public long getTimestamp() {
         return timestamp_;
       }
       /**
-       * <code>required uint64 timestamp = 2;</code>
-       *
        * <pre>
        * seconds since UNIX epoch
        * </pre>
+       *
+       * <code>required uint64 timestamp = 2;</code>
        */
       public Builder setTimestamp(long value) {
         bitField0_ |= 0x00000002;
@@ -1538,11 +1746,11 @@ public Builder setTimestamp(long value) {
         return this;
       }
       /**
-       * <code>required uint64 timestamp = 2;</code>
-       *
        * <pre>
        * seconds since UNIX epoch
        * </pre>
+       *
+       * <code>required uint64 timestamp = 2;</code>
        */
       public Builder clearTimestamp() {
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -1626,16 +1834,57 @@ public Builder setNetBytes(
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:org.bitcoin.crawler.PeerSeeds)
     }
 
+    // @@protoc_insertion_point(class_scope:org.bitcoin.crawler.PeerSeeds)
+    private static final org.bitcoin.crawler.PeerSeedProtos.PeerSeeds DEFAULT_INSTANCE;
     static {
-      defaultInstance = new PeerSeeds(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoin.crawler.PeerSeedProtos.PeerSeeds();
+    }
+
+    public static org.bitcoin.crawler.PeerSeedProtos.PeerSeeds getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<PeerSeeds>
+        PARSER = new com.google.protobuf.AbstractParser<PeerSeeds>() {
+      @java.lang.Override
+      public PeerSeeds parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new PeerSeeds(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<PeerSeeds> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<PeerSeeds> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoin.crawler.PeerSeedProtos.PeerSeeds getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:org.bitcoin.crawler.PeerSeeds)
   }
 
   public interface SignedPeerSeedsOrBuilder extends
@@ -1672,37 +1921,34 @@ public interface SignedPeerSeedsOrBuilder extends
   /**
    * Protobuf type {@code org.bitcoin.crawler.SignedPeerSeeds}
    */
-  public static final class SignedPeerSeeds extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class SignedPeerSeeds extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:org.bitcoin.crawler.SignedPeerSeeds)
       SignedPeerSeedsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use SignedPeerSeeds.newBuilder() to construct.
-    private SignedPeerSeeds(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private SignedPeerSeeds(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private SignedPeerSeeds(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final SignedPeerSeeds defaultInstance;
-    public static SignedPeerSeeds getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public SignedPeerSeeds getDefaultInstanceForType() {
-      return defaultInstance;
+    private SignedPeerSeeds() {
+      peerSeeds_ = com.google.protobuf.ByteString.EMPTY;
+      signature_ = com.google.protobuf.ByteString.EMPTY;
+      pubkey_ = com.google.protobuf.ByteString.EMPTY;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private SignedPeerSeeds(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1714,13 +1960,6 @@ private SignedPeerSeeds(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               bitField0_ |= 0x00000001;
               peerSeeds_ = input.readBytes();
@@ -1736,13 +1975,20 @@ private SignedPeerSeeds(
               pubkey_ = input.readBytes();
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -1753,28 +1999,14 @@ private SignedPeerSeeds(
       return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_SignedPeerSeeds_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_SignedPeerSeeds_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds.class, org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<SignedPeerSeeds> PARSER =
-        new com.google.protobuf.AbstractParser<SignedPeerSeeds>() {
-      public SignedPeerSeeds parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new SignedPeerSeeds(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<SignedPeerSeeds> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int PEER_SEEDS_FIELD_NUMBER = 1;
     private com.google.protobuf.ByteString peerSeeds_;
@@ -1821,12 +2053,8 @@ public com.google.protobuf.ByteString getPubkey() {
       return pubkey_;
     }
 
-    private void initFields() {
-      peerSeeds_ = com.google.protobuf.ByteString.EMPTY;
-      signature_ = com.google.protobuf.ByteString.EMPTY;
-      pubkey_ = com.google.protobuf.ByteString.EMPTY;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1848,9 +2076,9 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeBytes(1, peerSeeds_);
       }
@@ -1860,12 +2088,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         output.writeBytes(3, pubkey_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -1881,18 +2109,76 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(3, pubkey_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds)) {
+        return super.equals(obj);
+      }
+      org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds other = (org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds) obj;
+
+      boolean result = true;
+      result = result && (hasPeerSeeds() == other.hasPeerSeeds());
+      if (hasPeerSeeds()) {
+        result = result && getPeerSeeds()
+            .equals(other.getPeerSeeds());
+      }
+      result = result && (hasSignature() == other.hasSignature());
+      if (hasSignature()) {
+        result = result && getSignature()
+            .equals(other.getSignature());
+      }
+      result = result && (hasPubkey() == other.hasPubkey());
+      if (hasPubkey()) {
+        result = result && getPubkey()
+            .equals(other.getPubkey());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasPeerSeeds()) {
+        hash = (37 * hash) + PEER_SEEDS_FIELD_NUMBER;
+        hash = (53 * hash) + getPeerSeeds().hashCode();
+      }
+      if (hasSignature()) {
+        hash = (37 * hash) + SIGNATURE_FIELD_NUMBER;
+        hash = (53 * hash) + getSignature().hashCode();
+      }
+      if (hasPubkey()) {
+        hash = (37 * hash) + PUBKEY_FIELD_NUMBER;
+        hash = (53 * hash) + getPubkey().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -1916,46 +2202,59 @@ public static org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds parseFrom(
     }
     public static org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -1963,7 +2262,7 @@ protected Builder newBuilderForType(
      * Protobuf type {@code org.bitcoin.crawler.SignedPeerSeeds}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:org.bitcoin.crawler.SignedPeerSeeds)
         org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeedsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -1971,7 +2270,8 @@ public static final class Builder extends
         return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_SignedPeerSeeds_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_SignedPeerSeeds_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -1984,18 +2284,16 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         peerSeeds_ = com.google.protobuf.ByteString.EMPTY;
@@ -2007,19 +2305,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoin.crawler.PeerSeedProtos.internal_static_org_bitcoin_crawler_SignedPeerSeeds_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds getDefaultInstanceForType() {
         return org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds build() {
         org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds result = buildPartial();
         if (!result.isInitialized()) {
@@ -2028,6 +2325,7 @@ public org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds buildPartial() {
         org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds result = new org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds(this);
         int from_bitField0_ = bitField0_;
@@ -2049,6 +2347,39 @@ public org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds) {
           return mergeFrom((org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds)other);
@@ -2069,26 +2400,26 @@ public Builder mergeFrom(org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds othe
         if (other.hasPubkey()) {
           setPubkey(other.getPubkey());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasPeerSeeds()) {
-          
           return false;
         }
         if (!hasSignature()) {
-          
           return false;
         }
         if (!hasPubkey()) {
-          
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2098,7 +2429,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -2212,39 +2543,80 @@ public Builder clearPubkey() {
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:org.bitcoin.crawler.SignedPeerSeeds)
     }
 
+    // @@protoc_insertion_point(class_scope:org.bitcoin.crawler.SignedPeerSeeds)
+    private static final org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds DEFAULT_INSTANCE;
     static {
-      defaultInstance = new SignedPeerSeeds(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds();
+    }
+
+    public static org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<SignedPeerSeeds>
+        PARSER = new com.google.protobuf.AbstractParser<SignedPeerSeeds>() {
+      @java.lang.Override
+      public SignedPeerSeeds parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new SignedPeerSeeds(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<SignedPeerSeeds> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<SignedPeerSeeds> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoin.crawler.PeerSeedProtos.SignedPeerSeeds getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:org.bitcoin.crawler.SignedPeerSeeds)
   }
 
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_org_bitcoin_crawler_PeerSeedData_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_org_bitcoin_crawler_PeerSeedData_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_org_bitcoin_crawler_PeerSeeds_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_org_bitcoin_crawler_PeerSeeds_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_org_bitcoin_crawler_SignedPeerSeeds_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_org_bitcoin_crawler_SignedPeerSeeds_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
   }
-  private static com.google.protobuf.Descriptors.FileDescriptor
+  private static  com.google.protobuf.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
@@ -2272,19 +2644,19 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     internal_static_org_bitcoin_crawler_PeerSeedData_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_org_bitcoin_crawler_PeerSeedData_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_org_bitcoin_crawler_PeerSeedData_descriptor,
         new java.lang.String[] { "IpAddress", "Port", "Services", });
     internal_static_org_bitcoin_crawler_PeerSeeds_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_org_bitcoin_crawler_PeerSeeds_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_org_bitcoin_crawler_PeerSeeds_descriptor,
         new java.lang.String[] { "Seed", "Timestamp", "Net", });
     internal_static_org_bitcoin_crawler_SignedPeerSeeds_descriptor =
       getDescriptor().getMessageTypes().get(2);
     internal_static_org_bitcoin_crawler_SignedPeerSeeds_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_org_bitcoin_crawler_SignedPeerSeeds_descriptor,
         new java.lang.String[] { "PeerSeeds", "Signature", "Pubkey", });
   }
diff --git a/core/src/main/java/org/bitcoin/paymentchannel/Protos.java b/core/src/main/java/org/bitcoin/paymentchannel/Protos.java
index 22dfa808c69..cd79f9c2ba4 100644
--- a/core/src/main/java/org/bitcoin/paymentchannel/Protos.java
+++ b/core/src/main/java/org/bitcoin/paymentchannel/Protos.java
@@ -5,56 +5,62 @@
 
 public final class Protos {
   private Protos() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   public interface TwoWayChannelMessageOrBuilder extends
       // @@protoc_insertion_point(interface_extends:paymentchannels.TwoWayChannelMessage)
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>required .paymentchannels.TwoWayChannelMessage.MessageType type = 1;</code>
-     *
      * <pre>
      * This is required so if a new message type is added in future, old software aborts trying
      * to read the message as early as possible. If the message doesn't parse, the socket should
      * be closed.
      * </pre>
+     *
+     * <code>required .paymentchannels.TwoWayChannelMessage.MessageType type = 1;</code>
      */
     boolean hasType();
     /**
-     * <code>required .paymentchannels.TwoWayChannelMessage.MessageType type = 1;</code>
-     *
      * <pre>
      * This is required so if a new message type is added in future, old software aborts trying
      * to read the message as early as possible. If the message doesn't parse, the socket should
      * be closed.
      * </pre>
+     *
+     * <code>required .paymentchannels.TwoWayChannelMessage.MessageType type = 1;</code>
      */
     org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType getType();
 
     /**
-     * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
-     *
      * <pre>
      * Now one optional field for each message. Only the field specified by type should be read.
      * </pre>
+     *
+     * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
      */
     boolean hasClientVersion();
     /**
-     * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
-     *
      * <pre>
      * Now one optional field for each message. Only the field specified by type should be read.
      * </pre>
+     *
+     * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
      */
     org.bitcoin.paymentchannel.Protos.ClientVersion getClientVersion();
     /**
-     * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
-     *
      * <pre>
      * Now one optional field for each message. Only the field specified by type should be read.
      * </pre>
+     *
+     * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
      */
     org.bitcoin.paymentchannel.Protos.ClientVersionOrBuilder getClientVersionOrBuilder();
 
@@ -176,45 +182,40 @@ public interface TwoWayChannelMessageOrBuilder extends
     org.bitcoin.paymentchannel.Protos.ErrorOrBuilder getErrorOrBuilder();
   }
   /**
-   * Protobuf type {@code paymentchannels.TwoWayChannelMessage}
-   *
    * <pre>
    * This message is designed to be either sent raw over the network (e.g. length prefixed) or embedded inside another
    * protocol that is being extended to support micropayments. In this file "primary" typically can be read as "client"
    * and "secondary" as "server".
    * </pre>
+   *
+   * Protobuf type {@code paymentchannels.TwoWayChannelMessage}
    */
-  public static final class TwoWayChannelMessage extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class TwoWayChannelMessage extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:paymentchannels.TwoWayChannelMessage)
       TwoWayChannelMessageOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use TwoWayChannelMessage.newBuilder() to construct.
-    private TwoWayChannelMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private TwoWayChannelMessage(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private TwoWayChannelMessage(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final TwoWayChannelMessage defaultInstance;
-    public static TwoWayChannelMessage getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public TwoWayChannelMessage getDefaultInstanceForType() {
-      return defaultInstance;
+    private TwoWayChannelMessage() {
+      type_ = 1;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private TwoWayChannelMessage(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -226,21 +227,15 @@ private TwoWayChannelMessage(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 8: {
               int rawValue = input.readEnum();
+                @SuppressWarnings("deprecation")
               org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType value = org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(1, rawValue);
               } else {
                 bitField0_ |= 0x00000001;
-                type_ = value;
+                type_ = rawValue;
               }
               break;
             }
@@ -374,13 +369,20 @@ private TwoWayChannelMessage(
               bitField0_ |= 0x00000100;
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -391,28 +393,14 @@ private TwoWayChannelMessage(
       return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_TwoWayChannelMessage_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_TwoWayChannelMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.class, org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<TwoWayChannelMessage> PARSER =
-        new com.google.protobuf.AbstractParser<TwoWayChannelMessage>() {
-      public TwoWayChannelMessage parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TwoWayChannelMessage(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<TwoWayChannelMessage> getParserForType() {
-      return PARSER;
-    }
-
     /**
      * Protobuf enum {@code paymentchannels.TwoWayChannelMessage.MessageType}
      */
@@ -421,30 +409,28 @@ public enum MessageType
       /**
        * <code>CLIENT_VERSION = 1;</code>
        */
-      CLIENT_VERSION(0, 1),
+      CLIENT_VERSION(1),
       /**
        * <code>SERVER_VERSION = 2;</code>
        */
-      SERVER_VERSION(1, 2),
+      SERVER_VERSION(2),
       /**
        * <code>INITIATE = 3;</code>
        */
-      INITIATE(2, 3),
+      INITIATE(3),
       /**
        * <code>PROVIDE_REFUND = 4;</code>
        */
-      PROVIDE_REFUND(3, 4),
+      PROVIDE_REFUND(4),
       /**
        * <code>RETURN_REFUND = 5;</code>
        */
-      RETURN_REFUND(4, 5),
+      RETURN_REFUND(5),
       /**
        * <code>PROVIDE_CONTRACT = 6;</code>
        */
-      PROVIDE_CONTRACT(5, 6),
+      PROVIDE_CONTRACT(6),
       /**
-       * <code>CHANNEL_OPEN = 7;</code>
-       *
        * <pre>
        * Note that there are no optional fields set for CHANNEL_OPEN, it is sent from the
        * secondary to the primary to indicate that the provided contract was received,
@@ -454,23 +440,23 @@ public enum MessageType
        * reopen the channel by setting the contract transaction hash in its CLIENT_VERSION
        * message.
        * </pre>
+       *
+       * <code>CHANNEL_OPEN = 7;</code>
        */
-      CHANNEL_OPEN(6, 7),
+      CHANNEL_OPEN(7),
       /**
        * <code>UPDATE_PAYMENT = 8;</code>
        */
-      UPDATE_PAYMENT(7, 8),
+      UPDATE_PAYMENT(8),
       /**
-       * <code>PAYMENT_ACK = 11;</code>
-       *
        * <pre>
        * Sent by the server to the client after an UPDATE_PAYMENT message is successfully processed.
        * </pre>
+       *
+       * <code>PAYMENT_ACK = 11;</code>
        */
-      PAYMENT_ACK(8, 11),
+      PAYMENT_ACK(11),
       /**
-       * <code>CLOSE = 9;</code>
-       *
        * <pre>
        * Either side can send this message. If the client sends it to the server, then the server
        * takes the most recent signature it received in an UPDATE_PAYMENT and uses it to create a
@@ -483,19 +469,21 @@ public enum MessageType
        * case this is just an equivalent to a TCP FIN packet. An explicit end-of-protocol markers can be
        * useful when this protocol is embedded inside another.
        * </pre>
+       *
+       * <code>CLOSE = 9;</code>
        */
-      CLOSE(9, 9),
+      CLOSE(9),
       /**
-       * <code>ERROR = 10;</code>
-       *
        * <pre>
        * Used to indicate an error condition.
        * Both parties should make an effort to send either an ERROR or a CLOSE immediately
        * before closing the socket (unless they just received an ERROR or a CLOSE). This is important
        * because the protocol may not run over TCP.
        * </pre>
+       *
+       * <code>ERROR = 10;</code>
        */
-      ERROR(10, 10),
+      ERROR(10),
       ;
 
       /**
@@ -523,8 +511,6 @@ public enum MessageType
        */
       public static final int PROVIDE_CONTRACT_VALUE = 6;
       /**
-       * <code>CHANNEL_OPEN = 7;</code>
-       *
        * <pre>
        * Note that there are no optional fields set for CHANNEL_OPEN, it is sent from the
        * secondary to the primary to indicate that the provided contract was received,
@@ -534,6 +520,8 @@ public enum MessageType
        * reopen the channel by setting the contract transaction hash in its CLIENT_VERSION
        * message.
        * </pre>
+       *
+       * <code>CHANNEL_OPEN = 7;</code>
        */
       public static final int CHANNEL_OPEN_VALUE = 7;
       /**
@@ -541,16 +529,14 @@ public enum MessageType
        */
       public static final int UPDATE_PAYMENT_VALUE = 8;
       /**
-       * <code>PAYMENT_ACK = 11;</code>
-       *
        * <pre>
        * Sent by the server to the client after an UPDATE_PAYMENT message is successfully processed.
        * </pre>
+       *
+       * <code>PAYMENT_ACK = 11;</code>
        */
       public static final int PAYMENT_ACK_VALUE = 11;
       /**
-       * <code>CLOSE = 9;</code>
-       *
        * <pre>
        * Either side can send this message. If the client sends it to the server, then the server
        * takes the most recent signature it received in an UPDATE_PAYMENT and uses it to create a
@@ -563,24 +549,36 @@ public enum MessageType
        * case this is just an equivalent to a TCP FIN packet. An explicit end-of-protocol markers can be
        * useful when this protocol is embedded inside another.
        * </pre>
+       *
+       * <code>CLOSE = 9;</code>
        */
       public static final int CLOSE_VALUE = 9;
       /**
-       * <code>ERROR = 10;</code>
-       *
        * <pre>
        * Used to indicate an error condition.
        * Both parties should make an effort to send either an ERROR or a CLOSE immediately
        * before closing the socket (unless they just received an ERROR or a CLOSE). This is important
        * because the protocol may not run over TCP.
        * </pre>
+       *
+       * <code>ERROR = 10;</code>
        */
       public static final int ERROR_VALUE = 10;
 
 
-      public final int getNumber() { return value; }
+      public final int getNumber() {
+        return value;
+      }
 
+      /**
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
       public static MessageType valueOf(int value) {
+        return forNumber(value);
+      }
+
+      public static MessageType forNumber(int value) {
         switch (value) {
           case 1: return CLIENT_VERSION;
           case 2: return SERVER_VERSION;
@@ -601,17 +599,17 @@ public static MessageType valueOf(int value) {
           internalGetValueMap() {
         return internalValueMap;
       }
-      private static com.google.protobuf.Internal.EnumLiteMap<MessageType>
-          internalValueMap =
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          MessageType> internalValueMap =
             new com.google.protobuf.Internal.EnumLiteMap<MessageType>() {
               public MessageType findValueByNumber(int number) {
-                return MessageType.valueOf(number);
+                return MessageType.forNumber(number);
               }
             };
 
       public final com.google.protobuf.Descriptors.EnumValueDescriptor
           getValueDescriptor() {
-        return getDescriptor().getValues().get(index);
+        return getDescriptor().getValues().get(ordinal());
       }
       public final com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptorForType() {
@@ -633,11 +631,9 @@ public static MessageType valueOf(
         return VALUES[desc.getIndex()];
       }
 
-      private final int index;
       private final int value;
 
-      private MessageType(int index, int value) {
-        this.index = index;
+      private MessageType(int value) {
         this.value = value;
       }
 
@@ -646,63 +642,65 @@ private MessageType(int index, int value) {
 
     private int bitField0_;
     public static final int TYPE_FIELD_NUMBER = 1;
-    private org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType type_;
+    private int type_;
     /**
-     * <code>required .paymentchannels.TwoWayChannelMessage.MessageType type = 1;</code>
-     *
      * <pre>
      * This is required so if a new message type is added in future, old software aborts trying
      * to read the message as early as possible. If the message doesn't parse, the socket should
      * be closed.
      * </pre>
+     *
+     * <code>required .paymentchannels.TwoWayChannelMessage.MessageType type = 1;</code>
      */
     public boolean hasType() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required .paymentchannels.TwoWayChannelMessage.MessageType type = 1;</code>
-     *
      * <pre>
      * This is required so if a new message type is added in future, old software aborts trying
      * to read the message as early as possible. If the message doesn't parse, the socket should
      * be closed.
      * </pre>
+     *
+     * <code>required .paymentchannels.TwoWayChannelMessage.MessageType type = 1;</code>
      */
     public org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType getType() {
-      return type_;
+      @SuppressWarnings("deprecation")
+      org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType result = org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType.valueOf(type_);
+      return result == null ? org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType.CLIENT_VERSION : result;
     }
 
     public static final int CLIENT_VERSION_FIELD_NUMBER = 2;
     private org.bitcoin.paymentchannel.Protos.ClientVersion clientVersion_;
     /**
-     * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
-     *
      * <pre>
      * Now one optional field for each message. Only the field specified by type should be read.
      * </pre>
+     *
+     * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
      */
     public boolean hasClientVersion() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
-     *
      * <pre>
      * Now one optional field for each message. Only the field specified by type should be read.
      * </pre>
+     *
+     * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
      */
     public org.bitcoin.paymentchannel.Protos.ClientVersion getClientVersion() {
-      return clientVersion_;
+      return clientVersion_ == null ? org.bitcoin.paymentchannel.Protos.ClientVersion.getDefaultInstance() : clientVersion_;
     }
     /**
-     * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
-     *
      * <pre>
      * Now one optional field for each message. Only the field specified by type should be read.
      * </pre>
+     *
+     * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
      */
     public org.bitcoin.paymentchannel.Protos.ClientVersionOrBuilder getClientVersionOrBuilder() {
-      return clientVersion_;
+      return clientVersion_ == null ? org.bitcoin.paymentchannel.Protos.ClientVersion.getDefaultInstance() : clientVersion_;
     }
 
     public static final int SERVER_VERSION_FIELD_NUMBER = 3;
@@ -717,13 +715,13 @@ public boolean hasServerVersion() {
      * <code>optional .paymentchannels.ServerVersion server_version = 3;</code>
      */
     public org.bitcoin.paymentchannel.Protos.ServerVersion getServerVersion() {
-      return serverVersion_;
+      return serverVersion_ == null ? org.bitcoin.paymentchannel.Protos.ServerVersion.getDefaultInstance() : serverVersion_;
     }
     /**
      * <code>optional .paymentchannels.ServerVersion server_version = 3;</code>
      */
     public org.bitcoin.paymentchannel.Protos.ServerVersionOrBuilder getServerVersionOrBuilder() {
-      return serverVersion_;
+      return serverVersion_ == null ? org.bitcoin.paymentchannel.Protos.ServerVersion.getDefaultInstance() : serverVersion_;
     }
 
     public static final int INITIATE_FIELD_NUMBER = 4;
@@ -738,13 +736,13 @@ public boolean hasInitiate() {
      * <code>optional .paymentchannels.Initiate initiate = 4;</code>
      */
     public org.bitcoin.paymentchannel.Protos.Initiate getInitiate() {
-      return initiate_;
+      return initiate_ == null ? org.bitcoin.paymentchannel.Protos.Initiate.getDefaultInstance() : initiate_;
     }
     /**
      * <code>optional .paymentchannels.Initiate initiate = 4;</code>
      */
     public org.bitcoin.paymentchannel.Protos.InitiateOrBuilder getInitiateOrBuilder() {
-      return initiate_;
+      return initiate_ == null ? org.bitcoin.paymentchannel.Protos.Initiate.getDefaultInstance() : initiate_;
     }
 
     public static final int PROVIDE_REFUND_FIELD_NUMBER = 5;
@@ -759,13 +757,13 @@ public boolean hasProvideRefund() {
      * <code>optional .paymentchannels.ProvideRefund provide_refund = 5;</code>
      */
     public org.bitcoin.paymentchannel.Protos.ProvideRefund getProvideRefund() {
-      return provideRefund_;
+      return provideRefund_ == null ? org.bitcoin.paymentchannel.Protos.ProvideRefund.getDefaultInstance() : provideRefund_;
     }
     /**
      * <code>optional .paymentchannels.ProvideRefund provide_refund = 5;</code>
      */
     public org.bitcoin.paymentchannel.Protos.ProvideRefundOrBuilder getProvideRefundOrBuilder() {
-      return provideRefund_;
+      return provideRefund_ == null ? org.bitcoin.paymentchannel.Protos.ProvideRefund.getDefaultInstance() : provideRefund_;
     }
 
     public static final int RETURN_REFUND_FIELD_NUMBER = 6;
@@ -780,13 +778,13 @@ public boolean hasReturnRefund() {
      * <code>optional .paymentchannels.ReturnRefund return_refund = 6;</code>
      */
     public org.bitcoin.paymentchannel.Protos.ReturnRefund getReturnRefund() {
-      return returnRefund_;
+      return returnRefund_ == null ? org.bitcoin.paymentchannel.Protos.ReturnRefund.getDefaultInstance() : returnRefund_;
     }
     /**
      * <code>optional .paymentchannels.ReturnRefund return_refund = 6;</code>
      */
     public org.bitcoin.paymentchannel.Protos.ReturnRefundOrBuilder getReturnRefundOrBuilder() {
-      return returnRefund_;
+      return returnRefund_ == null ? org.bitcoin.paymentchannel.Protos.ReturnRefund.getDefaultInstance() : returnRefund_;
     }
 
     public static final int PROVIDE_CONTRACT_FIELD_NUMBER = 7;
@@ -801,13 +799,13 @@ public boolean hasProvideContract() {
      * <code>optional .paymentchannels.ProvideContract provide_contract = 7;</code>
      */
     public org.bitcoin.paymentchannel.Protos.ProvideContract getProvideContract() {
-      return provideContract_;
+      return provideContract_ == null ? org.bitcoin.paymentchannel.Protos.ProvideContract.getDefaultInstance() : provideContract_;
     }
     /**
      * <code>optional .paymentchannels.ProvideContract provide_contract = 7;</code>
      */
     public org.bitcoin.paymentchannel.Protos.ProvideContractOrBuilder getProvideContractOrBuilder() {
-      return provideContract_;
+      return provideContract_ == null ? org.bitcoin.paymentchannel.Protos.ProvideContract.getDefaultInstance() : provideContract_;
     }
 
     public static final int UPDATE_PAYMENT_FIELD_NUMBER = 8;
@@ -822,13 +820,13 @@ public boolean hasUpdatePayment() {
      * <code>optional .paymentchannels.UpdatePayment update_payment = 8;</code>
      */
     public org.bitcoin.paymentchannel.Protos.UpdatePayment getUpdatePayment() {
-      return updatePayment_;
+      return updatePayment_ == null ? org.bitcoin.paymentchannel.Protos.UpdatePayment.getDefaultInstance() : updatePayment_;
     }
     /**
      * <code>optional .paymentchannels.UpdatePayment update_payment = 8;</code>
      */
     public org.bitcoin.paymentchannel.Protos.UpdatePaymentOrBuilder getUpdatePaymentOrBuilder() {
-      return updatePayment_;
+      return updatePayment_ == null ? org.bitcoin.paymentchannel.Protos.UpdatePayment.getDefaultInstance() : updatePayment_;
     }
 
     public static final int PAYMENT_ACK_FIELD_NUMBER = 11;
@@ -843,13 +841,13 @@ public boolean hasPaymentAck() {
      * <code>optional .paymentchannels.PaymentAck payment_ack = 11;</code>
      */
     public org.bitcoin.paymentchannel.Protos.PaymentAck getPaymentAck() {
-      return paymentAck_;
+      return paymentAck_ == null ? org.bitcoin.paymentchannel.Protos.PaymentAck.getDefaultInstance() : paymentAck_;
     }
     /**
      * <code>optional .paymentchannels.PaymentAck payment_ack = 11;</code>
      */
     public org.bitcoin.paymentchannel.Protos.PaymentAckOrBuilder getPaymentAckOrBuilder() {
-      return paymentAck_;
+      return paymentAck_ == null ? org.bitcoin.paymentchannel.Protos.PaymentAck.getDefaultInstance() : paymentAck_;
     }
 
     public static final int SETTLEMENT_FIELD_NUMBER = 9;
@@ -864,13 +862,13 @@ public boolean hasSettlement() {
      * <code>optional .paymentchannels.Settlement settlement = 9;</code>
      */
     public org.bitcoin.paymentchannel.Protos.Settlement getSettlement() {
-      return settlement_;
+      return settlement_ == null ? org.bitcoin.paymentchannel.Protos.Settlement.getDefaultInstance() : settlement_;
     }
     /**
      * <code>optional .paymentchannels.Settlement settlement = 9;</code>
      */
     public org.bitcoin.paymentchannel.Protos.SettlementOrBuilder getSettlementOrBuilder() {
-      return settlement_;
+      return settlement_ == null ? org.bitcoin.paymentchannel.Protos.Settlement.getDefaultInstance() : settlement_;
     }
 
     public static final int ERROR_FIELD_NUMBER = 10;
@@ -885,29 +883,17 @@ public boolean hasError() {
      * <code>optional .paymentchannels.Error error = 10;</code>
      */
     public org.bitcoin.paymentchannel.Protos.Error getError() {
-      return error_;
+      return error_ == null ? org.bitcoin.paymentchannel.Protos.Error.getDefaultInstance() : error_;
     }
     /**
      * <code>optional .paymentchannels.Error error = 10;</code>
      */
     public org.bitcoin.paymentchannel.Protos.ErrorOrBuilder getErrorOrBuilder() {
-      return error_;
-    }
-
-    private void initFields() {
-      type_ = org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType.CLIENT_VERSION;
-      clientVersion_ = org.bitcoin.paymentchannel.Protos.ClientVersion.getDefaultInstance();
-      serverVersion_ = org.bitcoin.paymentchannel.Protos.ServerVersion.getDefaultInstance();
-      initiate_ = org.bitcoin.paymentchannel.Protos.Initiate.getDefaultInstance();
-      provideRefund_ = org.bitcoin.paymentchannel.Protos.ProvideRefund.getDefaultInstance();
-      returnRefund_ = org.bitcoin.paymentchannel.Protos.ReturnRefund.getDefaultInstance();
-      provideContract_ = org.bitcoin.paymentchannel.Protos.ProvideContract.getDefaultInstance();
-      updatePayment_ = org.bitcoin.paymentchannel.Protos.UpdatePayment.getDefaultInstance();
-      paymentAck_ = org.bitcoin.paymentchannel.Protos.PaymentAck.getDefaultInstance();
-      settlement_ = org.bitcoin.paymentchannel.Protos.Settlement.getDefaultInstance();
-      error_ = org.bitcoin.paymentchannel.Protos.Error.getDefaultInstance();
+      return error_ == null ? org.bitcoin.paymentchannel.Protos.Error.getDefaultInstance() : error_;
     }
+
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -969,107 +955,236 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeEnum(1, type_.getNumber());
+        output.writeEnum(1, type_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeMessage(2, clientVersion_);
+        output.writeMessage(2, getClientVersion());
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeMessage(3, serverVersion_);
+        output.writeMessage(3, getServerVersion());
       }
       if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeMessage(4, initiate_);
+        output.writeMessage(4, getInitiate());
       }
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        output.writeMessage(5, provideRefund_);
+        output.writeMessage(5, getProvideRefund());
       }
       if (((bitField0_ & 0x00000020) == 0x00000020)) {
-        output.writeMessage(6, returnRefund_);
+        output.writeMessage(6, getReturnRefund());
       }
       if (((bitField0_ & 0x00000040) == 0x00000040)) {
-        output.writeMessage(7, provideContract_);
+        output.writeMessage(7, getProvideContract());
       }
       if (((bitField0_ & 0x00000080) == 0x00000080)) {
-        output.writeMessage(8, updatePayment_);
+        output.writeMessage(8, getUpdatePayment());
       }
       if (((bitField0_ & 0x00000200) == 0x00000200)) {
-        output.writeMessage(9, settlement_);
+        output.writeMessage(9, getSettlement());
       }
       if (((bitField0_ & 0x00000400) == 0x00000400)) {
-        output.writeMessage(10, error_);
+        output.writeMessage(10, getError());
       }
       if (((bitField0_ & 0x00000100) == 0x00000100)) {
-        output.writeMessage(11, paymentAck_);
+        output.writeMessage(11, getPaymentAck());
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(1, type_.getNumber());
+          .computeEnumSize(1, type_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, clientVersion_);
+          .computeMessageSize(2, getClientVersion());
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, serverVersion_);
+          .computeMessageSize(3, getServerVersion());
       }
       if (((bitField0_ & 0x00000008) == 0x00000008)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, initiate_);
+          .computeMessageSize(4, getInitiate());
       }
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, provideRefund_);
+          .computeMessageSize(5, getProvideRefund());
       }
       if (((bitField0_ & 0x00000020) == 0x00000020)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, returnRefund_);
+          .computeMessageSize(6, getReturnRefund());
       }
       if (((bitField0_ & 0x00000040) == 0x00000040)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, provideContract_);
+          .computeMessageSize(7, getProvideContract());
       }
       if (((bitField0_ & 0x00000080) == 0x00000080)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, updatePayment_);
+          .computeMessageSize(8, getUpdatePayment());
       }
       if (((bitField0_ & 0x00000200) == 0x00000200)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, settlement_);
+          .computeMessageSize(9, getSettlement());
       }
       if (((bitField0_ & 0x00000400) == 0x00000400)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, error_);
+          .computeMessageSize(10, getError());
       }
       if (((bitField0_ & 0x00000100) == 0x00000100)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, paymentAck_);
+          .computeMessageSize(11, getPaymentAck());
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage)) {
+        return super.equals(obj);
+      }
+      org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage other = (org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage) obj;
+
+      boolean result = true;
+      result = result && (hasType() == other.hasType());
+      if (hasType()) {
+        result = result && type_ == other.type_;
+      }
+      result = result && (hasClientVersion() == other.hasClientVersion());
+      if (hasClientVersion()) {
+        result = result && getClientVersion()
+            .equals(other.getClientVersion());
+      }
+      result = result && (hasServerVersion() == other.hasServerVersion());
+      if (hasServerVersion()) {
+        result = result && getServerVersion()
+            .equals(other.getServerVersion());
+      }
+      result = result && (hasInitiate() == other.hasInitiate());
+      if (hasInitiate()) {
+        result = result && getInitiate()
+            .equals(other.getInitiate());
+      }
+      result = result && (hasProvideRefund() == other.hasProvideRefund());
+      if (hasProvideRefund()) {
+        result = result && getProvideRefund()
+            .equals(other.getProvideRefund());
+      }
+      result = result && (hasReturnRefund() == other.hasReturnRefund());
+      if (hasReturnRefund()) {
+        result = result && getReturnRefund()
+            .equals(other.getReturnRefund());
+      }
+      result = result && (hasProvideContract() == other.hasProvideContract());
+      if (hasProvideContract()) {
+        result = result && getProvideContract()
+            .equals(other.getProvideContract());
+      }
+      result = result && (hasUpdatePayment() == other.hasUpdatePayment());
+      if (hasUpdatePayment()) {
+        result = result && getUpdatePayment()
+            .equals(other.getUpdatePayment());
+      }
+      result = result && (hasPaymentAck() == other.hasPaymentAck());
+      if (hasPaymentAck()) {
+        result = result && getPaymentAck()
+            .equals(other.getPaymentAck());
+      }
+      result = result && (hasSettlement() == other.hasSettlement());
+      if (hasSettlement()) {
+        result = result && getSettlement()
+            .equals(other.getSettlement());
+      }
+      result = result && (hasError() == other.hasError());
+      if (hasError()) {
+        result = result && getError()
+            .equals(other.getError());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasType()) {
+        hash = (37 * hash) + TYPE_FIELD_NUMBER;
+        hash = (53 * hash) + type_;
+      }
+      if (hasClientVersion()) {
+        hash = (37 * hash) + CLIENT_VERSION_FIELD_NUMBER;
+        hash = (53 * hash) + getClientVersion().hashCode();
+      }
+      if (hasServerVersion()) {
+        hash = (37 * hash) + SERVER_VERSION_FIELD_NUMBER;
+        hash = (53 * hash) + getServerVersion().hashCode();
+      }
+      if (hasInitiate()) {
+        hash = (37 * hash) + INITIATE_FIELD_NUMBER;
+        hash = (53 * hash) + getInitiate().hashCode();
+      }
+      if (hasProvideRefund()) {
+        hash = (37 * hash) + PROVIDE_REFUND_FIELD_NUMBER;
+        hash = (53 * hash) + getProvideRefund().hashCode();
+      }
+      if (hasReturnRefund()) {
+        hash = (37 * hash) + RETURN_REFUND_FIELD_NUMBER;
+        hash = (53 * hash) + getReturnRefund().hashCode();
+      }
+      if (hasProvideContract()) {
+        hash = (37 * hash) + PROVIDE_CONTRACT_FIELD_NUMBER;
+        hash = (53 * hash) + getProvideContract().hashCode();
+      }
+      if (hasUpdatePayment()) {
+        hash = (37 * hash) + UPDATE_PAYMENT_FIELD_NUMBER;
+        hash = (53 * hash) + getUpdatePayment().hashCode();
+      }
+      if (hasPaymentAck()) {
+        hash = (37 * hash) + PAYMENT_ACK_FIELD_NUMBER;
+        hash = (53 * hash) + getPaymentAck().hashCode();
+      }
+      if (hasSettlement()) {
+        hash = (37 * hash) + SETTLEMENT_FIELD_NUMBER;
+        hash = (53 * hash) + getSettlement().hashCode();
+      }
+      if (hasError()) {
+        hash = (37 * hash) + ERROR_FIELD_NUMBER;
+        hash = (53 * hash) + getError().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -1093,60 +1208,73 @@ public static org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage parseFrom(
     }
     public static org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code paymentchannels.TwoWayChannelMessage}
-     *
      * <pre>
      * This message is designed to be either sent raw over the network (e.g. length prefixed) or embedded inside another
      * protocol that is being extended to support micropayments. In this file "primary" typically can be read as "client"
      * and "secondary" as "server".
      * </pre>
+     *
+     * Protobuf type {@code paymentchannels.TwoWayChannelMessage}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:paymentchannels.TwoWayChannelMessage)
         org.bitcoin.paymentchannel.Protos.TwoWayChannelMessageOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -1154,7 +1282,8 @@ public static final class Builder extends
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_TwoWayChannelMessage_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_TwoWayChannelMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -1167,12 +1296,13 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
           getClientVersionFieldBuilder();
           getServerVersionFieldBuilder();
           getInitiateFieldBuilder();
@@ -1185,70 +1315,67 @@ private void maybeForceBuilderInitialization() {
           getErrorFieldBuilder();
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
-        type_ = org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType.CLIENT_VERSION;
+        type_ = 1;
         bitField0_ = (bitField0_ & ~0x00000001);
         if (clientVersionBuilder_ == null) {
-          clientVersion_ = org.bitcoin.paymentchannel.Protos.ClientVersion.getDefaultInstance();
+          clientVersion_ = null;
         } else {
           clientVersionBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000002);
         if (serverVersionBuilder_ == null) {
-          serverVersion_ = org.bitcoin.paymentchannel.Protos.ServerVersion.getDefaultInstance();
+          serverVersion_ = null;
         } else {
           serverVersionBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000004);
         if (initiateBuilder_ == null) {
-          initiate_ = org.bitcoin.paymentchannel.Protos.Initiate.getDefaultInstance();
+          initiate_ = null;
         } else {
           initiateBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000008);
         if (provideRefundBuilder_ == null) {
-          provideRefund_ = org.bitcoin.paymentchannel.Protos.ProvideRefund.getDefaultInstance();
+          provideRefund_ = null;
         } else {
           provideRefundBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000010);
         if (returnRefundBuilder_ == null) {
-          returnRefund_ = org.bitcoin.paymentchannel.Protos.ReturnRefund.getDefaultInstance();
+          returnRefund_ = null;
         } else {
           returnRefundBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000020);
         if (provideContractBuilder_ == null) {
-          provideContract_ = org.bitcoin.paymentchannel.Protos.ProvideContract.getDefaultInstance();
+          provideContract_ = null;
         } else {
           provideContractBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000040);
         if (updatePaymentBuilder_ == null) {
-          updatePayment_ = org.bitcoin.paymentchannel.Protos.UpdatePayment.getDefaultInstance();
+          updatePayment_ = null;
         } else {
           updatePaymentBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000080);
         if (paymentAckBuilder_ == null) {
-          paymentAck_ = org.bitcoin.paymentchannel.Protos.PaymentAck.getDefaultInstance();
+          paymentAck_ = null;
         } else {
           paymentAckBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000100);
         if (settlementBuilder_ == null) {
-          settlement_ = org.bitcoin.paymentchannel.Protos.Settlement.getDefaultInstance();
+          settlement_ = null;
         } else {
           settlementBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000200);
         if (errorBuilder_ == null) {
-          error_ = org.bitcoin.paymentchannel.Protos.Error.getDefaultInstance();
+          error_ = null;
         } else {
           errorBuilder_.clear();
         }
@@ -1256,19 +1383,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_TwoWayChannelMessage_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage getDefaultInstanceForType() {
         return org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage build() {
         org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage result = buildPartial();
         if (!result.isInitialized()) {
@@ -1277,6 +1403,7 @@ public org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage buildPartial() {
         org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage result = new org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage(this);
         int from_bitField0_ = bitField0_;
@@ -1370,6 +1497,39 @@ public org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage) {
           return mergeFrom((org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage)other);
@@ -1414,66 +1574,60 @@ public Builder mergeFrom(org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage
         if (other.hasError()) {
           mergeError(other.getError());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasType()) {
-          
           return false;
         }
         if (hasClientVersion()) {
           if (!getClientVersion().isInitialized()) {
-            
             return false;
           }
         }
         if (hasServerVersion()) {
           if (!getServerVersion().isInitialized()) {
-            
             return false;
           }
         }
         if (hasInitiate()) {
           if (!getInitiate().isInitialized()) {
-            
             return false;
           }
         }
         if (hasProvideRefund()) {
           if (!getProvideRefund().isInitialized()) {
-            
             return false;
           }
         }
         if (hasReturnRefund()) {
           if (!getReturnRefund().isInitialized()) {
-            
             return false;
           }
         }
         if (hasProvideContract()) {
           if (!getProvideContract().isInitialized()) {
-            
             return false;
           }
         }
         if (hasUpdatePayment()) {
           if (!getUpdatePayment().isInitialized()) {
-            
             return false;
           }
         }
         if (hasSettlement()) {
           if (!getSettlement().isInitialized()) {
-            
             return false;
           }
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1483,7 +1637,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -1493,98 +1647,100 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType type_ = org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType.CLIENT_VERSION;
+      private int type_ = 1;
       /**
-       * <code>required .paymentchannels.TwoWayChannelMessage.MessageType type = 1;</code>
-       *
        * <pre>
        * This is required so if a new message type is added in future, old software aborts trying
        * to read the message as early as possible. If the message doesn't parse, the socket should
        * be closed.
        * </pre>
+       *
+       * <code>required .paymentchannels.TwoWayChannelMessage.MessageType type = 1;</code>
        */
       public boolean hasType() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>required .paymentchannels.TwoWayChannelMessage.MessageType type = 1;</code>
-       *
        * <pre>
        * This is required so if a new message type is added in future, old software aborts trying
        * to read the message as early as possible. If the message doesn't parse, the socket should
        * be closed.
        * </pre>
+       *
+       * <code>required .paymentchannels.TwoWayChannelMessage.MessageType type = 1;</code>
        */
       public org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType getType() {
-        return type_;
+        @SuppressWarnings("deprecation")
+        org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType result = org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType.valueOf(type_);
+        return result == null ? org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType.CLIENT_VERSION : result;
       }
       /**
-       * <code>required .paymentchannels.TwoWayChannelMessage.MessageType type = 1;</code>
-       *
        * <pre>
        * This is required so if a new message type is added in future, old software aborts trying
        * to read the message as early as possible. If the message doesn't parse, the socket should
        * be closed.
        * </pre>
+       *
+       * <code>required .paymentchannels.TwoWayChannelMessage.MessageType type = 1;</code>
        */
       public Builder setType(org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType value) {
         if (value == null) {
           throw new NullPointerException();
         }
         bitField0_ |= 0x00000001;
-        type_ = value;
+        type_ = value.getNumber();
         onChanged();
         return this;
       }
       /**
-       * <code>required .paymentchannels.TwoWayChannelMessage.MessageType type = 1;</code>
-       *
        * <pre>
        * This is required so if a new message type is added in future, old software aborts trying
        * to read the message as early as possible. If the message doesn't parse, the socket should
        * be closed.
        * </pre>
+       *
+       * <code>required .paymentchannels.TwoWayChannelMessage.MessageType type = 1;</code>
        */
       public Builder clearType() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        type_ = org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType.CLIENT_VERSION;
+        type_ = 1;
         onChanged();
         return this;
       }
 
-      private org.bitcoin.paymentchannel.Protos.ClientVersion clientVersion_ = org.bitcoin.paymentchannel.Protos.ClientVersion.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
+      private org.bitcoin.paymentchannel.Protos.ClientVersion clientVersion_ = null;
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.paymentchannel.Protos.ClientVersion, org.bitcoin.paymentchannel.Protos.ClientVersion.Builder, org.bitcoin.paymentchannel.Protos.ClientVersionOrBuilder> clientVersionBuilder_;
       /**
-       * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
-       *
        * <pre>
        * Now one optional field for each message. Only the field specified by type should be read.
        * </pre>
+       *
+       * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
        */
       public boolean hasClientVersion() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
-       *
        * <pre>
        * Now one optional field for each message. Only the field specified by type should be read.
        * </pre>
+       *
+       * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
        */
       public org.bitcoin.paymentchannel.Protos.ClientVersion getClientVersion() {
         if (clientVersionBuilder_ == null) {
-          return clientVersion_;
+          return clientVersion_ == null ? org.bitcoin.paymentchannel.Protos.ClientVersion.getDefaultInstance() : clientVersion_;
         } else {
           return clientVersionBuilder_.getMessage();
         }
       }
       /**
-       * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
-       *
        * <pre>
        * Now one optional field for each message. Only the field specified by type should be read.
        * </pre>
+       *
+       * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
        */
       public Builder setClientVersion(org.bitcoin.paymentchannel.Protos.ClientVersion value) {
         if (clientVersionBuilder_ == null) {
@@ -1600,11 +1756,11 @@ public Builder setClientVersion(org.bitcoin.paymentchannel.Protos.ClientVersion
         return this;
       }
       /**
-       * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
-       *
        * <pre>
        * Now one optional field for each message. Only the field specified by type should be read.
        * </pre>
+       *
+       * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
        */
       public Builder setClientVersion(
           org.bitcoin.paymentchannel.Protos.ClientVersion.Builder builderForValue) {
@@ -1618,15 +1774,16 @@ public Builder setClientVersion(
         return this;
       }
       /**
-       * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
-       *
        * <pre>
        * Now one optional field for each message. Only the field specified by type should be read.
        * </pre>
+       *
+       * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
        */
       public Builder mergeClientVersion(org.bitcoin.paymentchannel.Protos.ClientVersion value) {
         if (clientVersionBuilder_ == null) {
           if (((bitField0_ & 0x00000002) == 0x00000002) &&
+              clientVersion_ != null &&
               clientVersion_ != org.bitcoin.paymentchannel.Protos.ClientVersion.getDefaultInstance()) {
             clientVersion_ =
               org.bitcoin.paymentchannel.Protos.ClientVersion.newBuilder(clientVersion_).mergeFrom(value).buildPartial();
@@ -1641,15 +1798,15 @@ public Builder mergeClientVersion(org.bitcoin.paymentchannel.Protos.ClientVersio
         return this;
       }
       /**
-       * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
-       *
        * <pre>
        * Now one optional field for each message. Only the field specified by type should be read.
        * </pre>
+       *
+       * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
        */
       public Builder clearClientVersion() {
         if (clientVersionBuilder_ == null) {
-          clientVersion_ = org.bitcoin.paymentchannel.Protos.ClientVersion.getDefaultInstance();
+          clientVersion_ = null;
           onChanged();
         } else {
           clientVersionBuilder_.clear();
@@ -1658,11 +1815,11 @@ public Builder clearClientVersion() {
         return this;
       }
       /**
-       * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
-       *
        * <pre>
        * Now one optional field for each message. Only the field specified by type should be read.
        * </pre>
+       *
+       * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
        */
       public org.bitcoin.paymentchannel.Protos.ClientVersion.Builder getClientVersionBuilder() {
         bitField0_ |= 0x00000002;
@@ -1670,31 +1827,32 @@ public org.bitcoin.paymentchannel.Protos.ClientVersion.Builder getClientVersionB
         return getClientVersionFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
-       *
        * <pre>
        * Now one optional field for each message. Only the field specified by type should be read.
        * </pre>
+       *
+       * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
        */
       public org.bitcoin.paymentchannel.Protos.ClientVersionOrBuilder getClientVersionOrBuilder() {
         if (clientVersionBuilder_ != null) {
           return clientVersionBuilder_.getMessageOrBuilder();
         } else {
-          return clientVersion_;
+          return clientVersion_ == null ?
+              org.bitcoin.paymentchannel.Protos.ClientVersion.getDefaultInstance() : clientVersion_;
         }
       }
       /**
-       * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
-       *
        * <pre>
        * Now one optional field for each message. Only the field specified by type should be read.
        * </pre>
+       *
+       * <code>optional .paymentchannels.ClientVersion client_version = 2;</code>
        */
-      private com.google.protobuf.SingleFieldBuilder<
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.paymentchannel.Protos.ClientVersion, org.bitcoin.paymentchannel.Protos.ClientVersion.Builder, org.bitcoin.paymentchannel.Protos.ClientVersionOrBuilder> 
           getClientVersionFieldBuilder() {
         if (clientVersionBuilder_ == null) {
-          clientVersionBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+          clientVersionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               org.bitcoin.paymentchannel.Protos.ClientVersion, org.bitcoin.paymentchannel.Protos.ClientVersion.Builder, org.bitcoin.paymentchannel.Protos.ClientVersionOrBuilder>(
                   getClientVersion(),
                   getParentForChildren(),
@@ -1704,8 +1862,8 @@ public org.bitcoin.paymentchannel.Protos.ClientVersionOrBuilder getClientVersion
         return clientVersionBuilder_;
       }
 
-      private org.bitcoin.paymentchannel.Protos.ServerVersion serverVersion_ = org.bitcoin.paymentchannel.Protos.ServerVersion.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
+      private org.bitcoin.paymentchannel.Protos.ServerVersion serverVersion_ = null;
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.paymentchannel.Protos.ServerVersion, org.bitcoin.paymentchannel.Protos.ServerVersion.Builder, org.bitcoin.paymentchannel.Protos.ServerVersionOrBuilder> serverVersionBuilder_;
       /**
        * <code>optional .paymentchannels.ServerVersion server_version = 3;</code>
@@ -1718,7 +1876,7 @@ public boolean hasServerVersion() {
        */
       public org.bitcoin.paymentchannel.Protos.ServerVersion getServerVersion() {
         if (serverVersionBuilder_ == null) {
-          return serverVersion_;
+          return serverVersion_ == null ? org.bitcoin.paymentchannel.Protos.ServerVersion.getDefaultInstance() : serverVersion_;
         } else {
           return serverVersionBuilder_.getMessage();
         }
@@ -1759,6 +1917,7 @@ public Builder setServerVersion(
       public Builder mergeServerVersion(org.bitcoin.paymentchannel.Protos.ServerVersion value) {
         if (serverVersionBuilder_ == null) {
           if (((bitField0_ & 0x00000004) == 0x00000004) &&
+              serverVersion_ != null &&
               serverVersion_ != org.bitcoin.paymentchannel.Protos.ServerVersion.getDefaultInstance()) {
             serverVersion_ =
               org.bitcoin.paymentchannel.Protos.ServerVersion.newBuilder(serverVersion_).mergeFrom(value).buildPartial();
@@ -1777,7 +1936,7 @@ public Builder mergeServerVersion(org.bitcoin.paymentchannel.Protos.ServerVersio
        */
       public Builder clearServerVersion() {
         if (serverVersionBuilder_ == null) {
-          serverVersion_ = org.bitcoin.paymentchannel.Protos.ServerVersion.getDefaultInstance();
+          serverVersion_ = null;
           onChanged();
         } else {
           serverVersionBuilder_.clear();
@@ -1800,17 +1959,18 @@ public org.bitcoin.paymentchannel.Protos.ServerVersionOrBuilder getServerVersion
         if (serverVersionBuilder_ != null) {
           return serverVersionBuilder_.getMessageOrBuilder();
         } else {
-          return serverVersion_;
+          return serverVersion_ == null ?
+              org.bitcoin.paymentchannel.Protos.ServerVersion.getDefaultInstance() : serverVersion_;
         }
       }
       /**
        * <code>optional .paymentchannels.ServerVersion server_version = 3;</code>
        */
-      private com.google.protobuf.SingleFieldBuilder<
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.paymentchannel.Protos.ServerVersion, org.bitcoin.paymentchannel.Protos.ServerVersion.Builder, org.bitcoin.paymentchannel.Protos.ServerVersionOrBuilder> 
           getServerVersionFieldBuilder() {
         if (serverVersionBuilder_ == null) {
-          serverVersionBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+          serverVersionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               org.bitcoin.paymentchannel.Protos.ServerVersion, org.bitcoin.paymentchannel.Protos.ServerVersion.Builder, org.bitcoin.paymentchannel.Protos.ServerVersionOrBuilder>(
                   getServerVersion(),
                   getParentForChildren(),
@@ -1820,8 +1980,8 @@ public org.bitcoin.paymentchannel.Protos.ServerVersionOrBuilder getServerVersion
         return serverVersionBuilder_;
       }
 
-      private org.bitcoin.paymentchannel.Protos.Initiate initiate_ = org.bitcoin.paymentchannel.Protos.Initiate.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
+      private org.bitcoin.paymentchannel.Protos.Initiate initiate_ = null;
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.paymentchannel.Protos.Initiate, org.bitcoin.paymentchannel.Protos.Initiate.Builder, org.bitcoin.paymentchannel.Protos.InitiateOrBuilder> initiateBuilder_;
       /**
        * <code>optional .paymentchannels.Initiate initiate = 4;</code>
@@ -1834,7 +1994,7 @@ public boolean hasInitiate() {
        */
       public org.bitcoin.paymentchannel.Protos.Initiate getInitiate() {
         if (initiateBuilder_ == null) {
-          return initiate_;
+          return initiate_ == null ? org.bitcoin.paymentchannel.Protos.Initiate.getDefaultInstance() : initiate_;
         } else {
           return initiateBuilder_.getMessage();
         }
@@ -1875,6 +2035,7 @@ public Builder setInitiate(
       public Builder mergeInitiate(org.bitcoin.paymentchannel.Protos.Initiate value) {
         if (initiateBuilder_ == null) {
           if (((bitField0_ & 0x00000008) == 0x00000008) &&
+              initiate_ != null &&
               initiate_ != org.bitcoin.paymentchannel.Protos.Initiate.getDefaultInstance()) {
             initiate_ =
               org.bitcoin.paymentchannel.Protos.Initiate.newBuilder(initiate_).mergeFrom(value).buildPartial();
@@ -1893,7 +2054,7 @@ public Builder mergeInitiate(org.bitcoin.paymentchannel.Protos.Initiate value) {
        */
       public Builder clearInitiate() {
         if (initiateBuilder_ == null) {
-          initiate_ = org.bitcoin.paymentchannel.Protos.Initiate.getDefaultInstance();
+          initiate_ = null;
           onChanged();
         } else {
           initiateBuilder_.clear();
@@ -1916,17 +2077,18 @@ public org.bitcoin.paymentchannel.Protos.InitiateOrBuilder getInitiateOrBuilder(
         if (initiateBuilder_ != null) {
           return initiateBuilder_.getMessageOrBuilder();
         } else {
-          return initiate_;
+          return initiate_ == null ?
+              org.bitcoin.paymentchannel.Protos.Initiate.getDefaultInstance() : initiate_;
         }
       }
       /**
        * <code>optional .paymentchannels.Initiate initiate = 4;</code>
        */
-      private com.google.protobuf.SingleFieldBuilder<
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.paymentchannel.Protos.Initiate, org.bitcoin.paymentchannel.Protos.Initiate.Builder, org.bitcoin.paymentchannel.Protos.InitiateOrBuilder> 
           getInitiateFieldBuilder() {
         if (initiateBuilder_ == null) {
-          initiateBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+          initiateBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               org.bitcoin.paymentchannel.Protos.Initiate, org.bitcoin.paymentchannel.Protos.Initiate.Builder, org.bitcoin.paymentchannel.Protos.InitiateOrBuilder>(
                   getInitiate(),
                   getParentForChildren(),
@@ -1936,8 +2098,8 @@ public org.bitcoin.paymentchannel.Protos.InitiateOrBuilder getInitiateOrBuilder(
         return initiateBuilder_;
       }
 
-      private org.bitcoin.paymentchannel.Protos.ProvideRefund provideRefund_ = org.bitcoin.paymentchannel.Protos.ProvideRefund.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
+      private org.bitcoin.paymentchannel.Protos.ProvideRefund provideRefund_ = null;
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.paymentchannel.Protos.ProvideRefund, org.bitcoin.paymentchannel.Protos.ProvideRefund.Builder, org.bitcoin.paymentchannel.Protos.ProvideRefundOrBuilder> provideRefundBuilder_;
       /**
        * <code>optional .paymentchannels.ProvideRefund provide_refund = 5;</code>
@@ -1950,7 +2112,7 @@ public boolean hasProvideRefund() {
        */
       public org.bitcoin.paymentchannel.Protos.ProvideRefund getProvideRefund() {
         if (provideRefundBuilder_ == null) {
-          return provideRefund_;
+          return provideRefund_ == null ? org.bitcoin.paymentchannel.Protos.ProvideRefund.getDefaultInstance() : provideRefund_;
         } else {
           return provideRefundBuilder_.getMessage();
         }
@@ -1991,6 +2153,7 @@ public Builder setProvideRefund(
       public Builder mergeProvideRefund(org.bitcoin.paymentchannel.Protos.ProvideRefund value) {
         if (provideRefundBuilder_ == null) {
           if (((bitField0_ & 0x00000010) == 0x00000010) &&
+              provideRefund_ != null &&
               provideRefund_ != org.bitcoin.paymentchannel.Protos.ProvideRefund.getDefaultInstance()) {
             provideRefund_ =
               org.bitcoin.paymentchannel.Protos.ProvideRefund.newBuilder(provideRefund_).mergeFrom(value).buildPartial();
@@ -2009,7 +2172,7 @@ public Builder mergeProvideRefund(org.bitcoin.paymentchannel.Protos.ProvideRefun
        */
       public Builder clearProvideRefund() {
         if (provideRefundBuilder_ == null) {
-          provideRefund_ = org.bitcoin.paymentchannel.Protos.ProvideRefund.getDefaultInstance();
+          provideRefund_ = null;
           onChanged();
         } else {
           provideRefundBuilder_.clear();
@@ -2032,17 +2195,18 @@ public org.bitcoin.paymentchannel.Protos.ProvideRefundOrBuilder getProvideRefund
         if (provideRefundBuilder_ != null) {
           return provideRefundBuilder_.getMessageOrBuilder();
         } else {
-          return provideRefund_;
+          return provideRefund_ == null ?
+              org.bitcoin.paymentchannel.Protos.ProvideRefund.getDefaultInstance() : provideRefund_;
         }
       }
       /**
        * <code>optional .paymentchannels.ProvideRefund provide_refund = 5;</code>
        */
-      private com.google.protobuf.SingleFieldBuilder<
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.paymentchannel.Protos.ProvideRefund, org.bitcoin.paymentchannel.Protos.ProvideRefund.Builder, org.bitcoin.paymentchannel.Protos.ProvideRefundOrBuilder> 
           getProvideRefundFieldBuilder() {
         if (provideRefundBuilder_ == null) {
-          provideRefundBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+          provideRefundBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               org.bitcoin.paymentchannel.Protos.ProvideRefund, org.bitcoin.paymentchannel.Protos.ProvideRefund.Builder, org.bitcoin.paymentchannel.Protos.ProvideRefundOrBuilder>(
                   getProvideRefund(),
                   getParentForChildren(),
@@ -2052,8 +2216,8 @@ public org.bitcoin.paymentchannel.Protos.ProvideRefundOrBuilder getProvideRefund
         return provideRefundBuilder_;
       }
 
-      private org.bitcoin.paymentchannel.Protos.ReturnRefund returnRefund_ = org.bitcoin.paymentchannel.Protos.ReturnRefund.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
+      private org.bitcoin.paymentchannel.Protos.ReturnRefund returnRefund_ = null;
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.paymentchannel.Protos.ReturnRefund, org.bitcoin.paymentchannel.Protos.ReturnRefund.Builder, org.bitcoin.paymentchannel.Protos.ReturnRefundOrBuilder> returnRefundBuilder_;
       /**
        * <code>optional .paymentchannels.ReturnRefund return_refund = 6;</code>
@@ -2066,7 +2230,7 @@ public boolean hasReturnRefund() {
        */
       public org.bitcoin.paymentchannel.Protos.ReturnRefund getReturnRefund() {
         if (returnRefundBuilder_ == null) {
-          return returnRefund_;
+          return returnRefund_ == null ? org.bitcoin.paymentchannel.Protos.ReturnRefund.getDefaultInstance() : returnRefund_;
         } else {
           return returnRefundBuilder_.getMessage();
         }
@@ -2107,6 +2271,7 @@ public Builder setReturnRefund(
       public Builder mergeReturnRefund(org.bitcoin.paymentchannel.Protos.ReturnRefund value) {
         if (returnRefundBuilder_ == null) {
           if (((bitField0_ & 0x00000020) == 0x00000020) &&
+              returnRefund_ != null &&
               returnRefund_ != org.bitcoin.paymentchannel.Protos.ReturnRefund.getDefaultInstance()) {
             returnRefund_ =
               org.bitcoin.paymentchannel.Protos.ReturnRefund.newBuilder(returnRefund_).mergeFrom(value).buildPartial();
@@ -2125,7 +2290,7 @@ public Builder mergeReturnRefund(org.bitcoin.paymentchannel.Protos.ReturnRefund
        */
       public Builder clearReturnRefund() {
         if (returnRefundBuilder_ == null) {
-          returnRefund_ = org.bitcoin.paymentchannel.Protos.ReturnRefund.getDefaultInstance();
+          returnRefund_ = null;
           onChanged();
         } else {
           returnRefundBuilder_.clear();
@@ -2148,17 +2313,18 @@ public org.bitcoin.paymentchannel.Protos.ReturnRefundOrBuilder getReturnRefundOr
         if (returnRefundBuilder_ != null) {
           return returnRefundBuilder_.getMessageOrBuilder();
         } else {
-          return returnRefund_;
+          return returnRefund_ == null ?
+              org.bitcoin.paymentchannel.Protos.ReturnRefund.getDefaultInstance() : returnRefund_;
         }
       }
       /**
        * <code>optional .paymentchannels.ReturnRefund return_refund = 6;</code>
        */
-      private com.google.protobuf.SingleFieldBuilder<
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.paymentchannel.Protos.ReturnRefund, org.bitcoin.paymentchannel.Protos.ReturnRefund.Builder, org.bitcoin.paymentchannel.Protos.ReturnRefundOrBuilder> 
           getReturnRefundFieldBuilder() {
         if (returnRefundBuilder_ == null) {
-          returnRefundBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+          returnRefundBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               org.bitcoin.paymentchannel.Protos.ReturnRefund, org.bitcoin.paymentchannel.Protos.ReturnRefund.Builder, org.bitcoin.paymentchannel.Protos.ReturnRefundOrBuilder>(
                   getReturnRefund(),
                   getParentForChildren(),
@@ -2168,8 +2334,8 @@ public org.bitcoin.paymentchannel.Protos.ReturnRefundOrBuilder getReturnRefundOr
         return returnRefundBuilder_;
       }
 
-      private org.bitcoin.paymentchannel.Protos.ProvideContract provideContract_ = org.bitcoin.paymentchannel.Protos.ProvideContract.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
+      private org.bitcoin.paymentchannel.Protos.ProvideContract provideContract_ = null;
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.paymentchannel.Protos.ProvideContract, org.bitcoin.paymentchannel.Protos.ProvideContract.Builder, org.bitcoin.paymentchannel.Protos.ProvideContractOrBuilder> provideContractBuilder_;
       /**
        * <code>optional .paymentchannels.ProvideContract provide_contract = 7;</code>
@@ -2182,7 +2348,7 @@ public boolean hasProvideContract() {
        */
       public org.bitcoin.paymentchannel.Protos.ProvideContract getProvideContract() {
         if (provideContractBuilder_ == null) {
-          return provideContract_;
+          return provideContract_ == null ? org.bitcoin.paymentchannel.Protos.ProvideContract.getDefaultInstance() : provideContract_;
         } else {
           return provideContractBuilder_.getMessage();
         }
@@ -2223,6 +2389,7 @@ public Builder setProvideContract(
       public Builder mergeProvideContract(org.bitcoin.paymentchannel.Protos.ProvideContract value) {
         if (provideContractBuilder_ == null) {
           if (((bitField0_ & 0x00000040) == 0x00000040) &&
+              provideContract_ != null &&
               provideContract_ != org.bitcoin.paymentchannel.Protos.ProvideContract.getDefaultInstance()) {
             provideContract_ =
               org.bitcoin.paymentchannel.Protos.ProvideContract.newBuilder(provideContract_).mergeFrom(value).buildPartial();
@@ -2241,7 +2408,7 @@ public Builder mergeProvideContract(org.bitcoin.paymentchannel.Protos.ProvideCon
        */
       public Builder clearProvideContract() {
         if (provideContractBuilder_ == null) {
-          provideContract_ = org.bitcoin.paymentchannel.Protos.ProvideContract.getDefaultInstance();
+          provideContract_ = null;
           onChanged();
         } else {
           provideContractBuilder_.clear();
@@ -2264,17 +2431,18 @@ public org.bitcoin.paymentchannel.Protos.ProvideContractOrBuilder getProvideCont
         if (provideContractBuilder_ != null) {
           return provideContractBuilder_.getMessageOrBuilder();
         } else {
-          return provideContract_;
+          return provideContract_ == null ?
+              org.bitcoin.paymentchannel.Protos.ProvideContract.getDefaultInstance() : provideContract_;
         }
       }
       /**
        * <code>optional .paymentchannels.ProvideContract provide_contract = 7;</code>
        */
-      private com.google.protobuf.SingleFieldBuilder<
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.paymentchannel.Protos.ProvideContract, org.bitcoin.paymentchannel.Protos.ProvideContract.Builder, org.bitcoin.paymentchannel.Protos.ProvideContractOrBuilder> 
           getProvideContractFieldBuilder() {
         if (provideContractBuilder_ == null) {
-          provideContractBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+          provideContractBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               org.bitcoin.paymentchannel.Protos.ProvideContract, org.bitcoin.paymentchannel.Protos.ProvideContract.Builder, org.bitcoin.paymentchannel.Protos.ProvideContractOrBuilder>(
                   getProvideContract(),
                   getParentForChildren(),
@@ -2284,8 +2452,8 @@ public org.bitcoin.paymentchannel.Protos.ProvideContractOrBuilder getProvideCont
         return provideContractBuilder_;
       }
 
-      private org.bitcoin.paymentchannel.Protos.UpdatePayment updatePayment_ = org.bitcoin.paymentchannel.Protos.UpdatePayment.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
+      private org.bitcoin.paymentchannel.Protos.UpdatePayment updatePayment_ = null;
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.paymentchannel.Protos.UpdatePayment, org.bitcoin.paymentchannel.Protos.UpdatePayment.Builder, org.bitcoin.paymentchannel.Protos.UpdatePaymentOrBuilder> updatePaymentBuilder_;
       /**
        * <code>optional .paymentchannels.UpdatePayment update_payment = 8;</code>
@@ -2298,7 +2466,7 @@ public boolean hasUpdatePayment() {
        */
       public org.bitcoin.paymentchannel.Protos.UpdatePayment getUpdatePayment() {
         if (updatePaymentBuilder_ == null) {
-          return updatePayment_;
+          return updatePayment_ == null ? org.bitcoin.paymentchannel.Protos.UpdatePayment.getDefaultInstance() : updatePayment_;
         } else {
           return updatePaymentBuilder_.getMessage();
         }
@@ -2339,6 +2507,7 @@ public Builder setUpdatePayment(
       public Builder mergeUpdatePayment(org.bitcoin.paymentchannel.Protos.UpdatePayment value) {
         if (updatePaymentBuilder_ == null) {
           if (((bitField0_ & 0x00000080) == 0x00000080) &&
+              updatePayment_ != null &&
               updatePayment_ != org.bitcoin.paymentchannel.Protos.UpdatePayment.getDefaultInstance()) {
             updatePayment_ =
               org.bitcoin.paymentchannel.Protos.UpdatePayment.newBuilder(updatePayment_).mergeFrom(value).buildPartial();
@@ -2357,7 +2526,7 @@ public Builder mergeUpdatePayment(org.bitcoin.paymentchannel.Protos.UpdatePaymen
        */
       public Builder clearUpdatePayment() {
         if (updatePaymentBuilder_ == null) {
-          updatePayment_ = org.bitcoin.paymentchannel.Protos.UpdatePayment.getDefaultInstance();
+          updatePayment_ = null;
           onChanged();
         } else {
           updatePaymentBuilder_.clear();
@@ -2380,17 +2549,18 @@ public org.bitcoin.paymentchannel.Protos.UpdatePaymentOrBuilder getUpdatePayment
         if (updatePaymentBuilder_ != null) {
           return updatePaymentBuilder_.getMessageOrBuilder();
         } else {
-          return updatePayment_;
+          return updatePayment_ == null ?
+              org.bitcoin.paymentchannel.Protos.UpdatePayment.getDefaultInstance() : updatePayment_;
         }
       }
       /**
        * <code>optional .paymentchannels.UpdatePayment update_payment = 8;</code>
        */
-      private com.google.protobuf.SingleFieldBuilder<
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.paymentchannel.Protos.UpdatePayment, org.bitcoin.paymentchannel.Protos.UpdatePayment.Builder, org.bitcoin.paymentchannel.Protos.UpdatePaymentOrBuilder> 
           getUpdatePaymentFieldBuilder() {
         if (updatePaymentBuilder_ == null) {
-          updatePaymentBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+          updatePaymentBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               org.bitcoin.paymentchannel.Protos.UpdatePayment, org.bitcoin.paymentchannel.Protos.UpdatePayment.Builder, org.bitcoin.paymentchannel.Protos.UpdatePaymentOrBuilder>(
                   getUpdatePayment(),
                   getParentForChildren(),
@@ -2400,8 +2570,8 @@ public org.bitcoin.paymentchannel.Protos.UpdatePaymentOrBuilder getUpdatePayment
         return updatePaymentBuilder_;
       }
 
-      private org.bitcoin.paymentchannel.Protos.PaymentAck paymentAck_ = org.bitcoin.paymentchannel.Protos.PaymentAck.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
+      private org.bitcoin.paymentchannel.Protos.PaymentAck paymentAck_ = null;
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.paymentchannel.Protos.PaymentAck, org.bitcoin.paymentchannel.Protos.PaymentAck.Builder, org.bitcoin.paymentchannel.Protos.PaymentAckOrBuilder> paymentAckBuilder_;
       /**
        * <code>optional .paymentchannels.PaymentAck payment_ack = 11;</code>
@@ -2414,7 +2584,7 @@ public boolean hasPaymentAck() {
        */
       public org.bitcoin.paymentchannel.Protos.PaymentAck getPaymentAck() {
         if (paymentAckBuilder_ == null) {
-          return paymentAck_;
+          return paymentAck_ == null ? org.bitcoin.paymentchannel.Protos.PaymentAck.getDefaultInstance() : paymentAck_;
         } else {
           return paymentAckBuilder_.getMessage();
         }
@@ -2455,6 +2625,7 @@ public Builder setPaymentAck(
       public Builder mergePaymentAck(org.bitcoin.paymentchannel.Protos.PaymentAck value) {
         if (paymentAckBuilder_ == null) {
           if (((bitField0_ & 0x00000100) == 0x00000100) &&
+              paymentAck_ != null &&
               paymentAck_ != org.bitcoin.paymentchannel.Protos.PaymentAck.getDefaultInstance()) {
             paymentAck_ =
               org.bitcoin.paymentchannel.Protos.PaymentAck.newBuilder(paymentAck_).mergeFrom(value).buildPartial();
@@ -2473,7 +2644,7 @@ public Builder mergePaymentAck(org.bitcoin.paymentchannel.Protos.PaymentAck valu
        */
       public Builder clearPaymentAck() {
         if (paymentAckBuilder_ == null) {
-          paymentAck_ = org.bitcoin.paymentchannel.Protos.PaymentAck.getDefaultInstance();
+          paymentAck_ = null;
           onChanged();
         } else {
           paymentAckBuilder_.clear();
@@ -2496,17 +2667,18 @@ public org.bitcoin.paymentchannel.Protos.PaymentAckOrBuilder getPaymentAckOrBuil
         if (paymentAckBuilder_ != null) {
           return paymentAckBuilder_.getMessageOrBuilder();
         } else {
-          return paymentAck_;
+          return paymentAck_ == null ?
+              org.bitcoin.paymentchannel.Protos.PaymentAck.getDefaultInstance() : paymentAck_;
         }
       }
       /**
        * <code>optional .paymentchannels.PaymentAck payment_ack = 11;</code>
        */
-      private com.google.protobuf.SingleFieldBuilder<
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.paymentchannel.Protos.PaymentAck, org.bitcoin.paymentchannel.Protos.PaymentAck.Builder, org.bitcoin.paymentchannel.Protos.PaymentAckOrBuilder> 
           getPaymentAckFieldBuilder() {
         if (paymentAckBuilder_ == null) {
-          paymentAckBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+          paymentAckBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               org.bitcoin.paymentchannel.Protos.PaymentAck, org.bitcoin.paymentchannel.Protos.PaymentAck.Builder, org.bitcoin.paymentchannel.Protos.PaymentAckOrBuilder>(
                   getPaymentAck(),
                   getParentForChildren(),
@@ -2516,8 +2688,8 @@ public org.bitcoin.paymentchannel.Protos.PaymentAckOrBuilder getPaymentAckOrBuil
         return paymentAckBuilder_;
       }
 
-      private org.bitcoin.paymentchannel.Protos.Settlement settlement_ = org.bitcoin.paymentchannel.Protos.Settlement.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
+      private org.bitcoin.paymentchannel.Protos.Settlement settlement_ = null;
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.paymentchannel.Protos.Settlement, org.bitcoin.paymentchannel.Protos.Settlement.Builder, org.bitcoin.paymentchannel.Protos.SettlementOrBuilder> settlementBuilder_;
       /**
        * <code>optional .paymentchannels.Settlement settlement = 9;</code>
@@ -2530,7 +2702,7 @@ public boolean hasSettlement() {
        */
       public org.bitcoin.paymentchannel.Protos.Settlement getSettlement() {
         if (settlementBuilder_ == null) {
-          return settlement_;
+          return settlement_ == null ? org.bitcoin.paymentchannel.Protos.Settlement.getDefaultInstance() : settlement_;
         } else {
           return settlementBuilder_.getMessage();
         }
@@ -2571,6 +2743,7 @@ public Builder setSettlement(
       public Builder mergeSettlement(org.bitcoin.paymentchannel.Protos.Settlement value) {
         if (settlementBuilder_ == null) {
           if (((bitField0_ & 0x00000200) == 0x00000200) &&
+              settlement_ != null &&
               settlement_ != org.bitcoin.paymentchannel.Protos.Settlement.getDefaultInstance()) {
             settlement_ =
               org.bitcoin.paymentchannel.Protos.Settlement.newBuilder(settlement_).mergeFrom(value).buildPartial();
@@ -2589,7 +2762,7 @@ public Builder mergeSettlement(org.bitcoin.paymentchannel.Protos.Settlement valu
        */
       public Builder clearSettlement() {
         if (settlementBuilder_ == null) {
-          settlement_ = org.bitcoin.paymentchannel.Protos.Settlement.getDefaultInstance();
+          settlement_ = null;
           onChanged();
         } else {
           settlementBuilder_.clear();
@@ -2612,17 +2785,18 @@ public org.bitcoin.paymentchannel.Protos.SettlementOrBuilder getSettlementOrBuil
         if (settlementBuilder_ != null) {
           return settlementBuilder_.getMessageOrBuilder();
         } else {
-          return settlement_;
+          return settlement_ == null ?
+              org.bitcoin.paymentchannel.Protos.Settlement.getDefaultInstance() : settlement_;
         }
       }
       /**
        * <code>optional .paymentchannels.Settlement settlement = 9;</code>
        */
-      private com.google.protobuf.SingleFieldBuilder<
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.paymentchannel.Protos.Settlement, org.bitcoin.paymentchannel.Protos.Settlement.Builder, org.bitcoin.paymentchannel.Protos.SettlementOrBuilder> 
           getSettlementFieldBuilder() {
         if (settlementBuilder_ == null) {
-          settlementBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+          settlementBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               org.bitcoin.paymentchannel.Protos.Settlement, org.bitcoin.paymentchannel.Protos.Settlement.Builder, org.bitcoin.paymentchannel.Protos.SettlementOrBuilder>(
                   getSettlement(),
                   getParentForChildren(),
@@ -2632,8 +2806,8 @@ public org.bitcoin.paymentchannel.Protos.SettlementOrBuilder getSettlementOrBuil
         return settlementBuilder_;
       }
 
-      private org.bitcoin.paymentchannel.Protos.Error error_ = org.bitcoin.paymentchannel.Protos.Error.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
+      private org.bitcoin.paymentchannel.Protos.Error error_ = null;
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.paymentchannel.Protos.Error, org.bitcoin.paymentchannel.Protos.Error.Builder, org.bitcoin.paymentchannel.Protos.ErrorOrBuilder> errorBuilder_;
       /**
        * <code>optional .paymentchannels.Error error = 10;</code>
@@ -2646,7 +2820,7 @@ public boolean hasError() {
        */
       public org.bitcoin.paymentchannel.Protos.Error getError() {
         if (errorBuilder_ == null) {
-          return error_;
+          return error_ == null ? org.bitcoin.paymentchannel.Protos.Error.getDefaultInstance() : error_;
         } else {
           return errorBuilder_.getMessage();
         }
@@ -2687,6 +2861,7 @@ public Builder setError(
       public Builder mergeError(org.bitcoin.paymentchannel.Protos.Error value) {
         if (errorBuilder_ == null) {
           if (((bitField0_ & 0x00000400) == 0x00000400) &&
+              error_ != null &&
               error_ != org.bitcoin.paymentchannel.Protos.Error.getDefaultInstance()) {
             error_ =
               org.bitcoin.paymentchannel.Protos.Error.newBuilder(error_).mergeFrom(value).buildPartial();
@@ -2705,7 +2880,7 @@ public Builder mergeError(org.bitcoin.paymentchannel.Protos.Error value) {
        */
       public Builder clearError() {
         if (errorBuilder_ == null) {
-          error_ = org.bitcoin.paymentchannel.Protos.Error.getDefaultInstance();
+          error_ = null;
           onChanged();
         } else {
           errorBuilder_.clear();
@@ -2728,17 +2903,18 @@ public org.bitcoin.paymentchannel.Protos.ErrorOrBuilder getErrorOrBuilder() {
         if (errorBuilder_ != null) {
           return errorBuilder_.getMessageOrBuilder();
         } else {
-          return error_;
+          return error_ == null ?
+              org.bitcoin.paymentchannel.Protos.Error.getDefaultInstance() : error_;
         }
       }
       /**
        * <code>optional .paymentchannels.Error error = 10;</code>
        */
-      private com.google.protobuf.SingleFieldBuilder<
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.paymentchannel.Protos.Error, org.bitcoin.paymentchannel.Protos.Error.Builder, org.bitcoin.paymentchannel.Protos.ErrorOrBuilder> 
           getErrorFieldBuilder() {
         if (errorBuilder_ == null) {
-          errorBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+          errorBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               org.bitcoin.paymentchannel.Protos.Error, org.bitcoin.paymentchannel.Protos.Error.Builder, org.bitcoin.paymentchannel.Protos.ErrorOrBuilder>(
                   getError(),
                   getParentForChildren(),
@@ -2747,16 +2923,57 @@ public org.bitcoin.paymentchannel.Protos.ErrorOrBuilder getErrorOrBuilder() {
         }
         return errorBuilder_;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:paymentchannels.TwoWayChannelMessage)
     }
 
+    // @@protoc_insertion_point(class_scope:paymentchannels.TwoWayChannelMessage)
+    private static final org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage DEFAULT_INSTANCE;
     static {
-      defaultInstance = new TwoWayChannelMessage(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage();
+    }
+
+    public static org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<TwoWayChannelMessage>
+        PARSER = new com.google.protobuf.AbstractParser<TwoWayChannelMessage>() {
+      @java.lang.Override
+      public TwoWayChannelMessage parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new TwoWayChannelMessage(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<TwoWayChannelMessage> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<TwoWayChannelMessage> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:paymentchannels.TwoWayChannelMessage)
   }
 
   public interface ClientVersionOrBuilder extends
@@ -2782,86 +2999,84 @@ public interface ClientVersionOrBuilder extends
     int getMinor();
 
     /**
-     * <code>optional bytes previous_channel_contract_hash = 3;</code>
-     *
      * <pre>
      * The hash of the multisig contract of a previous channel. This indicates that the primary
      * wishes to reopen the given channel. If the server is willing to reopen it, it simply
      * responds with a SERVER_VERSION and then immediately sends a CHANNEL_OPEN, it otherwise
      * follows SERVER_VERSION with an Initiate representing a new channel
      * </pre>
+     *
+     * <code>optional bytes previous_channel_contract_hash = 3;</code>
      */
     boolean hasPreviousChannelContractHash();
     /**
-     * <code>optional bytes previous_channel_contract_hash = 3;</code>
-     *
      * <pre>
      * The hash of the multisig contract of a previous channel. This indicates that the primary
      * wishes to reopen the given channel. If the server is willing to reopen it, it simply
      * responds with a SERVER_VERSION and then immediately sends a CHANNEL_OPEN, it otherwise
      * follows SERVER_VERSION with an Initiate representing a new channel
      * </pre>
+     *
+     * <code>optional bytes previous_channel_contract_hash = 3;</code>
      */
     com.google.protobuf.ByteString getPreviousChannelContractHash();
 
     /**
-     * <code>optional uint64 time_window_secs = 4 [default = 86340];</code>
-     *
      * <pre>
      * How many seconds should the channel be open, only used when a new channel is created.
      * Defaults to 24 h minus 60 seconds, 24*60*60 - 60
      * </pre>
+     *
+     * <code>optional uint64 time_window_secs = 4 [default = 86340];</code>
      */
     boolean hasTimeWindowSecs();
     /**
-     * <code>optional uint64 time_window_secs = 4 [default = 86340];</code>
-     *
      * <pre>
      * How many seconds should the channel be open, only used when a new channel is created.
      * Defaults to 24 h minus 60 seconds, 24*60*60 - 60
      * </pre>
+     *
+     * <code>optional uint64 time_window_secs = 4 [default = 86340];</code>
      */
     long getTimeWindowSecs();
   }
   /**
-   * Protobuf type {@code paymentchannels.ClientVersion}
-   *
    * <pre>
    * Sent by primary to secondary on opening the connection. If anything is received before this is
    * sent, the socket is closed.
    * </pre>
+   *
+   * Protobuf type {@code paymentchannels.ClientVersion}
    */
-  public static final class ClientVersion extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class ClientVersion extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:paymentchannels.ClientVersion)
       ClientVersionOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ClientVersion.newBuilder() to construct.
-    private ClientVersion(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private ClientVersion(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private ClientVersion(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final ClientVersion defaultInstance;
-    public static ClientVersion getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public ClientVersion getDefaultInstanceForType() {
-      return defaultInstance;
+    private ClientVersion() {
+      major_ = 0;
+      minor_ = 0;
+      previousChannelContractHash_ = com.google.protobuf.ByteString.EMPTY;
+      timeWindowSecs_ = 86340L;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private ClientVersion(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2873,13 +3088,6 @@ private ClientVersion(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 8: {
               bitField0_ |= 0x00000001;
               major_ = input.readInt32();
@@ -2900,13 +3108,20 @@ private ClientVersion(
               timeWindowSecs_ = input.readUInt64();
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -2917,28 +3132,14 @@ private ClientVersion(
       return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ClientVersion_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ClientVersion_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoin.paymentchannel.Protos.ClientVersion.class, org.bitcoin.paymentchannel.Protos.ClientVersion.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<ClientVersion> PARSER =
-        new com.google.protobuf.AbstractParser<ClientVersion>() {
-      public ClientVersion parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ClientVersion(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<ClientVersion> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int MAJOR_FIELD_NUMBER = 1;
     private int major_;
@@ -2973,27 +3174,27 @@ public int getMinor() {
     public static final int PREVIOUS_CHANNEL_CONTRACT_HASH_FIELD_NUMBER = 3;
     private com.google.protobuf.ByteString previousChannelContractHash_;
     /**
-     * <code>optional bytes previous_channel_contract_hash = 3;</code>
-     *
      * <pre>
      * The hash of the multisig contract of a previous channel. This indicates that the primary
      * wishes to reopen the given channel. If the server is willing to reopen it, it simply
      * responds with a SERVER_VERSION and then immediately sends a CHANNEL_OPEN, it otherwise
      * follows SERVER_VERSION with an Initiate representing a new channel
      * </pre>
+     *
+     * <code>optional bytes previous_channel_contract_hash = 3;</code>
      */
     public boolean hasPreviousChannelContractHash() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * <code>optional bytes previous_channel_contract_hash = 3;</code>
-     *
      * <pre>
      * The hash of the multisig contract of a previous channel. This indicates that the primary
      * wishes to reopen the given channel. If the server is willing to reopen it, it simply
      * responds with a SERVER_VERSION and then immediately sends a CHANNEL_OPEN, it otherwise
      * follows SERVER_VERSION with an Initiate representing a new channel
      * </pre>
+     *
+     * <code>optional bytes previous_channel_contract_hash = 3;</code>
      */
     public com.google.protobuf.ByteString getPreviousChannelContractHash() {
       return previousChannelContractHash_;
@@ -3002,35 +3203,30 @@ public com.google.protobuf.ByteString getPreviousChannelContractHash() {
     public static final int TIME_WINDOW_SECS_FIELD_NUMBER = 4;
     private long timeWindowSecs_;
     /**
-     * <code>optional uint64 time_window_secs = 4 [default = 86340];</code>
-     *
      * <pre>
      * How many seconds should the channel be open, only used when a new channel is created.
      * Defaults to 24 h minus 60 seconds, 24*60*60 - 60
      * </pre>
+     *
+     * <code>optional uint64 time_window_secs = 4 [default = 86340];</code>
      */
     public boolean hasTimeWindowSecs() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * <code>optional uint64 time_window_secs = 4 [default = 86340];</code>
-     *
      * <pre>
      * How many seconds should the channel be open, only used when a new channel is created.
      * Defaults to 24 h minus 60 seconds, 24*60*60 - 60
      * </pre>
+     *
+     * <code>optional uint64 time_window_secs = 4 [default = 86340];</code>
      */
     public long getTimeWindowSecs() {
       return timeWindowSecs_;
     }
 
-    private void initFields() {
-      major_ = 0;
-      minor_ = 0;
-      previousChannelContractHash_ = com.google.protobuf.ByteString.EMPTY;
-      timeWindowSecs_ = 86340L;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -3044,9 +3240,9 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt32(1, major_);
       }
@@ -3059,12 +3255,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000008) == 0x00000008)) {
         output.writeUInt64(4, timeWindowSecs_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -3084,18 +3280,86 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(4, timeWindowSecs_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoin.paymentchannel.Protos.ClientVersion)) {
+        return super.equals(obj);
+      }
+      org.bitcoin.paymentchannel.Protos.ClientVersion other = (org.bitcoin.paymentchannel.Protos.ClientVersion) obj;
+
+      boolean result = true;
+      result = result && (hasMajor() == other.hasMajor());
+      if (hasMajor()) {
+        result = result && (getMajor()
+            == other.getMajor());
+      }
+      result = result && (hasMinor() == other.hasMinor());
+      if (hasMinor()) {
+        result = result && (getMinor()
+            == other.getMinor());
+      }
+      result = result && (hasPreviousChannelContractHash() == other.hasPreviousChannelContractHash());
+      if (hasPreviousChannelContractHash()) {
+        result = result && getPreviousChannelContractHash()
+            .equals(other.getPreviousChannelContractHash());
+      }
+      result = result && (hasTimeWindowSecs() == other.hasTimeWindowSecs());
+      if (hasTimeWindowSecs()) {
+        result = result && (getTimeWindowSecs()
+            == other.getTimeWindowSecs());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasMajor()) {
+        hash = (37 * hash) + MAJOR_FIELD_NUMBER;
+        hash = (53 * hash) + getMajor();
+      }
+      if (hasMinor()) {
+        hash = (37 * hash) + MINOR_FIELD_NUMBER;
+        hash = (53 * hash) + getMinor();
+      }
+      if (hasPreviousChannelContractHash()) {
+        hash = (37 * hash) + PREVIOUS_CHANNEL_CONTRACT_HASH_FIELD_NUMBER;
+        hash = (53 * hash) + getPreviousChannelContractHash().hashCode();
+      }
+      if (hasTimeWindowSecs()) {
+        hash = (37 * hash) + TIME_WINDOW_SECS_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getTimeWindowSecs());
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoin.paymentchannel.Protos.ClientVersion parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoin.paymentchannel.Protos.ClientVersion parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoin.paymentchannel.Protos.ClientVersion parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -3119,59 +3383,72 @@ public static org.bitcoin.paymentchannel.Protos.ClientVersion parseFrom(
     }
     public static org.bitcoin.paymentchannel.Protos.ClientVersion parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.ClientVersion parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.paymentchannel.Protos.ClientVersion parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.ClientVersion parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.paymentchannel.Protos.ClientVersion parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.ClientVersion parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoin.paymentchannel.Protos.ClientVersion prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code paymentchannels.ClientVersion}
-     *
      * <pre>
      * Sent by primary to secondary on opening the connection. If anything is received before this is
      * sent, the socket is closed.
      * </pre>
+     *
+     * Protobuf type {@code paymentchannels.ClientVersion}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:paymentchannels.ClientVersion)
         org.bitcoin.paymentchannel.Protos.ClientVersionOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -3179,7 +3456,8 @@ public static final class Builder extends
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ClientVersion_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ClientVersion_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -3192,18 +3470,16 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         major_ = 0;
@@ -3217,19 +3493,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ClientVersion_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.ClientVersion getDefaultInstanceForType() {
         return org.bitcoin.paymentchannel.Protos.ClientVersion.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.ClientVersion build() {
         org.bitcoin.paymentchannel.Protos.ClientVersion result = buildPartial();
         if (!result.isInitialized()) {
@@ -3238,6 +3513,7 @@ public org.bitcoin.paymentchannel.Protos.ClientVersion build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.ClientVersion buildPartial() {
         org.bitcoin.paymentchannel.Protos.ClientVersion result = new org.bitcoin.paymentchannel.Protos.ClientVersion(this);
         int from_bitField0_ = bitField0_;
@@ -3263,6 +3539,39 @@ public org.bitcoin.paymentchannel.Protos.ClientVersion buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoin.paymentchannel.Protos.ClientVersion) {
           return mergeFrom((org.bitcoin.paymentchannel.Protos.ClientVersion)other);
@@ -3286,18 +3595,20 @@ public Builder mergeFrom(org.bitcoin.paymentchannel.Protos.ClientVersion other)
         if (other.hasTimeWindowSecs()) {
           setTimeWindowSecs(other.getTimeWindowSecs());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasMajor()) {
-          
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3307,7 +3618,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoin.paymentchannel.Protos.ClientVersion) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -3383,40 +3694,40 @@ public Builder clearMinor() {
 
       private com.google.protobuf.ByteString previousChannelContractHash_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>optional bytes previous_channel_contract_hash = 3;</code>
-       *
        * <pre>
        * The hash of the multisig contract of a previous channel. This indicates that the primary
        * wishes to reopen the given channel. If the server is willing to reopen it, it simply
        * responds with a SERVER_VERSION and then immediately sends a CHANNEL_OPEN, it otherwise
        * follows SERVER_VERSION with an Initiate representing a new channel
        * </pre>
+       *
+       * <code>optional bytes previous_channel_contract_hash = 3;</code>
        */
       public boolean hasPreviousChannelContractHash() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>optional bytes previous_channel_contract_hash = 3;</code>
-       *
        * <pre>
        * The hash of the multisig contract of a previous channel. This indicates that the primary
        * wishes to reopen the given channel. If the server is willing to reopen it, it simply
        * responds with a SERVER_VERSION and then immediately sends a CHANNEL_OPEN, it otherwise
        * follows SERVER_VERSION with an Initiate representing a new channel
        * </pre>
+       *
+       * <code>optional bytes previous_channel_contract_hash = 3;</code>
        */
       public com.google.protobuf.ByteString getPreviousChannelContractHash() {
         return previousChannelContractHash_;
       }
       /**
-       * <code>optional bytes previous_channel_contract_hash = 3;</code>
-       *
        * <pre>
        * The hash of the multisig contract of a previous channel. This indicates that the primary
        * wishes to reopen the given channel. If the server is willing to reopen it, it simply
        * responds with a SERVER_VERSION and then immediately sends a CHANNEL_OPEN, it otherwise
        * follows SERVER_VERSION with an Initiate representing a new channel
        * </pre>
+       *
+       * <code>optional bytes previous_channel_contract_hash = 3;</code>
        */
       public Builder setPreviousChannelContractHash(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -3428,14 +3739,14 @@ public Builder setPreviousChannelContractHash(com.google.protobuf.ByteString val
         return this;
       }
       /**
-       * <code>optional bytes previous_channel_contract_hash = 3;</code>
-       *
        * <pre>
        * The hash of the multisig contract of a previous channel. This indicates that the primary
        * wishes to reopen the given channel. If the server is willing to reopen it, it simply
        * responds with a SERVER_VERSION and then immediately sends a CHANNEL_OPEN, it otherwise
        * follows SERVER_VERSION with an Initiate representing a new channel
        * </pre>
+       *
+       * <code>optional bytes previous_channel_contract_hash = 3;</code>
        */
       public Builder clearPreviousChannelContractHash() {
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -3446,34 +3757,34 @@ public Builder clearPreviousChannelContractHash() {
 
       private long timeWindowSecs_ = 86340L;
       /**
-       * <code>optional uint64 time_window_secs = 4 [default = 86340];</code>
-       *
        * <pre>
        * How many seconds should the channel be open, only used when a new channel is created.
        * Defaults to 24 h minus 60 seconds, 24*60*60 - 60
        * </pre>
+       *
+       * <code>optional uint64 time_window_secs = 4 [default = 86340];</code>
        */
       public boolean hasTimeWindowSecs() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * <code>optional uint64 time_window_secs = 4 [default = 86340];</code>
-       *
        * <pre>
        * How many seconds should the channel be open, only used when a new channel is created.
        * Defaults to 24 h minus 60 seconds, 24*60*60 - 60
        * </pre>
+       *
+       * <code>optional uint64 time_window_secs = 4 [default = 86340];</code>
        */
       public long getTimeWindowSecs() {
         return timeWindowSecs_;
       }
       /**
-       * <code>optional uint64 time_window_secs = 4 [default = 86340];</code>
-       *
        * <pre>
        * How many seconds should the channel be open, only used when a new channel is created.
        * Defaults to 24 h minus 60 seconds, 24*60*60 - 60
        * </pre>
+       *
+       * <code>optional uint64 time_window_secs = 4 [default = 86340];</code>
        */
       public Builder setTimeWindowSecs(long value) {
         bitField0_ |= 0x00000008;
@@ -3482,12 +3793,12 @@ public Builder setTimeWindowSecs(long value) {
         return this;
       }
       /**
-       * <code>optional uint64 time_window_secs = 4 [default = 86340];</code>
-       *
        * <pre>
        * How many seconds should the channel be open, only used when a new channel is created.
        * Defaults to 24 h minus 60 seconds, 24*60*60 - 60
        * </pre>
+       *
+       * <code>optional uint64 time_window_secs = 4 [default = 86340];</code>
        */
       public Builder clearTimeWindowSecs() {
         bitField0_ = (bitField0_ & ~0x00000008);
@@ -3495,16 +3806,57 @@ public Builder clearTimeWindowSecs() {
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:paymentchannels.ClientVersion)
     }
 
+    // @@protoc_insertion_point(class_scope:paymentchannels.ClientVersion)
+    private static final org.bitcoin.paymentchannel.Protos.ClientVersion DEFAULT_INSTANCE;
     static {
-      defaultInstance = new ClientVersion(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoin.paymentchannel.Protos.ClientVersion();
+    }
+
+    public static org.bitcoin.paymentchannel.Protos.ClientVersion getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<ClientVersion>
+        PARSER = new com.google.protobuf.AbstractParser<ClientVersion>() {
+      @java.lang.Override
+      public ClientVersion parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new ClientVersion(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<ClientVersion> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<ClientVersion> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoin.paymentchannel.Protos.ClientVersion getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:paymentchannels.ClientVersion)
   }
 
   public interface ServerVersionOrBuilder extends
@@ -3530,8 +3882,6 @@ public interface ServerVersionOrBuilder extends
     int getMinor();
   }
   /**
-   * Protobuf type {@code paymentchannels.ServerVersion}
-   *
    * <pre>
    * Send by secondary to primary upon receiving the ClientVersion message. If it is willing to
    * speak the given major version, it sends back the same major version and the minor version it
@@ -3541,38 +3891,36 @@ public interface ServerVersionOrBuilder extends
    * should immediately close the connection with a NO_ACCEPTABLE_VERSION Error. Backwards
    * incompatible changes to the protocol bump the major version. Extensions bump the minor version
    * </pre>
+   *
+   * Protobuf type {@code paymentchannels.ServerVersion}
    */
-  public static final class ServerVersion extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class ServerVersion extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:paymentchannels.ServerVersion)
       ServerVersionOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ServerVersion.newBuilder() to construct.
-    private ServerVersion(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private ServerVersion(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private ServerVersion(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final ServerVersion defaultInstance;
-    public static ServerVersion getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public ServerVersion getDefaultInstanceForType() {
-      return defaultInstance;
+    private ServerVersion() {
+      major_ = 0;
+      minor_ = 0;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private ServerVersion(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3584,13 +3932,6 @@ private ServerVersion(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 8: {
               bitField0_ |= 0x00000001;
               major_ = input.readInt32();
@@ -3601,13 +3942,20 @@ private ServerVersion(
               minor_ = input.readInt32();
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -3618,28 +3966,14 @@ private ServerVersion(
       return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ServerVersion_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ServerVersion_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoin.paymentchannel.Protos.ServerVersion.class, org.bitcoin.paymentchannel.Protos.ServerVersion.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<ServerVersion> PARSER =
-        new com.google.protobuf.AbstractParser<ServerVersion>() {
-      public ServerVersion parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ServerVersion(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<ServerVersion> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int MAJOR_FIELD_NUMBER = 1;
     private int major_;
@@ -3671,11 +4005,8 @@ public int getMinor() {
       return minor_;
     }
 
-    private void initFields() {
-      major_ = 0;
-      minor_ = 0;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -3689,21 +4020,21 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt32(1, major_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeInt32(2, minor_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -3715,30 +4046,79 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(2, minor_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoin.paymentchannel.Protos.ServerVersion)) {
+        return super.equals(obj);
+      }
+      org.bitcoin.paymentchannel.Protos.ServerVersion other = (org.bitcoin.paymentchannel.Protos.ServerVersion) obj;
+
+      boolean result = true;
+      result = result && (hasMajor() == other.hasMajor());
+      if (hasMajor()) {
+        result = result && (getMajor()
+            == other.getMajor());
+      }
+      result = result && (hasMinor() == other.hasMinor());
+      if (hasMinor()) {
+        result = result && (getMinor()
+            == other.getMinor());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasMajor()) {
+        hash = (37 * hash) + MAJOR_FIELD_NUMBER;
+        hash = (53 * hash) + getMajor();
+      }
+      if (hasMinor()) {
+        hash = (37 * hash) + MINOR_FIELD_NUMBER;
+        hash = (53 * hash) + getMinor();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
     public static org.bitcoin.paymentchannel.Protos.ServerVersion parseFrom(
-        com.google.protobuf.ByteString data)
+        java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
     public static org.bitcoin.paymentchannel.Protos.ServerVersion parseFrom(
-        com.google.protobuf.ByteString data,
+        java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bitcoin.paymentchannel.Protos.ServerVersion parseFrom(byte[] data)
+    public static org.bitcoin.paymentchannel.Protos.ServerVersion parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoin.paymentchannel.Protos.ServerVersion parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.bitcoin.paymentchannel.Protos.ServerVersion parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
@@ -3750,52 +4130,63 @@ public static org.bitcoin.paymentchannel.Protos.ServerVersion parseFrom(
     }
     public static org.bitcoin.paymentchannel.Protos.ServerVersion parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.ServerVersion parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.paymentchannel.Protos.ServerVersion parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.ServerVersion parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.paymentchannel.Protos.ServerVersion parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.ServerVersion parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoin.paymentchannel.Protos.ServerVersion prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code paymentchannels.ServerVersion}
-     *
      * <pre>
      * Send by secondary to primary upon receiving the ClientVersion message. If it is willing to
      * speak the given major version, it sends back the same major version and the minor version it
@@ -3805,9 +4196,11 @@ protected Builder newBuilderForType(
      * should immediately close the connection with a NO_ACCEPTABLE_VERSION Error. Backwards
      * incompatible changes to the protocol bump the major version. Extensions bump the minor version
      * </pre>
+     *
+     * Protobuf type {@code paymentchannels.ServerVersion}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:paymentchannels.ServerVersion)
         org.bitcoin.paymentchannel.Protos.ServerVersionOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -3815,7 +4208,8 @@ public static final class Builder extends
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ServerVersion_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ServerVersion_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -3828,18 +4222,16 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         major_ = 0;
@@ -3849,19 +4241,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ServerVersion_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.ServerVersion getDefaultInstanceForType() {
         return org.bitcoin.paymentchannel.Protos.ServerVersion.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.ServerVersion build() {
         org.bitcoin.paymentchannel.Protos.ServerVersion result = buildPartial();
         if (!result.isInitialized()) {
@@ -3870,6 +4261,7 @@ public org.bitcoin.paymentchannel.Protos.ServerVersion build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.ServerVersion buildPartial() {
         org.bitcoin.paymentchannel.Protos.ServerVersion result = new org.bitcoin.paymentchannel.Protos.ServerVersion(this);
         int from_bitField0_ = bitField0_;
@@ -3887,6 +4279,39 @@ public org.bitcoin.paymentchannel.Protos.ServerVersion buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoin.paymentchannel.Protos.ServerVersion) {
           return mergeFrom((org.bitcoin.paymentchannel.Protos.ServerVersion)other);
@@ -3904,18 +4329,20 @@ public Builder mergeFrom(org.bitcoin.paymentchannel.Protos.ServerVersion other)
         if (other.hasMinor()) {
           setMinor(other.getMinor());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasMajor()) {
-          
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3925,7 +4352,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoin.paymentchannel.Protos.ServerVersion) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -3998,16 +4425,57 @@ public Builder clearMinor() {
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:paymentchannels.ServerVersion)
     }
 
+    // @@protoc_insertion_point(class_scope:paymentchannels.ServerVersion)
+    private static final org.bitcoin.paymentchannel.Protos.ServerVersion DEFAULT_INSTANCE;
     static {
-      defaultInstance = new ServerVersion(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoin.paymentchannel.Protos.ServerVersion();
+    }
+
+    public static org.bitcoin.paymentchannel.Protos.ServerVersion getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<ServerVersion>
+        PARSER = new com.google.protobuf.AbstractParser<ServerVersion>() {
+      @java.lang.Override
+      public ServerVersion parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new ServerVersion(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<ServerVersion> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<ServerVersion> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoin.paymentchannel.Protos.ServerVersion getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:paymentchannels.ServerVersion)
   }
 
   public interface InitiateOrBuilder extends
@@ -4015,52 +4483,50 @@ public interface InitiateOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>required bytes multisig_key = 1;</code>
-     *
      * <pre>
      * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
      * are accepted. It is used only in the creation of the multisig contract, as outputs are
      * created entirely by the secondary
      * </pre>
+     *
+     * <code>required bytes multisig_key = 1;</code>
      */
     boolean hasMultisigKey();
     /**
-     * <code>required bytes multisig_key = 1;</code>
-     *
      * <pre>
      * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
      * are accepted. It is used only in the creation of the multisig contract, as outputs are
      * created entirely by the secondary
      * </pre>
+     *
+     * <code>required bytes multisig_key = 1;</code>
      */
     com.google.protobuf.ByteString getMultisigKey();
 
     /**
-     * <code>required uint64 min_accepted_channel_size = 2;</code>
-     *
      * <pre>
      * Once a channel is exhausted a new one must be set up. So secondary indicates the minimum
      * size it's willing to accept here. This can be lower to trade off resources against
      * security but shouldn't be so low the transactions get rejected by the network as spam.
      * Zero isn't a sensible value to have here, so we make the field required.
      * </pre>
+     *
+     * <code>required uint64 min_accepted_channel_size = 2;</code>
      */
     boolean hasMinAcceptedChannelSize();
     /**
-     * <code>required uint64 min_accepted_channel_size = 2;</code>
-     *
      * <pre>
      * Once a channel is exhausted a new one must be set up. So secondary indicates the minimum
      * size it's willing to accept here. This can be lower to trade off resources against
      * security but shouldn't be so low the transactions get rejected by the network as spam.
      * Zero isn't a sensible value to have here, so we make the field required.
      * </pre>
+     *
+     * <code>required uint64 min_accepted_channel_size = 2;</code>
      */
     long getMinAcceptedChannelSize();
 
     /**
-     * <code>required uint64 expire_time_secs = 3;</code>
-     *
      * <pre>
      * Rough UNIX time for when the channel expires. This is determined by the block header
      * timestamps which can be very inaccurate when miners use the obsolete RollNTime hack.
@@ -4070,11 +4536,11 @@ public interface InitiateOrBuilder extends
      * considers this value too far off (eg more than a day), it may send an ERROR and close the
      * channel.
      * </pre>
+     *
+     * <code>required uint64 expire_time_secs = 3;</code>
      */
     boolean hasExpireTimeSecs();
     /**
-     * <code>required uint64 expire_time_secs = 3;</code>
-     *
      * <pre>
      * Rough UNIX time for when the channel expires. This is determined by the block header
      * timestamps which can be very inaccurate when miners use the obsolete RollNTime hack.
@@ -4084,12 +4550,12 @@ public interface InitiateOrBuilder extends
      * considers this value too far off (eg more than a day), it may send an ERROR and close the
      * channel.
      * </pre>
+     *
+     * <code>required uint64 expire_time_secs = 3;</code>
      */
     long getExpireTimeSecs();
 
     /**
-     * <code>required uint64 min_payment = 4;</code>
-     *
      * <pre>
      * The amount of money the server requires for the initial payment. The act of opening a channel
      * always transfers some quantity of money to the server: it's impossible to have a channel with
@@ -4098,11 +4564,11 @@ public interface InitiateOrBuilder extends
      * server tells the client what it thinks it is, and the client is supposed to sanity check this
      * value.
      * </pre>
+     *
+     * <code>required uint64 min_payment = 4;</code>
      */
     boolean hasMinPayment();
     /**
-     * <code>required uint64 min_payment = 4;</code>
-     *
      * <pre>
      * The amount of money the server requires for the initial payment. The act of opening a channel
      * always transfers some quantity of money to the server: it's impossible to have a channel with
@@ -4111,47 +4577,47 @@ public interface InitiateOrBuilder extends
      * server tells the client what it thinks it is, and the client is supposed to sanity check this
      * value.
      * </pre>
+     *
+     * <code>required uint64 min_payment = 4;</code>
      */
     long getMinPayment();
   }
   /**
-   * Protobuf type {@code paymentchannels.Initiate}
-   *
    * <pre>
    * Sent from server to client once version nego is done.
    * </pre>
+   *
+   * Protobuf type {@code paymentchannels.Initiate}
    */
-  public static final class Initiate extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class Initiate extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:paymentchannels.Initiate)
       InitiateOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Initiate.newBuilder() to construct.
-    private Initiate(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private Initiate(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private Initiate(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Initiate defaultInstance;
-    public static Initiate getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public Initiate getDefaultInstanceForType() {
-      return defaultInstance;
+    private Initiate() {
+      multisigKey_ = com.google.protobuf.ByteString.EMPTY;
+      minAcceptedChannelSize_ = 0L;
+      expireTimeSecs_ = 0L;
+      minPayment_ = 0L;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private Initiate(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4163,13 +4629,6 @@ private Initiate(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               bitField0_ |= 0x00000001;
               multisigKey_ = input.readBytes();
@@ -4190,13 +4649,20 @@ private Initiate(
               minPayment_ = input.readUInt64();
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -4207,51 +4673,37 @@ private Initiate(
       return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Initiate_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Initiate_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoin.paymentchannel.Protos.Initiate.class, org.bitcoin.paymentchannel.Protos.Initiate.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<Initiate> PARSER =
-        new com.google.protobuf.AbstractParser<Initiate>() {
-      public Initiate parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Initiate(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Initiate> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int MULTISIG_KEY_FIELD_NUMBER = 1;
     private com.google.protobuf.ByteString multisigKey_;
     /**
-     * <code>required bytes multisig_key = 1;</code>
-     *
      * <pre>
      * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
      * are accepted. It is used only in the creation of the multisig contract, as outputs are
      * created entirely by the secondary
      * </pre>
+     *
+     * <code>required bytes multisig_key = 1;</code>
      */
     public boolean hasMultisigKey() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required bytes multisig_key = 1;</code>
-     *
      * <pre>
      * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
      * are accepted. It is used only in the creation of the multisig contract, as outputs are
      * created entirely by the secondary
      * </pre>
+     *
+     * <code>required bytes multisig_key = 1;</code>
      */
     public com.google.protobuf.ByteString getMultisigKey() {
       return multisigKey_;
@@ -4260,27 +4712,27 @@ public com.google.protobuf.ByteString getMultisigKey() {
     public static final int MIN_ACCEPTED_CHANNEL_SIZE_FIELD_NUMBER = 2;
     private long minAcceptedChannelSize_;
     /**
-     * <code>required uint64 min_accepted_channel_size = 2;</code>
-     *
      * <pre>
      * Once a channel is exhausted a new one must be set up. So secondary indicates the minimum
      * size it's willing to accept here. This can be lower to trade off resources against
      * security but shouldn't be so low the transactions get rejected by the network as spam.
      * Zero isn't a sensible value to have here, so we make the field required.
      * </pre>
+     *
+     * <code>required uint64 min_accepted_channel_size = 2;</code>
      */
     public boolean hasMinAcceptedChannelSize() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>required uint64 min_accepted_channel_size = 2;</code>
-     *
      * <pre>
      * Once a channel is exhausted a new one must be set up. So secondary indicates the minimum
      * size it's willing to accept here. This can be lower to trade off resources against
      * security but shouldn't be so low the transactions get rejected by the network as spam.
      * Zero isn't a sensible value to have here, so we make the field required.
      * </pre>
+     *
+     * <code>required uint64 min_accepted_channel_size = 2;</code>
      */
     public long getMinAcceptedChannelSize() {
       return minAcceptedChannelSize_;
@@ -4289,8 +4741,6 @@ public long getMinAcceptedChannelSize() {
     public static final int EXPIRE_TIME_SECS_FIELD_NUMBER = 3;
     private long expireTimeSecs_;
     /**
-     * <code>required uint64 expire_time_secs = 3;</code>
-     *
      * <pre>
      * Rough UNIX time for when the channel expires. This is determined by the block header
      * timestamps which can be very inaccurate when miners use the obsolete RollNTime hack.
@@ -4300,13 +4750,13 @@ public long getMinAcceptedChannelSize() {
      * considers this value too far off (eg more than a day), it may send an ERROR and close the
      * channel.
      * </pre>
+     *
+     * <code>required uint64 expire_time_secs = 3;</code>
      */
     public boolean hasExpireTimeSecs() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * <code>required uint64 expire_time_secs = 3;</code>
-     *
      * <pre>
      * Rough UNIX time for when the channel expires. This is determined by the block header
      * timestamps which can be very inaccurate when miners use the obsolete RollNTime hack.
@@ -4316,6 +4766,8 @@ public boolean hasExpireTimeSecs() {
      * considers this value too far off (eg more than a day), it may send an ERROR and close the
      * channel.
      * </pre>
+     *
+     * <code>required uint64 expire_time_secs = 3;</code>
      */
     public long getExpireTimeSecs() {
       return expireTimeSecs_;
@@ -4324,8 +4776,6 @@ public long getExpireTimeSecs() {
     public static final int MIN_PAYMENT_FIELD_NUMBER = 4;
     private long minPayment_;
     /**
-     * <code>required uint64 min_payment = 4;</code>
-     *
      * <pre>
      * The amount of money the server requires for the initial payment. The act of opening a channel
      * always transfers some quantity of money to the server: it's impossible to have a channel with
@@ -4334,13 +4784,13 @@ public long getExpireTimeSecs() {
      * server tells the client what it thinks it is, and the client is supposed to sanity check this
      * value.
      * </pre>
+     *
+     * <code>required uint64 min_payment = 4;</code>
      */
     public boolean hasMinPayment() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * <code>required uint64 min_payment = 4;</code>
-     *
      * <pre>
      * The amount of money the server requires for the initial payment. The act of opening a channel
      * always transfers some quantity of money to the server: it's impossible to have a channel with
@@ -4349,18 +4799,15 @@ public boolean hasMinPayment() {
      * server tells the client what it thinks it is, and the client is supposed to sanity check this
      * value.
      * </pre>
+     *
+     * <code>required uint64 min_payment = 4;</code>
      */
     public long getMinPayment() {
       return minPayment_;
     }
 
-    private void initFields() {
-      multisigKey_ = com.google.protobuf.ByteString.EMPTY;
-      minAcceptedChannelSize_ = 0L;
-      expireTimeSecs_ = 0L;
-      minPayment_ = 0L;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -4386,9 +4833,9 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeBytes(1, multisigKey_);
       }
@@ -4401,12 +4848,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000008) == 0x00000008)) {
         output.writeUInt64(4, minPayment_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -4426,18 +4873,88 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(4, minPayment_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoin.paymentchannel.Protos.Initiate)) {
+        return super.equals(obj);
+      }
+      org.bitcoin.paymentchannel.Protos.Initiate other = (org.bitcoin.paymentchannel.Protos.Initiate) obj;
+
+      boolean result = true;
+      result = result && (hasMultisigKey() == other.hasMultisigKey());
+      if (hasMultisigKey()) {
+        result = result && getMultisigKey()
+            .equals(other.getMultisigKey());
+      }
+      result = result && (hasMinAcceptedChannelSize() == other.hasMinAcceptedChannelSize());
+      if (hasMinAcceptedChannelSize()) {
+        result = result && (getMinAcceptedChannelSize()
+            == other.getMinAcceptedChannelSize());
+      }
+      result = result && (hasExpireTimeSecs() == other.hasExpireTimeSecs());
+      if (hasExpireTimeSecs()) {
+        result = result && (getExpireTimeSecs()
+            == other.getExpireTimeSecs());
+      }
+      result = result && (hasMinPayment() == other.hasMinPayment());
+      if (hasMinPayment()) {
+        result = result && (getMinPayment()
+            == other.getMinPayment());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasMultisigKey()) {
+        hash = (37 * hash) + MULTISIG_KEY_FIELD_NUMBER;
+        hash = (53 * hash) + getMultisigKey().hashCode();
+      }
+      if (hasMinAcceptedChannelSize()) {
+        hash = (37 * hash) + MIN_ACCEPTED_CHANNEL_SIZE_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getMinAcceptedChannelSize());
+      }
+      if (hasExpireTimeSecs()) {
+        hash = (37 * hash) + EXPIRE_TIME_SECS_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getExpireTimeSecs());
+      }
+      if (hasMinPayment()) {
+        hash = (37 * hash) + MIN_PAYMENT_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getMinPayment());
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoin.paymentchannel.Protos.Initiate parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoin.paymentchannel.Protos.Initiate parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoin.paymentchannel.Protos.Initiate parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -4461,58 +4978,71 @@ public static org.bitcoin.paymentchannel.Protos.Initiate parseFrom(
     }
     public static org.bitcoin.paymentchannel.Protos.Initiate parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.Initiate parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.paymentchannel.Protos.Initiate parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.Initiate parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.paymentchannel.Protos.Initiate parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.Initiate parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoin.paymentchannel.Protos.Initiate prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code paymentchannels.Initiate}
-     *
      * <pre>
      * Sent from server to client once version nego is done.
      * </pre>
+     *
+     * Protobuf type {@code paymentchannels.Initiate}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:paymentchannels.Initiate)
         org.bitcoin.paymentchannel.Protos.InitiateOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -4520,7 +5050,8 @@ public static final class Builder extends
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Initiate_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Initiate_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -4533,18 +5064,16 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         multisigKey_ = com.google.protobuf.ByteString.EMPTY;
@@ -4558,19 +5087,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Initiate_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.Initiate getDefaultInstanceForType() {
         return org.bitcoin.paymentchannel.Protos.Initiate.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.Initiate build() {
         org.bitcoin.paymentchannel.Protos.Initiate result = buildPartial();
         if (!result.isInitialized()) {
@@ -4579,6 +5107,7 @@ public org.bitcoin.paymentchannel.Protos.Initiate build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.Initiate buildPartial() {
         org.bitcoin.paymentchannel.Protos.Initiate result = new org.bitcoin.paymentchannel.Protos.Initiate(this);
         int from_bitField0_ = bitField0_;
@@ -4604,6 +5133,39 @@ public org.bitcoin.paymentchannel.Protos.Initiate buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoin.paymentchannel.Protos.Initiate) {
           return mergeFrom((org.bitcoin.paymentchannel.Protos.Initiate)other);
@@ -4627,30 +5189,29 @@ public Builder mergeFrom(org.bitcoin.paymentchannel.Protos.Initiate other) {
         if (other.hasMinPayment()) {
           setMinPayment(other.getMinPayment());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasMultisigKey()) {
-          
           return false;
         }
         if (!hasMinAcceptedChannelSize()) {
-          
           return false;
         }
         if (!hasExpireTimeSecs()) {
-          
           return false;
         }
         if (!hasMinPayment()) {
-          
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4660,7 +5221,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoin.paymentchannel.Protos.Initiate) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -4672,37 +5233,37 @@ public Builder mergeFrom(
 
       private com.google.protobuf.ByteString multisigKey_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>required bytes multisig_key = 1;</code>
-       *
        * <pre>
        * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
        * are accepted. It is used only in the creation of the multisig contract, as outputs are
        * created entirely by the secondary
        * </pre>
+       *
+       * <code>required bytes multisig_key = 1;</code>
        */
       public boolean hasMultisigKey() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>required bytes multisig_key = 1;</code>
-       *
        * <pre>
        * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
        * are accepted. It is used only in the creation of the multisig contract, as outputs are
        * created entirely by the secondary
        * </pre>
+       *
+       * <code>required bytes multisig_key = 1;</code>
        */
       public com.google.protobuf.ByteString getMultisigKey() {
         return multisigKey_;
       }
       /**
-       * <code>required bytes multisig_key = 1;</code>
-       *
        * <pre>
        * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
        * are accepted. It is used only in the creation of the multisig contract, as outputs are
        * created entirely by the secondary
        * </pre>
+       *
+       * <code>required bytes multisig_key = 1;</code>
        */
       public Builder setMultisigKey(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -4714,13 +5275,13 @@ public Builder setMultisigKey(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>required bytes multisig_key = 1;</code>
-       *
        * <pre>
        * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
        * are accepted. It is used only in the creation of the multisig contract, as outputs are
        * created entirely by the secondary
        * </pre>
+       *
+       * <code>required bytes multisig_key = 1;</code>
        */
       public Builder clearMultisigKey() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -4731,40 +5292,40 @@ public Builder clearMultisigKey() {
 
       private long minAcceptedChannelSize_ ;
       /**
-       * <code>required uint64 min_accepted_channel_size = 2;</code>
-       *
        * <pre>
        * Once a channel is exhausted a new one must be set up. So secondary indicates the minimum
        * size it's willing to accept here. This can be lower to trade off resources against
        * security but shouldn't be so low the transactions get rejected by the network as spam.
        * Zero isn't a sensible value to have here, so we make the field required.
        * </pre>
+       *
+       * <code>required uint64 min_accepted_channel_size = 2;</code>
        */
       public boolean hasMinAcceptedChannelSize() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>required uint64 min_accepted_channel_size = 2;</code>
-       *
        * <pre>
        * Once a channel is exhausted a new one must be set up. So secondary indicates the minimum
        * size it's willing to accept here. This can be lower to trade off resources against
        * security but shouldn't be so low the transactions get rejected by the network as spam.
        * Zero isn't a sensible value to have here, so we make the field required.
        * </pre>
+       *
+       * <code>required uint64 min_accepted_channel_size = 2;</code>
        */
       public long getMinAcceptedChannelSize() {
         return minAcceptedChannelSize_;
       }
       /**
-       * <code>required uint64 min_accepted_channel_size = 2;</code>
-       *
        * <pre>
        * Once a channel is exhausted a new one must be set up. So secondary indicates the minimum
        * size it's willing to accept here. This can be lower to trade off resources against
        * security but shouldn't be so low the transactions get rejected by the network as spam.
        * Zero isn't a sensible value to have here, so we make the field required.
        * </pre>
+       *
+       * <code>required uint64 min_accepted_channel_size = 2;</code>
        */
       public Builder setMinAcceptedChannelSize(long value) {
         bitField0_ |= 0x00000002;
@@ -4773,14 +5334,14 @@ public Builder setMinAcceptedChannelSize(long value) {
         return this;
       }
       /**
-       * <code>required uint64 min_accepted_channel_size = 2;</code>
-       *
        * <pre>
        * Once a channel is exhausted a new one must be set up. So secondary indicates the minimum
        * size it's willing to accept here. This can be lower to trade off resources against
        * security but shouldn't be so low the transactions get rejected by the network as spam.
        * Zero isn't a sensible value to have here, so we make the field required.
        * </pre>
+       *
+       * <code>required uint64 min_accepted_channel_size = 2;</code>
        */
       public Builder clearMinAcceptedChannelSize() {
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -4791,8 +5352,6 @@ public Builder clearMinAcceptedChannelSize() {
 
       private long expireTimeSecs_ ;
       /**
-       * <code>required uint64 expire_time_secs = 3;</code>
-       *
        * <pre>
        * Rough UNIX time for when the channel expires. This is determined by the block header
        * timestamps which can be very inaccurate when miners use the obsolete RollNTime hack.
@@ -4802,13 +5361,13 @@ public Builder clearMinAcceptedChannelSize() {
        * considers this value too far off (eg more than a day), it may send an ERROR and close the
        * channel.
        * </pre>
+       *
+       * <code>required uint64 expire_time_secs = 3;</code>
        */
       public boolean hasExpireTimeSecs() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>required uint64 expire_time_secs = 3;</code>
-       *
        * <pre>
        * Rough UNIX time for when the channel expires. This is determined by the block header
        * timestamps which can be very inaccurate when miners use the obsolete RollNTime hack.
@@ -4818,13 +5377,13 @@ public boolean hasExpireTimeSecs() {
        * considers this value too far off (eg more than a day), it may send an ERROR and close the
        * channel.
        * </pre>
+       *
+       * <code>required uint64 expire_time_secs = 3;</code>
        */
       public long getExpireTimeSecs() {
         return expireTimeSecs_;
       }
       /**
-       * <code>required uint64 expire_time_secs = 3;</code>
-       *
        * <pre>
        * Rough UNIX time for when the channel expires. This is determined by the block header
        * timestamps which can be very inaccurate when miners use the obsolete RollNTime hack.
@@ -4834,6 +5393,8 @@ public long getExpireTimeSecs() {
        * considers this value too far off (eg more than a day), it may send an ERROR and close the
        * channel.
        * </pre>
+       *
+       * <code>required uint64 expire_time_secs = 3;</code>
        */
       public Builder setExpireTimeSecs(long value) {
         bitField0_ |= 0x00000004;
@@ -4842,8 +5403,6 @@ public Builder setExpireTimeSecs(long value) {
         return this;
       }
       /**
-       * <code>required uint64 expire_time_secs = 3;</code>
-       *
        * <pre>
        * Rough UNIX time for when the channel expires. This is determined by the block header
        * timestamps which can be very inaccurate when miners use the obsolete RollNTime hack.
@@ -4853,6 +5412,8 @@ public Builder setExpireTimeSecs(long value) {
        * considers this value too far off (eg more than a day), it may send an ERROR and close the
        * channel.
        * </pre>
+       *
+       * <code>required uint64 expire_time_secs = 3;</code>
        */
       public Builder clearExpireTimeSecs() {
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -4863,8 +5424,6 @@ public Builder clearExpireTimeSecs() {
 
       private long minPayment_ ;
       /**
-       * <code>required uint64 min_payment = 4;</code>
-       *
        * <pre>
        * The amount of money the server requires for the initial payment. The act of opening a channel
        * always transfers some quantity of money to the server: it's impossible to have a channel with
@@ -4873,13 +5432,13 @@ public Builder clearExpireTimeSecs() {
        * server tells the client what it thinks it is, and the client is supposed to sanity check this
        * value.
        * </pre>
+       *
+       * <code>required uint64 min_payment = 4;</code>
        */
       public boolean hasMinPayment() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * <code>required uint64 min_payment = 4;</code>
-       *
        * <pre>
        * The amount of money the server requires for the initial payment. The act of opening a channel
        * always transfers some quantity of money to the server: it's impossible to have a channel with
@@ -4888,13 +5447,13 @@ public boolean hasMinPayment() {
        * server tells the client what it thinks it is, and the client is supposed to sanity check this
        * value.
        * </pre>
-       */
+       *
+       * <code>required uint64 min_payment = 4;</code>
+       */
       public long getMinPayment() {
         return minPayment_;
       }
       /**
-       * <code>required uint64 min_payment = 4;</code>
-       *
        * <pre>
        * The amount of money the server requires for the initial payment. The act of opening a channel
        * always transfers some quantity of money to the server: it's impossible to have a channel with
@@ -4903,6 +5462,8 @@ public long getMinPayment() {
        * server tells the client what it thinks it is, and the client is supposed to sanity check this
        * value.
        * </pre>
+       *
+       * <code>required uint64 min_payment = 4;</code>
        */
       public Builder setMinPayment(long value) {
         bitField0_ |= 0x00000008;
@@ -4911,8 +5472,6 @@ public Builder setMinPayment(long value) {
         return this;
       }
       /**
-       * <code>required uint64 min_payment = 4;</code>
-       *
        * <pre>
        * The amount of money the server requires for the initial payment. The act of opening a channel
        * always transfers some quantity of money to the server: it's impossible to have a channel with
@@ -4921,6 +5480,8 @@ public Builder setMinPayment(long value) {
        * server tells the client what it thinks it is, and the client is supposed to sanity check this
        * value.
        * </pre>
+       *
+       * <code>required uint64 min_payment = 4;</code>
        */
       public Builder clearMinPayment() {
         bitField0_ = (bitField0_ & ~0x00000008);
@@ -4928,16 +5489,57 @@ public Builder clearMinPayment() {
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:paymentchannels.Initiate)
     }
 
+    // @@protoc_insertion_point(class_scope:paymentchannels.Initiate)
+    private static final org.bitcoin.paymentchannel.Protos.Initiate DEFAULT_INSTANCE;
     static {
-      defaultInstance = new Initiate(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoin.paymentchannel.Protos.Initiate();
+    }
+
+    public static org.bitcoin.paymentchannel.Protos.Initiate getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<Initiate>
+        PARSER = new com.google.protobuf.AbstractParser<Initiate>() {
+      @java.lang.Override
+      public Initiate parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new Initiate(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<Initiate> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Initiate> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoin.paymentchannel.Protos.Initiate getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:paymentchannels.Initiate)
   }
 
   public interface ProvideRefundOrBuilder extends
@@ -4945,27 +5547,25 @@ public interface ProvideRefundOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>required bytes multisig_key = 1;</code>
-     *
      * <pre>
      * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
      * are accepted.  It is only used in the creation of the multisig contract.
      * </pre>
+     *
+     * <code>required bytes multisig_key = 1;</code>
      */
     boolean hasMultisigKey();
     /**
-     * <code>required bytes multisig_key = 1;</code>
-     *
      * <pre>
      * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
      * are accepted.  It is only used in the creation of the multisig contract.
      * </pre>
+     *
+     * <code>required bytes multisig_key = 1;</code>
      */
     com.google.protobuf.ByteString getMultisigKey();
 
     /**
-     * <code>required bytes tx = 2;</code>
-     *
      * <pre>
      * The serialized bytes of the return transaction in Satoshi format.
      * * It must have exactly one input which spends the multisig output (see ProvideContract for
@@ -4976,11 +5576,11 @@ public interface ProvideRefundOrBuilder extends
      * * It must have exactly one output which goes back to the primary.  This output's
      *   scriptPubKey will be reused to create payment transactions.
      * </pre>
+     *
+     * <code>required bytes tx = 2;</code>
      */
     boolean hasTx();
     /**
-     * <code>required bytes tx = 2;</code>
-     *
      * <pre>
      * The serialized bytes of the return transaction in Satoshi format.
      * * It must have exactly one input which spends the multisig output (see ProvideContract for
@@ -4991,47 +5591,45 @@ public interface ProvideRefundOrBuilder extends
      * * It must have exactly one output which goes back to the primary.  This output's
      *   scriptPubKey will be reused to create payment transactions.
      * </pre>
+     *
+     * <code>required bytes tx = 2;</code>
      */
     com.google.protobuf.ByteString getTx();
   }
   /**
-   * Protobuf type {@code paymentchannels.ProvideRefund}
-   *
    * <pre>
    * Sent from primary to secondary after Initiate to begin the refund transaction signing.
    * </pre>
+   *
+   * Protobuf type {@code paymentchannels.ProvideRefund}
    */
-  public static final class ProvideRefund extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class ProvideRefund extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:paymentchannels.ProvideRefund)
       ProvideRefundOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ProvideRefund.newBuilder() to construct.
-    private ProvideRefund(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private ProvideRefund(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private ProvideRefund(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final ProvideRefund defaultInstance;
-    public static ProvideRefund getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public ProvideRefund getDefaultInstanceForType() {
-      return defaultInstance;
+    private ProvideRefund() {
+      multisigKey_ = com.google.protobuf.ByteString.EMPTY;
+      tx_ = com.google.protobuf.ByteString.EMPTY;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private ProvideRefund(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -5043,13 +5641,6 @@ private ProvideRefund(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               bitField0_ |= 0x00000001;
               multisigKey_ = input.readBytes();
@@ -5060,13 +5651,20 @@ private ProvideRefund(
               tx_ = input.readBytes();
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -5077,49 +5675,35 @@ private ProvideRefund(
       return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ProvideRefund_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ProvideRefund_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoin.paymentchannel.Protos.ProvideRefund.class, org.bitcoin.paymentchannel.Protos.ProvideRefund.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<ProvideRefund> PARSER =
-        new com.google.protobuf.AbstractParser<ProvideRefund>() {
-      public ProvideRefund parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ProvideRefund(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<ProvideRefund> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int MULTISIG_KEY_FIELD_NUMBER = 1;
     private com.google.protobuf.ByteString multisigKey_;
     /**
-     * <code>required bytes multisig_key = 1;</code>
-     *
      * <pre>
      * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
      * are accepted.  It is only used in the creation of the multisig contract.
      * </pre>
+     *
+     * <code>required bytes multisig_key = 1;</code>
      */
     public boolean hasMultisigKey() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required bytes multisig_key = 1;</code>
-     *
      * <pre>
      * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
      * are accepted.  It is only used in the creation of the multisig contract.
      * </pre>
+     *
+     * <code>required bytes multisig_key = 1;</code>
      */
     public com.google.protobuf.ByteString getMultisigKey() {
       return multisigKey_;
@@ -5128,8 +5712,6 @@ public com.google.protobuf.ByteString getMultisigKey() {
     public static final int TX_FIELD_NUMBER = 2;
     private com.google.protobuf.ByteString tx_;
     /**
-     * <code>required bytes tx = 2;</code>
-     *
      * <pre>
      * The serialized bytes of the return transaction in Satoshi format.
      * * It must have exactly one input which spends the multisig output (see ProvideContract for
@@ -5140,13 +5722,13 @@ public com.google.protobuf.ByteString getMultisigKey() {
      * * It must have exactly one output which goes back to the primary.  This output's
      *   scriptPubKey will be reused to create payment transactions.
      * </pre>
+     *
+     * <code>required bytes tx = 2;</code>
      */
     public boolean hasTx() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>required bytes tx = 2;</code>
-     *
      * <pre>
      * The serialized bytes of the return transaction in Satoshi format.
      * * It must have exactly one input which spends the multisig output (see ProvideContract for
@@ -5157,16 +5739,15 @@ public boolean hasTx() {
      * * It must have exactly one output which goes back to the primary.  This output's
      *   scriptPubKey will be reused to create payment transactions.
      * </pre>
+     *
+     * <code>required bytes tx = 2;</code>
      */
     public com.google.protobuf.ByteString getTx() {
       return tx_;
     }
 
-    private void initFields() {
-      multisigKey_ = com.google.protobuf.ByteString.EMPTY;
-      tx_ = com.google.protobuf.ByteString.EMPTY;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -5184,21 +5765,21 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeBytes(1, multisigKey_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeBytes(2, tx_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -5210,18 +5791,67 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(2, tx_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoin.paymentchannel.Protos.ProvideRefund)) {
+        return super.equals(obj);
+      }
+      org.bitcoin.paymentchannel.Protos.ProvideRefund other = (org.bitcoin.paymentchannel.Protos.ProvideRefund) obj;
+
+      boolean result = true;
+      result = result && (hasMultisigKey() == other.hasMultisigKey());
+      if (hasMultisigKey()) {
+        result = result && getMultisigKey()
+            .equals(other.getMultisigKey());
+      }
+      result = result && (hasTx() == other.hasTx());
+      if (hasTx()) {
+        result = result && getTx()
+            .equals(other.getTx());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasMultisigKey()) {
+        hash = (37 * hash) + MULTISIG_KEY_FIELD_NUMBER;
+        hash = (53 * hash) + getMultisigKey().hashCode();
+      }
+      if (hasTx()) {
+        hash = (37 * hash) + TX_FIELD_NUMBER;
+        hash = (53 * hash) + getTx().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoin.paymentchannel.Protos.ProvideRefund parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoin.paymentchannel.Protos.ProvideRefund parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoin.paymentchannel.Protos.ProvideRefund parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -5245,58 +5875,71 @@ public static org.bitcoin.paymentchannel.Protos.ProvideRefund parseFrom(
     }
     public static org.bitcoin.paymentchannel.Protos.ProvideRefund parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.ProvideRefund parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.paymentchannel.Protos.ProvideRefund parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.ProvideRefund parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.paymentchannel.Protos.ProvideRefund parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.ProvideRefund parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoin.paymentchannel.Protos.ProvideRefund prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code paymentchannels.ProvideRefund}
-     *
      * <pre>
      * Sent from primary to secondary after Initiate to begin the refund transaction signing.
      * </pre>
+     *
+     * Protobuf type {@code paymentchannels.ProvideRefund}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:paymentchannels.ProvideRefund)
         org.bitcoin.paymentchannel.Protos.ProvideRefundOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -5304,7 +5947,8 @@ public static final class Builder extends
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ProvideRefund_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ProvideRefund_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -5317,18 +5961,16 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         multisigKey_ = com.google.protobuf.ByteString.EMPTY;
@@ -5338,19 +5980,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ProvideRefund_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.ProvideRefund getDefaultInstanceForType() {
         return org.bitcoin.paymentchannel.Protos.ProvideRefund.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.ProvideRefund build() {
         org.bitcoin.paymentchannel.Protos.ProvideRefund result = buildPartial();
         if (!result.isInitialized()) {
@@ -5359,6 +6000,7 @@ public org.bitcoin.paymentchannel.Protos.ProvideRefund build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.ProvideRefund buildPartial() {
         org.bitcoin.paymentchannel.Protos.ProvideRefund result = new org.bitcoin.paymentchannel.Protos.ProvideRefund(this);
         int from_bitField0_ = bitField0_;
@@ -5376,6 +6018,39 @@ public org.bitcoin.paymentchannel.Protos.ProvideRefund buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoin.paymentchannel.Protos.ProvideRefund) {
           return mergeFrom((org.bitcoin.paymentchannel.Protos.ProvideRefund)other);
@@ -5393,22 +6068,23 @@ public Builder mergeFrom(org.bitcoin.paymentchannel.Protos.ProvideRefund other)
         if (other.hasTx()) {
           setTx(other.getTx());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasMultisigKey()) {
-          
           return false;
         }
         if (!hasTx()) {
-          
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -5418,7 +6094,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoin.paymentchannel.Protos.ProvideRefund) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -5430,34 +6106,34 @@ public Builder mergeFrom(
 
       private com.google.protobuf.ByteString multisigKey_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>required bytes multisig_key = 1;</code>
-       *
        * <pre>
        * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
        * are accepted.  It is only used in the creation of the multisig contract.
        * </pre>
+       *
+       * <code>required bytes multisig_key = 1;</code>
        */
       public boolean hasMultisigKey() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>required bytes multisig_key = 1;</code>
-       *
        * <pre>
        * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
        * are accepted.  It is only used in the creation of the multisig contract.
        * </pre>
+       *
+       * <code>required bytes multisig_key = 1;</code>
        */
       public com.google.protobuf.ByteString getMultisigKey() {
         return multisigKey_;
       }
       /**
-       * <code>required bytes multisig_key = 1;</code>
-       *
        * <pre>
        * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
        * are accepted.  It is only used in the creation of the multisig contract.
        * </pre>
+       *
+       * <code>required bytes multisig_key = 1;</code>
        */
       public Builder setMultisigKey(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -5469,12 +6145,12 @@ public Builder setMultisigKey(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>required bytes multisig_key = 1;</code>
-       *
        * <pre>
        * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
        * are accepted.  It is only used in the creation of the multisig contract.
        * </pre>
+       *
+       * <code>required bytes multisig_key = 1;</code>
        */
       public Builder clearMultisigKey() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -5485,8 +6161,6 @@ public Builder clearMultisigKey() {
 
       private com.google.protobuf.ByteString tx_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>required bytes tx = 2;</code>
-       *
        * <pre>
        * The serialized bytes of the return transaction in Satoshi format.
        * * It must have exactly one input which spends the multisig output (see ProvideContract for
@@ -5497,13 +6171,13 @@ public Builder clearMultisigKey() {
        * * It must have exactly one output which goes back to the primary.  This output's
        *   scriptPubKey will be reused to create payment transactions.
        * </pre>
+       *
+       * <code>required bytes tx = 2;</code>
        */
       public boolean hasTx() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>required bytes tx = 2;</code>
-       *
        * <pre>
        * The serialized bytes of the return transaction in Satoshi format.
        * * It must have exactly one input which spends the multisig output (see ProvideContract for
@@ -5514,13 +6188,13 @@ public boolean hasTx() {
        * * It must have exactly one output which goes back to the primary.  This output's
        *   scriptPubKey will be reused to create payment transactions.
        * </pre>
+       *
+       * <code>required bytes tx = 2;</code>
        */
       public com.google.protobuf.ByteString getTx() {
         return tx_;
       }
       /**
-       * <code>required bytes tx = 2;</code>
-       *
        * <pre>
        * The serialized bytes of the return transaction in Satoshi format.
        * * It must have exactly one input which spends the multisig output (see ProvideContract for
@@ -5531,6 +6205,8 @@ public com.google.protobuf.ByteString getTx() {
        * * It must have exactly one output which goes back to the primary.  This output's
        *   scriptPubKey will be reused to create payment transactions.
        * </pre>
+       *
+       * <code>required bytes tx = 2;</code>
        */
       public Builder setTx(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -5542,8 +6218,6 @@ public Builder setTx(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>required bytes tx = 2;</code>
-       *
        * <pre>
        * The serialized bytes of the return transaction in Satoshi format.
        * * It must have exactly one input which spends the multisig output (see ProvideContract for
@@ -5554,6 +6228,8 @@ public Builder setTx(com.google.protobuf.ByteString value) {
        * * It must have exactly one output which goes back to the primary.  This output's
        *   scriptPubKey will be reused to create payment transactions.
        * </pre>
+       *
+       * <code>required bytes tx = 2;</code>
        */
       public Builder clearTx() {
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -5561,16 +6237,57 @@ public Builder clearTx() {
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:paymentchannels.ProvideRefund)
     }
 
+    // @@protoc_insertion_point(class_scope:paymentchannels.ProvideRefund)
+    private static final org.bitcoin.paymentchannel.Protos.ProvideRefund DEFAULT_INSTANCE;
     static {
-      defaultInstance = new ProvideRefund(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoin.paymentchannel.Protos.ProvideRefund();
+    }
+
+    public static org.bitcoin.paymentchannel.Protos.ProvideRefund getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<ProvideRefund>
+        PARSER = new com.google.protobuf.AbstractParser<ProvideRefund>() {
+      @java.lang.Override
+      public ProvideRefund parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new ProvideRefund(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<ProvideRefund> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<ProvideRefund> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoin.paymentchannel.Protos.ProvideRefund getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:paymentchannels.ProvideRefund)
   }
 
   public interface ReturnRefundOrBuilder extends
@@ -5587,8 +6304,6 @@ public interface ReturnRefundOrBuilder extends
     com.google.protobuf.ByteString getSignature();
   }
   /**
-   * Protobuf type {@code paymentchannels.ReturnRefund}
-   *
    * <pre>
    * Sent from secondary to primary after it has done initial verification of the refund
    * transaction. Contains the primary's signature which is required to spend the multisig contract
@@ -5596,38 +6311,35 @@ public interface ReturnRefundOrBuilder extends
    * the postfix type byte) to allow the client to add any outputs/inputs it wants as long as the
    * input's sequence and transaction's nLockTime remain set.
    * </pre>
+   *
+   * Protobuf type {@code paymentchannels.ReturnRefund}
    */
-  public static final class ReturnRefund extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class ReturnRefund extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:paymentchannels.ReturnRefund)
       ReturnRefundOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ReturnRefund.newBuilder() to construct.
-    private ReturnRefund(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private ReturnRefund(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private ReturnRefund(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final ReturnRefund defaultInstance;
-    public static ReturnRefund getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public ReturnRefund getDefaultInstanceForType() {
-      return defaultInstance;
+    private ReturnRefund() {
+      signature_ = com.google.protobuf.ByteString.EMPTY;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private ReturnRefund(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -5639,25 +6351,25 @@ private ReturnRefund(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               bitField0_ |= 0x00000001;
               signature_ = input.readBytes();
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -5668,28 +6380,14 @@ private ReturnRefund(
       return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ReturnRefund_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ReturnRefund_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoin.paymentchannel.Protos.ReturnRefund.class, org.bitcoin.paymentchannel.Protos.ReturnRefund.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<ReturnRefund> PARSER =
-        new com.google.protobuf.AbstractParser<ReturnRefund>() {
-      public ReturnRefund parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReturnRefund(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<ReturnRefund> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int SIGNATURE_FIELD_NUMBER = 1;
     private com.google.protobuf.ByteString signature_;
@@ -5706,10 +6404,8 @@ public com.google.protobuf.ByteString getSignature() {
       return signature_;
     }
 
-    private void initFields() {
-      signature_ = com.google.protobuf.ByteString.EMPTY;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -5723,18 +6419,18 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeBytes(1, signature_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -5742,30 +6438,70 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(1, signature_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoin.paymentchannel.Protos.ReturnRefund)) {
+        return super.equals(obj);
+      }
+      org.bitcoin.paymentchannel.Protos.ReturnRefund other = (org.bitcoin.paymentchannel.Protos.ReturnRefund) obj;
+
+      boolean result = true;
+      result = result && (hasSignature() == other.hasSignature());
+      if (hasSignature()) {
+        result = result && getSignature()
+            .equals(other.getSignature());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasSignature()) {
+        hash = (37 * hash) + SIGNATURE_FIELD_NUMBER;
+        hash = (53 * hash) + getSignature().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
     public static org.bitcoin.paymentchannel.Protos.ReturnRefund parseFrom(
-        com.google.protobuf.ByteString data)
+        java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
     public static org.bitcoin.paymentchannel.Protos.ReturnRefund parseFrom(
-        com.google.protobuf.ByteString data,
+        java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bitcoin.paymentchannel.Protos.ReturnRefund parseFrom(byte[] data)
+    public static org.bitcoin.paymentchannel.Protos.ReturnRefund parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoin.paymentchannel.Protos.ReturnRefund parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.bitcoin.paymentchannel.Protos.ReturnRefund parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
@@ -5777,52 +6513,63 @@ public static org.bitcoin.paymentchannel.Protos.ReturnRefund parseFrom(
     }
     public static org.bitcoin.paymentchannel.Protos.ReturnRefund parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.ReturnRefund parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.paymentchannel.Protos.ReturnRefund parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.ReturnRefund parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.paymentchannel.Protos.ReturnRefund parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.ReturnRefund parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoin.paymentchannel.Protos.ReturnRefund prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code paymentchannels.ReturnRefund}
-     *
      * <pre>
      * Sent from secondary to primary after it has done initial verification of the refund
      * transaction. Contains the primary's signature which is required to spend the multisig contract
@@ -5830,9 +6577,11 @@ protected Builder newBuilderForType(
      * the postfix type byte) to allow the client to add any outputs/inputs it wants as long as the
      * input's sequence and transaction's nLockTime remain set.
      * </pre>
+     *
+     * Protobuf type {@code paymentchannels.ReturnRefund}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:paymentchannels.ReturnRefund)
         org.bitcoin.paymentchannel.Protos.ReturnRefundOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -5840,7 +6589,8 @@ public static final class Builder extends
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ReturnRefund_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ReturnRefund_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -5853,18 +6603,16 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         signature_ = com.google.protobuf.ByteString.EMPTY;
@@ -5872,19 +6620,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ReturnRefund_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.ReturnRefund getDefaultInstanceForType() {
         return org.bitcoin.paymentchannel.Protos.ReturnRefund.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.ReturnRefund build() {
         org.bitcoin.paymentchannel.Protos.ReturnRefund result = buildPartial();
         if (!result.isInitialized()) {
@@ -5893,6 +6640,7 @@ public org.bitcoin.paymentchannel.Protos.ReturnRefund build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.ReturnRefund buildPartial() {
         org.bitcoin.paymentchannel.Protos.ReturnRefund result = new org.bitcoin.paymentchannel.Protos.ReturnRefund(this);
         int from_bitField0_ = bitField0_;
@@ -5906,6 +6654,39 @@ public org.bitcoin.paymentchannel.Protos.ReturnRefund buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoin.paymentchannel.Protos.ReturnRefund) {
           return mergeFrom((org.bitcoin.paymentchannel.Protos.ReturnRefund)other);
@@ -5920,18 +6701,20 @@ public Builder mergeFrom(org.bitcoin.paymentchannel.Protos.ReturnRefund other) {
         if (other.hasSignature()) {
           setSignature(other.getSignature());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasSignature()) {
-          
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -5941,7 +6724,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoin.paymentchannel.Protos.ReturnRefund) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -5985,16 +6768,57 @@ public Builder clearSignature() {
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:paymentchannels.ReturnRefund)
     }
 
+    // @@protoc_insertion_point(class_scope:paymentchannels.ReturnRefund)
+    private static final org.bitcoin.paymentchannel.Protos.ReturnRefund DEFAULT_INSTANCE;
     static {
-      defaultInstance = new ReturnRefund(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoin.paymentchannel.Protos.ReturnRefund();
+    }
+
+    public static org.bitcoin.paymentchannel.Protos.ReturnRefund getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<ReturnRefund>
+        PARSER = new com.google.protobuf.AbstractParser<ReturnRefund>() {
+      @java.lang.Override
+      public ReturnRefund parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new ReturnRefund(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<ReturnRefund> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<ReturnRefund> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoin.paymentchannel.Protos.ReturnRefund getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:paymentchannels.ReturnRefund)
   }
 
   public interface ProvideContractOrBuilder extends
@@ -6002,8 +6826,6 @@ public interface ProvideContractOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>required bytes tx = 1;</code>
-     *
      * <pre>
      * The serialized bytes of the transaction in Satoshi format.
      * For version 1:
@@ -6018,11 +6840,11 @@ public interface ProvideContractOrBuilder extends
      * * Its first output must be a CHECKLOCKTIMEVERIFY output with the first pubkey being the
      *   primary's and the second being the secondary's.
      * </pre>
+     *
+     * <code>required bytes tx = 1;</code>
      */
     boolean hasTx();
     /**
-     * <code>required bytes tx = 1;</code>
-     *
      * <pre>
      * The serialized bytes of the transaction in Satoshi format.
      * For version 1:
@@ -6037,104 +6859,102 @@ public interface ProvideContractOrBuilder extends
      * * Its first output must be a CHECKLOCKTIMEVERIFY output with the first pubkey being the
      *   primary's and the second being the secondary's.
      * </pre>
+     *
+     * <code>required bytes tx = 1;</code>
      */
     com.google.protobuf.ByteString getTx();
 
     /**
-     * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
-     *
      * <pre>
      * To open the channel, an initial payment of the server-specified dust limit value must be
      * provided. This ensures that the channel is never in an un-settleable state due to either
      * no payment tx having been provided at all, or a payment that is smaller than the dust
      * limit being provided.
      * </pre>
+     *
+     * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
      */
     boolean hasInitialPayment();
     /**
-     * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
-     *
      * <pre>
      * To open the channel, an initial payment of the server-specified dust limit value must be
      * provided. This ensures that the channel is never in an un-settleable state due to either
      * no payment tx having been provided at all, or a payment that is smaller than the dust
      * limit being provided.
      * </pre>
+     *
+     * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
      */
     org.bitcoin.paymentchannel.Protos.UpdatePayment getInitialPayment();
     /**
-     * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
-     *
      * <pre>
      * To open the channel, an initial payment of the server-specified dust limit value must be
      * provided. This ensures that the channel is never in an un-settleable state due to either
      * no payment tx having been provided at all, or a payment that is smaller than the dust
      * limit being provided.
      * </pre>
+     *
+     * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
      */
     org.bitcoin.paymentchannel.Protos.UpdatePaymentOrBuilder getInitialPaymentOrBuilder();
 
     /**
-     * <code>optional bytes client_key = 3;</code>
-     *
      * <pre>
      * This field is added in protocol version 2 to send the client public key to the server.
      * In version 1 it isn't used.
      * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
      * are accepted.  It is only used in the creation of the multisig contract.
      * </pre>
+     *
+     * <code>optional bytes client_key = 3;</code>
      */
     boolean hasClientKey();
     /**
-     * <code>optional bytes client_key = 3;</code>
-     *
      * <pre>
      * This field is added in protocol version 2 to send the client public key to the server.
      * In version 1 it isn't used.
      * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
      * are accepted.  It is only used in the creation of the multisig contract.
      * </pre>
+     *
+     * <code>optional bytes client_key = 3;</code>
      */
     com.google.protobuf.ByteString getClientKey();
   }
   /**
-   * Protobuf type {@code paymentchannels.ProvideContract}
-   *
    * <pre>
    * Sent from the primary to the secondary to complete initialization.
    * </pre>
+   *
+   * Protobuf type {@code paymentchannels.ProvideContract}
    */
-  public static final class ProvideContract extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class ProvideContract extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:paymentchannels.ProvideContract)
       ProvideContractOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ProvideContract.newBuilder() to construct.
-    private ProvideContract(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private ProvideContract(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private ProvideContract(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final ProvideContract defaultInstance;
-    public static ProvideContract getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public ProvideContract getDefaultInstanceForType() {
-      return defaultInstance;
+    private ProvideContract() {
+      tx_ = com.google.protobuf.ByteString.EMPTY;
+      clientKey_ = com.google.protobuf.ByteString.EMPTY;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private ProvideContract(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6146,13 +6966,6 @@ private ProvideContract(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               bitField0_ |= 0x00000001;
               tx_ = input.readBytes();
@@ -6176,13 +6989,20 @@ private ProvideContract(
               clientKey_ = input.readBytes();
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -6193,34 +7013,18 @@ private ProvideContract(
       return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ProvideContract_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ProvideContract_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoin.paymentchannel.Protos.ProvideContract.class, org.bitcoin.paymentchannel.Protos.ProvideContract.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<ProvideContract> PARSER =
-        new com.google.protobuf.AbstractParser<ProvideContract>() {
-      public ProvideContract parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ProvideContract(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<ProvideContract> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int TX_FIELD_NUMBER = 1;
     private com.google.protobuf.ByteString tx_;
     /**
-     * <code>required bytes tx = 1;</code>
-     *
      * <pre>
      * The serialized bytes of the transaction in Satoshi format.
      * For version 1:
@@ -6235,13 +7039,13 @@ public com.google.protobuf.Parser<ProvideContract> getParserForType() {
      * * Its first output must be a CHECKLOCKTIMEVERIFY output with the first pubkey being the
      *   primary's and the second being the secondary's.
      * </pre>
+     *
+     * <code>required bytes tx = 1;</code>
      */
     public boolean hasTx() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required bytes tx = 1;</code>
-     *
      * <pre>
      * The serialized bytes of the transaction in Satoshi format.
      * For version 1:
@@ -6256,6 +7060,8 @@ public boolean hasTx() {
      * * Its first output must be a CHECKLOCKTIMEVERIFY output with the first pubkey being the
      *   primary's and the second being the secondary's.
      * </pre>
+     *
+     * <code>required bytes tx = 1;</code>
      */
     public com.google.protobuf.ByteString getTx() {
       return tx_;
@@ -6264,80 +7070,76 @@ public com.google.protobuf.ByteString getTx() {
     public static final int INITIAL_PAYMENT_FIELD_NUMBER = 2;
     private org.bitcoin.paymentchannel.Protos.UpdatePayment initialPayment_;
     /**
-     * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
-     *
      * <pre>
      * To open the channel, an initial payment of the server-specified dust limit value must be
      * provided. This ensures that the channel is never in an un-settleable state due to either
      * no payment tx having been provided at all, or a payment that is smaller than the dust
      * limit being provided.
      * </pre>
+     *
+     * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
      */
     public boolean hasInitialPayment() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
-     *
      * <pre>
      * To open the channel, an initial payment of the server-specified dust limit value must be
      * provided. This ensures that the channel is never in an un-settleable state due to either
      * no payment tx having been provided at all, or a payment that is smaller than the dust
      * limit being provided.
      * </pre>
+     *
+     * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
      */
     public org.bitcoin.paymentchannel.Protos.UpdatePayment getInitialPayment() {
-      return initialPayment_;
+      return initialPayment_ == null ? org.bitcoin.paymentchannel.Protos.UpdatePayment.getDefaultInstance() : initialPayment_;
     }
     /**
-     * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
-     *
      * <pre>
      * To open the channel, an initial payment of the server-specified dust limit value must be
      * provided. This ensures that the channel is never in an un-settleable state due to either
      * no payment tx having been provided at all, or a payment that is smaller than the dust
      * limit being provided.
      * </pre>
+     *
+     * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
      */
     public org.bitcoin.paymentchannel.Protos.UpdatePaymentOrBuilder getInitialPaymentOrBuilder() {
-      return initialPayment_;
+      return initialPayment_ == null ? org.bitcoin.paymentchannel.Protos.UpdatePayment.getDefaultInstance() : initialPayment_;
     }
 
     public static final int CLIENT_KEY_FIELD_NUMBER = 3;
     private com.google.protobuf.ByteString clientKey_;
     /**
-     * <code>optional bytes client_key = 3;</code>
-     *
      * <pre>
      * This field is added in protocol version 2 to send the client public key to the server.
      * In version 1 it isn't used.
      * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
      * are accepted.  It is only used in the creation of the multisig contract.
      * </pre>
+     *
+     * <code>optional bytes client_key = 3;</code>
      */
     public boolean hasClientKey() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * <code>optional bytes client_key = 3;</code>
-     *
      * <pre>
      * This field is added in protocol version 2 to send the client public key to the server.
      * In version 1 it isn't used.
      * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
      * are accepted.  It is only used in the creation of the multisig contract.
      * </pre>
+     *
+     * <code>optional bytes client_key = 3;</code>
      */
     public com.google.protobuf.ByteString getClientKey() {
       return clientKey_;
     }
 
-    private void initFields() {
-      tx_ = com.google.protobuf.ByteString.EMPTY;
-      initialPayment_ = org.bitcoin.paymentchannel.Protos.UpdatePayment.getDefaultInstance();
-      clientKey_ = com.google.protobuf.ByteString.EMPTY;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -6359,24 +7161,24 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeBytes(1, tx_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeMessage(2, initialPayment_);
+        output.writeMessage(2, getInitialPayment());
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         output.writeBytes(3, clientKey_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -6386,24 +7188,82 @@ public int getSerializedSize() {
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, initialPayment_);
+          .computeMessageSize(2, getInitialPayment());
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(3, clientKey_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoin.paymentchannel.Protos.ProvideContract)) {
+        return super.equals(obj);
+      }
+      org.bitcoin.paymentchannel.Protos.ProvideContract other = (org.bitcoin.paymentchannel.Protos.ProvideContract) obj;
+
+      boolean result = true;
+      result = result && (hasTx() == other.hasTx());
+      if (hasTx()) {
+        result = result && getTx()
+            .equals(other.getTx());
+      }
+      result = result && (hasInitialPayment() == other.hasInitialPayment());
+      if (hasInitialPayment()) {
+        result = result && getInitialPayment()
+            .equals(other.getInitialPayment());
+      }
+      result = result && (hasClientKey() == other.hasClientKey());
+      if (hasClientKey()) {
+        result = result && getClientKey()
+            .equals(other.getClientKey());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasTx()) {
+        hash = (37 * hash) + TX_FIELD_NUMBER;
+        hash = (53 * hash) + getTx().hashCode();
+      }
+      if (hasInitialPayment()) {
+        hash = (37 * hash) + INITIAL_PAYMENT_FIELD_NUMBER;
+        hash = (53 * hash) + getInitialPayment().hashCode();
+      }
+      if (hasClientKey()) {
+        hash = (37 * hash) + CLIENT_KEY_FIELD_NUMBER;
+        hash = (53 * hash) + getClientKey().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoin.paymentchannel.Protos.ProvideContract parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoin.paymentchannel.Protos.ProvideContract parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoin.paymentchannel.Protos.ProvideContract parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -6427,58 +7287,71 @@ public static org.bitcoin.paymentchannel.Protos.ProvideContract parseFrom(
     }
     public static org.bitcoin.paymentchannel.Protos.ProvideContract parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.ProvideContract parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.paymentchannel.Protos.ProvideContract parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.ProvideContract parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.paymentchannel.Protos.ProvideContract parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.ProvideContract parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoin.paymentchannel.Protos.ProvideContract prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code paymentchannels.ProvideContract}
-     *
      * <pre>
      * Sent from the primary to the secondary to complete initialization.
      * </pre>
+     *
+     * Protobuf type {@code paymentchannels.ProvideContract}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:paymentchannels.ProvideContract)
         org.bitcoin.paymentchannel.Protos.ProvideContractOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -6486,7 +7359,8 @@ public static final class Builder extends
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ProvideContract_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ProvideContract_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -6499,25 +7373,23 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
           getInitialPaymentFieldBuilder();
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         tx_ = com.google.protobuf.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
         if (initialPaymentBuilder_ == null) {
-          initialPayment_ = org.bitcoin.paymentchannel.Protos.UpdatePayment.getDefaultInstance();
+          initialPayment_ = null;
         } else {
           initialPaymentBuilder_.clear();
         }
@@ -6527,19 +7399,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_ProvideContract_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.ProvideContract getDefaultInstanceForType() {
         return org.bitcoin.paymentchannel.Protos.ProvideContract.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.ProvideContract build() {
         org.bitcoin.paymentchannel.Protos.ProvideContract result = buildPartial();
         if (!result.isInitialized()) {
@@ -6548,6 +7419,7 @@ public org.bitcoin.paymentchannel.Protos.ProvideContract build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.ProvideContract buildPartial() {
         org.bitcoin.paymentchannel.Protos.ProvideContract result = new org.bitcoin.paymentchannel.Protos.ProvideContract(this);
         int from_bitField0_ = bitField0_;
@@ -6573,6 +7445,39 @@ public org.bitcoin.paymentchannel.Protos.ProvideContract buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoin.paymentchannel.Protos.ProvideContract) {
           return mergeFrom((org.bitcoin.paymentchannel.Protos.ProvideContract)other);
@@ -6593,26 +7498,26 @@ public Builder mergeFrom(org.bitcoin.paymentchannel.Protos.ProvideContract other
         if (other.hasClientKey()) {
           setClientKey(other.getClientKey());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasTx()) {
-          
           return false;
         }
         if (!hasInitialPayment()) {
-          
           return false;
         }
         if (!getInitialPayment().isInitialized()) {
-          
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -6622,7 +7527,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoin.paymentchannel.Protos.ProvideContract) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -6634,8 +7539,6 @@ public Builder mergeFrom(
 
       private com.google.protobuf.ByteString tx_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>required bytes tx = 1;</code>
-       *
        * <pre>
        * The serialized bytes of the transaction in Satoshi format.
        * For version 1:
@@ -6650,13 +7553,13 @@ public Builder mergeFrom(
        * * Its first output must be a CHECKLOCKTIMEVERIFY output with the first pubkey being the
        *   primary's and the second being the secondary's.
        * </pre>
+       *
+       * <code>required bytes tx = 1;</code>
        */
       public boolean hasTx() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>required bytes tx = 1;</code>
-       *
        * <pre>
        * The serialized bytes of the transaction in Satoshi format.
        * For version 1:
@@ -6671,13 +7574,13 @@ public boolean hasTx() {
        * * Its first output must be a CHECKLOCKTIMEVERIFY output with the first pubkey being the
        *   primary's and the second being the secondary's.
        * </pre>
+       *
+       * <code>required bytes tx = 1;</code>
        */
       public com.google.protobuf.ByteString getTx() {
         return tx_;
       }
       /**
-       * <code>required bytes tx = 1;</code>
-       *
        * <pre>
        * The serialized bytes of the transaction in Satoshi format.
        * For version 1:
@@ -6692,6 +7595,8 @@ public com.google.protobuf.ByteString getTx() {
        * * Its first output must be a CHECKLOCKTIMEVERIFY output with the first pubkey being the
        *   primary's and the second being the secondary's.
        * </pre>
+       *
+       * <code>required bytes tx = 1;</code>
        */
       public Builder setTx(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -6703,8 +7608,6 @@ public Builder setTx(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>required bytes tx = 1;</code>
-       *
        * <pre>
        * The serialized bytes of the transaction in Satoshi format.
        * For version 1:
@@ -6719,6 +7622,8 @@ public Builder setTx(com.google.protobuf.ByteString value) {
        * * Its first output must be a CHECKLOCKTIMEVERIFY output with the first pubkey being the
        *   primary's and the second being the secondary's.
        * </pre>
+       *
+       * <code>required bytes tx = 1;</code>
        */
       public Builder clearTx() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -6727,48 +7632,48 @@ public Builder clearTx() {
         return this;
       }
 
-      private org.bitcoin.paymentchannel.Protos.UpdatePayment initialPayment_ = org.bitcoin.paymentchannel.Protos.UpdatePayment.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
+      private org.bitcoin.paymentchannel.Protos.UpdatePayment initialPayment_ = null;
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.paymentchannel.Protos.UpdatePayment, org.bitcoin.paymentchannel.Protos.UpdatePayment.Builder, org.bitcoin.paymentchannel.Protos.UpdatePaymentOrBuilder> initialPaymentBuilder_;
       /**
-       * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
-       *
        * <pre>
        * To open the channel, an initial payment of the server-specified dust limit value must be
        * provided. This ensures that the channel is never in an un-settleable state due to either
        * no payment tx having been provided at all, or a payment that is smaller than the dust
        * limit being provided.
        * </pre>
+       *
+       * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
        */
       public boolean hasInitialPayment() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
-       *
        * <pre>
        * To open the channel, an initial payment of the server-specified dust limit value must be
        * provided. This ensures that the channel is never in an un-settleable state due to either
        * no payment tx having been provided at all, or a payment that is smaller than the dust
        * limit being provided.
        * </pre>
+       *
+       * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
        */
       public org.bitcoin.paymentchannel.Protos.UpdatePayment getInitialPayment() {
         if (initialPaymentBuilder_ == null) {
-          return initialPayment_;
+          return initialPayment_ == null ? org.bitcoin.paymentchannel.Protos.UpdatePayment.getDefaultInstance() : initialPayment_;
         } else {
           return initialPaymentBuilder_.getMessage();
         }
       }
       /**
-       * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
-       *
        * <pre>
        * To open the channel, an initial payment of the server-specified dust limit value must be
        * provided. This ensures that the channel is never in an un-settleable state due to either
        * no payment tx having been provided at all, or a payment that is smaller than the dust
        * limit being provided.
        * </pre>
+       *
+       * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
        */
       public Builder setInitialPayment(org.bitcoin.paymentchannel.Protos.UpdatePayment value) {
         if (initialPaymentBuilder_ == null) {
@@ -6784,14 +7689,14 @@ public Builder setInitialPayment(org.bitcoin.paymentchannel.Protos.UpdatePayment
         return this;
       }
       /**
-       * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
-       *
        * <pre>
        * To open the channel, an initial payment of the server-specified dust limit value must be
        * provided. This ensures that the channel is never in an un-settleable state due to either
        * no payment tx having been provided at all, or a payment that is smaller than the dust
        * limit being provided.
        * </pre>
+       *
+       * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
        */
       public Builder setInitialPayment(
           org.bitcoin.paymentchannel.Protos.UpdatePayment.Builder builderForValue) {
@@ -6805,18 +7710,19 @@ public Builder setInitialPayment(
         return this;
       }
       /**
-       * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
-       *
        * <pre>
        * To open the channel, an initial payment of the server-specified dust limit value must be
        * provided. This ensures that the channel is never in an un-settleable state due to either
        * no payment tx having been provided at all, or a payment that is smaller than the dust
        * limit being provided.
        * </pre>
+       *
+       * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
        */
       public Builder mergeInitialPayment(org.bitcoin.paymentchannel.Protos.UpdatePayment value) {
         if (initialPaymentBuilder_ == null) {
           if (((bitField0_ & 0x00000002) == 0x00000002) &&
+              initialPayment_ != null &&
               initialPayment_ != org.bitcoin.paymentchannel.Protos.UpdatePayment.getDefaultInstance()) {
             initialPayment_ =
               org.bitcoin.paymentchannel.Protos.UpdatePayment.newBuilder(initialPayment_).mergeFrom(value).buildPartial();
@@ -6831,18 +7737,18 @@ public Builder mergeInitialPayment(org.bitcoin.paymentchannel.Protos.UpdatePayme
         return this;
       }
       /**
-       * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
-       *
        * <pre>
        * To open the channel, an initial payment of the server-specified dust limit value must be
        * provided. This ensures that the channel is never in an un-settleable state due to either
        * no payment tx having been provided at all, or a payment that is smaller than the dust
        * limit being provided.
        * </pre>
+       *
+       * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
        */
       public Builder clearInitialPayment() {
         if (initialPaymentBuilder_ == null) {
-          initialPayment_ = org.bitcoin.paymentchannel.Protos.UpdatePayment.getDefaultInstance();
+          initialPayment_ = null;
           onChanged();
         } else {
           initialPaymentBuilder_.clear();
@@ -6851,14 +7757,14 @@ public Builder clearInitialPayment() {
         return this;
       }
       /**
-       * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
-       *
        * <pre>
        * To open the channel, an initial payment of the server-specified dust limit value must be
        * provided. This ensures that the channel is never in an un-settleable state due to either
        * no payment tx having been provided at all, or a payment that is smaller than the dust
        * limit being provided.
        * </pre>
+       *
+       * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
        */
       public org.bitcoin.paymentchannel.Protos.UpdatePayment.Builder getInitialPaymentBuilder() {
         bitField0_ |= 0x00000002;
@@ -6866,37 +7772,38 @@ public org.bitcoin.paymentchannel.Protos.UpdatePayment.Builder getInitialPayment
         return getInitialPaymentFieldBuilder().getBuilder();
       }
       /**
-       * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
-       *
        * <pre>
        * To open the channel, an initial payment of the server-specified dust limit value must be
        * provided. This ensures that the channel is never in an un-settleable state due to either
        * no payment tx having been provided at all, or a payment that is smaller than the dust
        * limit being provided.
        * </pre>
+       *
+       * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
        */
       public org.bitcoin.paymentchannel.Protos.UpdatePaymentOrBuilder getInitialPaymentOrBuilder() {
         if (initialPaymentBuilder_ != null) {
           return initialPaymentBuilder_.getMessageOrBuilder();
         } else {
-          return initialPayment_;
+          return initialPayment_ == null ?
+              org.bitcoin.paymentchannel.Protos.UpdatePayment.getDefaultInstance() : initialPayment_;
         }
       }
       /**
-       * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
-       *
        * <pre>
        * To open the channel, an initial payment of the server-specified dust limit value must be
        * provided. This ensures that the channel is never in an un-settleable state due to either
        * no payment tx having been provided at all, or a payment that is smaller than the dust
        * limit being provided.
        * </pre>
+       *
+       * <code>required .paymentchannels.UpdatePayment initial_payment = 2;</code>
        */
-      private com.google.protobuf.SingleFieldBuilder<
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.paymentchannel.Protos.UpdatePayment, org.bitcoin.paymentchannel.Protos.UpdatePayment.Builder, org.bitcoin.paymentchannel.Protos.UpdatePaymentOrBuilder> 
           getInitialPaymentFieldBuilder() {
         if (initialPaymentBuilder_ == null) {
-          initialPaymentBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+          initialPaymentBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               org.bitcoin.paymentchannel.Protos.UpdatePayment, org.bitcoin.paymentchannel.Protos.UpdatePayment.Builder, org.bitcoin.paymentchannel.Protos.UpdatePaymentOrBuilder>(
                   getInitialPayment(),
                   getParentForChildren(),
@@ -6908,40 +7815,40 @@ public org.bitcoin.paymentchannel.Protos.UpdatePaymentOrBuilder getInitialPaymen
 
       private com.google.protobuf.ByteString clientKey_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>optional bytes client_key = 3;</code>
-       *
        * <pre>
        * This field is added in protocol version 2 to send the client public key to the server.
        * In version 1 it isn't used.
        * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
        * are accepted.  It is only used in the creation of the multisig contract.
        * </pre>
+       *
+       * <code>optional bytes client_key = 3;</code>
        */
       public boolean hasClientKey() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>optional bytes client_key = 3;</code>
-       *
        * <pre>
        * This field is added in protocol version 2 to send the client public key to the server.
        * In version 1 it isn't used.
        * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
        * are accepted.  It is only used in the creation of the multisig contract.
        * </pre>
+       *
+       * <code>optional bytes client_key = 3;</code>
        */
       public com.google.protobuf.ByteString getClientKey() {
         return clientKey_;
       }
       /**
-       * <code>optional bytes client_key = 3;</code>
-       *
        * <pre>
        * This field is added in protocol version 2 to send the client public key to the server.
        * In version 1 it isn't used.
        * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
        * are accepted.  It is only used in the creation of the multisig contract.
        * </pre>
+       *
+       * <code>optional bytes client_key = 3;</code>
        */
       public Builder setClientKey(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -6953,14 +7860,14 @@ public Builder setClientKey(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>optional bytes client_key = 3;</code>
-       *
        * <pre>
        * This field is added in protocol version 2 to send the client public key to the server.
        * In version 1 it isn't used.
        * This must be a raw pubkey in regular ECDSA form. Both compressed and non-compressed forms
        * are accepted.  It is only used in the creation of the multisig contract.
        * </pre>
+       *
+       * <code>optional bytes client_key = 3;</code>
        */
       public Builder clearClientKey() {
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -6968,16 +7875,57 @@ public Builder clearClientKey() {
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:paymentchannels.ProvideContract)
     }
 
+    // @@protoc_insertion_point(class_scope:paymentchannels.ProvideContract)
+    private static final org.bitcoin.paymentchannel.Protos.ProvideContract DEFAULT_INSTANCE;
     static {
-      defaultInstance = new ProvideContract(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoin.paymentchannel.Protos.ProvideContract();
+    }
+
+    public static org.bitcoin.paymentchannel.Protos.ProvideContract getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<ProvideContract>
+        PARSER = new com.google.protobuf.AbstractParser<ProvideContract>() {
+      @java.lang.Override
+      public ProvideContract parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new ProvideContract(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<ProvideContract> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<ProvideContract> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoin.paymentchannel.Protos.ProvideContract getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:paymentchannels.ProvideContract)
   }
 
   public interface UpdatePaymentOrBuilder extends
@@ -6985,67 +7933,65 @@ public interface UpdatePaymentOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>required uint64 client_change_value = 1;</code>
-     *
      * <pre>
      * The value which is sent back to the primary.  The rest of the multisig output is left for
      * the secondary to do with as they wish.
      * </pre>
+     *
+     * <code>required uint64 client_change_value = 1;</code>
      */
     boolean hasClientChangeValue();
     /**
-     * <code>required uint64 client_change_value = 1;</code>
-     *
      * <pre>
      * The value which is sent back to the primary.  The rest of the multisig output is left for
      * the secondary to do with as they wish.
      * </pre>
+     *
+     * <code>required uint64 client_change_value = 1;</code>
      */
     long getClientChangeValue();
 
     /**
-     * <code>required bytes signature = 2;</code>
-     *
      * <pre>
      * A SIGHASH_SINGLE|SIGHASH_ANYONECANPAY signature (including the postfix type byte) which
      * spends the primary's part of the multisig contract's output.  This signature only covers
      * the primary's refund output and thus the secondary is free to do what they wish with their
      * part of the multisig output.
      * </pre>
+     *
+     * <code>required bytes signature = 2;</code>
      */
     boolean hasSignature();
     /**
-     * <code>required bytes signature = 2;</code>
-     *
      * <pre>
      * A SIGHASH_SINGLE|SIGHASH_ANYONECANPAY signature (including the postfix type byte) which
      * spends the primary's part of the multisig contract's output.  This signature only covers
      * the primary's refund output and thus the secondary is free to do what they wish with their
      * part of the multisig output.
      * </pre>
+     *
+     * <code>required bytes signature = 2;</code>
      */
     com.google.protobuf.ByteString getSignature();
 
     /**
-     * <code>optional bytes info = 3;</code>
-     *
      * <pre>
      * Information about this update. Used to extend this protocol.
      * </pre>
+     *
+     * <code>optional bytes info = 3;</code>
      */
     boolean hasInfo();
     /**
-     * <code>optional bytes info = 3;</code>
-     *
      * <pre>
      * Information about this update. Used to extend this protocol.
      * </pre>
+     *
+     * <code>optional bytes info = 3;</code>
      */
     com.google.protobuf.ByteString getInfo();
   }
   /**
-   * Protobuf type {@code paymentchannels.UpdatePayment}
-   *
    * <pre>
    * This message can only be used by the primary after it has received a CHANNEL_OPEN message. It
    * creates a new payment transaction. Note that we don't resubmit the entire TX, this is to avoid
@@ -7061,38 +8007,37 @@ public interface UpdatePaymentOrBuilder extends
    * * Adding any number of additional outputs as desired (leaving sufficient fee, if necessary)
    * * Adding any number of additional inputs as desired (eg to add more fee)
    * </pre>
+   *
+   * Protobuf type {@code paymentchannels.UpdatePayment}
    */
-  public static final class UpdatePayment extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class UpdatePayment extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:paymentchannels.UpdatePayment)
       UpdatePaymentOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use UpdatePayment.newBuilder() to construct.
-    private UpdatePayment(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private UpdatePayment(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private UpdatePayment(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final UpdatePayment defaultInstance;
-    public static UpdatePayment getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public UpdatePayment getDefaultInstanceForType() {
-      return defaultInstance;
+    private UpdatePayment() {
+      clientChangeValue_ = 0L;
+      signature_ = com.google.protobuf.ByteString.EMPTY;
+      info_ = com.google.protobuf.ByteString.EMPTY;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private UpdatePayment(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -7104,13 +8049,6 @@ private UpdatePayment(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 8: {
               bitField0_ |= 0x00000001;
               clientChangeValue_ = input.readUInt64();
@@ -7126,13 +8064,20 @@ private UpdatePayment(
               info_ = input.readBytes();
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -7143,49 +8088,35 @@ private UpdatePayment(
       return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_UpdatePayment_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_UpdatePayment_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoin.paymentchannel.Protos.UpdatePayment.class, org.bitcoin.paymentchannel.Protos.UpdatePayment.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<UpdatePayment> PARSER =
-        new com.google.protobuf.AbstractParser<UpdatePayment>() {
-      public UpdatePayment parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new UpdatePayment(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<UpdatePayment> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int CLIENT_CHANGE_VALUE_FIELD_NUMBER = 1;
     private long clientChangeValue_;
     /**
-     * <code>required uint64 client_change_value = 1;</code>
-     *
      * <pre>
      * The value which is sent back to the primary.  The rest of the multisig output is left for
      * the secondary to do with as they wish.
      * </pre>
+     *
+     * <code>required uint64 client_change_value = 1;</code>
      */
     public boolean hasClientChangeValue() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required uint64 client_change_value = 1;</code>
-     *
      * <pre>
      * The value which is sent back to the primary.  The rest of the multisig output is left for
      * the secondary to do with as they wish.
      * </pre>
+     *
+     * <code>required uint64 client_change_value = 1;</code>
      */
     public long getClientChangeValue() {
       return clientChangeValue_;
@@ -7194,27 +8125,27 @@ public long getClientChangeValue() {
     public static final int SIGNATURE_FIELD_NUMBER = 2;
     private com.google.protobuf.ByteString signature_;
     /**
-     * <code>required bytes signature = 2;</code>
-     *
      * <pre>
      * A SIGHASH_SINGLE|SIGHASH_ANYONECANPAY signature (including the postfix type byte) which
      * spends the primary's part of the multisig contract's output.  This signature only covers
      * the primary's refund output and thus the secondary is free to do what they wish with their
      * part of the multisig output.
      * </pre>
+     *
+     * <code>required bytes signature = 2;</code>
      */
     public boolean hasSignature() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>required bytes signature = 2;</code>
-     *
      * <pre>
      * A SIGHASH_SINGLE|SIGHASH_ANYONECANPAY signature (including the postfix type byte) which
      * spends the primary's part of the multisig contract's output.  This signature only covers
      * the primary's refund output and thus the secondary is free to do what they wish with their
      * part of the multisig output.
      * </pre>
+     *
+     * <code>required bytes signature = 2;</code>
      */
     public com.google.protobuf.ByteString getSignature() {
       return signature_;
@@ -7223,32 +8154,28 @@ public com.google.protobuf.ByteString getSignature() {
     public static final int INFO_FIELD_NUMBER = 3;
     private com.google.protobuf.ByteString info_;
     /**
-     * <code>optional bytes info = 3;</code>
-     *
      * <pre>
      * Information about this update. Used to extend this protocol.
      * </pre>
+     *
+     * <code>optional bytes info = 3;</code>
      */
     public boolean hasInfo() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * <code>optional bytes info = 3;</code>
-     *
      * <pre>
      * Information about this update. Used to extend this protocol.
      * </pre>
+     *
+     * <code>optional bytes info = 3;</code>
      */
     public com.google.protobuf.ByteString getInfo() {
       return info_;
     }
 
-    private void initFields() {
-      clientChangeValue_ = 0L;
-      signature_ = com.google.protobuf.ByteString.EMPTY;
-      info_ = com.google.protobuf.ByteString.EMPTY;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -7266,9 +8193,9 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeUInt64(1, clientChangeValue_);
       }
@@ -7278,12 +8205,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         output.writeBytes(3, info_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -7299,18 +8226,77 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(3, info_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoin.paymentchannel.Protos.UpdatePayment)) {
+        return super.equals(obj);
+      }
+      org.bitcoin.paymentchannel.Protos.UpdatePayment other = (org.bitcoin.paymentchannel.Protos.UpdatePayment) obj;
+
+      boolean result = true;
+      result = result && (hasClientChangeValue() == other.hasClientChangeValue());
+      if (hasClientChangeValue()) {
+        result = result && (getClientChangeValue()
+            == other.getClientChangeValue());
+      }
+      result = result && (hasSignature() == other.hasSignature());
+      if (hasSignature()) {
+        result = result && getSignature()
+            .equals(other.getSignature());
+      }
+      result = result && (hasInfo() == other.hasInfo());
+      if (hasInfo()) {
+        result = result && getInfo()
+            .equals(other.getInfo());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
     }
 
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasClientChangeValue()) {
+        hash = (37 * hash) + CLIENT_CHANGE_VALUE_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getClientChangeValue());
+      }
+      if (hasSignature()) {
+        hash = (37 * hash) + SIGNATURE_FIELD_NUMBER;
+        hash = (53 * hash) + getSignature().hashCode();
+      }
+      if (hasInfo()) {
+        hash = (37 * hash) + INFO_FIELD_NUMBER;
+        hash = (53 * hash) + getInfo().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static org.bitcoin.paymentchannel.Protos.UpdatePayment parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoin.paymentchannel.Protos.UpdatePayment parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoin.paymentchannel.Protos.UpdatePayment parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -7334,52 +8320,63 @@ public static org.bitcoin.paymentchannel.Protos.UpdatePayment parseFrom(
     }
     public static org.bitcoin.paymentchannel.Protos.UpdatePayment parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.UpdatePayment parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.paymentchannel.Protos.UpdatePayment parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.UpdatePayment parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.paymentchannel.Protos.UpdatePayment parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.UpdatePayment parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoin.paymentchannel.Protos.UpdatePayment prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code paymentchannels.UpdatePayment}
-     *
      * <pre>
      * This message can only be used by the primary after it has received a CHANNEL_OPEN message. It
      * creates a new payment transaction. Note that we don't resubmit the entire TX, this is to avoid
@@ -7395,9 +8392,11 @@ protected Builder newBuilderForType(
      * * Adding any number of additional outputs as desired (leaving sufficient fee, if necessary)
      * * Adding any number of additional inputs as desired (eg to add more fee)
      * </pre>
+     *
+     * Protobuf type {@code paymentchannels.UpdatePayment}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:paymentchannels.UpdatePayment)
         org.bitcoin.paymentchannel.Protos.UpdatePaymentOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -7405,7 +8404,8 @@ public static final class Builder extends
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_UpdatePayment_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_UpdatePayment_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -7418,18 +8418,16 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         clientChangeValue_ = 0L;
@@ -7441,19 +8439,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_UpdatePayment_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.UpdatePayment getDefaultInstanceForType() {
         return org.bitcoin.paymentchannel.Protos.UpdatePayment.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.UpdatePayment build() {
         org.bitcoin.paymentchannel.Protos.UpdatePayment result = buildPartial();
         if (!result.isInitialized()) {
@@ -7462,6 +8459,7 @@ public org.bitcoin.paymentchannel.Protos.UpdatePayment build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.UpdatePayment buildPartial() {
         org.bitcoin.paymentchannel.Protos.UpdatePayment result = new org.bitcoin.paymentchannel.Protos.UpdatePayment(this);
         int from_bitField0_ = bitField0_;
@@ -7483,6 +8481,39 @@ public org.bitcoin.paymentchannel.Protos.UpdatePayment buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoin.paymentchannel.Protos.UpdatePayment) {
           return mergeFrom((org.bitcoin.paymentchannel.Protos.UpdatePayment)other);
@@ -7503,22 +8534,23 @@ public Builder mergeFrom(org.bitcoin.paymentchannel.Protos.UpdatePayment other)
         if (other.hasInfo()) {
           setInfo(other.getInfo());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasClientChangeValue()) {
-          
           return false;
         }
         if (!hasSignature()) {
-          
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -7528,7 +8560,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoin.paymentchannel.Protos.UpdatePayment) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -7540,34 +8572,34 @@ public Builder mergeFrom(
 
       private long clientChangeValue_ ;
       /**
-       * <code>required uint64 client_change_value = 1;</code>
-       *
        * <pre>
        * The value which is sent back to the primary.  The rest of the multisig output is left for
        * the secondary to do with as they wish.
        * </pre>
+       *
+       * <code>required uint64 client_change_value = 1;</code>
        */
       public boolean hasClientChangeValue() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>required uint64 client_change_value = 1;</code>
-       *
        * <pre>
        * The value which is sent back to the primary.  The rest of the multisig output is left for
        * the secondary to do with as they wish.
        * </pre>
+       *
+       * <code>required uint64 client_change_value = 1;</code>
        */
       public long getClientChangeValue() {
         return clientChangeValue_;
       }
       /**
-       * <code>required uint64 client_change_value = 1;</code>
-       *
        * <pre>
        * The value which is sent back to the primary.  The rest of the multisig output is left for
        * the secondary to do with as they wish.
        * </pre>
+       *
+       * <code>required uint64 client_change_value = 1;</code>
        */
       public Builder setClientChangeValue(long value) {
         bitField0_ |= 0x00000001;
@@ -7576,12 +8608,12 @@ public Builder setClientChangeValue(long value) {
         return this;
       }
       /**
-       * <code>required uint64 client_change_value = 1;</code>
-       *
        * <pre>
        * The value which is sent back to the primary.  The rest of the multisig output is left for
        * the secondary to do with as they wish.
        * </pre>
+       *
+       * <code>required uint64 client_change_value = 1;</code>
        */
       public Builder clearClientChangeValue() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -7592,40 +8624,40 @@ public Builder clearClientChangeValue() {
 
       private com.google.protobuf.ByteString signature_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>required bytes signature = 2;</code>
-       *
        * <pre>
        * A SIGHASH_SINGLE|SIGHASH_ANYONECANPAY signature (including the postfix type byte) which
        * spends the primary's part of the multisig contract's output.  This signature only covers
        * the primary's refund output and thus the secondary is free to do what they wish with their
        * part of the multisig output.
        * </pre>
+       *
+       * <code>required bytes signature = 2;</code>
        */
       public boolean hasSignature() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>required bytes signature = 2;</code>
-       *
        * <pre>
        * A SIGHASH_SINGLE|SIGHASH_ANYONECANPAY signature (including the postfix type byte) which
        * spends the primary's part of the multisig contract's output.  This signature only covers
        * the primary's refund output and thus the secondary is free to do what they wish with their
        * part of the multisig output.
        * </pre>
+       *
+       * <code>required bytes signature = 2;</code>
        */
       public com.google.protobuf.ByteString getSignature() {
         return signature_;
       }
       /**
-       * <code>required bytes signature = 2;</code>
-       *
        * <pre>
        * A SIGHASH_SINGLE|SIGHASH_ANYONECANPAY signature (including the postfix type byte) which
        * spends the primary's part of the multisig contract's output.  This signature only covers
        * the primary's refund output and thus the secondary is free to do what they wish with their
        * part of the multisig output.
        * </pre>
+       *
+       * <code>required bytes signature = 2;</code>
        */
       public Builder setSignature(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -7637,14 +8669,14 @@ public Builder setSignature(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>required bytes signature = 2;</code>
-       *
        * <pre>
        * A SIGHASH_SINGLE|SIGHASH_ANYONECANPAY signature (including the postfix type byte) which
        * spends the primary's part of the multisig contract's output.  This signature only covers
        * the primary's refund output and thus the secondary is free to do what they wish with their
        * part of the multisig output.
        * </pre>
+       *
+       * <code>required bytes signature = 2;</code>
        */
       public Builder clearSignature() {
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -7655,31 +8687,31 @@ public Builder clearSignature() {
 
       private com.google.protobuf.ByteString info_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>optional bytes info = 3;</code>
-       *
        * <pre>
        * Information about this update. Used to extend this protocol.
        * </pre>
+       *
+       * <code>optional bytes info = 3;</code>
        */
       public boolean hasInfo() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>optional bytes info = 3;</code>
-       *
        * <pre>
        * Information about this update. Used to extend this protocol.
        * </pre>
+       *
+       * <code>optional bytes info = 3;</code>
        */
       public com.google.protobuf.ByteString getInfo() {
         return info_;
       }
       /**
-       * <code>optional bytes info = 3;</code>
-       *
        * <pre>
        * Information about this update. Used to extend this protocol.
        * </pre>
+       *
+       * <code>optional bytes info = 3;</code>
        */
       public Builder setInfo(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -7691,11 +8723,11 @@ public Builder setInfo(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>optional bytes info = 3;</code>
-       *
        * <pre>
        * Information about this update. Used to extend this protocol.
        * </pre>
+       *
+       * <code>optional bytes info = 3;</code>
        */
       public Builder clearInfo() {
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -7703,16 +8735,57 @@ public Builder clearInfo() {
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:paymentchannels.UpdatePayment)
     }
 
+    // @@protoc_insertion_point(class_scope:paymentchannels.UpdatePayment)
+    private static final org.bitcoin.paymentchannel.Protos.UpdatePayment DEFAULT_INSTANCE;
     static {
-      defaultInstance = new UpdatePayment(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoin.paymentchannel.Protos.UpdatePayment();
+    }
+
+    public static org.bitcoin.paymentchannel.Protos.UpdatePayment getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<UpdatePayment>
+        PARSER = new com.google.protobuf.AbstractParser<UpdatePayment>() {
+      @java.lang.Override
+      public UpdatePayment parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new UpdatePayment(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<UpdatePayment> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<UpdatePayment> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoin.paymentchannel.Protos.UpdatePayment getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:paymentchannels.UpdatePayment)
   }
 
   public interface PaymentAckOrBuilder extends
@@ -7720,60 +8793,55 @@ public interface PaymentAckOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>optional bytes info = 1;</code>
-     *
      * <pre>
      * Information about this update. Used to extend this protocol
      * </pre>
+     *
+     * <code>optional bytes info = 1;</code>
      */
     boolean hasInfo();
     /**
-     * <code>optional bytes info = 1;</code>
-     *
      * <pre>
      * Information about this update. Used to extend this protocol
      * </pre>
+     *
+     * <code>optional bytes info = 1;</code>
      */
     com.google.protobuf.ByteString getInfo();
   }
   /**
-   * Protobuf type {@code paymentchannels.PaymentAck}
-   *
    * <pre>
    * This message is sent as an acknowledgement of an UpdatePayment message
    * </pre>
+   *
+   * Protobuf type {@code paymentchannels.PaymentAck}
    */
-  public static final class PaymentAck extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class PaymentAck extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:paymentchannels.PaymentAck)
       PaymentAckOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use PaymentAck.newBuilder() to construct.
-    private PaymentAck(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private PaymentAck(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private PaymentAck(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final PaymentAck defaultInstance;
-    public static PaymentAck getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public PaymentAck getDefaultInstanceForType() {
-      return defaultInstance;
+    private PaymentAck() {
+      info_ = com.google.protobuf.ByteString.EMPTY;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private PaymentAck(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -7785,25 +8853,25 @@ private PaymentAck(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               bitField0_ |= 0x00000001;
               info_ = input.readBytes();
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -7814,56 +8882,40 @@ private PaymentAck(
       return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_PaymentAck_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_PaymentAck_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoin.paymentchannel.Protos.PaymentAck.class, org.bitcoin.paymentchannel.Protos.PaymentAck.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<PaymentAck> PARSER =
-        new com.google.protobuf.AbstractParser<PaymentAck>() {
-      public PaymentAck parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new PaymentAck(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<PaymentAck> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int INFO_FIELD_NUMBER = 1;
     private com.google.protobuf.ByteString info_;
     /**
-     * <code>optional bytes info = 1;</code>
-     *
      * <pre>
      * Information about this update. Used to extend this protocol
      * </pre>
+     *
+     * <code>optional bytes info = 1;</code>
      */
     public boolean hasInfo() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>optional bytes info = 1;</code>
-     *
      * <pre>
      * Information about this update. Used to extend this protocol
      * </pre>
+     *
+     * <code>optional bytes info = 1;</code>
      */
     public com.google.protobuf.ByteString getInfo() {
       return info_;
     }
 
-    private void initFields() {
-      info_ = com.google.protobuf.ByteString.EMPTY;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -7873,18 +8925,18 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeBytes(1, info_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -7892,18 +8944,58 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(1, info_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoin.paymentchannel.Protos.PaymentAck)) {
+        return super.equals(obj);
+      }
+      org.bitcoin.paymentchannel.Protos.PaymentAck other = (org.bitcoin.paymentchannel.Protos.PaymentAck) obj;
+
+      boolean result = true;
+      result = result && (hasInfo() == other.hasInfo());
+      if (hasInfo()) {
+        result = result && getInfo()
+            .equals(other.getInfo());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasInfo()) {
+        hash = (37 * hash) + INFO_FIELD_NUMBER;
+        hash = (53 * hash) + getInfo().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoin.paymentchannel.Protos.PaymentAck parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoin.paymentchannel.Protos.PaymentAck parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoin.paymentchannel.Protos.PaymentAck parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -7927,58 +9019,71 @@ public static org.bitcoin.paymentchannel.Protos.PaymentAck parseFrom(
     }
     public static org.bitcoin.paymentchannel.Protos.PaymentAck parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.PaymentAck parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.paymentchannel.Protos.PaymentAck parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.PaymentAck parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.paymentchannel.Protos.PaymentAck parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.PaymentAck parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoin.paymentchannel.Protos.PaymentAck prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code paymentchannels.PaymentAck}
-     *
      * <pre>
      * This message is sent as an acknowledgement of an UpdatePayment message
      * </pre>
+     *
+     * Protobuf type {@code paymentchannels.PaymentAck}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:paymentchannels.PaymentAck)
         org.bitcoin.paymentchannel.Protos.PaymentAckOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -7986,7 +9091,8 @@ public static final class Builder extends
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_PaymentAck_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_PaymentAck_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -7999,18 +9105,16 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         info_ = com.google.protobuf.ByteString.EMPTY;
@@ -8018,19 +9122,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_PaymentAck_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.PaymentAck getDefaultInstanceForType() {
         return org.bitcoin.paymentchannel.Protos.PaymentAck.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.PaymentAck build() {
         org.bitcoin.paymentchannel.Protos.PaymentAck result = buildPartial();
         if (!result.isInitialized()) {
@@ -8039,6 +9142,7 @@ public org.bitcoin.paymentchannel.Protos.PaymentAck build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.PaymentAck buildPartial() {
         org.bitcoin.paymentchannel.Protos.PaymentAck result = new org.bitcoin.paymentchannel.Protos.PaymentAck(this);
         int from_bitField0_ = bitField0_;
@@ -8052,6 +9156,39 @@ public org.bitcoin.paymentchannel.Protos.PaymentAck buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoin.paymentchannel.Protos.PaymentAck) {
           return mergeFrom((org.bitcoin.paymentchannel.Protos.PaymentAck)other);
@@ -8066,14 +9203,17 @@ public Builder mergeFrom(org.bitcoin.paymentchannel.Protos.PaymentAck other) {
         if (other.hasInfo()) {
           setInfo(other.getInfo());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -8083,7 +9223,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoin.paymentchannel.Protos.PaymentAck) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -8095,31 +9235,31 @@ public Builder mergeFrom(
 
       private com.google.protobuf.ByteString info_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>optional bytes info = 1;</code>
-       *
        * <pre>
        * Information about this update. Used to extend this protocol
        * </pre>
+       *
+       * <code>optional bytes info = 1;</code>
        */
       public boolean hasInfo() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>optional bytes info = 1;</code>
-       *
        * <pre>
        * Information about this update. Used to extend this protocol
        * </pre>
+       *
+       * <code>optional bytes info = 1;</code>
        */
       public com.google.protobuf.ByteString getInfo() {
         return info_;
       }
       /**
-       * <code>optional bytes info = 1;</code>
-       *
        * <pre>
        * Information about this update. Used to extend this protocol
        * </pre>
+       *
+       * <code>optional bytes info = 1;</code>
        */
       public Builder setInfo(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -8131,11 +9271,11 @@ public Builder setInfo(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>optional bytes info = 1;</code>
-       *
        * <pre>
        * Information about this update. Used to extend this protocol
        * </pre>
+       *
+       * <code>optional bytes info = 1;</code>
        */
       public Builder clearInfo() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -8143,16 +9283,57 @@ public Builder clearInfo() {
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:paymentchannels.PaymentAck)
     }
 
+    // @@protoc_insertion_point(class_scope:paymentchannels.PaymentAck)
+    private static final org.bitcoin.paymentchannel.Protos.PaymentAck DEFAULT_INSTANCE;
     static {
-      defaultInstance = new PaymentAck(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoin.paymentchannel.Protos.PaymentAck();
+    }
+
+    public static org.bitcoin.paymentchannel.Protos.PaymentAck getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<PaymentAck>
+        PARSER = new com.google.protobuf.AbstractParser<PaymentAck>() {
+      @java.lang.Override
+      public PaymentAck parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new PaymentAck(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<PaymentAck> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<PaymentAck> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoin.paymentchannel.Protos.PaymentAck getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:paymentchannels.PaymentAck)
   }
 
   public interface SettlementOrBuilder extends
@@ -8160,58 +9341,53 @@ public interface SettlementOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>required bytes tx = 3;</code>
-     *
      * <pre>
      * A copy of the fully signed final contract that settles the channel. The client can verify
      * the transaction is correct and then commit it to their wallet.
      * </pre>
+     *
+     * <code>required bytes tx = 3;</code>
      */
     boolean hasTx();
     /**
-     * <code>required bytes tx = 3;</code>
-     *
      * <pre>
      * A copy of the fully signed final contract that settles the channel. The client can verify
      * the transaction is correct and then commit it to their wallet.
      * </pre>
+     *
+     * <code>required bytes tx = 3;</code>
      */
     com.google.protobuf.ByteString getTx();
   }
   /**
    * Protobuf type {@code paymentchannels.Settlement}
    */
-  public static final class Settlement extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class Settlement extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:paymentchannels.Settlement)
       SettlementOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Settlement.newBuilder() to construct.
-    private Settlement(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private Settlement(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private Settlement(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Settlement defaultInstance;
-    public static Settlement getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public Settlement getDefaultInstanceForType() {
-      return defaultInstance;
+    private Settlement() {
+      tx_ = com.google.protobuf.ByteString.EMPTY;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private Settlement(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -8223,25 +9399,25 @@ private Settlement(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 26: {
               bitField0_ |= 0x00000001;
               tx_ = input.readBytes();
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -8252,58 +9428,42 @@ private Settlement(
       return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Settlement_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Settlement_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoin.paymentchannel.Protos.Settlement.class, org.bitcoin.paymentchannel.Protos.Settlement.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<Settlement> PARSER =
-        new com.google.protobuf.AbstractParser<Settlement>() {
-      public Settlement parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Settlement(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Settlement> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int TX_FIELD_NUMBER = 3;
     private com.google.protobuf.ByteString tx_;
     /**
-     * <code>required bytes tx = 3;</code>
-     *
      * <pre>
      * A copy of the fully signed final contract that settles the channel. The client can verify
      * the transaction is correct and then commit it to their wallet.
      * </pre>
+     *
+     * <code>required bytes tx = 3;</code>
      */
     public boolean hasTx() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required bytes tx = 3;</code>
-     *
      * <pre>
      * A copy of the fully signed final contract that settles the channel. The client can verify
      * the transaction is correct and then commit it to their wallet.
      * </pre>
+     *
+     * <code>required bytes tx = 3;</code>
      */
     public com.google.protobuf.ByteString getTx() {
       return tx_;
     }
 
-    private void initFields() {
-      tx_ = com.google.protobuf.ByteString.EMPTY;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -8317,18 +9477,18 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeBytes(3, tx_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -8336,18 +9496,58 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(3, tx_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoin.paymentchannel.Protos.Settlement)) {
+        return super.equals(obj);
+      }
+      org.bitcoin.paymentchannel.Protos.Settlement other = (org.bitcoin.paymentchannel.Protos.Settlement) obj;
+
+      boolean result = true;
+      result = result && (hasTx() == other.hasTx());
+      if (hasTx()) {
+        result = result && getTx()
+            .equals(other.getTx());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasTx()) {
+        hash = (37 * hash) + TX_FIELD_NUMBER;
+        hash = (53 * hash) + getTx().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoin.paymentchannel.Protos.Settlement parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoin.paymentchannel.Protos.Settlement parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoin.paymentchannel.Protos.Settlement parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -8371,46 +9571,59 @@ public static org.bitcoin.paymentchannel.Protos.Settlement parseFrom(
     }
     public static org.bitcoin.paymentchannel.Protos.Settlement parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.Settlement parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.paymentchannel.Protos.Settlement parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.Settlement parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.paymentchannel.Protos.Settlement parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.Settlement parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoin.paymentchannel.Protos.Settlement prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -8418,7 +9631,7 @@ protected Builder newBuilderForType(
      * Protobuf type {@code paymentchannels.Settlement}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:paymentchannels.Settlement)
         org.bitcoin.paymentchannel.Protos.SettlementOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -8426,7 +9639,8 @@ public static final class Builder extends
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Settlement_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Settlement_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -8439,18 +9653,16 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         tx_ = com.google.protobuf.ByteString.EMPTY;
@@ -8458,19 +9670,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Settlement_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.Settlement getDefaultInstanceForType() {
         return org.bitcoin.paymentchannel.Protos.Settlement.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.Settlement build() {
         org.bitcoin.paymentchannel.Protos.Settlement result = buildPartial();
         if (!result.isInitialized()) {
@@ -8479,6 +9690,7 @@ public org.bitcoin.paymentchannel.Protos.Settlement build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.Settlement buildPartial() {
         org.bitcoin.paymentchannel.Protos.Settlement result = new org.bitcoin.paymentchannel.Protos.Settlement(this);
         int from_bitField0_ = bitField0_;
@@ -8492,6 +9704,39 @@ public org.bitcoin.paymentchannel.Protos.Settlement buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoin.paymentchannel.Protos.Settlement) {
           return mergeFrom((org.bitcoin.paymentchannel.Protos.Settlement)other);
@@ -8506,18 +9751,20 @@ public Builder mergeFrom(org.bitcoin.paymentchannel.Protos.Settlement other) {
         if (other.hasTx()) {
           setTx(other.getTx());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasTx()) {
-          
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -8527,7 +9774,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoin.paymentchannel.Protos.Settlement) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -8539,34 +9786,34 @@ public Builder mergeFrom(
 
       private com.google.protobuf.ByteString tx_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>required bytes tx = 3;</code>
-       *
        * <pre>
        * A copy of the fully signed final contract that settles the channel. The client can verify
        * the transaction is correct and then commit it to their wallet.
        * </pre>
+       *
+       * <code>required bytes tx = 3;</code>
        */
       public boolean hasTx() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>required bytes tx = 3;</code>
-       *
        * <pre>
        * A copy of the fully signed final contract that settles the channel. The client can verify
        * the transaction is correct and then commit it to their wallet.
        * </pre>
+       *
+       * <code>required bytes tx = 3;</code>
        */
       public com.google.protobuf.ByteString getTx() {
         return tx_;
       }
       /**
-       * <code>required bytes tx = 3;</code>
-       *
        * <pre>
        * A copy of the fully signed final contract that settles the channel. The client can verify
        * the transaction is correct and then commit it to their wallet.
        * </pre>
+       *
+       * <code>required bytes tx = 3;</code>
        */
       public Builder setTx(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -8578,12 +9825,12 @@ public Builder setTx(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>required bytes tx = 3;</code>
-       *
        * <pre>
        * A copy of the fully signed final contract that settles the channel. The client can verify
        * the transaction is correct and then commit it to their wallet.
        * </pre>
+       *
+       * <code>required bytes tx = 3;</code>
        */
       public Builder clearTx() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -8591,16 +9838,57 @@ public Builder clearTx() {
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:paymentchannels.Settlement)
+    }
+
+    // @@protoc_insertion_point(class_scope:paymentchannels.Settlement)
+    private static final org.bitcoin.paymentchannel.Protos.Settlement DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new org.bitcoin.paymentchannel.Protos.Settlement();
+    }
+
+    public static org.bitcoin.paymentchannel.Protos.Settlement getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<Settlement>
+        PARSER = new com.google.protobuf.AbstractParser<Settlement>() {
+      @java.lang.Override
+      public Settlement parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new Settlement(input, extensionRegistry);
+      }
+    };
 
-      // @@protoc_insertion_point(builder_scope:paymentchannels.Settlement)
+    public static com.google.protobuf.Parser<Settlement> parser() {
+      return PARSER;
     }
 
-    static {
-      defaultInstance = new Settlement(true);
-      defaultInstance.initFields();
+    @java.lang.Override
+    public com.google.protobuf.Parser<Settlement> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoin.paymentchannel.Protos.Settlement getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:paymentchannels.Settlement)
   }
 
   public interface ErrorOrBuilder extends
@@ -8617,88 +9905,85 @@ public interface ErrorOrBuilder extends
     org.bitcoin.paymentchannel.Protos.Error.ErrorCode getCode();
 
     /**
-     * <code>optional string explanation = 2;</code>
-     *
      * <pre>
      * NOT SAFE FOR HTML WITHOUT ESCAPING
      * </pre>
+     *
+     * <code>optional string explanation = 2;</code>
      */
     boolean hasExplanation();
     /**
-     * <code>optional string explanation = 2;</code>
-     *
      * <pre>
      * NOT SAFE FOR HTML WITHOUT ESCAPING
      * </pre>
+     *
+     * <code>optional string explanation = 2;</code>
      */
     java.lang.String getExplanation();
     /**
-     * <code>optional string explanation = 2;</code>
-     *
      * <pre>
      * NOT SAFE FOR HTML WITHOUT ESCAPING
      * </pre>
+     *
+     * <code>optional string explanation = 2;</code>
      */
     com.google.protobuf.ByteString
         getExplanationBytes();
 
     /**
-     * <code>optional uint64 expected_value = 3;</code>
-     *
      * <pre>
      * Can be set by the client when erroring to the server if a value was out of range. Can help with debugging.
      * </pre>
+     *
+     * <code>optional uint64 expected_value = 3;</code>
      */
     boolean hasExpectedValue();
     /**
-     * <code>optional uint64 expected_value = 3;</code>
-     *
      * <pre>
      * Can be set by the client when erroring to the server if a value was out of range. Can help with debugging.
      * </pre>
+     *
+     * <code>optional uint64 expected_value = 3;</code>
      */
     long getExpectedValue();
   }
   /**
-   * Protobuf type {@code paymentchannels.Error}
-   *
    * <pre>
    * An Error can be sent by either party at any time
    * Both parties should make an effort to send either an ERROR or a CLOSE immediately before
    * closing the socket (unless they just received an ERROR or a CLOSE)
    * </pre>
+   *
+   * Protobuf type {@code paymentchannels.Error}
    */
-  public static final class Error extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class Error extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:paymentchannels.Error)
       ErrorOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Error.newBuilder() to construct.
-    private Error(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private Error(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private Error(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Error defaultInstance;
-    public static Error getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public Error getDefaultInstanceForType() {
-      return defaultInstance;
+    private Error() {
+      code_ = 8;
+      explanation_ = "";
+      expectedValue_ = 0L;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private Error(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -8710,21 +9995,15 @@ private Error(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 8: {
               int rawValue = input.readEnum();
+                @SuppressWarnings("deprecation")
               org.bitcoin.paymentchannel.Protos.Error.ErrorCode value = org.bitcoin.paymentchannel.Protos.Error.ErrorCode.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(1, rawValue);
               } else {
                 bitField0_ |= 0x00000001;
-                code_ = value;
+                code_ = rawValue;
               }
               break;
             }
@@ -8739,13 +10018,20 @@ private Error(
               expectedValue_ = input.readUInt64();
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -8756,151 +10042,137 @@ private Error(
       return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Error_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Error_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoin.paymentchannel.Protos.Error.class, org.bitcoin.paymentchannel.Protos.Error.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<Error> PARSER =
-        new com.google.protobuf.AbstractParser<Error>() {
-      public Error parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Error(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Error> getParserForType() {
-      return PARSER;
-    }
-
     /**
      * Protobuf enum {@code paymentchannels.Error.ErrorCode}
      */
     public enum ErrorCode
         implements com.google.protobuf.ProtocolMessageEnum {
       /**
-       * <code>TIMEOUT = 1;</code>
-       *
        * <pre>
        * Protocol timeout occurred (one party hung).
        * </pre>
+       *
+       * <code>TIMEOUT = 1;</code>
        */
-      TIMEOUT(0, 1),
+      TIMEOUT(1),
       /**
-       * <code>SYNTAX_ERROR = 2;</code>
-       *
        * <pre>
        * Generic error indicating some message was not properly
        * </pre>
+       *
+       * <code>SYNTAX_ERROR = 2;</code>
        */
-      SYNTAX_ERROR(1, 2),
+      SYNTAX_ERROR(2),
       /**
-       * <code>NO_ACCEPTABLE_VERSION = 3;</code>
-       *
        * <pre>
        * formatted or was out of order.
        * </pre>
+       *
+       * <code>NO_ACCEPTABLE_VERSION = 3;</code>
        */
-      NO_ACCEPTABLE_VERSION(2, 3),
+      NO_ACCEPTABLE_VERSION(3),
       /**
-       * <code>BAD_TRANSACTION = 4;</code>
-       *
        * <pre>
        * A provided transaction was not in the proper structure
        * </pre>
+       *
+       * <code>BAD_TRANSACTION = 4;</code>
        */
-      BAD_TRANSACTION(3, 4),
+      BAD_TRANSACTION(4),
       /**
-       * <code>TIME_WINDOW_UNACCEPTABLE = 5;</code>
-       *
        * <pre>
        * (wrong inputs/outputs, sequence, lock time, signature,
        * etc)
        * </pre>
+       *
+       * <code>TIME_WINDOW_UNACCEPTABLE = 5;</code>
        */
-      TIME_WINDOW_UNACCEPTABLE(4, 5),
+      TIME_WINDOW_UNACCEPTABLE(5),
       /**
-       * <code>CHANNEL_VALUE_TOO_LARGE = 6;</code>
-       *
        * <pre>
        * for the primary
        * </pre>
+       *
+       * <code>CHANNEL_VALUE_TOO_LARGE = 6;</code>
        */
-      CHANNEL_VALUE_TOO_LARGE(5, 6),
+      CHANNEL_VALUE_TOO_LARGE(6),
       /**
-       * <code>MIN_PAYMENT_TOO_LARGE = 7;</code>
-       *
        * <pre>
        * too large for the primary
        * </pre>
+       *
+       * <code>MIN_PAYMENT_TOO_LARGE = 7;</code>
        */
-      MIN_PAYMENT_TOO_LARGE(6, 7),
+      MIN_PAYMENT_TOO_LARGE(7),
       /**
        * <code>OTHER = 8;</code>
        */
-      OTHER(7, 8),
+      OTHER(8),
       ;
 
       /**
-       * <code>TIMEOUT = 1;</code>
-       *
        * <pre>
        * Protocol timeout occurred (one party hung).
        * </pre>
+       *
+       * <code>TIMEOUT = 1;</code>
        */
       public static final int TIMEOUT_VALUE = 1;
       /**
-       * <code>SYNTAX_ERROR = 2;</code>
-       *
        * <pre>
        * Generic error indicating some message was not properly
        * </pre>
+       *
+       * <code>SYNTAX_ERROR = 2;</code>
        */
       public static final int SYNTAX_ERROR_VALUE = 2;
       /**
-       * <code>NO_ACCEPTABLE_VERSION = 3;</code>
-       *
        * <pre>
        * formatted or was out of order.
        * </pre>
+       *
+       * <code>NO_ACCEPTABLE_VERSION = 3;</code>
        */
       public static final int NO_ACCEPTABLE_VERSION_VALUE = 3;
       /**
-       * <code>BAD_TRANSACTION = 4;</code>
-       *
        * <pre>
        * A provided transaction was not in the proper structure
        * </pre>
+       *
+       * <code>BAD_TRANSACTION = 4;</code>
        */
       public static final int BAD_TRANSACTION_VALUE = 4;
       /**
-       * <code>TIME_WINDOW_UNACCEPTABLE = 5;</code>
-       *
        * <pre>
        * (wrong inputs/outputs, sequence, lock time, signature,
        * etc)
        * </pre>
+       *
+       * <code>TIME_WINDOW_UNACCEPTABLE = 5;</code>
        */
       public static final int TIME_WINDOW_UNACCEPTABLE_VALUE = 5;
       /**
-       * <code>CHANNEL_VALUE_TOO_LARGE = 6;</code>
-       *
        * <pre>
        * for the primary
        * </pre>
+       *
+       * <code>CHANNEL_VALUE_TOO_LARGE = 6;</code>
        */
       public static final int CHANNEL_VALUE_TOO_LARGE_VALUE = 6;
       /**
-       * <code>MIN_PAYMENT_TOO_LARGE = 7;</code>
-       *
        * <pre>
        * too large for the primary
        * </pre>
+       *
+       * <code>MIN_PAYMENT_TOO_LARGE = 7;</code>
        */
       public static final int MIN_PAYMENT_TOO_LARGE_VALUE = 7;
       /**
@@ -8909,9 +10181,19 @@ public enum ErrorCode
       public static final int OTHER_VALUE = 8;
 
 
-      public final int getNumber() { return value; }
+      public final int getNumber() {
+        return value;
+      }
 
+      /**
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
       public static ErrorCode valueOf(int value) {
+        return forNumber(value);
+      }
+
+      public static ErrorCode forNumber(int value) {
         switch (value) {
           case 1: return TIMEOUT;
           case 2: return SYNTAX_ERROR;
@@ -8929,17 +10211,17 @@ public static ErrorCode valueOf(int value) {
           internalGetValueMap() {
         return internalValueMap;
       }
-      private static com.google.protobuf.Internal.EnumLiteMap<ErrorCode>
-          internalValueMap =
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          ErrorCode> internalValueMap =
             new com.google.protobuf.Internal.EnumLiteMap<ErrorCode>() {
               public ErrorCode findValueByNumber(int number) {
-                return ErrorCode.valueOf(number);
+                return ErrorCode.forNumber(number);
               }
             };
 
       public final com.google.protobuf.Descriptors.EnumValueDescriptor
           getValueDescriptor() {
-        return getDescriptor().getValues().get(index);
+        return getDescriptor().getValues().get(ordinal());
       }
       public final com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptorForType() {
@@ -8961,11 +10243,9 @@ public static ErrorCode valueOf(
         return VALUES[desc.getIndex()];
       }
 
-      private final int index;
       private final int value;
 
-      private ErrorCode(int index, int value) {
-        this.index = index;
+      private ErrorCode(int value) {
         this.value = value;
       }
 
@@ -8974,7 +10254,7 @@ private ErrorCode(int index, int value) {
 
     private int bitField0_;
     public static final int CODE_FIELD_NUMBER = 1;
-    private org.bitcoin.paymentchannel.Protos.Error.ErrorCode code_;
+    private int code_;
     /**
      * <code>optional .paymentchannels.Error.ErrorCode code = 1 [default = OTHER];</code>
      */
@@ -8985,27 +10265,29 @@ public boolean hasCode() {
      * <code>optional .paymentchannels.Error.ErrorCode code = 1 [default = OTHER];</code>
      */
     public org.bitcoin.paymentchannel.Protos.Error.ErrorCode getCode() {
-      return code_;
+      @SuppressWarnings("deprecation")
+      org.bitcoin.paymentchannel.Protos.Error.ErrorCode result = org.bitcoin.paymentchannel.Protos.Error.ErrorCode.valueOf(code_);
+      return result == null ? org.bitcoin.paymentchannel.Protos.Error.ErrorCode.OTHER : result;
     }
 
     public static final int EXPLANATION_FIELD_NUMBER = 2;
-    private java.lang.Object explanation_;
+    private volatile java.lang.Object explanation_;
     /**
-     * <code>optional string explanation = 2;</code>
-     *
      * <pre>
      * NOT SAFE FOR HTML WITHOUT ESCAPING
      * </pre>
+     *
+     * <code>optional string explanation = 2;</code>
      */
     public boolean hasExplanation() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>optional string explanation = 2;</code>
-     *
      * <pre>
      * NOT SAFE FOR HTML WITHOUT ESCAPING
      * </pre>
+     *
+     * <code>optional string explanation = 2;</code>
      */
     public java.lang.String getExplanation() {
       java.lang.Object ref = explanation_;
@@ -9022,11 +10304,11 @@ public java.lang.String getExplanation() {
       }
     }
     /**
-     * <code>optional string explanation = 2;</code>
-     *
      * <pre>
      * NOT SAFE FOR HTML WITHOUT ESCAPING
      * </pre>
+     *
+     * <code>optional string explanation = 2;</code>
      */
     public com.google.protobuf.ByteString
         getExplanationBytes() {
@@ -9045,32 +10327,28 @@ public java.lang.String getExplanation() {
     public static final int EXPECTED_VALUE_FIELD_NUMBER = 3;
     private long expectedValue_;
     /**
-     * <code>optional uint64 expected_value = 3;</code>
-     *
      * <pre>
      * Can be set by the client when erroring to the server if a value was out of range. Can help with debugging.
      * </pre>
+     *
+     * <code>optional uint64 expected_value = 3;</code>
      */
     public boolean hasExpectedValue() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * <code>optional uint64 expected_value = 3;</code>
-     *
      * <pre>
      * Can be set by the client when erroring to the server if a value was out of range. Can help with debugging.
      * </pre>
+     *
+     * <code>optional uint64 expected_value = 3;</code>
      */
     public long getExpectedValue() {
       return expectedValue_;
     }
 
-    private void initFields() {
-      code_ = org.bitcoin.paymentchannel.Protos.Error.ErrorCode.OTHER;
-      explanation_ = "";
-      expectedValue_ = 0L;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -9080,51 +10358,108 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeEnum(1, code_.getNumber());
+        output.writeEnum(1, code_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeBytes(2, getExplanationBytes());
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, explanation_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         output.writeUInt64(3, expectedValue_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(1, code_.getNumber());
+          .computeEnumSize(1, code_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(2, getExplanationBytes());
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, explanation_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(3, expectedValue_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoin.paymentchannel.Protos.Error)) {
+        return super.equals(obj);
+      }
+      org.bitcoin.paymentchannel.Protos.Error other = (org.bitcoin.paymentchannel.Protos.Error) obj;
+
+      boolean result = true;
+      result = result && (hasCode() == other.hasCode());
+      if (hasCode()) {
+        result = result && code_ == other.code_;
+      }
+      result = result && (hasExplanation() == other.hasExplanation());
+      if (hasExplanation()) {
+        result = result && getExplanation()
+            .equals(other.getExplanation());
+      }
+      result = result && (hasExpectedValue() == other.hasExpectedValue());
+      if (hasExpectedValue()) {
+        result = result && (getExpectedValue()
+            == other.getExpectedValue());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasCode()) {
+        hash = (37 * hash) + CODE_FIELD_NUMBER;
+        hash = (53 * hash) + code_;
+      }
+      if (hasExplanation()) {
+        hash = (37 * hash) + EXPLANATION_FIELD_NUMBER;
+        hash = (53 * hash) + getExplanation().hashCode();
+      }
+      if (hasExpectedValue()) {
+        hash = (37 * hash) + EXPECTED_VALUE_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getExpectedValue());
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoin.paymentchannel.Protos.Error parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoin.paymentchannel.Protos.Error parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoin.paymentchannel.Protos.Error parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -9148,60 +10483,73 @@ public static org.bitcoin.paymentchannel.Protos.Error parseFrom(
     }
     public static org.bitcoin.paymentchannel.Protos.Error parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.Error parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.paymentchannel.Protos.Error parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.Error parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.paymentchannel.Protos.Error parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.paymentchannel.Protos.Error parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoin.paymentchannel.Protos.Error prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code paymentchannels.Error}
-     *
      * <pre>
      * An Error can be sent by either party at any time
      * Both parties should make an effort to send either an ERROR or a CLOSE immediately before
      * closing the socket (unless they just received an ERROR or a CLOSE)
      * </pre>
+     *
+     * Protobuf type {@code paymentchannels.Error}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:paymentchannels.Error)
         org.bitcoin.paymentchannel.Protos.ErrorOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -9209,7 +10557,8 @@ public static final class Builder extends
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Error_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Error_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -9222,21 +10571,19 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
-        code_ = org.bitcoin.paymentchannel.Protos.Error.ErrorCode.OTHER;
+        code_ = 8;
         bitField0_ = (bitField0_ & ~0x00000001);
         explanation_ = "";
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -9245,19 +10592,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoin.paymentchannel.Protos.internal_static_paymentchannels_Error_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.Error getDefaultInstanceForType() {
         return org.bitcoin.paymentchannel.Protos.Error.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.Error build() {
         org.bitcoin.paymentchannel.Protos.Error result = buildPartial();
         if (!result.isInitialized()) {
@@ -9266,6 +10612,7 @@ public org.bitcoin.paymentchannel.Protos.Error build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoin.paymentchannel.Protos.Error buildPartial() {
         org.bitcoin.paymentchannel.Protos.Error result = new org.bitcoin.paymentchannel.Protos.Error(this);
         int from_bitField0_ = bitField0_;
@@ -9287,6 +10634,39 @@ public org.bitcoin.paymentchannel.Protos.Error buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoin.paymentchannel.Protos.Error) {
           return mergeFrom((org.bitcoin.paymentchannel.Protos.Error)other);
@@ -9309,14 +10689,17 @@ public Builder mergeFrom(org.bitcoin.paymentchannel.Protos.Error other) {
         if (other.hasExpectedValue()) {
           setExpectedValue(other.getExpectedValue());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -9326,7 +10709,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoin.paymentchannel.Protos.Error) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -9336,7 +10719,7 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private org.bitcoin.paymentchannel.Protos.Error.ErrorCode code_ = org.bitcoin.paymentchannel.Protos.Error.ErrorCode.OTHER;
+      private int code_ = 8;
       /**
        * <code>optional .paymentchannels.Error.ErrorCode code = 1 [default = OTHER];</code>
        */
@@ -9347,7 +10730,9 @@ public boolean hasCode() {
        * <code>optional .paymentchannels.Error.ErrorCode code = 1 [default = OTHER];</code>
        */
       public org.bitcoin.paymentchannel.Protos.Error.ErrorCode getCode() {
-        return code_;
+        @SuppressWarnings("deprecation")
+        org.bitcoin.paymentchannel.Protos.Error.ErrorCode result = org.bitcoin.paymentchannel.Protos.Error.ErrorCode.valueOf(code_);
+        return result == null ? org.bitcoin.paymentchannel.Protos.Error.ErrorCode.OTHER : result;
       }
       /**
        * <code>optional .paymentchannels.Error.ErrorCode code = 1 [default = OTHER];</code>
@@ -9357,7 +10742,7 @@ public Builder setCode(org.bitcoin.paymentchannel.Protos.Error.ErrorCode value)
           throw new NullPointerException();
         }
         bitField0_ |= 0x00000001;
-        code_ = value;
+        code_ = value.getNumber();
         onChanged();
         return this;
       }
@@ -9366,28 +10751,28 @@ public Builder setCode(org.bitcoin.paymentchannel.Protos.Error.ErrorCode value)
        */
       public Builder clearCode() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        code_ = org.bitcoin.paymentchannel.Protos.Error.ErrorCode.OTHER;
+        code_ = 8;
         onChanged();
         return this;
       }
 
       private java.lang.Object explanation_ = "";
       /**
-       * <code>optional string explanation = 2;</code>
-       *
        * <pre>
        * NOT SAFE FOR HTML WITHOUT ESCAPING
        * </pre>
+       *
+       * <code>optional string explanation = 2;</code>
        */
       public boolean hasExplanation() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>optional string explanation = 2;</code>
-       *
        * <pre>
        * NOT SAFE FOR HTML WITHOUT ESCAPING
        * </pre>
+       *
+       * <code>optional string explanation = 2;</code>
        */
       public java.lang.String getExplanation() {
         java.lang.Object ref = explanation_;
@@ -9404,11 +10789,11 @@ public java.lang.String getExplanation() {
         }
       }
       /**
-       * <code>optional string explanation = 2;</code>
-       *
        * <pre>
        * NOT SAFE FOR HTML WITHOUT ESCAPING
        * </pre>
+       *
+       * <code>optional string explanation = 2;</code>
        */
       public com.google.protobuf.ByteString
           getExplanationBytes() {
@@ -9424,11 +10809,11 @@ public java.lang.String getExplanation() {
         }
       }
       /**
-       * <code>optional string explanation = 2;</code>
-       *
        * <pre>
        * NOT SAFE FOR HTML WITHOUT ESCAPING
        * </pre>
+       *
+       * <code>optional string explanation = 2;</code>
        */
       public Builder setExplanation(
           java.lang.String value) {
@@ -9441,11 +10826,11 @@ public Builder setExplanation(
         return this;
       }
       /**
-       * <code>optional string explanation = 2;</code>
-       *
        * <pre>
        * NOT SAFE FOR HTML WITHOUT ESCAPING
        * </pre>
+       *
+       * <code>optional string explanation = 2;</code>
        */
       public Builder clearExplanation() {
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -9454,11 +10839,11 @@ public Builder clearExplanation() {
         return this;
       }
       /**
-       * <code>optional string explanation = 2;</code>
-       *
        * <pre>
        * NOT SAFE FOR HTML WITHOUT ESCAPING
        * </pre>
+       *
+       * <code>optional string explanation = 2;</code>
        */
       public Builder setExplanationBytes(
           com.google.protobuf.ByteString value) {
@@ -9473,31 +10858,31 @@ public Builder setExplanationBytes(
 
       private long expectedValue_ ;
       /**
-       * <code>optional uint64 expected_value = 3;</code>
-       *
        * <pre>
        * Can be set by the client when erroring to the server if a value was out of range. Can help with debugging.
        * </pre>
+       *
+       * <code>optional uint64 expected_value = 3;</code>
        */
       public boolean hasExpectedValue() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>optional uint64 expected_value = 3;</code>
-       *
        * <pre>
        * Can be set by the client when erroring to the server if a value was out of range. Can help with debugging.
        * </pre>
+       *
+       * <code>optional uint64 expected_value = 3;</code>
        */
       public long getExpectedValue() {
         return expectedValue_;
       }
       /**
-       * <code>optional uint64 expected_value = 3;</code>
-       *
        * <pre>
        * Can be set by the client when erroring to the server if a value was out of range. Can help with debugging.
        * </pre>
+       *
+       * <code>optional uint64 expected_value = 3;</code>
        */
       public Builder setExpectedValue(long value) {
         bitField0_ |= 0x00000004;
@@ -9506,11 +10891,11 @@ public Builder setExpectedValue(long value) {
         return this;
       }
       /**
-       * <code>optional uint64 expected_value = 3;</code>
-       *
        * <pre>
        * Can be set by the client when erroring to the server if a value was out of range. Can help with debugging.
        * </pre>
+       *
+       * <code>optional uint64 expected_value = 3;</code>
        */
       public Builder clearExpectedValue() {
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -9518,79 +10903,120 @@ public Builder clearExpectedValue() {
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:paymentchannels.Error)
     }
 
+    // @@protoc_insertion_point(class_scope:paymentchannels.Error)
+    private static final org.bitcoin.paymentchannel.Protos.Error DEFAULT_INSTANCE;
     static {
-      defaultInstance = new Error(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoin.paymentchannel.Protos.Error();
+    }
+
+    public static org.bitcoin.paymentchannel.Protos.Error getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<Error>
+        PARSER = new com.google.protobuf.AbstractParser<Error>() {
+      @java.lang.Override
+      public Error parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new Error(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<Error> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Error> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoin.paymentchannel.Protos.Error getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:paymentchannels.Error)
   }
 
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_paymentchannels_TwoWayChannelMessage_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_paymentchannels_TwoWayChannelMessage_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_paymentchannels_ClientVersion_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_paymentchannels_ClientVersion_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_paymentchannels_ServerVersion_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_paymentchannels_ServerVersion_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_paymentchannels_Initiate_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_paymentchannels_Initiate_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_paymentchannels_ProvideRefund_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_paymentchannels_ProvideRefund_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_paymentchannels_ReturnRefund_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_paymentchannels_ReturnRefund_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_paymentchannels_ProvideContract_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_paymentchannels_ProvideContract_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_paymentchannels_UpdatePayment_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_paymentchannels_UpdatePayment_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_paymentchannels_PaymentAck_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_paymentchannels_PaymentAck_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_paymentchannels_Settlement_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_paymentchannels_Settlement_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_paymentchannels_Error_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_paymentchannels_Error_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
   }
-  private static com.google.protobuf.Descriptors.FileDescriptor
+  private static  com.google.protobuf.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
@@ -9603,7 +11029,7 @@ public Builder clearExpectedValue() {
       "n\022+\n\010initiate\030\004 \001(\0132\031.paymentchannels.In" +
       "itiate\0226\n\016provide_refund\030\005 \001(\0132\036.payment" +
       "channels.ProvideRefund\0224\n\rreturn_refund\030" +
-      "\006 \001(\0132\035.paymentchannels.ReturnRefund\022:\n\020",
+      "\006 \001(\0132\035.paymentchannels.ReturnRefund\022:\n\020" +
       "provide_contract\030\007 \001(\0132 .paymentchannels" +
       ".ProvideContract\0226\n\016update_payment\030\010 \001(\013" +
       "2\036.paymentchannels.UpdatePayment\0220\n\013paym" +
@@ -9613,7 +11039,7 @@ public Builder clearExpectedValue() {
       "nels.Error\"\315\001\n\013MessageType\022\022\n\016CLIENT_VER" +
       "SION\020\001\022\022\n\016SERVER_VERSION\020\002\022\014\n\010INITIATE\020\003" +
       "\022\022\n\016PROVIDE_REFUND\020\004\022\021\n\rRETURN_REFUND\020\005\022" +
-      "\024\n\020PROVIDE_CONTRACT\020\006\022\020\n\014CHANNEL_OPEN\020\007\022",
+      "\024\n\020PROVIDE_CONTRACT\020\006\022\020\n\014CHANNEL_OPEN\020\007\022" +
       "\022\n\016UPDATE_PAYMENT\020\010\022\017\n\013PAYMENT_ACK\020\013\022\t\n\005" +
       "CLOSE\020\t\022\t\n\005ERROR\020\n\"y\n\rClientVersion\022\r\n\005m" +
       "ajor\030\001 \002(\005\022\020\n\005minor\030\002 \001(\005:\0010\022&\n\036previous" +
@@ -9623,7 +11049,7 @@ public Builder clearExpectedValue() {
       "ate\022\024\n\014multisig_key\030\001 \002(\014\022!\n\031min_accepte" +
       "d_channel_size\030\002 \002(\004\022\030\n\020expire_time_secs" +
       "\030\003 \002(\004\022\023\n\013min_payment\030\004 \002(\004\"1\n\rProvideRe" +
-      "fund\022\024\n\014multisig_key\030\001 \002(\014\022\n\n\002tx\030\002 \002(\014\"!",
+      "fund\022\024\n\014multisig_key\030\001 \002(\014\022\n\n\002tx\030\002 \002(\014\"!" +
       "\n\014ReturnRefund\022\021\n\tsignature\030\001 \002(\014\"j\n\017Pro" +
       "videContract\022\n\n\002tx\030\001 \002(\014\0227\n\017initial_paym" +
       "ent\030\002 \002(\0132\036.paymentchannels.UpdatePaymen" +
@@ -9633,7 +11059,7 @@ public Builder clearExpectedValue() {
       "fo\030\001 \001(\014\"\030\n\nSettlement\022\n\n\002tx\030\003 \002(\014\"\251\002\n\005E" +
       "rror\0225\n\004code\030\001 \001(\0162 .paymentchannels.Err" +
       "or.ErrorCode:\005OTHER\022\023\n\013explanation\030\002 \001(\t" +
-      "\022\026\n\016expected_value\030\003 \001(\004\"\273\001\n\tErrorCode\022\013",
+      "\022\026\n\016expected_value\030\003 \001(\004\"\273\001\n\tErrorCode\022\013" +
       "\n\007TIMEOUT\020\001\022\020\n\014SYNTAX_ERROR\020\002\022\031\n\025NO_ACCE" +
       "PTABLE_VERSION\020\003\022\023\n\017BAD_TRANSACTION\020\004\022\034\n" +
       "\030TIME_WINDOW_UNACCEPTABLE\020\005\022\033\n\027CHANNEL_V" +
@@ -9656,67 +11082,67 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     internal_static_paymentchannels_TwoWayChannelMessage_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_paymentchannels_TwoWayChannelMessage_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_paymentchannels_TwoWayChannelMessage_descriptor,
         new java.lang.String[] { "Type", "ClientVersion", "ServerVersion", "Initiate", "ProvideRefund", "ReturnRefund", "ProvideContract", "UpdatePayment", "PaymentAck", "Settlement", "Error", });
     internal_static_paymentchannels_ClientVersion_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_paymentchannels_ClientVersion_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_paymentchannels_ClientVersion_descriptor,
         new java.lang.String[] { "Major", "Minor", "PreviousChannelContractHash", "TimeWindowSecs", });
     internal_static_paymentchannels_ServerVersion_descriptor =
       getDescriptor().getMessageTypes().get(2);
     internal_static_paymentchannels_ServerVersion_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_paymentchannels_ServerVersion_descriptor,
         new java.lang.String[] { "Major", "Minor", });
     internal_static_paymentchannels_Initiate_descriptor =
       getDescriptor().getMessageTypes().get(3);
     internal_static_paymentchannels_Initiate_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_paymentchannels_Initiate_descriptor,
         new java.lang.String[] { "MultisigKey", "MinAcceptedChannelSize", "ExpireTimeSecs", "MinPayment", });
     internal_static_paymentchannels_ProvideRefund_descriptor =
       getDescriptor().getMessageTypes().get(4);
     internal_static_paymentchannels_ProvideRefund_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_paymentchannels_ProvideRefund_descriptor,
         new java.lang.String[] { "MultisigKey", "Tx", });
     internal_static_paymentchannels_ReturnRefund_descriptor =
       getDescriptor().getMessageTypes().get(5);
     internal_static_paymentchannels_ReturnRefund_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_paymentchannels_ReturnRefund_descriptor,
         new java.lang.String[] { "Signature", });
     internal_static_paymentchannels_ProvideContract_descriptor =
       getDescriptor().getMessageTypes().get(6);
     internal_static_paymentchannels_ProvideContract_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_paymentchannels_ProvideContract_descriptor,
         new java.lang.String[] { "Tx", "InitialPayment", "ClientKey", });
     internal_static_paymentchannels_UpdatePayment_descriptor =
       getDescriptor().getMessageTypes().get(7);
     internal_static_paymentchannels_UpdatePayment_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_paymentchannels_UpdatePayment_descriptor,
         new java.lang.String[] { "ClientChangeValue", "Signature", "Info", });
     internal_static_paymentchannels_PaymentAck_descriptor =
       getDescriptor().getMessageTypes().get(8);
     internal_static_paymentchannels_PaymentAck_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_paymentchannels_PaymentAck_descriptor,
         new java.lang.String[] { "Info", });
     internal_static_paymentchannels_Settlement_descriptor =
       getDescriptor().getMessageTypes().get(9);
     internal_static_paymentchannels_Settlement_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_paymentchannels_Settlement_descriptor,
         new java.lang.String[] { "Tx", });
     internal_static_paymentchannels_Error_descriptor =
       getDescriptor().getMessageTypes().get(10);
     internal_static_paymentchannels_Error_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_paymentchannels_Error_descriptor,
         new java.lang.String[] { "Code", "Explanation", "ExpectedValue", });
   }
diff --git a/core/src/main/java/org/bitcoin/protocols/payments/Protos.java b/core/src/main/java/org/bitcoin/protocols/payments/Protos.java
index 7ffc24a072e..7cb2580875a 100644
--- a/core/src/main/java/org/bitcoin/protocols/payments/Protos.java
+++ b/core/src/main/java/org/bitcoin/protocols/payments/Protos.java
@@ -5,85 +5,87 @@
 
 public final class Protos {
   private Protos() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   public interface OutputOrBuilder extends
       // @@protoc_insertion_point(interface_extends:payments.Output)
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>optional uint64 amount = 1 [default = 0];</code>
-     *
      * <pre>
      * amount is integer-number-of-satoshis
      * </pre>
+     *
+     * <code>optional uint64 amount = 1 [default = 0];</code>
      */
     boolean hasAmount();
     /**
-     * <code>optional uint64 amount = 1 [default = 0];</code>
-     *
      * <pre>
      * amount is integer-number-of-satoshis
      * </pre>
+     *
+     * <code>optional uint64 amount = 1 [default = 0];</code>
      */
     long getAmount();
 
     /**
-     * <code>required bytes script = 2;</code>
-     *
      * <pre>
      * usually one of the standard Script forms
      * </pre>
+     *
+     * <code>required bytes script = 2;</code>
      */
     boolean hasScript();
     /**
-     * <code>required bytes script = 2;</code>
-     *
      * <pre>
      * usually one of the standard Script forms
      * </pre>
+     *
+     * <code>required bytes script = 2;</code>
      */
     com.google.protobuf.ByteString getScript();
   }
   /**
-   * Protobuf type {@code payments.Output}
-   *
    * <pre>
    * Generalized form of "send payment to this/these bitcoin addresses"
    * </pre>
+   *
+   * Protobuf type {@code payments.Output}
    */
-  public static final class Output extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class Output extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:payments.Output)
       OutputOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Output.newBuilder() to construct.
-    private Output(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private Output(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private Output(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Output defaultInstance;
-    public static Output getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public Output getDefaultInstanceForType() {
-      return defaultInstance;
+    private Output() {
+      amount_ = 0L;
+      script_ = com.google.protobuf.ByteString.EMPTY;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private Output(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -95,13 +97,6 @@ private Output(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 8: {
               bitField0_ |= 0x00000001;
               amount_ = input.readUInt64();
@@ -112,13 +107,20 @@ private Output(
               script_ = input.readBytes();
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -129,47 +131,33 @@ private Output(
       return org.bitcoin.protocols.payments.Protos.internal_static_payments_Output_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoin.protocols.payments.Protos.internal_static_payments_Output_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoin.protocols.payments.Protos.Output.class, org.bitcoin.protocols.payments.Protos.Output.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<Output> PARSER =
-        new com.google.protobuf.AbstractParser<Output>() {
-      public Output parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Output(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Output> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int AMOUNT_FIELD_NUMBER = 1;
     private long amount_;
     /**
-     * <code>optional uint64 amount = 1 [default = 0];</code>
-     *
      * <pre>
      * amount is integer-number-of-satoshis
      * </pre>
+     *
+     * <code>optional uint64 amount = 1 [default = 0];</code>
      */
     public boolean hasAmount() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>optional uint64 amount = 1 [default = 0];</code>
-     *
      * <pre>
      * amount is integer-number-of-satoshis
      * </pre>
+     *
+     * <code>optional uint64 amount = 1 [default = 0];</code>
      */
     public long getAmount() {
       return amount_;
@@ -178,31 +166,28 @@ public long getAmount() {
     public static final int SCRIPT_FIELD_NUMBER = 2;
     private com.google.protobuf.ByteString script_;
     /**
-     * <code>required bytes script = 2;</code>
-     *
      * <pre>
      * usually one of the standard Script forms
      * </pre>
+     *
+     * <code>required bytes script = 2;</code>
      */
     public boolean hasScript() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>required bytes script = 2;</code>
-     *
      * <pre>
      * usually one of the standard Script forms
      * </pre>
+     *
+     * <code>required bytes script = 2;</code>
      */
     public com.google.protobuf.ByteString getScript() {
       return script_;
     }
 
-    private void initFields() {
-      amount_ = 0L;
-      script_ = com.google.protobuf.ByteString.EMPTY;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -216,21 +201,21 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeUInt64(1, amount_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeBytes(2, script_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -242,18 +227,68 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(2, script_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoin.protocols.payments.Protos.Output)) {
+        return super.equals(obj);
+      }
+      org.bitcoin.protocols.payments.Protos.Output other = (org.bitcoin.protocols.payments.Protos.Output) obj;
+
+      boolean result = true;
+      result = result && (hasAmount() == other.hasAmount());
+      if (hasAmount()) {
+        result = result && (getAmount()
+            == other.getAmount());
+      }
+      result = result && (hasScript() == other.hasScript());
+      if (hasScript()) {
+        result = result && getScript()
+            .equals(other.getScript());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
     }
 
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasAmount()) {
+        hash = (37 * hash) + AMOUNT_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getAmount());
+      }
+      if (hasScript()) {
+        hash = (37 * hash) + SCRIPT_FIELD_NUMBER;
+        hash = (53 * hash) + getScript().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static org.bitcoin.protocols.payments.Protos.Output parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoin.protocols.payments.Protos.Output parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoin.protocols.payments.Protos.Output parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -277,58 +312,71 @@ public static org.bitcoin.protocols.payments.Protos.Output parseFrom(
     }
     public static org.bitcoin.protocols.payments.Protos.Output parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.protocols.payments.Protos.Output parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.protocols.payments.Protos.Output parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoin.protocols.payments.Protos.Output parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.protocols.payments.Protos.Output parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.protocols.payments.Protos.Output parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoin.protocols.payments.Protos.Output prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code payments.Output}
-     *
      * <pre>
      * Generalized form of "send payment to this/these bitcoin addresses"
      * </pre>
+     *
+     * Protobuf type {@code payments.Output}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:payments.Output)
         org.bitcoin.protocols.payments.Protos.OutputOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -336,7 +384,8 @@ public static final class Builder extends
         return org.bitcoin.protocols.payments.Protos.internal_static_payments_Output_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoin.protocols.payments.Protos.internal_static_payments_Output_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -349,18 +398,16 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         amount_ = 0L;
@@ -370,19 +417,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoin.protocols.payments.Protos.internal_static_payments_Output_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoin.protocols.payments.Protos.Output getDefaultInstanceForType() {
         return org.bitcoin.protocols.payments.Protos.Output.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoin.protocols.payments.Protos.Output build() {
         org.bitcoin.protocols.payments.Protos.Output result = buildPartial();
         if (!result.isInitialized()) {
@@ -391,6 +437,7 @@ public org.bitcoin.protocols.payments.Protos.Output build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoin.protocols.payments.Protos.Output buildPartial() {
         org.bitcoin.protocols.payments.Protos.Output result = new org.bitcoin.protocols.payments.Protos.Output(this);
         int from_bitField0_ = bitField0_;
@@ -408,6 +455,39 @@ public org.bitcoin.protocols.payments.Protos.Output buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoin.protocols.payments.Protos.Output) {
           return mergeFrom((org.bitcoin.protocols.payments.Protos.Output)other);
@@ -425,18 +505,20 @@ public Builder mergeFrom(org.bitcoin.protocols.payments.Protos.Output other) {
         if (other.hasScript()) {
           setScript(other.getScript());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasScript()) {
-          
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -446,7 +528,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoin.protocols.payments.Protos.Output) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -458,31 +540,31 @@ public Builder mergeFrom(
 
       private long amount_ ;
       /**
-       * <code>optional uint64 amount = 1 [default = 0];</code>
-       *
        * <pre>
        * amount is integer-number-of-satoshis
        * </pre>
+       *
+       * <code>optional uint64 amount = 1 [default = 0];</code>
        */
       public boolean hasAmount() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>optional uint64 amount = 1 [default = 0];</code>
-       *
        * <pre>
        * amount is integer-number-of-satoshis
        * </pre>
+       *
+       * <code>optional uint64 amount = 1 [default = 0];</code>
        */
       public long getAmount() {
         return amount_;
       }
       /**
-       * <code>optional uint64 amount = 1 [default = 0];</code>
-       *
        * <pre>
        * amount is integer-number-of-satoshis
        * </pre>
+       *
+       * <code>optional uint64 amount = 1 [default = 0];</code>
        */
       public Builder setAmount(long value) {
         bitField0_ |= 0x00000001;
@@ -491,11 +573,11 @@ public Builder setAmount(long value) {
         return this;
       }
       /**
-       * <code>optional uint64 amount = 1 [default = 0];</code>
-       *
        * <pre>
        * amount is integer-number-of-satoshis
        * </pre>
+       *
+       * <code>optional uint64 amount = 1 [default = 0];</code>
        */
       public Builder clearAmount() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -506,31 +588,31 @@ public Builder clearAmount() {
 
       private com.google.protobuf.ByteString script_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>required bytes script = 2;</code>
-       *
        * <pre>
        * usually one of the standard Script forms
        * </pre>
+       *
+       * <code>required bytes script = 2;</code>
        */
       public boolean hasScript() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>required bytes script = 2;</code>
-       *
        * <pre>
        * usually one of the standard Script forms
        * </pre>
+       *
+       * <code>required bytes script = 2;</code>
        */
       public com.google.protobuf.ByteString getScript() {
         return script_;
       }
       /**
-       * <code>required bytes script = 2;</code>
-       *
        * <pre>
        * usually one of the standard Script forms
        * </pre>
+       *
+       * <code>required bytes script = 2;</code>
        */
       public Builder setScript(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -542,11 +624,11 @@ public Builder setScript(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>required bytes script = 2;</code>
-       *
        * <pre>
        * usually one of the standard Script forms
        * </pre>
+       *
+       * <code>required bytes script = 2;</code>
        */
       public Builder clearScript() {
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -554,16 +636,57 @@ public Builder clearScript() {
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:payments.Output)
     }
 
+    // @@protoc_insertion_point(class_scope:payments.Output)
+    private static final org.bitcoin.protocols.payments.Protos.Output DEFAULT_INSTANCE;
     static {
-      defaultInstance = new Output(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoin.protocols.payments.Protos.Output();
+    }
+
+    public static org.bitcoin.protocols.payments.Protos.Output getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<Output>
+        PARSER = new com.google.protobuf.AbstractParser<Output>() {
+      @java.lang.Override
+      public Output parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new Output(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<Output> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Output> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoin.protocols.payments.Protos.Output getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:payments.Output)
   }
 
   public interface PaymentDetailsOrBuilder extends
@@ -571,212 +694,213 @@ public interface PaymentDetailsOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>optional string network = 1 [default = "main"];</code>
-     *
      * <pre>
      * "main" or "test"
      * </pre>
+     *
+     * <code>optional string network = 1 [default = "main"];</code>
      */
     boolean hasNetwork();
     /**
-     * <code>optional string network = 1 [default = "main"];</code>
-     *
      * <pre>
      * "main" or "test"
      * </pre>
+     *
+     * <code>optional string network = 1 [default = "main"];</code>
      */
     java.lang.String getNetwork();
     /**
-     * <code>optional string network = 1 [default = "main"];</code>
-     *
      * <pre>
      * "main" or "test"
      * </pre>
+     *
+     * <code>optional string network = 1 [default = "main"];</code>
      */
     com.google.protobuf.ByteString
         getNetworkBytes();
 
     /**
-     * <code>repeated .payments.Output outputs = 2;</code>
-     *
      * <pre>
      * Where payment should be sent
      * </pre>
+     *
+     * <code>repeated .payments.Output outputs = 2;</code>
      */
     java.util.List<org.bitcoin.protocols.payments.Protos.Output> 
         getOutputsList();
     /**
-     * <code>repeated .payments.Output outputs = 2;</code>
-     *
      * <pre>
      * Where payment should be sent
      * </pre>
+     *
+     * <code>repeated .payments.Output outputs = 2;</code>
      */
     org.bitcoin.protocols.payments.Protos.Output getOutputs(int index);
     /**
-     * <code>repeated .payments.Output outputs = 2;</code>
-     *
      * <pre>
      * Where payment should be sent
      * </pre>
+     *
+     * <code>repeated .payments.Output outputs = 2;</code>
      */
     int getOutputsCount();
     /**
-     * <code>repeated .payments.Output outputs = 2;</code>
-     *
      * <pre>
      * Where payment should be sent
      * </pre>
+     *
+     * <code>repeated .payments.Output outputs = 2;</code>
      */
     java.util.List<? extends org.bitcoin.protocols.payments.Protos.OutputOrBuilder> 
         getOutputsOrBuilderList();
     /**
-     * <code>repeated .payments.Output outputs = 2;</code>
-     *
      * <pre>
      * Where payment should be sent
      * </pre>
+     *
+     * <code>repeated .payments.Output outputs = 2;</code>
      */
     org.bitcoin.protocols.payments.Protos.OutputOrBuilder getOutputsOrBuilder(
         int index);
 
     /**
-     * <code>required uint64 time = 3;</code>
-     *
      * <pre>
      * Timestamp; when payment request created
      * </pre>
+     *
+     * <code>required uint64 time = 3;</code>
      */
     boolean hasTime();
     /**
-     * <code>required uint64 time = 3;</code>
-     *
      * <pre>
      * Timestamp; when payment request created
      * </pre>
+     *
+     * <code>required uint64 time = 3;</code>
      */
     long getTime();
 
     /**
-     * <code>optional uint64 expires = 4;</code>
-     *
      * <pre>
      * Timestamp; when this request should be considered invalid
      * </pre>
+     *
+     * <code>optional uint64 expires = 4;</code>
      */
     boolean hasExpires();
     /**
-     * <code>optional uint64 expires = 4;</code>
-     *
      * <pre>
      * Timestamp; when this request should be considered invalid
      * </pre>
+     *
+     * <code>optional uint64 expires = 4;</code>
      */
     long getExpires();
 
     /**
-     * <code>optional string memo = 5;</code>
-     *
      * <pre>
      * Human-readable description of request for the customer
      * </pre>
+     *
+     * <code>optional string memo = 5;</code>
      */
     boolean hasMemo();
     /**
-     * <code>optional string memo = 5;</code>
-     *
      * <pre>
      * Human-readable description of request for the customer
      * </pre>
+     *
+     * <code>optional string memo = 5;</code>
      */
     java.lang.String getMemo();
     /**
-     * <code>optional string memo = 5;</code>
-     *
      * <pre>
      * Human-readable description of request for the customer
      * </pre>
+     *
+     * <code>optional string memo = 5;</code>
      */
     com.google.protobuf.ByteString
         getMemoBytes();
 
     /**
-     * <code>optional string payment_url = 6;</code>
-     *
      * <pre>
      * URL to send Payment and get PaymentACK
      * </pre>
+     *
+     * <code>optional string payment_url = 6;</code>
      */
     boolean hasPaymentUrl();
     /**
-     * <code>optional string payment_url = 6;</code>
-     *
      * <pre>
      * URL to send Payment and get PaymentACK
      * </pre>
+     *
+     * <code>optional string payment_url = 6;</code>
      */
     java.lang.String getPaymentUrl();
     /**
-     * <code>optional string payment_url = 6;</code>
-     *
      * <pre>
      * URL to send Payment and get PaymentACK
      * </pre>
+     *
+     * <code>optional string payment_url = 6;</code>
      */
     com.google.protobuf.ByteString
         getPaymentUrlBytes();
 
     /**
-     * <code>optional bytes merchant_data = 7;</code>
-     *
      * <pre>
      * Arbitrary data to include in the Payment message
      * </pre>
+     *
+     * <code>optional bytes merchant_data = 7;</code>
      */
     boolean hasMerchantData();
     /**
-     * <code>optional bytes merchant_data = 7;</code>
-     *
      * <pre>
      * Arbitrary data to include in the Payment message
      * </pre>
+     *
+     * <code>optional bytes merchant_data = 7;</code>
      */
     com.google.protobuf.ByteString getMerchantData();
   }
   /**
    * Protobuf type {@code payments.PaymentDetails}
    */
-  public static final class PaymentDetails extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class PaymentDetails extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:payments.PaymentDetails)
       PaymentDetailsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use PaymentDetails.newBuilder() to construct.
-    private PaymentDetails(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private PaymentDetails(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private PaymentDetails(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final PaymentDetails defaultInstance;
-    public static PaymentDetails getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public PaymentDetails getDefaultInstanceForType() {
-      return defaultInstance;
+    private PaymentDetails() {
+      network_ = "main";
+      outputs_ = java.util.Collections.emptyList();
+      time_ = 0L;
+      expires_ = 0L;
+      memo_ = "";
+      paymentUrl_ = "";
+      merchantData_ = com.google.protobuf.ByteString.EMPTY;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private PaymentDetails(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -788,13 +912,6 @@ private PaymentDetails(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               com.google.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
@@ -806,7 +923,8 @@ private PaymentDetails(
                 outputs_ = new java.util.ArrayList<org.bitcoin.protocols.payments.Protos.Output>();
                 mutable_bitField0_ |= 0x00000002;
               }
-              outputs_.add(input.readMessage(org.bitcoin.protocols.payments.Protos.Output.PARSER, extensionRegistry));
+              outputs_.add(
+                  input.readMessage(org.bitcoin.protocols.payments.Protos.Output.PARSER, extensionRegistry));
               break;
             }
             case 24: {
@@ -836,13 +954,20 @@ private PaymentDetails(
               merchantData_ = input.readBytes();
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
           outputs_ = java.util.Collections.unmodifiableList(outputs_);
@@ -856,47 +981,33 @@ private PaymentDetails(
       return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentDetails_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentDetails_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoin.protocols.payments.Protos.PaymentDetails.class, org.bitcoin.protocols.payments.Protos.PaymentDetails.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<PaymentDetails> PARSER =
-        new com.google.protobuf.AbstractParser<PaymentDetails>() {
-      public PaymentDetails parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new PaymentDetails(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<PaymentDetails> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int NETWORK_FIELD_NUMBER = 1;
-    private java.lang.Object network_;
+    private volatile java.lang.Object network_;
     /**
-     * <code>optional string network = 1 [default = "main"];</code>
-     *
      * <pre>
      * "main" or "test"
      * </pre>
+     *
+     * <code>optional string network = 1 [default = "main"];</code>
      */
     public boolean hasNetwork() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>optional string network = 1 [default = "main"];</code>
-     *
      * <pre>
      * "main" or "test"
      * </pre>
+     *
+     * <code>optional string network = 1 [default = "main"];</code>
      */
     public java.lang.String getNetwork() {
       java.lang.Object ref = network_;
@@ -913,11 +1024,11 @@ public java.lang.String getNetwork() {
       }
     }
     /**
-     * <code>optional string network = 1 [default = "main"];</code>
-     *
      * <pre>
      * "main" or "test"
      * </pre>
+     *
+     * <code>optional string network = 1 [default = "main"];</code>
      */
     public com.google.protobuf.ByteString
         getNetworkBytes() {
@@ -935,53 +1046,53 @@ public java.lang.String getNetwork() {
 
     public static final int OUTPUTS_FIELD_NUMBER = 2;
     private java.util.List<org.bitcoin.protocols.payments.Protos.Output> outputs_;
-    /**
-     * <code>repeated .payments.Output outputs = 2;</code>
-     *
+    /**
      * <pre>
      * Where payment should be sent
      * </pre>
+     *
+     * <code>repeated .payments.Output outputs = 2;</code>
      */
     public java.util.List<org.bitcoin.protocols.payments.Protos.Output> getOutputsList() {
       return outputs_;
     }
     /**
-     * <code>repeated .payments.Output outputs = 2;</code>
-     *
      * <pre>
      * Where payment should be sent
      * </pre>
+     *
+     * <code>repeated .payments.Output outputs = 2;</code>
      */
     public java.util.List<? extends org.bitcoin.protocols.payments.Protos.OutputOrBuilder> 
         getOutputsOrBuilderList() {
       return outputs_;
     }
     /**
-     * <code>repeated .payments.Output outputs = 2;</code>
-     *
      * <pre>
      * Where payment should be sent
      * </pre>
+     *
+     * <code>repeated .payments.Output outputs = 2;</code>
      */
     public int getOutputsCount() {
       return outputs_.size();
     }
     /**
-     * <code>repeated .payments.Output outputs = 2;</code>
-     *
      * <pre>
      * Where payment should be sent
      * </pre>
+     *
+     * <code>repeated .payments.Output outputs = 2;</code>
      */
     public org.bitcoin.protocols.payments.Protos.Output getOutputs(int index) {
       return outputs_.get(index);
     }
     /**
-     * <code>repeated .payments.Output outputs = 2;</code>
-     *
      * <pre>
      * Where payment should be sent
      * </pre>
+     *
+     * <code>repeated .payments.Output outputs = 2;</code>
      */
     public org.bitcoin.protocols.payments.Protos.OutputOrBuilder getOutputsOrBuilder(
         int index) {
@@ -991,21 +1102,21 @@ public org.bitcoin.protocols.payments.Protos.OutputOrBuilder getOutputsOrBuilder
     public static final int TIME_FIELD_NUMBER = 3;
     private long time_;
     /**
-     * <code>required uint64 time = 3;</code>
-     *
      * <pre>
      * Timestamp; when payment request created
      * </pre>
+     *
+     * <code>required uint64 time = 3;</code>
      */
     public boolean hasTime() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>required uint64 time = 3;</code>
-     *
      * <pre>
      * Timestamp; when payment request created
      * </pre>
+     *
+     * <code>required uint64 time = 3;</code>
      */
     public long getTime() {
       return time_;
@@ -1014,44 +1125,44 @@ public long getTime() {
     public static final int EXPIRES_FIELD_NUMBER = 4;
     private long expires_;
     /**
-     * <code>optional uint64 expires = 4;</code>
-     *
      * <pre>
      * Timestamp; when this request should be considered invalid
      * </pre>
+     *
+     * <code>optional uint64 expires = 4;</code>
      */
     public boolean hasExpires() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * <code>optional uint64 expires = 4;</code>
-     *
      * <pre>
      * Timestamp; when this request should be considered invalid
      * </pre>
+     *
+     * <code>optional uint64 expires = 4;</code>
      */
     public long getExpires() {
       return expires_;
     }
 
     public static final int MEMO_FIELD_NUMBER = 5;
-    private java.lang.Object memo_;
+    private volatile java.lang.Object memo_;
     /**
-     * <code>optional string memo = 5;</code>
-     *
      * <pre>
      * Human-readable description of request for the customer
      * </pre>
+     *
+     * <code>optional string memo = 5;</code>
      */
     public boolean hasMemo() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * <code>optional string memo = 5;</code>
-     *
      * <pre>
      * Human-readable description of request for the customer
      * </pre>
+     *
+     * <code>optional string memo = 5;</code>
      */
     public java.lang.String getMemo() {
       java.lang.Object ref = memo_;
@@ -1068,11 +1179,11 @@ public java.lang.String getMemo() {
       }
     }
     /**
-     * <code>optional string memo = 5;</code>
-     *
      * <pre>
      * Human-readable description of request for the customer
      * </pre>
+     *
+     * <code>optional string memo = 5;</code>
      */
     public com.google.protobuf.ByteString
         getMemoBytes() {
@@ -1089,23 +1200,23 @@ public java.lang.String getMemo() {
     }
 
     public static final int PAYMENT_URL_FIELD_NUMBER = 6;
-    private java.lang.Object paymentUrl_;
+    private volatile java.lang.Object paymentUrl_;
     /**
-     * <code>optional string payment_url = 6;</code>
-     *
      * <pre>
      * URL to send Payment and get PaymentACK
      * </pre>
+     *
+     * <code>optional string payment_url = 6;</code>
      */
     public boolean hasPaymentUrl() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * <code>optional string payment_url = 6;</code>
-     *
      * <pre>
      * URL to send Payment and get PaymentACK
      * </pre>
+     *
+     * <code>optional string payment_url = 6;</code>
      */
     public java.lang.String getPaymentUrl() {
       java.lang.Object ref = paymentUrl_;
@@ -1122,11 +1233,11 @@ public java.lang.String getPaymentUrl() {
       }
     }
     /**
-     * <code>optional string payment_url = 6;</code>
-     *
      * <pre>
      * URL to send Payment and get PaymentACK
      * </pre>
+     *
+     * <code>optional string payment_url = 6;</code>
      */
     public com.google.protobuf.ByteString
         getPaymentUrlBytes() {
@@ -1145,36 +1256,28 @@ public java.lang.String getPaymentUrl() {
     public static final int MERCHANT_DATA_FIELD_NUMBER = 7;
     private com.google.protobuf.ByteString merchantData_;
     /**
-     * <code>optional bytes merchant_data = 7;</code>
-     *
      * <pre>
      * Arbitrary data to include in the Payment message
      * </pre>
+     *
+     * <code>optional bytes merchant_data = 7;</code>
      */
     public boolean hasMerchantData() {
       return ((bitField0_ & 0x00000020) == 0x00000020);
     }
     /**
-     * <code>optional bytes merchant_data = 7;</code>
-     *
      * <pre>
      * Arbitrary data to include in the Payment message
      * </pre>
+     *
+     * <code>optional bytes merchant_data = 7;</code>
      */
     public com.google.protobuf.ByteString getMerchantData() {
       return merchantData_;
     }
 
-    private void initFields() {
-      network_ = "main";
-      outputs_ = java.util.Collections.emptyList();
-      time_ = 0L;
-      expires_ = 0L;
-      memo_ = "";
-      paymentUrl_ = "";
-      merchantData_ = com.google.protobuf.ByteString.EMPTY;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1194,11 +1297,11 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeBytes(1, getNetworkBytes());
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, network_);
       }
       for (int i = 0; i < outputs_.size(); i++) {
         output.writeMessage(2, outputs_.get(i));
@@ -1210,26 +1313,25 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         output.writeUInt64(4, expires_);
       }
       if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeBytes(5, getMemoBytes());
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 5, memo_);
       }
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        output.writeBytes(6, getPaymentUrlBytes());
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 6, paymentUrl_);
       }
       if (((bitField0_ & 0x00000020) == 0x00000020)) {
         output.writeBytes(7, merchantData_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(1, getNetworkBytes());
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, network_);
       }
       for (int i = 0; i < outputs_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
@@ -1244,29 +1346,120 @@ public int getSerializedSize() {
           .computeUInt64Size(4, expires_);
       }
       if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(5, getMemoBytes());
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, memo_);
       }
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(6, getPaymentUrlBytes());
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, paymentUrl_);
       }
       if (((bitField0_ & 0x00000020) == 0x00000020)) {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(7, merchantData_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoin.protocols.payments.Protos.PaymentDetails)) {
+        return super.equals(obj);
+      }
+      org.bitcoin.protocols.payments.Protos.PaymentDetails other = (org.bitcoin.protocols.payments.Protos.PaymentDetails) obj;
+
+      boolean result = true;
+      result = result && (hasNetwork() == other.hasNetwork());
+      if (hasNetwork()) {
+        result = result && getNetwork()
+            .equals(other.getNetwork());
+      }
+      result = result && getOutputsList()
+          .equals(other.getOutputsList());
+      result = result && (hasTime() == other.hasTime());
+      if (hasTime()) {
+        result = result && (getTime()
+            == other.getTime());
+      }
+      result = result && (hasExpires() == other.hasExpires());
+      if (hasExpires()) {
+        result = result && (getExpires()
+            == other.getExpires());
+      }
+      result = result && (hasMemo() == other.hasMemo());
+      if (hasMemo()) {
+        result = result && getMemo()
+            .equals(other.getMemo());
+      }
+      result = result && (hasPaymentUrl() == other.hasPaymentUrl());
+      if (hasPaymentUrl()) {
+        result = result && getPaymentUrl()
+            .equals(other.getPaymentUrl());
+      }
+      result = result && (hasMerchantData() == other.hasMerchantData());
+      if (hasMerchantData()) {
+        result = result && getMerchantData()
+            .equals(other.getMerchantData());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasNetwork()) {
+        hash = (37 * hash) + NETWORK_FIELD_NUMBER;
+        hash = (53 * hash) + getNetwork().hashCode();
+      }
+      if (getOutputsCount() > 0) {
+        hash = (37 * hash) + OUTPUTS_FIELD_NUMBER;
+        hash = (53 * hash) + getOutputsList().hashCode();
+      }
+      if (hasTime()) {
+        hash = (37 * hash) + TIME_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getTime());
+      }
+      if (hasExpires()) {
+        hash = (37 * hash) + EXPIRES_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getExpires());
+      }
+      if (hasMemo()) {
+        hash = (37 * hash) + MEMO_FIELD_NUMBER;
+        hash = (53 * hash) + getMemo().hashCode();
+      }
+      if (hasPaymentUrl()) {
+        hash = (37 * hash) + PAYMENT_URL_FIELD_NUMBER;
+        hash = (53 * hash) + getPaymentUrl().hashCode();
+      }
+      if (hasMerchantData()) {
+        hash = (37 * hash) + MERCHANT_DATA_FIELD_NUMBER;
+        hash = (53 * hash) + getMerchantData().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoin.protocols.payments.Protos.PaymentDetails parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoin.protocols.payments.Protos.PaymentDetails parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoin.protocols.payments.Protos.PaymentDetails parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -1290,46 +1483,59 @@ public static org.bitcoin.protocols.payments.Protos.PaymentDetails parseFrom(
     }
     public static org.bitcoin.protocols.payments.Protos.PaymentDetails parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.protocols.payments.Protos.PaymentDetails parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.protocols.payments.Protos.PaymentDetails parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoin.protocols.payments.Protos.PaymentDetails parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.protocols.payments.Protos.PaymentDetails parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.protocols.payments.Protos.PaymentDetails parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoin.protocols.payments.Protos.PaymentDetails prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -1337,7 +1543,7 @@ protected Builder newBuilderForType(
      * Protobuf type {@code payments.PaymentDetails}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:payments.PaymentDetails)
         org.bitcoin.protocols.payments.Protos.PaymentDetailsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -1345,7 +1551,8 @@ public static final class Builder extends
         return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentDetails_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentDetails_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -1358,19 +1565,17 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
           getOutputsFieldBuilder();
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         network_ = "main";
@@ -1394,19 +1599,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentDetails_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoin.protocols.payments.Protos.PaymentDetails getDefaultInstanceForType() {
         return org.bitcoin.protocols.payments.Protos.PaymentDetails.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoin.protocols.payments.Protos.PaymentDetails build() {
         org.bitcoin.protocols.payments.Protos.PaymentDetails result = buildPartial();
         if (!result.isInitialized()) {
@@ -1415,6 +1619,7 @@ public org.bitcoin.protocols.payments.Protos.PaymentDetails build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoin.protocols.payments.Protos.PaymentDetails buildPartial() {
         org.bitcoin.protocols.payments.Protos.PaymentDetails result = new org.bitcoin.protocols.payments.Protos.PaymentDetails(this);
         int from_bitField0_ = bitField0_;
@@ -1457,6 +1662,39 @@ public org.bitcoin.protocols.payments.Protos.PaymentDetails buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoin.protocols.payments.Protos.PaymentDetails) {
           return mergeFrom((org.bitcoin.protocols.payments.Protos.PaymentDetails)other);
@@ -1492,7 +1730,7 @@ public Builder mergeFrom(org.bitcoin.protocols.payments.Protos.PaymentDetails ot
               outputs_ = other.outputs_;
               bitField0_ = (bitField0_ & ~0x00000002);
               outputsBuilder_ = 
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getOutputsFieldBuilder() : null;
             } else {
               outputsBuilder_.addAllMessages(other.outputs_);
@@ -1518,24 +1756,25 @@ public Builder mergeFrom(org.bitcoin.protocols.payments.Protos.PaymentDetails ot
         if (other.hasMerchantData()) {
           setMerchantData(other.getMerchantData());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasTime()) {
-          
           return false;
         }
         for (int i = 0; i < getOutputsCount(); i++) {
           if (!getOutputs(i).isInitialized()) {
-            
             return false;
           }
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1545,7 +1784,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoin.protocols.payments.Protos.PaymentDetails) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -1557,21 +1796,21 @@ public Builder mergeFrom(
 
       private java.lang.Object network_ = "main";
       /**
-       * <code>optional string network = 1 [default = "main"];</code>
-       *
        * <pre>
        * "main" or "test"
        * </pre>
+       *
+       * <code>optional string network = 1 [default = "main"];</code>
        */
       public boolean hasNetwork() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>optional string network = 1 [default = "main"];</code>
-       *
        * <pre>
        * "main" or "test"
        * </pre>
+       *
+       * <code>optional string network = 1 [default = "main"];</code>
        */
       public java.lang.String getNetwork() {
         java.lang.Object ref = network_;
@@ -1588,11 +1827,11 @@ public java.lang.String getNetwork() {
         }
       }
       /**
-       * <code>optional string network = 1 [default = "main"];</code>
-       *
        * <pre>
        * "main" or "test"
        * </pre>
+       *
+       * <code>optional string network = 1 [default = "main"];</code>
        */
       public com.google.protobuf.ByteString
           getNetworkBytes() {
@@ -1608,11 +1847,11 @@ public java.lang.String getNetwork() {
         }
       }
       /**
-       * <code>optional string network = 1 [default = "main"];</code>
-       *
        * <pre>
        * "main" or "test"
        * </pre>
+       *
+       * <code>optional string network = 1 [default = "main"];</code>
        */
       public Builder setNetwork(
           java.lang.String value) {
@@ -1625,11 +1864,11 @@ public Builder setNetwork(
         return this;
       }
       /**
-       * <code>optional string network = 1 [default = "main"];</code>
-       *
        * <pre>
        * "main" or "test"
        * </pre>
+       *
+       * <code>optional string network = 1 [default = "main"];</code>
        */
       public Builder clearNetwork() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -1638,11 +1877,11 @@ public Builder clearNetwork() {
         return this;
       }
       /**
-       * <code>optional string network = 1 [default = "main"];</code>
-       *
        * <pre>
        * "main" or "test"
        * </pre>
+       *
+       * <code>optional string network = 1 [default = "main"];</code>
        */
       public Builder setNetworkBytes(
           com.google.protobuf.ByteString value) {
@@ -1664,15 +1903,15 @@ private void ensureOutputsIsMutable() {
          }
       }
 
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.bitcoin.protocols.payments.Protos.Output, org.bitcoin.protocols.payments.Protos.Output.Builder, org.bitcoin.protocols.payments.Protos.OutputOrBuilder> outputsBuilder_;
 
       /**
-       * <code>repeated .payments.Output outputs = 2;</code>
-       *
        * <pre>
        * Where payment should be sent
        * </pre>
+       *
+       * <code>repeated .payments.Output outputs = 2;</code>
        */
       public java.util.List<org.bitcoin.protocols.payments.Protos.Output> getOutputsList() {
         if (outputsBuilder_ == null) {
@@ -1682,11 +1921,11 @@ public java.util.List<org.bitcoin.protocols.payments.Protos.Output> getOutputsLi
         }
       }
       /**
-       * <code>repeated .payments.Output outputs = 2;</code>
-       *
        * <pre>
        * Where payment should be sent
        * </pre>
+       *
+       * <code>repeated .payments.Output outputs = 2;</code>
        */
       public int getOutputsCount() {
         if (outputsBuilder_ == null) {
@@ -1696,11 +1935,11 @@ public int getOutputsCount() {
         }
       }
       /**
-       * <code>repeated .payments.Output outputs = 2;</code>
-       *
        * <pre>
        * Where payment should be sent
        * </pre>
+       *
+       * <code>repeated .payments.Output outputs = 2;</code>
        */
       public org.bitcoin.protocols.payments.Protos.Output getOutputs(int index) {
         if (outputsBuilder_ == null) {
@@ -1710,11 +1949,11 @@ public org.bitcoin.protocols.payments.Protos.Output getOutputs(int index) {
         }
       }
       /**
-       * <code>repeated .payments.Output outputs = 2;</code>
-       *
        * <pre>
        * Where payment should be sent
        * </pre>
+       *
+       * <code>repeated .payments.Output outputs = 2;</code>
        */
       public Builder setOutputs(
           int index, org.bitcoin.protocols.payments.Protos.Output value) {
@@ -1731,11 +1970,11 @@ public Builder setOutputs(
         return this;
       }
       /**
-       * <code>repeated .payments.Output outputs = 2;</code>
-       *
        * <pre>
        * Where payment should be sent
        * </pre>
+       *
+       * <code>repeated .payments.Output outputs = 2;</code>
        */
       public Builder setOutputs(
           int index, org.bitcoin.protocols.payments.Protos.Output.Builder builderForValue) {
@@ -1749,11 +1988,11 @@ public Builder setOutputs(
         return this;
       }
       /**
-       * <code>repeated .payments.Output outputs = 2;</code>
-       *
        * <pre>
        * Where payment should be sent
        * </pre>
+       *
+       * <code>repeated .payments.Output outputs = 2;</code>
        */
       public Builder addOutputs(org.bitcoin.protocols.payments.Protos.Output value) {
         if (outputsBuilder_ == null) {
@@ -1769,11 +2008,11 @@ public Builder addOutputs(org.bitcoin.protocols.payments.Protos.Output value) {
         return this;
       }
       /**
-       * <code>repeated .payments.Output outputs = 2;</code>
-       *
        * <pre>
        * Where payment should be sent
        * </pre>
+       *
+       * <code>repeated .payments.Output outputs = 2;</code>
        */
       public Builder addOutputs(
           int index, org.bitcoin.protocols.payments.Protos.Output value) {
@@ -1790,11 +2029,11 @@ public Builder addOutputs(
         return this;
       }
       /**
-       * <code>repeated .payments.Output outputs = 2;</code>
-       *
        * <pre>
        * Where payment should be sent
        * </pre>
+       *
+       * <code>repeated .payments.Output outputs = 2;</code>
        */
       public Builder addOutputs(
           org.bitcoin.protocols.payments.Protos.Output.Builder builderForValue) {
@@ -1808,11 +2047,11 @@ public Builder addOutputs(
         return this;
       }
       /**
-       * <code>repeated .payments.Output outputs = 2;</code>
-       *
        * <pre>
        * Where payment should be sent
        * </pre>
+       *
+       * <code>repeated .payments.Output outputs = 2;</code>
        */
       public Builder addOutputs(
           int index, org.bitcoin.protocols.payments.Protos.Output.Builder builderForValue) {
@@ -1826,11 +2065,11 @@ public Builder addOutputs(
         return this;
       }
       /**
-       * <code>repeated .payments.Output outputs = 2;</code>
-       *
        * <pre>
        * Where payment should be sent
        * </pre>
+       *
+       * <code>repeated .payments.Output outputs = 2;</code>
        */
       public Builder addAllOutputs(
           java.lang.Iterable<? extends org.bitcoin.protocols.payments.Protos.Output> values) {
@@ -1845,11 +2084,11 @@ public Builder addAllOutputs(
         return this;
       }
       /**
-       * <code>repeated .payments.Output outputs = 2;</code>
-       *
        * <pre>
        * Where payment should be sent
        * </pre>
+       *
+       * <code>repeated .payments.Output outputs = 2;</code>
        */
       public Builder clearOutputs() {
         if (outputsBuilder_ == null) {
@@ -1862,11 +2101,11 @@ public Builder clearOutputs() {
         return this;
       }
       /**
-       * <code>repeated .payments.Output outputs = 2;</code>
-       *
        * <pre>
        * Where payment should be sent
        * </pre>
+       *
+       * <code>repeated .payments.Output outputs = 2;</code>
        */
       public Builder removeOutputs(int index) {
         if (outputsBuilder_ == null) {
@@ -1879,22 +2118,22 @@ public Builder removeOutputs(int index) {
         return this;
       }
       /**
-       * <code>repeated .payments.Output outputs = 2;</code>
-       *
        * <pre>
        * Where payment should be sent
        * </pre>
+       *
+       * <code>repeated .payments.Output outputs = 2;</code>
        */
       public org.bitcoin.protocols.payments.Protos.Output.Builder getOutputsBuilder(
           int index) {
         return getOutputsFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .payments.Output outputs = 2;</code>
-       *
        * <pre>
        * Where payment should be sent
        * </pre>
+       *
+       * <code>repeated .payments.Output outputs = 2;</code>
        */
       public org.bitcoin.protocols.payments.Protos.OutputOrBuilder getOutputsOrBuilder(
           int index) {
@@ -1904,11 +2143,11 @@ public org.bitcoin.protocols.payments.Protos.OutputOrBuilder getOutputsOrBuilder
         }
       }
       /**
-       * <code>repeated .payments.Output outputs = 2;</code>
-       *
        * <pre>
        * Where payment should be sent
        * </pre>
+       *
+       * <code>repeated .payments.Output outputs = 2;</code>
        */
       public java.util.List<? extends org.bitcoin.protocols.payments.Protos.OutputOrBuilder> 
            getOutputsOrBuilderList() {
@@ -1919,22 +2158,22 @@ public org.bitcoin.protocols.payments.Protos.OutputOrBuilder getOutputsOrBuilder
         }
       }
       /**
-       * <code>repeated .payments.Output outputs = 2;</code>
-       *
        * <pre>
        * Where payment should be sent
        * </pre>
+       *
+       * <code>repeated .payments.Output outputs = 2;</code>
        */
       public org.bitcoin.protocols.payments.Protos.Output.Builder addOutputsBuilder() {
         return getOutputsFieldBuilder().addBuilder(
             org.bitcoin.protocols.payments.Protos.Output.getDefaultInstance());
       }
       /**
-       * <code>repeated .payments.Output outputs = 2;</code>
-       *
        * <pre>
        * Where payment should be sent
        * </pre>
+       *
+       * <code>repeated .payments.Output outputs = 2;</code>
        */
       public org.bitcoin.protocols.payments.Protos.Output.Builder addOutputsBuilder(
           int index) {
@@ -1942,21 +2181,21 @@ public org.bitcoin.protocols.payments.Protos.Output.Builder addOutputsBuilder(
             index, org.bitcoin.protocols.payments.Protos.Output.getDefaultInstance());
       }
       /**
-       * <code>repeated .payments.Output outputs = 2;</code>
-       *
        * <pre>
        * Where payment should be sent
        * </pre>
+       *
+       * <code>repeated .payments.Output outputs = 2;</code>
        */
       public java.util.List<org.bitcoin.protocols.payments.Protos.Output.Builder> 
            getOutputsBuilderList() {
         return getOutputsFieldBuilder().getBuilderList();
       }
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.bitcoin.protocols.payments.Protos.Output, org.bitcoin.protocols.payments.Protos.Output.Builder, org.bitcoin.protocols.payments.Protos.OutputOrBuilder> 
           getOutputsFieldBuilder() {
         if (outputsBuilder_ == null) {
-          outputsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+          outputsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               org.bitcoin.protocols.payments.Protos.Output, org.bitcoin.protocols.payments.Protos.Output.Builder, org.bitcoin.protocols.payments.Protos.OutputOrBuilder>(
                   outputs_,
                   ((bitField0_ & 0x00000002) == 0x00000002),
@@ -1969,31 +2208,31 @@ public org.bitcoin.protocols.payments.Protos.Output.Builder addOutputsBuilder(
 
       private long time_ ;
       /**
-       * <code>required uint64 time = 3;</code>
-       *
        * <pre>
        * Timestamp; when payment request created
        * </pre>
+       *
+       * <code>required uint64 time = 3;</code>
        */
       public boolean hasTime() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>required uint64 time = 3;</code>
-       *
        * <pre>
        * Timestamp; when payment request created
        * </pre>
+       *
+       * <code>required uint64 time = 3;</code>
        */
       public long getTime() {
         return time_;
       }
       /**
-       * <code>required uint64 time = 3;</code>
-       *
        * <pre>
        * Timestamp; when payment request created
        * </pre>
+       *
+       * <code>required uint64 time = 3;</code>
        */
       public Builder setTime(long value) {
         bitField0_ |= 0x00000004;
@@ -2002,11 +2241,11 @@ public Builder setTime(long value) {
         return this;
       }
       /**
-       * <code>required uint64 time = 3;</code>
-       *
        * <pre>
        * Timestamp; when payment request created
        * </pre>
+       *
+       * <code>required uint64 time = 3;</code>
        */
       public Builder clearTime() {
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -2017,31 +2256,31 @@ public Builder clearTime() {
 
       private long expires_ ;
       /**
-       * <code>optional uint64 expires = 4;</code>
-       *
        * <pre>
        * Timestamp; when this request should be considered invalid
        * </pre>
+       *
+       * <code>optional uint64 expires = 4;</code>
        */
       public boolean hasExpires() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * <code>optional uint64 expires = 4;</code>
-       *
        * <pre>
        * Timestamp; when this request should be considered invalid
        * </pre>
+       *
+       * <code>optional uint64 expires = 4;</code>
        */
       public long getExpires() {
         return expires_;
       }
       /**
-       * <code>optional uint64 expires = 4;</code>
-       *
        * <pre>
        * Timestamp; when this request should be considered invalid
        * </pre>
+       *
+       * <code>optional uint64 expires = 4;</code>
        */
       public Builder setExpires(long value) {
         bitField0_ |= 0x00000008;
@@ -2050,11 +2289,11 @@ public Builder setExpires(long value) {
         return this;
       }
       /**
-       * <code>optional uint64 expires = 4;</code>
-       *
        * <pre>
        * Timestamp; when this request should be considered invalid
        * </pre>
+       *
+       * <code>optional uint64 expires = 4;</code>
        */
       public Builder clearExpires() {
         bitField0_ = (bitField0_ & ~0x00000008);
@@ -2065,21 +2304,21 @@ public Builder clearExpires() {
 
       private java.lang.Object memo_ = "";
       /**
-       * <code>optional string memo = 5;</code>
-       *
        * <pre>
        * Human-readable description of request for the customer
        * </pre>
+       *
+       * <code>optional string memo = 5;</code>
        */
       public boolean hasMemo() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * <code>optional string memo = 5;</code>
-       *
        * <pre>
        * Human-readable description of request for the customer
        * </pre>
+       *
+       * <code>optional string memo = 5;</code>
        */
       public java.lang.String getMemo() {
         java.lang.Object ref = memo_;
@@ -2096,11 +2335,11 @@ public java.lang.String getMemo() {
         }
       }
       /**
-       * <code>optional string memo = 5;</code>
-       *
        * <pre>
        * Human-readable description of request for the customer
        * </pre>
+       *
+       * <code>optional string memo = 5;</code>
        */
       public com.google.protobuf.ByteString
           getMemoBytes() {
@@ -2116,11 +2355,11 @@ public java.lang.String getMemo() {
         }
       }
       /**
-       * <code>optional string memo = 5;</code>
-       *
        * <pre>
        * Human-readable description of request for the customer
        * </pre>
+       *
+       * <code>optional string memo = 5;</code>
        */
       public Builder setMemo(
           java.lang.String value) {
@@ -2133,11 +2372,11 @@ public Builder setMemo(
         return this;
       }
       /**
-       * <code>optional string memo = 5;</code>
-       *
        * <pre>
        * Human-readable description of request for the customer
        * </pre>
+       *
+       * <code>optional string memo = 5;</code>
        */
       public Builder clearMemo() {
         bitField0_ = (bitField0_ & ~0x00000010);
@@ -2146,11 +2385,11 @@ public Builder clearMemo() {
         return this;
       }
       /**
-       * <code>optional string memo = 5;</code>
-       *
        * <pre>
        * Human-readable description of request for the customer
        * </pre>
+       *
+       * <code>optional string memo = 5;</code>
        */
       public Builder setMemoBytes(
           com.google.protobuf.ByteString value) {
@@ -2165,21 +2404,21 @@ public Builder setMemoBytes(
 
       private java.lang.Object paymentUrl_ = "";
       /**
-       * <code>optional string payment_url = 6;</code>
-       *
        * <pre>
        * URL to send Payment and get PaymentACK
        * </pre>
+       *
+       * <code>optional string payment_url = 6;</code>
        */
       public boolean hasPaymentUrl() {
         return ((bitField0_ & 0x00000020) == 0x00000020);
       }
       /**
-       * <code>optional string payment_url = 6;</code>
-       *
        * <pre>
        * URL to send Payment and get PaymentACK
        * </pre>
+       *
+       * <code>optional string payment_url = 6;</code>
        */
       public java.lang.String getPaymentUrl() {
         java.lang.Object ref = paymentUrl_;
@@ -2196,11 +2435,11 @@ public java.lang.String getPaymentUrl() {
         }
       }
       /**
-       * <code>optional string payment_url = 6;</code>
-       *
        * <pre>
        * URL to send Payment and get PaymentACK
        * </pre>
+       *
+       * <code>optional string payment_url = 6;</code>
        */
       public com.google.protobuf.ByteString
           getPaymentUrlBytes() {
@@ -2216,11 +2455,11 @@ public java.lang.String getPaymentUrl() {
         }
       }
       /**
-       * <code>optional string payment_url = 6;</code>
-       *
        * <pre>
        * URL to send Payment and get PaymentACK
        * </pre>
+       *
+       * <code>optional string payment_url = 6;</code>
        */
       public Builder setPaymentUrl(
           java.lang.String value) {
@@ -2233,11 +2472,11 @@ public Builder setPaymentUrl(
         return this;
       }
       /**
-       * <code>optional string payment_url = 6;</code>
-       *
        * <pre>
        * URL to send Payment and get PaymentACK
        * </pre>
+       *
+       * <code>optional string payment_url = 6;</code>
        */
       public Builder clearPaymentUrl() {
         bitField0_ = (bitField0_ & ~0x00000020);
@@ -2246,11 +2485,11 @@ public Builder clearPaymentUrl() {
         return this;
       }
       /**
-       * <code>optional string payment_url = 6;</code>
-       *
        * <pre>
        * URL to send Payment and get PaymentACK
        * </pre>
+       *
+       * <code>optional string payment_url = 6;</code>
        */
       public Builder setPaymentUrlBytes(
           com.google.protobuf.ByteString value) {
@@ -2265,31 +2504,31 @@ public Builder setPaymentUrlBytes(
 
       private com.google.protobuf.ByteString merchantData_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>optional bytes merchant_data = 7;</code>
-       *
        * <pre>
        * Arbitrary data to include in the Payment message
        * </pre>
+       *
+       * <code>optional bytes merchant_data = 7;</code>
        */
       public boolean hasMerchantData() {
         return ((bitField0_ & 0x00000040) == 0x00000040);
       }
       /**
-       * <code>optional bytes merchant_data = 7;</code>
-       *
        * <pre>
        * Arbitrary data to include in the Payment message
        * </pre>
+       *
+       * <code>optional bytes merchant_data = 7;</code>
        */
       public com.google.protobuf.ByteString getMerchantData() {
         return merchantData_;
       }
       /**
-       * <code>optional bytes merchant_data = 7;</code>
-       *
        * <pre>
        * Arbitrary data to include in the Payment message
        * </pre>
+       *
+       * <code>optional bytes merchant_data = 7;</code>
        */
       public Builder setMerchantData(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -2301,11 +2540,11 @@ public Builder setMerchantData(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>optional bytes merchant_data = 7;</code>
-       *
        * <pre>
        * Arbitrary data to include in the Payment message
        * </pre>
+       *
+       * <code>optional bytes merchant_data = 7;</code>
        */
       public Builder clearMerchantData() {
         bitField0_ = (bitField0_ & ~0x00000040);
@@ -2313,16 +2552,57 @@ public Builder clearMerchantData() {
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:payments.PaymentDetails)
     }
 
+    // @@protoc_insertion_point(class_scope:payments.PaymentDetails)
+    private static final org.bitcoin.protocols.payments.Protos.PaymentDetails DEFAULT_INSTANCE;
     static {
-      defaultInstance = new PaymentDetails(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoin.protocols.payments.Protos.PaymentDetails();
+    }
+
+    public static org.bitcoin.protocols.payments.Protos.PaymentDetails getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<PaymentDetails>
+        PARSER = new com.google.protobuf.AbstractParser<PaymentDetails>() {
+      @java.lang.Override
+      public PaymentDetails parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new PaymentDetails(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<PaymentDetails> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<PaymentDetails> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoin.protocols.payments.Protos.PaymentDetails getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:payments.PaymentDetails)
   }
 
   public interface PaymentRequestOrBuilder extends
@@ -2339,116 +2619,115 @@ public interface PaymentRequestOrBuilder extends
     int getPaymentDetailsVersion();
 
     /**
-     * <code>optional string pki_type = 2 [default = "none"];</code>
-     *
      * <pre>
      * none / x509+sha256 / x509+sha1
      * </pre>
+     *
+     * <code>optional string pki_type = 2 [default = "none"];</code>
      */
     boolean hasPkiType();
     /**
-     * <code>optional string pki_type = 2 [default = "none"];</code>
-     *
      * <pre>
      * none / x509+sha256 / x509+sha1
      * </pre>
+     *
+     * <code>optional string pki_type = 2 [default = "none"];</code>
      */
     java.lang.String getPkiType();
     /**
-     * <code>optional string pki_type = 2 [default = "none"];</code>
-     *
      * <pre>
      * none / x509+sha256 / x509+sha1
      * </pre>
+     *
+     * <code>optional string pki_type = 2 [default = "none"];</code>
      */
     com.google.protobuf.ByteString
         getPkiTypeBytes();
 
     /**
-     * <code>optional bytes pki_data = 3;</code>
-     *
      * <pre>
      * depends on pki_type
      * </pre>
+     *
+     * <code>optional bytes pki_data = 3;</code>
      */
     boolean hasPkiData();
     /**
-     * <code>optional bytes pki_data = 3;</code>
-     *
      * <pre>
      * depends on pki_type
      * </pre>
+     *
+     * <code>optional bytes pki_data = 3;</code>
      */
     com.google.protobuf.ByteString getPkiData();
 
     /**
-     * <code>required bytes serialized_payment_details = 4;</code>
-     *
      * <pre>
      * PaymentDetails
      * </pre>
+     *
+     * <code>required bytes serialized_payment_details = 4;</code>
      */
     boolean hasSerializedPaymentDetails();
     /**
-     * <code>required bytes serialized_payment_details = 4;</code>
-     *
      * <pre>
      * PaymentDetails
      * </pre>
+     *
+     * <code>required bytes serialized_payment_details = 4;</code>
      */
     com.google.protobuf.ByteString getSerializedPaymentDetails();
 
     /**
-     * <code>optional bytes signature = 5;</code>
-     *
      * <pre>
      * pki-dependent signature
      * </pre>
+     *
+     * <code>optional bytes signature = 5;</code>
      */
     boolean hasSignature();
     /**
-     * <code>optional bytes signature = 5;</code>
-     *
      * <pre>
      * pki-dependent signature
      * </pre>
+     *
+     * <code>optional bytes signature = 5;</code>
      */
     com.google.protobuf.ByteString getSignature();
   }
   /**
    * Protobuf type {@code payments.PaymentRequest}
    */
-  public static final class PaymentRequest extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class PaymentRequest extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:payments.PaymentRequest)
       PaymentRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use PaymentRequest.newBuilder() to construct.
-    private PaymentRequest(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private PaymentRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private PaymentRequest(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final PaymentRequest defaultInstance;
-    public static PaymentRequest getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public PaymentRequest getDefaultInstanceForType() {
-      return defaultInstance;
+    private PaymentRequest() {
+      paymentDetailsVersion_ = 1;
+      pkiType_ = "none";
+      pkiData_ = com.google.protobuf.ByteString.EMPTY;
+      serializedPaymentDetails_ = com.google.protobuf.ByteString.EMPTY;
+      signature_ = com.google.protobuf.ByteString.EMPTY;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private PaymentRequest(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2460,13 +2739,6 @@ private PaymentRequest(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 8: {
               bitField0_ |= 0x00000001;
               paymentDetailsVersion_ = input.readUInt32();
@@ -2493,13 +2765,20 @@ private PaymentRequest(
               signature_ = input.readBytes();
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -2510,28 +2789,14 @@ private PaymentRequest(
       return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentRequest_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentRequest_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoin.protocols.payments.Protos.PaymentRequest.class, org.bitcoin.protocols.payments.Protos.PaymentRequest.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<PaymentRequest> PARSER =
-        new com.google.protobuf.AbstractParser<PaymentRequest>() {
-      public PaymentRequest parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new PaymentRequest(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<PaymentRequest> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int PAYMENT_DETAILS_VERSION_FIELD_NUMBER = 1;
     private int paymentDetailsVersion_;
@@ -2549,23 +2814,23 @@ public int getPaymentDetailsVersion() {
     }
 
     public static final int PKI_TYPE_FIELD_NUMBER = 2;
-    private java.lang.Object pkiType_;
+    private volatile java.lang.Object pkiType_;
     /**
-     * <code>optional string pki_type = 2 [default = "none"];</code>
-     *
      * <pre>
      * none / x509+sha256 / x509+sha1
      * </pre>
+     *
+     * <code>optional string pki_type = 2 [default = "none"];</code>
      */
     public boolean hasPkiType() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>optional string pki_type = 2 [default = "none"];</code>
-     *
      * <pre>
      * none / x509+sha256 / x509+sha1
      * </pre>
+     *
+     * <code>optional string pki_type = 2 [default = "none"];</code>
      */
     public java.lang.String getPkiType() {
       java.lang.Object ref = pkiType_;
@@ -2582,11 +2847,11 @@ public java.lang.String getPkiType() {
       }
     }
     /**
-     * <code>optional string pki_type = 2 [default = "none"];</code>
-     *
      * <pre>
      * none / x509+sha256 / x509+sha1
      * </pre>
+     *
+     * <code>optional string pki_type = 2 [default = "none"];</code>
      */
     public com.google.protobuf.ByteString
         getPkiTypeBytes() {
@@ -2605,21 +2870,21 @@ public java.lang.String getPkiType() {
     public static final int PKI_DATA_FIELD_NUMBER = 3;
     private com.google.protobuf.ByteString pkiData_;
     /**
-     * <code>optional bytes pki_data = 3;</code>
-     *
      * <pre>
      * depends on pki_type
      * </pre>
+     *
+     * <code>optional bytes pki_data = 3;</code>
      */
     public boolean hasPkiData() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * <code>optional bytes pki_data = 3;</code>
-     *
      * <pre>
      * depends on pki_type
      * </pre>
+     *
+     * <code>optional bytes pki_data = 3;</code>
      */
     public com.google.protobuf.ByteString getPkiData() {
       return pkiData_;
@@ -2628,21 +2893,21 @@ public com.google.protobuf.ByteString getPkiData() {
     public static final int SERIALIZED_PAYMENT_DETAILS_FIELD_NUMBER = 4;
     private com.google.protobuf.ByteString serializedPaymentDetails_;
     /**
-     * <code>required bytes serialized_payment_details = 4;</code>
-     *
      * <pre>
      * PaymentDetails
      * </pre>
+     *
+     * <code>required bytes serialized_payment_details = 4;</code>
      */
     public boolean hasSerializedPaymentDetails() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * <code>required bytes serialized_payment_details = 4;</code>
-     *
      * <pre>
      * PaymentDetails
      * </pre>
+     *
+     * <code>required bytes serialized_payment_details = 4;</code>
      */
     public com.google.protobuf.ByteString getSerializedPaymentDetails() {
       return serializedPaymentDetails_;
@@ -2651,34 +2916,28 @@ public com.google.protobuf.ByteString getSerializedPaymentDetails() {
     public static final int SIGNATURE_FIELD_NUMBER = 5;
     private com.google.protobuf.ByteString signature_;
     /**
-     * <code>optional bytes signature = 5;</code>
-     *
      * <pre>
      * pki-dependent signature
      * </pre>
+     *
+     * <code>optional bytes signature = 5;</code>
      */
     public boolean hasSignature() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * <code>optional bytes signature = 5;</code>
-     *
      * <pre>
      * pki-dependent signature
      * </pre>
+     *
+     * <code>optional bytes signature = 5;</code>
      */
     public com.google.protobuf.ByteString getSignature() {
       return signature_;
     }
 
-    private void initFields() {
-      paymentDetailsVersion_ = 1;
-      pkiType_ = "none";
-      pkiData_ = com.google.protobuf.ByteString.EMPTY;
-      serializedPaymentDetails_ = com.google.protobuf.ByteString.EMPTY;
-      signature_ = com.google.protobuf.ByteString.EMPTY;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -2692,14 +2951,14 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeUInt32(1, paymentDetailsVersion_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeBytes(2, getPkiTypeBytes());
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, pkiType_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         output.writeBytes(3, pkiData_);
@@ -2710,12 +2969,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
         output.writeBytes(5, signature_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -2724,8 +2983,7 @@ public int getSerializedSize() {
           .computeUInt32Size(1, paymentDetailsVersion_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(2, getPkiTypeBytes());
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, pkiType_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         size += com.google.protobuf.CodedOutputStream
@@ -2739,18 +2997,94 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(5, signature_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoin.protocols.payments.Protos.PaymentRequest)) {
+        return super.equals(obj);
+      }
+      org.bitcoin.protocols.payments.Protos.PaymentRequest other = (org.bitcoin.protocols.payments.Protos.PaymentRequest) obj;
+
+      boolean result = true;
+      result = result && (hasPaymentDetailsVersion() == other.hasPaymentDetailsVersion());
+      if (hasPaymentDetailsVersion()) {
+        result = result && (getPaymentDetailsVersion()
+            == other.getPaymentDetailsVersion());
+      }
+      result = result && (hasPkiType() == other.hasPkiType());
+      if (hasPkiType()) {
+        result = result && getPkiType()
+            .equals(other.getPkiType());
+      }
+      result = result && (hasPkiData() == other.hasPkiData());
+      if (hasPkiData()) {
+        result = result && getPkiData()
+            .equals(other.getPkiData());
+      }
+      result = result && (hasSerializedPaymentDetails() == other.hasSerializedPaymentDetails());
+      if (hasSerializedPaymentDetails()) {
+        result = result && getSerializedPaymentDetails()
+            .equals(other.getSerializedPaymentDetails());
+      }
+      result = result && (hasSignature() == other.hasSignature());
+      if (hasSignature()) {
+        result = result && getSignature()
+            .equals(other.getSignature());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasPaymentDetailsVersion()) {
+        hash = (37 * hash) + PAYMENT_DETAILS_VERSION_FIELD_NUMBER;
+        hash = (53 * hash) + getPaymentDetailsVersion();
+      }
+      if (hasPkiType()) {
+        hash = (37 * hash) + PKI_TYPE_FIELD_NUMBER;
+        hash = (53 * hash) + getPkiType().hashCode();
+      }
+      if (hasPkiData()) {
+        hash = (37 * hash) + PKI_DATA_FIELD_NUMBER;
+        hash = (53 * hash) + getPkiData().hashCode();
+      }
+      if (hasSerializedPaymentDetails()) {
+        hash = (37 * hash) + SERIALIZED_PAYMENT_DETAILS_FIELD_NUMBER;
+        hash = (53 * hash) + getSerializedPaymentDetails().hashCode();
+      }
+      if (hasSignature()) {
+        hash = (37 * hash) + SIGNATURE_FIELD_NUMBER;
+        hash = (53 * hash) + getSignature().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoin.protocols.payments.Protos.PaymentRequest parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoin.protocols.payments.Protos.PaymentRequest parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoin.protocols.payments.Protos.PaymentRequest parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -2774,46 +3108,59 @@ public static org.bitcoin.protocols.payments.Protos.PaymentRequest parseFrom(
     }
     public static org.bitcoin.protocols.payments.Protos.PaymentRequest parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.protocols.payments.Protos.PaymentRequest parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.protocols.payments.Protos.PaymentRequest parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoin.protocols.payments.Protos.PaymentRequest parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.protocols.payments.Protos.PaymentRequest parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.protocols.payments.Protos.PaymentRequest parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoin.protocols.payments.Protos.PaymentRequest prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -2821,7 +3168,7 @@ protected Builder newBuilderForType(
      * Protobuf type {@code payments.PaymentRequest}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:payments.PaymentRequest)
         org.bitcoin.protocols.payments.Protos.PaymentRequestOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -2829,7 +3176,8 @@ public static final class Builder extends
         return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentRequest_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentRequest_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -2842,18 +3190,16 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         paymentDetailsVersion_ = 1;
@@ -2869,19 +3215,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentRequest_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoin.protocols.payments.Protos.PaymentRequest getDefaultInstanceForType() {
         return org.bitcoin.protocols.payments.Protos.PaymentRequest.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoin.protocols.payments.Protos.PaymentRequest build() {
         org.bitcoin.protocols.payments.Protos.PaymentRequest result = buildPartial();
         if (!result.isInitialized()) {
@@ -2890,6 +3235,7 @@ public org.bitcoin.protocols.payments.Protos.PaymentRequest build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoin.protocols.payments.Protos.PaymentRequest buildPartial() {
         org.bitcoin.protocols.payments.Protos.PaymentRequest result = new org.bitcoin.protocols.payments.Protos.PaymentRequest(this);
         int from_bitField0_ = bitField0_;
@@ -2919,6 +3265,39 @@ public org.bitcoin.protocols.payments.Protos.PaymentRequest buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoin.protocols.payments.Protos.PaymentRequest) {
           return mergeFrom((org.bitcoin.protocols.payments.Protos.PaymentRequest)other);
@@ -2947,18 +3326,20 @@ public Builder mergeFrom(org.bitcoin.protocols.payments.Protos.PaymentRequest ot
         if (other.hasSignature()) {
           setSignature(other.getSignature());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasSerializedPaymentDetails()) {
-          
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2968,7 +3349,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoin.protocols.payments.Protos.PaymentRequest) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -3012,21 +3393,21 @@ public Builder clearPaymentDetailsVersion() {
 
       private java.lang.Object pkiType_ = "none";
       /**
-       * <code>optional string pki_type = 2 [default = "none"];</code>
-       *
        * <pre>
        * none / x509+sha256 / x509+sha1
        * </pre>
+       *
+       * <code>optional string pki_type = 2 [default = "none"];</code>
        */
       public boolean hasPkiType() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>optional string pki_type = 2 [default = "none"];</code>
-       *
        * <pre>
        * none / x509+sha256 / x509+sha1
        * </pre>
+       *
+       * <code>optional string pki_type = 2 [default = "none"];</code>
        */
       public java.lang.String getPkiType() {
         java.lang.Object ref = pkiType_;
@@ -3043,11 +3424,11 @@ public java.lang.String getPkiType() {
         }
       }
       /**
-       * <code>optional string pki_type = 2 [default = "none"];</code>
-       *
        * <pre>
        * none / x509+sha256 / x509+sha1
        * </pre>
+       *
+       * <code>optional string pki_type = 2 [default = "none"];</code>
        */
       public com.google.protobuf.ByteString
           getPkiTypeBytes() {
@@ -3063,11 +3444,11 @@ public java.lang.String getPkiType() {
         }
       }
       /**
-       * <code>optional string pki_type = 2 [default = "none"];</code>
-       *
        * <pre>
        * none / x509+sha256 / x509+sha1
        * </pre>
+       *
+       * <code>optional string pki_type = 2 [default = "none"];</code>
        */
       public Builder setPkiType(
           java.lang.String value) {
@@ -3080,11 +3461,11 @@ public Builder setPkiType(
         return this;
       }
       /**
-       * <code>optional string pki_type = 2 [default = "none"];</code>
-       *
        * <pre>
        * none / x509+sha256 / x509+sha1
        * </pre>
+       *
+       * <code>optional string pki_type = 2 [default = "none"];</code>
        */
       public Builder clearPkiType() {
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -3093,11 +3474,11 @@ public Builder clearPkiType() {
         return this;
       }
       /**
-       * <code>optional string pki_type = 2 [default = "none"];</code>
-       *
        * <pre>
        * none / x509+sha256 / x509+sha1
        * </pre>
+       *
+       * <code>optional string pki_type = 2 [default = "none"];</code>
        */
       public Builder setPkiTypeBytes(
           com.google.protobuf.ByteString value) {
@@ -3112,31 +3493,31 @@ public Builder setPkiTypeBytes(
 
       private com.google.protobuf.ByteString pkiData_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>optional bytes pki_data = 3;</code>
-       *
        * <pre>
        * depends on pki_type
        * </pre>
+       *
+       * <code>optional bytes pki_data = 3;</code>
        */
       public boolean hasPkiData() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>optional bytes pki_data = 3;</code>
-       *
        * <pre>
        * depends on pki_type
        * </pre>
+       *
+       * <code>optional bytes pki_data = 3;</code>
        */
       public com.google.protobuf.ByteString getPkiData() {
         return pkiData_;
       }
       /**
-       * <code>optional bytes pki_data = 3;</code>
-       *
        * <pre>
        * depends on pki_type
        * </pre>
+       *
+       * <code>optional bytes pki_data = 3;</code>
        */
       public Builder setPkiData(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -3148,11 +3529,11 @@ public Builder setPkiData(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>optional bytes pki_data = 3;</code>
-       *
        * <pre>
        * depends on pki_type
        * </pre>
+       *
+       * <code>optional bytes pki_data = 3;</code>
        */
       public Builder clearPkiData() {
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -3163,31 +3544,31 @@ public Builder clearPkiData() {
 
       private com.google.protobuf.ByteString serializedPaymentDetails_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>required bytes serialized_payment_details = 4;</code>
-       *
        * <pre>
        * PaymentDetails
        * </pre>
+       *
+       * <code>required bytes serialized_payment_details = 4;</code>
        */
       public boolean hasSerializedPaymentDetails() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * <code>required bytes serialized_payment_details = 4;</code>
-       *
        * <pre>
        * PaymentDetails
        * </pre>
+       *
+       * <code>required bytes serialized_payment_details = 4;</code>
        */
       public com.google.protobuf.ByteString getSerializedPaymentDetails() {
         return serializedPaymentDetails_;
       }
       /**
-       * <code>required bytes serialized_payment_details = 4;</code>
-       *
        * <pre>
        * PaymentDetails
        * </pre>
+       *
+       * <code>required bytes serialized_payment_details = 4;</code>
        */
       public Builder setSerializedPaymentDetails(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -3199,11 +3580,11 @@ public Builder setSerializedPaymentDetails(com.google.protobuf.ByteString value)
         return this;
       }
       /**
-       * <code>required bytes serialized_payment_details = 4;</code>
-       *
        * <pre>
        * PaymentDetails
        * </pre>
+       *
+       * <code>required bytes serialized_payment_details = 4;</code>
        */
       public Builder clearSerializedPaymentDetails() {
         bitField0_ = (bitField0_ & ~0x00000008);
@@ -3214,31 +3595,31 @@ public Builder clearSerializedPaymentDetails() {
 
       private com.google.protobuf.ByteString signature_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>optional bytes signature = 5;</code>
-       *
        * <pre>
        * pki-dependent signature
        * </pre>
+       *
+       * <code>optional bytes signature = 5;</code>
        */
       public boolean hasSignature() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * <code>optional bytes signature = 5;</code>
-       *
        * <pre>
        * pki-dependent signature
        * </pre>
+       *
+       * <code>optional bytes signature = 5;</code>
        */
       public com.google.protobuf.ByteString getSignature() {
         return signature_;
       }
       /**
-       * <code>optional bytes signature = 5;</code>
-       *
        * <pre>
        * pki-dependent signature
        * </pre>
+       *
+       * <code>optional bytes signature = 5;</code>
        */
       public Builder setSignature(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -3250,11 +3631,11 @@ public Builder setSignature(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>optional bytes signature = 5;</code>
-       *
        * <pre>
        * pki-dependent signature
        * </pre>
+       *
+       * <code>optional bytes signature = 5;</code>
        */
       public Builder clearSignature() {
         bitField0_ = (bitField0_ & ~0x00000010);
@@ -3262,16 +3643,57 @@ public Builder clearSignature() {
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:payments.PaymentRequest)
     }
 
+    // @@protoc_insertion_point(class_scope:payments.PaymentRequest)
+    private static final org.bitcoin.protocols.payments.Protos.PaymentRequest DEFAULT_INSTANCE;
     static {
-      defaultInstance = new PaymentRequest(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoin.protocols.payments.Protos.PaymentRequest();
+    }
+
+    public static org.bitcoin.protocols.payments.Protos.PaymentRequest getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<PaymentRequest>
+        PARSER = new com.google.protobuf.AbstractParser<PaymentRequest>() {
+      @java.lang.Override
+      public PaymentRequest parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new PaymentRequest(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<PaymentRequest> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<PaymentRequest> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoin.protocols.payments.Protos.PaymentRequest getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:payments.PaymentRequest)
   }
 
   public interface X509CertificatesOrBuilder extends
@@ -3279,64 +3701,59 @@ public interface X509CertificatesOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated bytes certificate = 1;</code>
-     *
      * <pre>
      * DER-encoded X.509 certificate chain
      * </pre>
+     *
+     * <code>repeated bytes certificate = 1;</code>
      */
     java.util.List<com.google.protobuf.ByteString> getCertificateList();
     /**
-     * <code>repeated bytes certificate = 1;</code>
-     *
      * <pre>
      * DER-encoded X.509 certificate chain
      * </pre>
+     *
+     * <code>repeated bytes certificate = 1;</code>
      */
     int getCertificateCount();
     /**
-     * <code>repeated bytes certificate = 1;</code>
-     *
      * <pre>
      * DER-encoded X.509 certificate chain
      * </pre>
+     *
+     * <code>repeated bytes certificate = 1;</code>
      */
     com.google.protobuf.ByteString getCertificate(int index);
   }
   /**
    * Protobuf type {@code payments.X509Certificates}
    */
-  public static final class X509Certificates extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class X509Certificates extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:payments.X509Certificates)
       X509CertificatesOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use X509Certificates.newBuilder() to construct.
-    private X509Certificates(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private X509Certificates(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private X509Certificates(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final X509Certificates defaultInstance;
-    public static X509Certificates getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public X509Certificates getDefaultInstanceForType() {
-      return defaultInstance;
+    private X509Certificates() {
+      certificate_ = java.util.Collections.emptyList();
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private X509Certificates(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3348,13 +3765,6 @@ private X509Certificates(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                 certificate_ = new java.util.ArrayList<com.google.protobuf.ByteString>();
@@ -3363,13 +3773,20 @@ private X509Certificates(
               certificate_.add(input.readBytes());
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
           certificate_ = java.util.Collections.unmodifiableList(certificate_);
@@ -3383,66 +3800,50 @@ private X509Certificates(
       return org.bitcoin.protocols.payments.Protos.internal_static_payments_X509Certificates_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoin.protocols.payments.Protos.internal_static_payments_X509Certificates_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoin.protocols.payments.Protos.X509Certificates.class, org.bitcoin.protocols.payments.Protos.X509Certificates.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<X509Certificates> PARSER =
-        new com.google.protobuf.AbstractParser<X509Certificates>() {
-      public X509Certificates parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new X509Certificates(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<X509Certificates> getParserForType() {
-      return PARSER;
-    }
-
     public static final int CERTIFICATE_FIELD_NUMBER = 1;
     private java.util.List<com.google.protobuf.ByteString> certificate_;
     /**
-     * <code>repeated bytes certificate = 1;</code>
-     *
      * <pre>
      * DER-encoded X.509 certificate chain
      * </pre>
+     *
+     * <code>repeated bytes certificate = 1;</code>
      */
     public java.util.List<com.google.protobuf.ByteString>
         getCertificateList() {
       return certificate_;
     }
     /**
-     * <code>repeated bytes certificate = 1;</code>
-     *
      * <pre>
      * DER-encoded X.509 certificate chain
      * </pre>
+     *
+     * <code>repeated bytes certificate = 1;</code>
      */
     public int getCertificateCount() {
       return certificate_.size();
     }
     /**
-     * <code>repeated bytes certificate = 1;</code>
-     *
      * <pre>
      * DER-encoded X.509 certificate chain
      * </pre>
+     *
+     * <code>repeated bytes certificate = 1;</code>
      */
     public com.google.protobuf.ByteString getCertificate(int index) {
       return certificate_.get(index);
     }
 
-    private void initFields() {
-      certificate_ = java.util.Collections.emptyList();
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -3452,18 +3853,18 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       for (int i = 0; i < certificate_.size(); i++) {
         output.writeBytes(1, certificate_.get(i));
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -3476,18 +3877,55 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getCertificateList().size();
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoin.protocols.payments.Protos.X509Certificates)) {
+        return super.equals(obj);
+      }
+      org.bitcoin.protocols.payments.Protos.X509Certificates other = (org.bitcoin.protocols.payments.Protos.X509Certificates) obj;
+
+      boolean result = true;
+      result = result && getCertificateList()
+          .equals(other.getCertificateList());
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (getCertificateCount() > 0) {
+        hash = (37 * hash) + CERTIFICATE_FIELD_NUMBER;
+        hash = (53 * hash) + getCertificateList().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoin.protocols.payments.Protos.X509Certificates parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoin.protocols.payments.Protos.X509Certificates parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoin.protocols.payments.Protos.X509Certificates parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -3511,46 +3949,59 @@ public static org.bitcoin.protocols.payments.Protos.X509Certificates parseFrom(
     }
     public static org.bitcoin.protocols.payments.Protos.X509Certificates parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.protocols.payments.Protos.X509Certificates parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.protocols.payments.Protos.X509Certificates parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoin.protocols.payments.Protos.X509Certificates parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.protocols.payments.Protos.X509Certificates parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.protocols.payments.Protos.X509Certificates parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoin.protocols.payments.Protos.X509Certificates prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -3558,7 +4009,7 @@ protected Builder newBuilderForType(
      * Protobuf type {@code payments.X509Certificates}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:payments.X509Certificates)
         org.bitcoin.protocols.payments.Protos.X509CertificatesOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -3566,7 +4017,8 @@ public static final class Builder extends
         return org.bitcoin.protocols.payments.Protos.internal_static_payments_X509Certificates_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoin.protocols.payments.Protos.internal_static_payments_X509Certificates_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -3579,18 +4031,16 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         certificate_ = java.util.Collections.emptyList();
@@ -3598,19 +4048,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoin.protocols.payments.Protos.internal_static_payments_X509Certificates_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoin.protocols.payments.Protos.X509Certificates getDefaultInstanceForType() {
         return org.bitcoin.protocols.payments.Protos.X509Certificates.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoin.protocols.payments.Protos.X509Certificates build() {
         org.bitcoin.protocols.payments.Protos.X509Certificates result = buildPartial();
         if (!result.isInitialized()) {
@@ -3619,6 +4068,7 @@ public org.bitcoin.protocols.payments.Protos.X509Certificates build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoin.protocols.payments.Protos.X509Certificates buildPartial() {
         org.bitcoin.protocols.payments.Protos.X509Certificates result = new org.bitcoin.protocols.payments.Protos.X509Certificates(this);
         int from_bitField0_ = bitField0_;
@@ -3631,6 +4081,39 @@ public org.bitcoin.protocols.payments.Protos.X509Certificates buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoin.protocols.payments.Protos.X509Certificates) {
           return mergeFrom((org.bitcoin.protocols.payments.Protos.X509Certificates)other);
@@ -3652,14 +4135,17 @@ public Builder mergeFrom(org.bitcoin.protocols.payments.Protos.X509Certificates
           }
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3669,7 +4155,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoin.protocols.payments.Protos.X509Certificates) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -3687,42 +4173,42 @@ private void ensureCertificateIsMutable() {
          }
       }
       /**
-       * <code>repeated bytes certificate = 1;</code>
-       *
        * <pre>
        * DER-encoded X.509 certificate chain
        * </pre>
+       *
+       * <code>repeated bytes certificate = 1;</code>
        */
       public java.util.List<com.google.protobuf.ByteString>
           getCertificateList() {
         return java.util.Collections.unmodifiableList(certificate_);
       }
       /**
-       * <code>repeated bytes certificate = 1;</code>
-       *
        * <pre>
        * DER-encoded X.509 certificate chain
        * </pre>
+       *
+       * <code>repeated bytes certificate = 1;</code>
        */
       public int getCertificateCount() {
         return certificate_.size();
       }
       /**
-       * <code>repeated bytes certificate = 1;</code>
-       *
        * <pre>
        * DER-encoded X.509 certificate chain
        * </pre>
+       *
+       * <code>repeated bytes certificate = 1;</code>
        */
       public com.google.protobuf.ByteString getCertificate(int index) {
         return certificate_.get(index);
       }
       /**
-       * <code>repeated bytes certificate = 1;</code>
-       *
        * <pre>
        * DER-encoded X.509 certificate chain
        * </pre>
+       *
+       * <code>repeated bytes certificate = 1;</code>
        */
       public Builder setCertificate(
           int index, com.google.protobuf.ByteString value) {
@@ -3735,11 +4221,11 @@ public Builder setCertificate(
         return this;
       }
       /**
-       * <code>repeated bytes certificate = 1;</code>
-       *
        * <pre>
        * DER-encoded X.509 certificate chain
        * </pre>
+       *
+       * <code>repeated bytes certificate = 1;</code>
        */
       public Builder addCertificate(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -3751,11 +4237,11 @@ public Builder addCertificate(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>repeated bytes certificate = 1;</code>
-       *
        * <pre>
        * DER-encoded X.509 certificate chain
        * </pre>
+       *
+       * <code>repeated bytes certificate = 1;</code>
        */
       public Builder addAllCertificate(
           java.lang.Iterable<? extends com.google.protobuf.ByteString> values) {
@@ -3766,11 +4252,11 @@ public Builder addAllCertificate(
         return this;
       }
       /**
-       * <code>repeated bytes certificate = 1;</code>
-       *
        * <pre>
        * DER-encoded X.509 certificate chain
        * </pre>
+       *
+       * <code>repeated bytes certificate = 1;</code>
        */
       public Builder clearCertificate() {
         certificate_ = java.util.Collections.emptyList();
@@ -3778,16 +4264,57 @@ public Builder clearCertificate() {
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:payments.X509Certificates)
     }
 
+    // @@protoc_insertion_point(class_scope:payments.X509Certificates)
+    private static final org.bitcoin.protocols.payments.Protos.X509Certificates DEFAULT_INSTANCE;
     static {
-      defaultInstance = new X509Certificates(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoin.protocols.payments.Protos.X509Certificates();
+    }
+
+    public static org.bitcoin.protocols.payments.Protos.X509Certificates getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<X509Certificates>
+        PARSER = new com.google.protobuf.AbstractParser<X509Certificates>() {
+      @java.lang.Override
+      public X509Certificates parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new X509Certificates(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<X509Certificates> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<X509Certificates> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoin.protocols.payments.Protos.X509Certificates getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:payments.X509Certificates)
   }
 
   public interface PaymentOrBuilder extends
@@ -3795,113 +4322,113 @@ public interface PaymentOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>optional bytes merchant_data = 1;</code>
-     *
      * <pre>
      * From PaymentDetails.merchant_data
      * </pre>
+     *
+     * <code>optional bytes merchant_data = 1;</code>
      */
     boolean hasMerchantData();
     /**
-     * <code>optional bytes merchant_data = 1;</code>
-     *
      * <pre>
      * From PaymentDetails.merchant_data
      * </pre>
+     *
+     * <code>optional bytes merchant_data = 1;</code>
      */
     com.google.protobuf.ByteString getMerchantData();
 
     /**
-     * <code>repeated bytes transactions = 2;</code>
-     *
      * <pre>
      * Signed transactions that satisfy PaymentDetails.outputs
      * </pre>
+     *
+     * <code>repeated bytes transactions = 2;</code>
      */
     java.util.List<com.google.protobuf.ByteString> getTransactionsList();
     /**
-     * <code>repeated bytes transactions = 2;</code>
-     *
      * <pre>
      * Signed transactions that satisfy PaymentDetails.outputs
      * </pre>
+     *
+     * <code>repeated bytes transactions = 2;</code>
      */
     int getTransactionsCount();
     /**
-     * <code>repeated bytes transactions = 2;</code>
-     *
      * <pre>
      * Signed transactions that satisfy PaymentDetails.outputs
      * </pre>
+     *
+     * <code>repeated bytes transactions = 2;</code>
      */
     com.google.protobuf.ByteString getTransactions(int index);
 
     /**
-     * <code>repeated .payments.Output refund_to = 3;</code>
-     *
      * <pre>
      * Where to send refunds, if a refund is necessary
      * </pre>
+     *
+     * <code>repeated .payments.Output refund_to = 3;</code>
      */
     java.util.List<org.bitcoin.protocols.payments.Protos.Output> 
         getRefundToList();
     /**
-     * <code>repeated .payments.Output refund_to = 3;</code>
-     *
      * <pre>
      * Where to send refunds, if a refund is necessary
      * </pre>
+     *
+     * <code>repeated .payments.Output refund_to = 3;</code>
      */
     org.bitcoin.protocols.payments.Protos.Output getRefundTo(int index);
     /**
-     * <code>repeated .payments.Output refund_to = 3;</code>
-     *
      * <pre>
      * Where to send refunds, if a refund is necessary
      * </pre>
+     *
+     * <code>repeated .payments.Output refund_to = 3;</code>
      */
     int getRefundToCount();
     /**
-     * <code>repeated .payments.Output refund_to = 3;</code>
-     *
      * <pre>
      * Where to send refunds, if a refund is necessary
      * </pre>
+     *
+     * <code>repeated .payments.Output refund_to = 3;</code>
      */
     java.util.List<? extends org.bitcoin.protocols.payments.Protos.OutputOrBuilder> 
         getRefundToOrBuilderList();
     /**
-     * <code>repeated .payments.Output refund_to = 3;</code>
-     *
      * <pre>
      * Where to send refunds, if a refund is necessary
      * </pre>
+     *
+     * <code>repeated .payments.Output refund_to = 3;</code>
      */
     org.bitcoin.protocols.payments.Protos.OutputOrBuilder getRefundToOrBuilder(
         int index);
 
     /**
-     * <code>optional string memo = 4;</code>
-     *
      * <pre>
      * Human-readable message for the merchant
      * </pre>
+     *
+     * <code>optional string memo = 4;</code>
      */
     boolean hasMemo();
     /**
-     * <code>optional string memo = 4;</code>
-     *
      * <pre>
      * Human-readable message for the merchant
      * </pre>
+     *
+     * <code>optional string memo = 4;</code>
      */
     java.lang.String getMemo();
     /**
-     * <code>optional string memo = 4;</code>
-     *
      * <pre>
      * Human-readable message for the merchant
      * </pre>
+     *
+     * <code>optional string memo = 4;</code>
      */
     com.google.protobuf.ByteString
         getMemoBytes();
@@ -3909,37 +4436,35 @@ org.bitcoin.protocols.payments.Protos.OutputOrBuilder getRefundToOrBuilder(
   /**
    * Protobuf type {@code payments.Payment}
    */
-  public static final class Payment extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class Payment extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:payments.Payment)
       PaymentOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Payment.newBuilder() to construct.
-    private Payment(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private Payment(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private Payment(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Payment defaultInstance;
-    public static Payment getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public Payment getDefaultInstanceForType() {
-      return defaultInstance;
+    private Payment() {
+      merchantData_ = com.google.protobuf.ByteString.EMPTY;
+      transactions_ = java.util.Collections.emptyList();
+      refundTo_ = java.util.Collections.emptyList();
+      memo_ = "";
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private Payment(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3951,13 +4476,6 @@ private Payment(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               bitField0_ |= 0x00000001;
               merchantData_ = input.readBytes();
@@ -3976,7 +4494,8 @@ private Payment(
                 refundTo_ = new java.util.ArrayList<org.bitcoin.protocols.payments.Protos.Output>();
                 mutable_bitField0_ |= 0x00000004;
               }
-              refundTo_.add(input.readMessage(org.bitcoin.protocols.payments.Protos.Output.PARSER, extensionRegistry));
+              refundTo_.add(
+                  input.readMessage(org.bitcoin.protocols.payments.Protos.Output.PARSER, extensionRegistry));
               break;
             }
             case 34: {
@@ -3985,13 +4504,20 @@ private Payment(
               memo_ = bs;
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
           transactions_ = java.util.Collections.unmodifiableList(transactions_);
@@ -4008,47 +4534,33 @@ private Payment(
       return org.bitcoin.protocols.payments.Protos.internal_static_payments_Payment_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoin.protocols.payments.Protos.internal_static_payments_Payment_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoin.protocols.payments.Protos.Payment.class, org.bitcoin.protocols.payments.Protos.Payment.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<Payment> PARSER =
-        new com.google.protobuf.AbstractParser<Payment>() {
-      public Payment parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Payment(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Payment> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int MERCHANT_DATA_FIELD_NUMBER = 1;
     private com.google.protobuf.ByteString merchantData_;
     /**
-     * <code>optional bytes merchant_data = 1;</code>
-     *
      * <pre>
      * From PaymentDetails.merchant_data
      * </pre>
+     *
+     * <code>optional bytes merchant_data = 1;</code>
      */
     public boolean hasMerchantData() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>optional bytes merchant_data = 1;</code>
-     *
      * <pre>
      * From PaymentDetails.merchant_data
      * </pre>
+     *
+     * <code>optional bytes merchant_data = 1;</code>
      */
     public com.google.protobuf.ByteString getMerchantData() {
       return merchantData_;
@@ -4057,32 +4569,32 @@ public com.google.protobuf.ByteString getMerchantData() {
     public static final int TRANSACTIONS_FIELD_NUMBER = 2;
     private java.util.List<com.google.protobuf.ByteString> transactions_;
     /**
-     * <code>repeated bytes transactions = 2;</code>
-     *
      * <pre>
      * Signed transactions that satisfy PaymentDetails.outputs
      * </pre>
+     *
+     * <code>repeated bytes transactions = 2;</code>
      */
     public java.util.List<com.google.protobuf.ByteString>
         getTransactionsList() {
       return transactions_;
     }
     /**
-     * <code>repeated bytes transactions = 2;</code>
-     *
      * <pre>
      * Signed transactions that satisfy PaymentDetails.outputs
      * </pre>
+     *
+     * <code>repeated bytes transactions = 2;</code>
      */
     public int getTransactionsCount() {
       return transactions_.size();
     }
     /**
-     * <code>repeated bytes transactions = 2;</code>
-     *
      * <pre>
      * Signed transactions that satisfy PaymentDetails.outputs
      * </pre>
+     *
+     * <code>repeated bytes transactions = 2;</code>
      */
     public com.google.protobuf.ByteString getTransactions(int index) {
       return transactions_.get(index);
@@ -4091,52 +4603,52 @@ public com.google.protobuf.ByteString getTransactions(int index) {
     public static final int REFUND_TO_FIELD_NUMBER = 3;
     private java.util.List<org.bitcoin.protocols.payments.Protos.Output> refundTo_;
     /**
-     * <code>repeated .payments.Output refund_to = 3;</code>
-     *
      * <pre>
      * Where to send refunds, if a refund is necessary
      * </pre>
+     *
+     * <code>repeated .payments.Output refund_to = 3;</code>
      */
     public java.util.List<org.bitcoin.protocols.payments.Protos.Output> getRefundToList() {
       return refundTo_;
     }
     /**
-     * <code>repeated .payments.Output refund_to = 3;</code>
-     *
      * <pre>
      * Where to send refunds, if a refund is necessary
      * </pre>
+     *
+     * <code>repeated .payments.Output refund_to = 3;</code>
      */
     public java.util.List<? extends org.bitcoin.protocols.payments.Protos.OutputOrBuilder> 
         getRefundToOrBuilderList() {
       return refundTo_;
     }
     /**
-     * <code>repeated .payments.Output refund_to = 3;</code>
-     *
      * <pre>
      * Where to send refunds, if a refund is necessary
      * </pre>
+     *
+     * <code>repeated .payments.Output refund_to = 3;</code>
      */
     public int getRefundToCount() {
       return refundTo_.size();
     }
     /**
-     * <code>repeated .payments.Output refund_to = 3;</code>
-     *
      * <pre>
      * Where to send refunds, if a refund is necessary
      * </pre>
+     *
+     * <code>repeated .payments.Output refund_to = 3;</code>
      */
     public org.bitcoin.protocols.payments.Protos.Output getRefundTo(int index) {
       return refundTo_.get(index);
     }
     /**
-     * <code>repeated .payments.Output refund_to = 3;</code>
-     *
      * <pre>
      * Where to send refunds, if a refund is necessary
      * </pre>
+     *
+     * <code>repeated .payments.Output refund_to = 3;</code>
      */
     public org.bitcoin.protocols.payments.Protos.OutputOrBuilder getRefundToOrBuilder(
         int index) {
@@ -4144,23 +4656,23 @@ public org.bitcoin.protocols.payments.Protos.OutputOrBuilder getRefundToOrBuilde
     }
 
     public static final int MEMO_FIELD_NUMBER = 4;
-    private java.lang.Object memo_;
+    private volatile java.lang.Object memo_;
     /**
-     * <code>optional string memo = 4;</code>
-     *
      * <pre>
      * Human-readable message for the merchant
      * </pre>
+     *
+     * <code>optional string memo = 4;</code>
      */
     public boolean hasMemo() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>optional string memo = 4;</code>
-     *
      * <pre>
      * Human-readable message for the merchant
      * </pre>
+     *
+     * <code>optional string memo = 4;</code>
      */
     public java.lang.String getMemo() {
       java.lang.Object ref = memo_;
@@ -4177,11 +4689,11 @@ public java.lang.String getMemo() {
       }
     }
     /**
-     * <code>optional string memo = 4;</code>
-     *
      * <pre>
      * Human-readable message for the merchant
      * </pre>
+     *
+     * <code>optional string memo = 4;</code>
      */
     public com.google.protobuf.ByteString
         getMemoBytes() {
@@ -4197,13 +4709,8 @@ public java.lang.String getMemo() {
       }
     }
 
-    private void initFields() {
-      merchantData_ = com.google.protobuf.ByteString.EMPTY;
-      transactions_ = java.util.Collections.emptyList();
-      refundTo_ = java.util.Collections.emptyList();
-      memo_ = "";
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -4219,9 +4726,9 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeBytes(1, merchantData_);
       }
@@ -4232,14 +4739,14 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         output.writeMessage(3, refundTo_.get(i));
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeBytes(4, getMemoBytes());
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 4, memo_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -4261,21 +4768,81 @@ public int getSerializedSize() {
           .computeMessageSize(3, refundTo_.get(i));
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(4, getMemoBytes());
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, memo_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoin.protocols.payments.Protos.Payment)) {
+        return super.equals(obj);
+      }
+      org.bitcoin.protocols.payments.Protos.Payment other = (org.bitcoin.protocols.payments.Protos.Payment) obj;
+
+      boolean result = true;
+      result = result && (hasMerchantData() == other.hasMerchantData());
+      if (hasMerchantData()) {
+        result = result && getMerchantData()
+            .equals(other.getMerchantData());
+      }
+      result = result && getTransactionsList()
+          .equals(other.getTransactionsList());
+      result = result && getRefundToList()
+          .equals(other.getRefundToList());
+      result = result && (hasMemo() == other.hasMemo());
+      if (hasMemo()) {
+        result = result && getMemo()
+            .equals(other.getMemo());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasMerchantData()) {
+        hash = (37 * hash) + MERCHANT_DATA_FIELD_NUMBER;
+        hash = (53 * hash) + getMerchantData().hashCode();
+      }
+      if (getTransactionsCount() > 0) {
+        hash = (37 * hash) + TRANSACTIONS_FIELD_NUMBER;
+        hash = (53 * hash) + getTransactionsList().hashCode();
+      }
+      if (getRefundToCount() > 0) {
+        hash = (37 * hash) + REFUND_TO_FIELD_NUMBER;
+        hash = (53 * hash) + getRefundToList().hashCode();
+      }
+      if (hasMemo()) {
+        hash = (37 * hash) + MEMO_FIELD_NUMBER;
+        hash = (53 * hash) + getMemo().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoin.protocols.payments.Protos.Payment parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoin.protocols.payments.Protos.Payment parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoin.protocols.payments.Protos.Payment parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -4299,46 +4866,59 @@ public static org.bitcoin.protocols.payments.Protos.Payment parseFrom(
     }
     public static org.bitcoin.protocols.payments.Protos.Payment parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.protocols.payments.Protos.Payment parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.protocols.payments.Protos.Payment parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoin.protocols.payments.Protos.Payment parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.protocols.payments.Protos.Payment parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.protocols.payments.Protos.Payment parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoin.protocols.payments.Protos.Payment prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -4346,7 +4926,7 @@ protected Builder newBuilderForType(
      * Protobuf type {@code payments.Payment}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:payments.Payment)
         org.bitcoin.protocols.payments.Protos.PaymentOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -4354,7 +4934,8 @@ public static final class Builder extends
         return org.bitcoin.protocols.payments.Protos.internal_static_payments_Payment_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoin.protocols.payments.Protos.internal_static_payments_Payment_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -4367,19 +4948,17 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
           getRefundToFieldBuilder();
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         merchantData_ = com.google.protobuf.ByteString.EMPTY;
@@ -4397,19 +4976,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoin.protocols.payments.Protos.internal_static_payments_Payment_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoin.protocols.payments.Protos.Payment getDefaultInstanceForType() {
         return org.bitcoin.protocols.payments.Protos.Payment.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoin.protocols.payments.Protos.Payment build() {
         org.bitcoin.protocols.payments.Protos.Payment result = buildPartial();
         if (!result.isInitialized()) {
@@ -4418,6 +4996,7 @@ public org.bitcoin.protocols.payments.Protos.Payment build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoin.protocols.payments.Protos.Payment buildPartial() {
         org.bitcoin.protocols.payments.Protos.Payment result = new org.bitcoin.protocols.payments.Protos.Payment(this);
         int from_bitField0_ = bitField0_;
@@ -4449,6 +5028,39 @@ public org.bitcoin.protocols.payments.Protos.Payment buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoin.protocols.payments.Protos.Payment) {
           return mergeFrom((org.bitcoin.protocols.payments.Protos.Payment)other);
@@ -4492,7 +5104,7 @@ public Builder mergeFrom(org.bitcoin.protocols.payments.Protos.Payment other) {
               refundTo_ = other.refundTo_;
               bitField0_ = (bitField0_ & ~0x00000004);
               refundToBuilder_ = 
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getRefundToFieldBuilder() : null;
             } else {
               refundToBuilder_.addAllMessages(other.refundTo_);
@@ -4504,20 +5116,22 @@ public Builder mergeFrom(org.bitcoin.protocols.payments.Protos.Payment other) {
           memo_ = other.memo_;
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         for (int i = 0; i < getRefundToCount(); i++) {
           if (!getRefundTo(i).isInitialized()) {
-            
             return false;
           }
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4527,7 +5141,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoin.protocols.payments.Protos.Payment) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -4539,31 +5153,31 @@ public Builder mergeFrom(
 
       private com.google.protobuf.ByteString merchantData_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>optional bytes merchant_data = 1;</code>
-       *
        * <pre>
        * From PaymentDetails.merchant_data
        * </pre>
+       *
+       * <code>optional bytes merchant_data = 1;</code>
        */
       public boolean hasMerchantData() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>optional bytes merchant_data = 1;</code>
-       *
        * <pre>
        * From PaymentDetails.merchant_data
        * </pre>
+       *
+       * <code>optional bytes merchant_data = 1;</code>
        */
       public com.google.protobuf.ByteString getMerchantData() {
         return merchantData_;
       }
       /**
-       * <code>optional bytes merchant_data = 1;</code>
-       *
        * <pre>
        * From PaymentDetails.merchant_data
        * </pre>
+       *
+       * <code>optional bytes merchant_data = 1;</code>
        */
       public Builder setMerchantData(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -4575,11 +5189,11 @@ public Builder setMerchantData(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>optional bytes merchant_data = 1;</code>
-       *
        * <pre>
        * From PaymentDetails.merchant_data
        * </pre>
+       *
+       * <code>optional bytes merchant_data = 1;</code>
        */
       public Builder clearMerchantData() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -4596,42 +5210,42 @@ private void ensureTransactionsIsMutable() {
          }
       }
       /**
-       * <code>repeated bytes transactions = 2;</code>
-       *
        * <pre>
        * Signed transactions that satisfy PaymentDetails.outputs
        * </pre>
+       *
+       * <code>repeated bytes transactions = 2;</code>
        */
       public java.util.List<com.google.protobuf.ByteString>
           getTransactionsList() {
         return java.util.Collections.unmodifiableList(transactions_);
       }
       /**
-       * <code>repeated bytes transactions = 2;</code>
-       *
        * <pre>
        * Signed transactions that satisfy PaymentDetails.outputs
        * </pre>
+       *
+       * <code>repeated bytes transactions = 2;</code>
        */
       public int getTransactionsCount() {
         return transactions_.size();
       }
       /**
-       * <code>repeated bytes transactions = 2;</code>
-       *
        * <pre>
        * Signed transactions that satisfy PaymentDetails.outputs
        * </pre>
+       *
+       * <code>repeated bytes transactions = 2;</code>
        */
       public com.google.protobuf.ByteString getTransactions(int index) {
         return transactions_.get(index);
       }
       /**
-       * <code>repeated bytes transactions = 2;</code>
-       *
        * <pre>
        * Signed transactions that satisfy PaymentDetails.outputs
        * </pre>
+       *
+       * <code>repeated bytes transactions = 2;</code>
        */
       public Builder setTransactions(
           int index, com.google.protobuf.ByteString value) {
@@ -4644,11 +5258,11 @@ public Builder setTransactions(
         return this;
       }
       /**
-       * <code>repeated bytes transactions = 2;</code>
-       *
        * <pre>
        * Signed transactions that satisfy PaymentDetails.outputs
        * </pre>
+       *
+       * <code>repeated bytes transactions = 2;</code>
        */
       public Builder addTransactions(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -4660,11 +5274,11 @@ public Builder addTransactions(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>repeated bytes transactions = 2;</code>
-       *
        * <pre>
        * Signed transactions that satisfy PaymentDetails.outputs
        * </pre>
+       *
+       * <code>repeated bytes transactions = 2;</code>
        */
       public Builder addAllTransactions(
           java.lang.Iterable<? extends com.google.protobuf.ByteString> values) {
@@ -4675,11 +5289,11 @@ public Builder addAllTransactions(
         return this;
       }
       /**
-       * <code>repeated bytes transactions = 2;</code>
-       *
        * <pre>
        * Signed transactions that satisfy PaymentDetails.outputs
        * </pre>
+       *
+       * <code>repeated bytes transactions = 2;</code>
        */
       public Builder clearTransactions() {
         transactions_ = java.util.Collections.emptyList();
@@ -4697,15 +5311,15 @@ private void ensureRefundToIsMutable() {
          }
       }
 
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.bitcoin.protocols.payments.Protos.Output, org.bitcoin.protocols.payments.Protos.Output.Builder, org.bitcoin.protocols.payments.Protos.OutputOrBuilder> refundToBuilder_;
 
       /**
-       * <code>repeated .payments.Output refund_to = 3;</code>
-       *
        * <pre>
        * Where to send refunds, if a refund is necessary
        * </pre>
+       *
+       * <code>repeated .payments.Output refund_to = 3;</code>
        */
       public java.util.List<org.bitcoin.protocols.payments.Protos.Output> getRefundToList() {
         if (refundToBuilder_ == null) {
@@ -4715,11 +5329,11 @@ public java.util.List<org.bitcoin.protocols.payments.Protos.Output> getRefundToL
         }
       }
       /**
-       * <code>repeated .payments.Output refund_to = 3;</code>
-       *
        * <pre>
        * Where to send refunds, if a refund is necessary
        * </pre>
+       *
+       * <code>repeated .payments.Output refund_to = 3;</code>
        */
       public int getRefundToCount() {
         if (refundToBuilder_ == null) {
@@ -4729,11 +5343,11 @@ public int getRefundToCount() {
         }
       }
       /**
-       * <code>repeated .payments.Output refund_to = 3;</code>
-       *
        * <pre>
        * Where to send refunds, if a refund is necessary
        * </pre>
+       *
+       * <code>repeated .payments.Output refund_to = 3;</code>
        */
       public org.bitcoin.protocols.payments.Protos.Output getRefundTo(int index) {
         if (refundToBuilder_ == null) {
@@ -4743,11 +5357,11 @@ public org.bitcoin.protocols.payments.Protos.Output getRefundTo(int index) {
         }
       }
       /**
-       * <code>repeated .payments.Output refund_to = 3;</code>
-       *
        * <pre>
        * Where to send refunds, if a refund is necessary
        * </pre>
+       *
+       * <code>repeated .payments.Output refund_to = 3;</code>
        */
       public Builder setRefundTo(
           int index, org.bitcoin.protocols.payments.Protos.Output value) {
@@ -4764,11 +5378,11 @@ public Builder setRefundTo(
         return this;
       }
       /**
-       * <code>repeated .payments.Output refund_to = 3;</code>
-       *
        * <pre>
        * Where to send refunds, if a refund is necessary
        * </pre>
+       *
+       * <code>repeated .payments.Output refund_to = 3;</code>
        */
       public Builder setRefundTo(
           int index, org.bitcoin.protocols.payments.Protos.Output.Builder builderForValue) {
@@ -4782,11 +5396,11 @@ public Builder setRefundTo(
         return this;
       }
       /**
-       * <code>repeated .payments.Output refund_to = 3;</code>
-       *
        * <pre>
        * Where to send refunds, if a refund is necessary
        * </pre>
+       *
+       * <code>repeated .payments.Output refund_to = 3;</code>
        */
       public Builder addRefundTo(org.bitcoin.protocols.payments.Protos.Output value) {
         if (refundToBuilder_ == null) {
@@ -4802,11 +5416,11 @@ public Builder addRefundTo(org.bitcoin.protocols.payments.Protos.Output value) {
         return this;
       }
       /**
-       * <code>repeated .payments.Output refund_to = 3;</code>
-       *
        * <pre>
        * Where to send refunds, if a refund is necessary
        * </pre>
+       *
+       * <code>repeated .payments.Output refund_to = 3;</code>
        */
       public Builder addRefundTo(
           int index, org.bitcoin.protocols.payments.Protos.Output value) {
@@ -4823,11 +5437,11 @@ public Builder addRefundTo(
         return this;
       }
       /**
-       * <code>repeated .payments.Output refund_to = 3;</code>
-       *
        * <pre>
        * Where to send refunds, if a refund is necessary
        * </pre>
+       *
+       * <code>repeated .payments.Output refund_to = 3;</code>
        */
       public Builder addRefundTo(
           org.bitcoin.protocols.payments.Protos.Output.Builder builderForValue) {
@@ -4841,11 +5455,11 @@ public Builder addRefundTo(
         return this;
       }
       /**
-       * <code>repeated .payments.Output refund_to = 3;</code>
-       *
        * <pre>
        * Where to send refunds, if a refund is necessary
        * </pre>
+       *
+       * <code>repeated .payments.Output refund_to = 3;</code>
        */
       public Builder addRefundTo(
           int index, org.bitcoin.protocols.payments.Protos.Output.Builder builderForValue) {
@@ -4859,11 +5473,11 @@ public Builder addRefundTo(
         return this;
       }
       /**
-       * <code>repeated .payments.Output refund_to = 3;</code>
-       *
        * <pre>
        * Where to send refunds, if a refund is necessary
        * </pre>
+       *
+       * <code>repeated .payments.Output refund_to = 3;</code>
        */
       public Builder addAllRefundTo(
           java.lang.Iterable<? extends org.bitcoin.protocols.payments.Protos.Output> values) {
@@ -4878,11 +5492,11 @@ public Builder addAllRefundTo(
         return this;
       }
       /**
-       * <code>repeated .payments.Output refund_to = 3;</code>
-       *
        * <pre>
        * Where to send refunds, if a refund is necessary
        * </pre>
+       *
+       * <code>repeated .payments.Output refund_to = 3;</code>
        */
       public Builder clearRefundTo() {
         if (refundToBuilder_ == null) {
@@ -4895,11 +5509,11 @@ public Builder clearRefundTo() {
         return this;
       }
       /**
-       * <code>repeated .payments.Output refund_to = 3;</code>
-       *
        * <pre>
        * Where to send refunds, if a refund is necessary
        * </pre>
+       *
+       * <code>repeated .payments.Output refund_to = 3;</code>
        */
       public Builder removeRefundTo(int index) {
         if (refundToBuilder_ == null) {
@@ -4912,22 +5526,22 @@ public Builder removeRefundTo(int index) {
         return this;
       }
       /**
-       * <code>repeated .payments.Output refund_to = 3;</code>
-       *
        * <pre>
        * Where to send refunds, if a refund is necessary
        * </pre>
+       *
+       * <code>repeated .payments.Output refund_to = 3;</code>
        */
       public org.bitcoin.protocols.payments.Protos.Output.Builder getRefundToBuilder(
           int index) {
         return getRefundToFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .payments.Output refund_to = 3;</code>
-       *
        * <pre>
        * Where to send refunds, if a refund is necessary
        * </pre>
+       *
+       * <code>repeated .payments.Output refund_to = 3;</code>
        */
       public org.bitcoin.protocols.payments.Protos.OutputOrBuilder getRefundToOrBuilder(
           int index) {
@@ -4937,11 +5551,11 @@ public org.bitcoin.protocols.payments.Protos.OutputOrBuilder getRefundToOrBuilde
         }
       }
       /**
-       * <code>repeated .payments.Output refund_to = 3;</code>
-       *
        * <pre>
        * Where to send refunds, if a refund is necessary
        * </pre>
+       *
+       * <code>repeated .payments.Output refund_to = 3;</code>
        */
       public java.util.List<? extends org.bitcoin.protocols.payments.Protos.OutputOrBuilder> 
            getRefundToOrBuilderList() {
@@ -4952,22 +5566,22 @@ public org.bitcoin.protocols.payments.Protos.OutputOrBuilder getRefundToOrBuilde
         }
       }
       /**
-       * <code>repeated .payments.Output refund_to = 3;</code>
-       *
        * <pre>
        * Where to send refunds, if a refund is necessary
        * </pre>
+       *
+       * <code>repeated .payments.Output refund_to = 3;</code>
        */
       public org.bitcoin.protocols.payments.Protos.Output.Builder addRefundToBuilder() {
         return getRefundToFieldBuilder().addBuilder(
             org.bitcoin.protocols.payments.Protos.Output.getDefaultInstance());
       }
       /**
-       * <code>repeated .payments.Output refund_to = 3;</code>
-       *
        * <pre>
        * Where to send refunds, if a refund is necessary
        * </pre>
+       *
+       * <code>repeated .payments.Output refund_to = 3;</code>
        */
       public org.bitcoin.protocols.payments.Protos.Output.Builder addRefundToBuilder(
           int index) {
@@ -4975,21 +5589,21 @@ public org.bitcoin.protocols.payments.Protos.Output.Builder addRefundToBuilder(
             index, org.bitcoin.protocols.payments.Protos.Output.getDefaultInstance());
       }
       /**
-       * <code>repeated .payments.Output refund_to = 3;</code>
-       *
        * <pre>
        * Where to send refunds, if a refund is necessary
        * </pre>
+       *
+       * <code>repeated .payments.Output refund_to = 3;</code>
        */
       public java.util.List<org.bitcoin.protocols.payments.Protos.Output.Builder> 
            getRefundToBuilderList() {
         return getRefundToFieldBuilder().getBuilderList();
       }
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.bitcoin.protocols.payments.Protos.Output, org.bitcoin.protocols.payments.Protos.Output.Builder, org.bitcoin.protocols.payments.Protos.OutputOrBuilder> 
           getRefundToFieldBuilder() {
         if (refundToBuilder_ == null) {
-          refundToBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+          refundToBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               org.bitcoin.protocols.payments.Protos.Output, org.bitcoin.protocols.payments.Protos.Output.Builder, org.bitcoin.protocols.payments.Protos.OutputOrBuilder>(
                   refundTo_,
                   ((bitField0_ & 0x00000004) == 0x00000004),
@@ -5002,21 +5616,21 @@ public org.bitcoin.protocols.payments.Protos.Output.Builder addRefundToBuilder(
 
       private java.lang.Object memo_ = "";
       /**
-       * <code>optional string memo = 4;</code>
-       *
        * <pre>
        * Human-readable message for the merchant
        * </pre>
+       *
+       * <code>optional string memo = 4;</code>
        */
       public boolean hasMemo() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * <code>optional string memo = 4;</code>
-       *
        * <pre>
        * Human-readable message for the merchant
        * </pre>
+       *
+       * <code>optional string memo = 4;</code>
        */
       public java.lang.String getMemo() {
         java.lang.Object ref = memo_;
@@ -5033,11 +5647,11 @@ public java.lang.String getMemo() {
         }
       }
       /**
-       * <code>optional string memo = 4;</code>
-       *
        * <pre>
        * Human-readable message for the merchant
        * </pre>
+       *
+       * <code>optional string memo = 4;</code>
        */
       public com.google.protobuf.ByteString
           getMemoBytes() {
@@ -5053,11 +5667,11 @@ public java.lang.String getMemo() {
         }
       }
       /**
-       * <code>optional string memo = 4;</code>
-       *
        * <pre>
        * Human-readable message for the merchant
        * </pre>
+       *
+       * <code>optional string memo = 4;</code>
        */
       public Builder setMemo(
           java.lang.String value) {
@@ -5070,11 +5684,11 @@ public Builder setMemo(
         return this;
       }
       /**
-       * <code>optional string memo = 4;</code>
-       *
        * <pre>
        * Human-readable message for the merchant
        * </pre>
+       *
+       * <code>optional string memo = 4;</code>
        */
       public Builder clearMemo() {
         bitField0_ = (bitField0_ & ~0x00000008);
@@ -5083,11 +5697,11 @@ public Builder clearMemo() {
         return this;
       }
       /**
-       * <code>optional string memo = 4;</code>
-       *
        * <pre>
        * Human-readable message for the merchant
        * </pre>
+       *
+       * <code>optional string memo = 4;</code>
        */
       public Builder setMemoBytes(
           com.google.protobuf.ByteString value) {
@@ -5099,16 +5713,57 @@ public Builder setMemoBytes(
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:payments.Payment)
     }
 
+    // @@protoc_insertion_point(class_scope:payments.Payment)
+    private static final org.bitcoin.protocols.payments.Protos.Payment DEFAULT_INSTANCE;
     static {
-      defaultInstance = new Payment(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoin.protocols.payments.Protos.Payment();
+    }
+
+    public static org.bitcoin.protocols.payments.Protos.Payment getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<Payment>
+        PARSER = new com.google.protobuf.AbstractParser<Payment>() {
+      @java.lang.Override
+      public Payment parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new Payment(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<Payment> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Payment> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoin.protocols.payments.Protos.Payment getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:payments.Payment)
   }
 
   public interface PaymentACKOrBuilder extends
@@ -5116,52 +5771,52 @@ public interface PaymentACKOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>required .payments.Payment payment = 1;</code>
-     *
      * <pre>
      * Payment message that triggered this ACK
      * </pre>
+     *
+     * <code>required .payments.Payment payment = 1;</code>
      */
     boolean hasPayment();
     /**
-     * <code>required .payments.Payment payment = 1;</code>
-     *
      * <pre>
      * Payment message that triggered this ACK
      * </pre>
+     *
+     * <code>required .payments.Payment payment = 1;</code>
      */
     org.bitcoin.protocols.payments.Protos.Payment getPayment();
     /**
-     * <code>required .payments.Payment payment = 1;</code>
-     *
      * <pre>
      * Payment message that triggered this ACK
      * </pre>
+     *
+     * <code>required .payments.Payment payment = 1;</code>
      */
     org.bitcoin.protocols.payments.Protos.PaymentOrBuilder getPaymentOrBuilder();
 
     /**
-     * <code>optional string memo = 2;</code>
-     *
      * <pre>
      * human-readable message for customer
      * </pre>
+     *
+     * <code>optional string memo = 2;</code>
      */
     boolean hasMemo();
     /**
-     * <code>optional string memo = 2;</code>
-     *
      * <pre>
      * human-readable message for customer
      * </pre>
+     *
+     * <code>optional string memo = 2;</code>
      */
     java.lang.String getMemo();
     /**
-     * <code>optional string memo = 2;</code>
-     *
      * <pre>
      * human-readable message for customer
      * </pre>
+     *
+     * <code>optional string memo = 2;</code>
      */
     com.google.protobuf.ByteString
         getMemoBytes();
@@ -5169,37 +5824,32 @@ public interface PaymentACKOrBuilder extends
   /**
    * Protobuf type {@code payments.PaymentACK}
    */
-  public static final class PaymentACK extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class PaymentACK extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:payments.PaymentACK)
       PaymentACKOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use PaymentACK.newBuilder() to construct.
-    private PaymentACK(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private PaymentACK(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private PaymentACK(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final PaymentACK defaultInstance;
-    public static PaymentACK getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public PaymentACK getDefaultInstanceForType() {
-      return defaultInstance;
+    private PaymentACK() {
+      memo_ = "";
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private PaymentACK(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -5211,13 +5861,6 @@ private PaymentACK(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               org.bitcoin.protocols.payments.Protos.Payment.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -5237,13 +5880,20 @@ private PaymentACK(
               memo_ = bs;
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -5254,80 +5904,66 @@ private PaymentACK(
       return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentACK_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentACK_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoin.protocols.payments.Protos.PaymentACK.class, org.bitcoin.protocols.payments.Protos.PaymentACK.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<PaymentACK> PARSER =
-        new com.google.protobuf.AbstractParser<PaymentACK>() {
-      public PaymentACK parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new PaymentACK(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<PaymentACK> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int PAYMENT_FIELD_NUMBER = 1;
     private org.bitcoin.protocols.payments.Protos.Payment payment_;
     /**
-     * <code>required .payments.Payment payment = 1;</code>
-     *
      * <pre>
      * Payment message that triggered this ACK
      * </pre>
+     *
+     * <code>required .payments.Payment payment = 1;</code>
      */
     public boolean hasPayment() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required .payments.Payment payment = 1;</code>
-     *
      * <pre>
      * Payment message that triggered this ACK
      * </pre>
+     *
+     * <code>required .payments.Payment payment = 1;</code>
      */
     public org.bitcoin.protocols.payments.Protos.Payment getPayment() {
-      return payment_;
+      return payment_ == null ? org.bitcoin.protocols.payments.Protos.Payment.getDefaultInstance() : payment_;
     }
     /**
-     * <code>required .payments.Payment payment = 1;</code>
-     *
      * <pre>
      * Payment message that triggered this ACK
      * </pre>
+     *
+     * <code>required .payments.Payment payment = 1;</code>
      */
     public org.bitcoin.protocols.payments.Protos.PaymentOrBuilder getPaymentOrBuilder() {
-      return payment_;
+      return payment_ == null ? org.bitcoin.protocols.payments.Protos.Payment.getDefaultInstance() : payment_;
     }
 
     public static final int MEMO_FIELD_NUMBER = 2;
-    private java.lang.Object memo_;
+    private volatile java.lang.Object memo_;
     /**
-     * <code>optional string memo = 2;</code>
-     *
      * <pre>
      * human-readable message for customer
      * </pre>
+     *
+     * <code>optional string memo = 2;</code>
      */
     public boolean hasMemo() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>optional string memo = 2;</code>
-     *
      * <pre>
      * human-readable message for customer
      * </pre>
+     *
+     * <code>optional string memo = 2;</code>
      */
     public java.lang.String getMemo() {
       java.lang.Object ref = memo_;
@@ -5344,11 +5980,11 @@ public java.lang.String getMemo() {
       }
     }
     /**
-     * <code>optional string memo = 2;</code>
-     *
      * <pre>
      * human-readable message for customer
      * </pre>
+     *
+     * <code>optional string memo = 2;</code>
      */
     public com.google.protobuf.ByteString
         getMemoBytes() {
@@ -5364,11 +6000,8 @@ public java.lang.String getMemo() {
       }
     }
 
-    private void initFields() {
-      payment_ = org.bitcoin.protocols.payments.Protos.Payment.getDefaultInstance();
-      memo_ = "";
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -5386,44 +6019,92 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeMessage(1, payment_);
+        output.writeMessage(1, getPayment());
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeBytes(2, getMemoBytes());
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, memo_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, payment_);
+          .computeMessageSize(1, getPayment());
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(2, getMemoBytes());
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, memo_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoin.protocols.payments.Protos.PaymentACK)) {
+        return super.equals(obj);
+      }
+      org.bitcoin.protocols.payments.Protos.PaymentACK other = (org.bitcoin.protocols.payments.Protos.PaymentACK) obj;
+
+      boolean result = true;
+      result = result && (hasPayment() == other.hasPayment());
+      if (hasPayment()) {
+        result = result && getPayment()
+            .equals(other.getPayment());
+      }
+      result = result && (hasMemo() == other.hasMemo());
+      if (hasMemo()) {
+        result = result && getMemo()
+            .equals(other.getMemo());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasPayment()) {
+        hash = (37 * hash) + PAYMENT_FIELD_NUMBER;
+        hash = (53 * hash) + getPayment().hashCode();
+      }
+      if (hasMemo()) {
+        hash = (37 * hash) + MEMO_FIELD_NUMBER;
+        hash = (53 * hash) + getMemo().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoin.protocols.payments.Protos.PaymentACK parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoin.protocols.payments.Protos.PaymentACK parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoin.protocols.payments.Protos.PaymentACK parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -5447,46 +6128,59 @@ public static org.bitcoin.protocols.payments.Protos.PaymentACK parseFrom(
     }
     public static org.bitcoin.protocols.payments.Protos.PaymentACK parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.protocols.payments.Protos.PaymentACK parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.protocols.payments.Protos.PaymentACK parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoin.protocols.payments.Protos.PaymentACK parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoin.protocols.payments.Protos.PaymentACK parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoin.protocols.payments.Protos.PaymentACK parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoin.protocols.payments.Protos.PaymentACK prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -5494,7 +6188,7 @@ protected Builder newBuilderForType(
      * Protobuf type {@code payments.PaymentACK}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:payments.PaymentACK)
         org.bitcoin.protocols.payments.Protos.PaymentACKOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -5502,7 +6196,8 @@ public static final class Builder extends
         return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentACK_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentACK_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -5515,23 +6210,21 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
           getPaymentFieldBuilder();
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (paymentBuilder_ == null) {
-          payment_ = org.bitcoin.protocols.payments.Protos.Payment.getDefaultInstance();
+          payment_ = null;
         } else {
           paymentBuilder_.clear();
         }
@@ -5541,19 +6234,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoin.protocols.payments.Protos.internal_static_payments_PaymentACK_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoin.protocols.payments.Protos.PaymentACK getDefaultInstanceForType() {
         return org.bitcoin.protocols.payments.Protos.PaymentACK.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoin.protocols.payments.Protos.PaymentACK build() {
         org.bitcoin.protocols.payments.Protos.PaymentACK result = buildPartial();
         if (!result.isInitialized()) {
@@ -5562,6 +6254,7 @@ public org.bitcoin.protocols.payments.Protos.PaymentACK build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoin.protocols.payments.Protos.PaymentACK buildPartial() {
         org.bitcoin.protocols.payments.Protos.PaymentACK result = new org.bitcoin.protocols.payments.Protos.PaymentACK(this);
         int from_bitField0_ = bitField0_;
@@ -5583,6 +6276,39 @@ public org.bitcoin.protocols.payments.Protos.PaymentACK buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoin.protocols.payments.Protos.PaymentACK) {
           return mergeFrom((org.bitcoin.protocols.payments.Protos.PaymentACK)other);
@@ -5602,22 +6328,23 @@ public Builder mergeFrom(org.bitcoin.protocols.payments.Protos.PaymentACK other)
           memo_ = other.memo_;
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasPayment()) {
-          
           return false;
         }
         if (!getPayment().isInitialized()) {
-          
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -5627,7 +6354,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoin.protocols.payments.Protos.PaymentACK) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -5637,39 +6364,39 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private org.bitcoin.protocols.payments.Protos.Payment payment_ = org.bitcoin.protocols.payments.Protos.Payment.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
+      private org.bitcoin.protocols.payments.Protos.Payment payment_ = null;
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.protocols.payments.Protos.Payment, org.bitcoin.protocols.payments.Protos.Payment.Builder, org.bitcoin.protocols.payments.Protos.PaymentOrBuilder> paymentBuilder_;
       /**
-       * <code>required .payments.Payment payment = 1;</code>
-       *
        * <pre>
        * Payment message that triggered this ACK
        * </pre>
+       *
+       * <code>required .payments.Payment payment = 1;</code>
        */
       public boolean hasPayment() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>required .payments.Payment payment = 1;</code>
-       *
        * <pre>
        * Payment message that triggered this ACK
        * </pre>
+       *
+       * <code>required .payments.Payment payment = 1;</code>
        */
       public org.bitcoin.protocols.payments.Protos.Payment getPayment() {
         if (paymentBuilder_ == null) {
-          return payment_;
+          return payment_ == null ? org.bitcoin.protocols.payments.Protos.Payment.getDefaultInstance() : payment_;
         } else {
           return paymentBuilder_.getMessage();
         }
       }
       /**
-       * <code>required .payments.Payment payment = 1;</code>
-       *
        * <pre>
        * Payment message that triggered this ACK
        * </pre>
+       *
+       * <code>required .payments.Payment payment = 1;</code>
        */
       public Builder setPayment(org.bitcoin.protocols.payments.Protos.Payment value) {
         if (paymentBuilder_ == null) {
@@ -5685,11 +6412,11 @@ public Builder setPayment(org.bitcoin.protocols.payments.Protos.Payment value) {
         return this;
       }
       /**
-       * <code>required .payments.Payment payment = 1;</code>
-       *
        * <pre>
        * Payment message that triggered this ACK
        * </pre>
+       *
+       * <code>required .payments.Payment payment = 1;</code>
        */
       public Builder setPayment(
           org.bitcoin.protocols.payments.Protos.Payment.Builder builderForValue) {
@@ -5703,15 +6430,16 @@ public Builder setPayment(
         return this;
       }
       /**
-       * <code>required .payments.Payment payment = 1;</code>
-       *
        * <pre>
        * Payment message that triggered this ACK
        * </pre>
+       *
+       * <code>required .payments.Payment payment = 1;</code>
        */
       public Builder mergePayment(org.bitcoin.protocols.payments.Protos.Payment value) {
         if (paymentBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
+              payment_ != null &&
               payment_ != org.bitcoin.protocols.payments.Protos.Payment.getDefaultInstance()) {
             payment_ =
               org.bitcoin.protocols.payments.Protos.Payment.newBuilder(payment_).mergeFrom(value).buildPartial();
@@ -5726,15 +6454,15 @@ public Builder mergePayment(org.bitcoin.protocols.payments.Protos.Payment value)
         return this;
       }
       /**
-       * <code>required .payments.Payment payment = 1;</code>
-       *
        * <pre>
        * Payment message that triggered this ACK
        * </pre>
+       *
+       * <code>required .payments.Payment payment = 1;</code>
        */
       public Builder clearPayment() {
         if (paymentBuilder_ == null) {
-          payment_ = org.bitcoin.protocols.payments.Protos.Payment.getDefaultInstance();
+          payment_ = null;
           onChanged();
         } else {
           paymentBuilder_.clear();
@@ -5743,11 +6471,11 @@ public Builder clearPayment() {
         return this;
       }
       /**
-       * <code>required .payments.Payment payment = 1;</code>
-       *
        * <pre>
        * Payment message that triggered this ACK
        * </pre>
+       *
+       * <code>required .payments.Payment payment = 1;</code>
        */
       public org.bitcoin.protocols.payments.Protos.Payment.Builder getPaymentBuilder() {
         bitField0_ |= 0x00000001;
@@ -5755,31 +6483,32 @@ public org.bitcoin.protocols.payments.Protos.Payment.Builder getPaymentBuilder()
         return getPaymentFieldBuilder().getBuilder();
       }
       /**
-       * <code>required .payments.Payment payment = 1;</code>
-       *
        * <pre>
        * Payment message that triggered this ACK
        * </pre>
+       *
+       * <code>required .payments.Payment payment = 1;</code>
        */
       public org.bitcoin.protocols.payments.Protos.PaymentOrBuilder getPaymentOrBuilder() {
         if (paymentBuilder_ != null) {
           return paymentBuilder_.getMessageOrBuilder();
         } else {
-          return payment_;
+          return payment_ == null ?
+              org.bitcoin.protocols.payments.Protos.Payment.getDefaultInstance() : payment_;
         }
       }
       /**
-       * <code>required .payments.Payment payment = 1;</code>
-       *
        * <pre>
        * Payment message that triggered this ACK
        * </pre>
+       *
+       * <code>required .payments.Payment payment = 1;</code>
        */
-      private com.google.protobuf.SingleFieldBuilder<
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoin.protocols.payments.Protos.Payment, org.bitcoin.protocols.payments.Protos.Payment.Builder, org.bitcoin.protocols.payments.Protos.PaymentOrBuilder> 
           getPaymentFieldBuilder() {
         if (paymentBuilder_ == null) {
-          paymentBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+          paymentBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               org.bitcoin.protocols.payments.Protos.Payment, org.bitcoin.protocols.payments.Protos.Payment.Builder, org.bitcoin.protocols.payments.Protos.PaymentOrBuilder>(
                   getPayment(),
                   getParentForChildren(),
@@ -5791,21 +6520,21 @@ public org.bitcoin.protocols.payments.Protos.PaymentOrBuilder getPaymentOrBuilde
 
       private java.lang.Object memo_ = "";
       /**
-       * <code>optional string memo = 2;</code>
-       *
        * <pre>
        * human-readable message for customer
        * </pre>
+       *
+       * <code>optional string memo = 2;</code>
        */
       public boolean hasMemo() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>optional string memo = 2;</code>
-       *
        * <pre>
        * human-readable message for customer
        * </pre>
+       *
+       * <code>optional string memo = 2;</code>
        */
       public java.lang.String getMemo() {
         java.lang.Object ref = memo_;
@@ -5822,11 +6551,11 @@ public java.lang.String getMemo() {
         }
       }
       /**
-       * <code>optional string memo = 2;</code>
-       *
        * <pre>
        * human-readable message for customer
        * </pre>
+       *
+       * <code>optional string memo = 2;</code>
        */
       public com.google.protobuf.ByteString
           getMemoBytes() {
@@ -5842,11 +6571,11 @@ public java.lang.String getMemo() {
         }
       }
       /**
-       * <code>optional string memo = 2;</code>
-       *
        * <pre>
        * human-readable message for customer
        * </pre>
+       *
+       * <code>optional string memo = 2;</code>
        */
       public Builder setMemo(
           java.lang.String value) {
@@ -5859,11 +6588,11 @@ public Builder setMemo(
         return this;
       }
       /**
-       * <code>optional string memo = 2;</code>
-       *
        * <pre>
        * human-readable message for customer
        * </pre>
+       *
+       * <code>optional string memo = 2;</code>
        */
       public Builder clearMemo() {
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -5872,11 +6601,11 @@ public Builder clearMemo() {
         return this;
       }
       /**
-       * <code>optional string memo = 2;</code>
-       *
        * <pre>
        * human-readable message for customer
        * </pre>
+       *
+       * <code>optional string memo = 2;</code>
        */
       public Builder setMemoBytes(
           com.google.protobuf.ByteString value) {
@@ -5888,54 +6617,95 @@ public Builder setMemoBytes(
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:payments.PaymentACK)
     }
 
+    // @@protoc_insertion_point(class_scope:payments.PaymentACK)
+    private static final org.bitcoin.protocols.payments.Protos.PaymentACK DEFAULT_INSTANCE;
     static {
-      defaultInstance = new PaymentACK(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoin.protocols.payments.Protos.PaymentACK();
+    }
+
+    public static org.bitcoin.protocols.payments.Protos.PaymentACK getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<PaymentACK>
+        PARSER = new com.google.protobuf.AbstractParser<PaymentACK>() {
+      @java.lang.Override
+      public PaymentACK parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new PaymentACK(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<PaymentACK> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<PaymentACK> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoin.protocols.payments.Protos.PaymentACK getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:payments.PaymentACK)
   }
 
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_payments_Output_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_payments_Output_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_payments_PaymentDetails_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_payments_PaymentDetails_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_payments_PaymentRequest_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_payments_PaymentRequest_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_payments_X509Certificates_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_payments_X509Certificates_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_payments_Payment_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_payments_Payment_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_payments_PaymentACK_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_payments_PaymentACK_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
   }
-  private static com.google.protobuf.Descriptors.FileDescriptor
+  private static  com.google.protobuf.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
@@ -5948,7 +6718,7 @@ public Builder setMemoBytes(
       "\001(\014\"\225\001\n\016PaymentRequest\022\"\n\027payment_detail" +
       "s_version\030\001 \001(\r:\0011\022\026\n\010pki_type\030\002 \001(\t:\004no" +
       "ne\022\020\n\010pki_data\030\003 \001(\014\022\"\n\032serialized_payme" +
-      "nt_details\030\004 \002(\014\022\021\n\tsignature\030\005 \001(\014\"\'\n\020X",
+      "nt_details\030\004 \002(\014\022\021\n\tsignature\030\005 \001(\014\"\'\n\020X" +
       "509Certificates\022\023\n\013certificate\030\001 \003(\014\"i\n\007" +
       "Payment\022\025\n\rmerchant_data\030\001 \001(\014\022\024\n\014transa" +
       "ctions\030\002 \003(\014\022#\n\trefund_to\030\003 \003(\0132\020.paymen" +
@@ -5972,37 +6742,37 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     internal_static_payments_Output_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_payments_Output_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_payments_Output_descriptor,
         new java.lang.String[] { "Amount", "Script", });
     internal_static_payments_PaymentDetails_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_payments_PaymentDetails_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_payments_PaymentDetails_descriptor,
         new java.lang.String[] { "Network", "Outputs", "Time", "Expires", "Memo", "PaymentUrl", "MerchantData", });
     internal_static_payments_PaymentRequest_descriptor =
       getDescriptor().getMessageTypes().get(2);
     internal_static_payments_PaymentRequest_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_payments_PaymentRequest_descriptor,
         new java.lang.String[] { "PaymentDetailsVersion", "PkiType", "PkiData", "SerializedPaymentDetails", "Signature", });
     internal_static_payments_X509Certificates_descriptor =
       getDescriptor().getMessageTypes().get(3);
     internal_static_payments_X509Certificates_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_payments_X509Certificates_descriptor,
         new java.lang.String[] { "Certificate", });
     internal_static_payments_Payment_descriptor =
       getDescriptor().getMessageTypes().get(4);
     internal_static_payments_Payment_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_payments_Payment_descriptor,
         new java.lang.String[] { "MerchantData", "Transactions", "RefundTo", "Memo", });
     internal_static_payments_PaymentACK_descriptor =
       getDescriptor().getMessageTypes().get(5);
     internal_static_payments_PaymentACK_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_payments_PaymentACK_descriptor,
         new java.lang.String[] { "Payment", "Memo", });
   }
diff --git a/core/src/main/java/org/bitcoinj/core/AbstractBlockChain.java b/core/src/main/java/org/bitcoinj/core/AbstractBlockChain.java
index 49d83ed975a..0ecfcfd91c1 100644
--- a/core/src/main/java/org/bitcoinj/core/AbstractBlockChain.java
+++ b/core/src/main/java/org/bitcoinj/core/AbstractBlockChain.java
@@ -21,6 +21,7 @@
 import com.google.common.collect.*;
 import com.google.common.util.concurrent.*;
 import org.bitcoinj.core.listeners.*;
+import org.bitcoinj.script.ScriptException;
 import org.bitcoinj.store.*;
 import org.bitcoinj.utils.*;
 import org.bitcoinj.wallet.Wallet;
@@ -43,7 +44,7 @@
  * <p>An AbstractBlockChain implementation must be connected to a {@link BlockStore} implementation. The chain object
  * by itself doesn't store any data, that's delegated to the store. Which store you use is a decision best made by
  * reading the getting started guide, but briefly, fully validating block chains need fully validating stores. In
- * the lightweight SPV mode, a {@link org.bitcoinj.store.SPVBlockStore} is the right choice.</p>
+ * the lightweight SPV mode, a {@link SPVBlockStore} is the right choice.</p>
  *
  * <p>This class implements an abstract class which makes it simple to create a BlockChain that does/doesn't do full
  * verification.  It verifies headers and is implements most of what is required to implement SPV mode, but
@@ -52,7 +53,7 @@
  * <p>There are two subclasses of AbstractBlockChain that are useful: {@link BlockChain}, which is the simplest
  * class and implements <i>simplified payment verification</i>. This is a lightweight and efficient mode that does
  * not verify the contents of blocks, just their headers. A {@link FullPrunedBlockChain} paired with a
- * {@link org.bitcoinj.store.H2FullPrunedBlockStore} implements full verification, which is equivalent to
+ * {@link H2FullPrunedBlockStore} implements full verification, which is equivalent to
  * Bitcoin Core. To learn more about the alternative security models, please consult the articles on the
  * website.</p>
  *
@@ -68,8 +69,8 @@
  * we say it is an orphan chain. Orphan chains can occur when blocks are solved and received during the initial block
  * chain download, or if we connect to a peer that doesn't send us blocks in order.</p>
  *
- * <p>A reorganize occurs when the blocks that make up the best known chain changes. Note that simply adding a
- * new block to the top of the best chain isn't as reorganize, but that a reorganize is always triggered by adding
+ * <p>A reorganize occurs when the blocks that make up the best known chain change. Note that simply adding a
+ * new block to the top of the best chain isn't a reorganize, but that a reorganize is always triggered by adding
  * a new block that connects to some other (non best head) block. By "best" we mean the chain representing the largest
  * amount of work done.</p>
  *
@@ -121,7 +122,7 @@ class OrphanBlock {
     }
     // Holds blocks that we have received but can't plug into the chain yet, eg because they were created whilst we
     // were downloading the block chain.
-    private final LinkedHashMap<Sha256Hash, OrphanBlock> orphanBlocks = new LinkedHashMap<Sha256Hash, OrphanBlock>();
+    private final LinkedHashMap<Sha256Hash, OrphanBlock> orphanBlocks = new LinkedHashMap<>();
 
     /** False positive estimation uses a double exponential moving average. */
     public static final double FP_ESTIMATOR_ALPHA = 0.0001;
@@ -150,9 +151,9 @@ public AbstractBlockChain(Context context, List<? extends Wallet> wallets,
         log.info("chain head is at height {}:\n{}", chainHead.getHeight(), chainHead.getHeader());
         this.params = context.getParams();
 
-        this.newBestBlockListeners = new CopyOnWriteArrayList<ListenerRegistration<NewBestBlockListener>>();
-        this.reorganizeListeners = new CopyOnWriteArrayList<ListenerRegistration<ReorganizeListener>>();
-        this.transactionReceivedListeners = new CopyOnWriteArrayList<ListenerRegistration<TransactionReceivedInBlockListener>>();
+        this.newBestBlockListeners = new CopyOnWriteArrayList<>();
+        this.reorganizeListeners = new CopyOnWriteArrayList<>();
+        this.transactionReceivedListeners = new CopyOnWriteArrayList<>();
         for (NewBestBlockListener l : wallets) addNewBestBlockListener(Threading.SAME_THREAD, l);
         for (ReorganizeListener l : wallets) addReorganizeListener(Threading.SAME_THREAD, l);
         for (TransactionReceivedInBlockListener l : wallets) addTransactionReceivedListener(Threading.SAME_THREAD, l);
@@ -173,14 +174,14 @@ public final void addWallet(Wallet wallet) {
         addTransactionReceivedListener(Threading.SAME_THREAD, wallet);
         int walletHeight = wallet.getLastBlockSeenHeight();
         int chainHeight = getBestChainHeight();
-        if (walletHeight != chainHeight) {
+        if (walletHeight != chainHeight && walletHeight > 0) {
             log.warn("Wallet/chain height mismatch: {} vs {}", walletHeight, chainHeight);
             log.warn("Hashes: {} vs {}", wallet.getLastBlockSeenHash(), getChainHead().getHeader().getHash());
 
             // This special case happens when the VM crashes because of a transaction received. It causes the updated
             // block store to persist, but not the wallet. In order to fix the issue, we roll back the block store to
             // the wallet height to make it look like as if the block has never been received.
-            if (walletHeight < chainHeight && walletHeight > 0) {
+            if (walletHeight < chainHeight) {
                 try {
                     rollbackBlockStore(walletHeight);
                     log.info("Rolled back block store to height {}.", walletHeight);
@@ -198,27 +199,6 @@ public void removeWallet(Wallet wallet) {
         removeTransactionReceivedListener(wallet);
     }
 
-    /** Replaced with more specific listener methods: use them instead. */
-    @Deprecated @SuppressWarnings("deprecation")
-    public void addListener(BlockChainListener listener) {
-        addListener(listener, Threading.USER_THREAD);
-    }
-
-    /** Replaced with more specific listener methods: use them instead. */
-    @Deprecated
-    public void addListener(BlockChainListener listener, Executor executor) {
-        addReorganizeListener(executor, listener);
-        addNewBestBlockListener(executor, listener);
-        addTransactionReceivedListener(executor, listener);
-    }
-
-    @Deprecated
-    public void removeListener(BlockChainListener listener) {
-        removeReorganizeListener(listener);
-        removeNewBestBlockListener(listener);
-        removeTransactionReceivedListener(listener);
-    }
-
     /**
      * Adds a {@link NewBestBlockListener} listener to the chain.
      */
@@ -230,7 +210,7 @@ public void addNewBestBlockListener(NewBestBlockListener listener) {
      * Adds a {@link NewBestBlockListener} listener to the chain.
      */
     public final void addNewBestBlockListener(Executor executor, NewBestBlockListener listener) {
-        newBestBlockListeners.add(new ListenerRegistration<NewBestBlockListener>(listener, executor));
+        newBestBlockListeners.add(new ListenerRegistration<>(listener, executor));
     }
 
     /**
@@ -244,7 +224,7 @@ public void addReorganizeListener(ReorganizeListener listener) {
      * Adds a generic {@link ReorganizeListener} listener to the chain.
      */
     public final void addReorganizeListener(Executor executor, ReorganizeListener listener) {
-        reorganizeListeners.add(new ListenerRegistration<ReorganizeListener>(listener, executor));
+        reorganizeListeners.add(new ListenerRegistration<>(listener, executor));
     }
 
     /**
@@ -258,7 +238,7 @@ public void addTransactionReceivedListener(TransactionReceivedInBlockListener li
      * Adds a generic {@link TransactionReceivedInBlockListener} listener to the chain.
      */
     public final void addTransactionReceivedListener(Executor executor, TransactionReceivedInBlockListener listener) {
-        transactionReceivedListeners.add(new ListenerRegistration<TransactionReceivedInBlockListener>(listener, executor));
+        transactionReceivedListeners.add(new ListenerRegistration<>(listener, executor));
     }
 
     /**
@@ -454,7 +434,7 @@ private boolean add(Block block, boolean tryConnecting,
             // Prove the block is internally valid: hash is lower than target, etc. This only checks the block contents
             // if there is a tx sending or receiving coins using an address in one of our wallets. And those transactions
             // are only lightly verified: presence in a valid connecting block is taken as proof of validity. See the
-            // article here for more details: http://code.google.com/p/bitcoinj/wiki/SecurityModel
+            // article here for more details: https://bitcoinj.github.io/security-model
             try {
                 block.verifyHeader();
                 storedPrev = getStoredBlockInCurrentScope(block.getPrevBlockHash());
@@ -506,7 +486,7 @@ private boolean add(Block block, boolean tryConnecting,
     public Set<Sha256Hash> drainOrphanBlocks() {
         lock.lock();
         try {
-            Set<Sha256Hash> hashes = new HashSet<Sha256Hash>(orphanBlocks.keySet());
+            Set<Sha256Hash> hashes = new HashSet<>(orphanBlocks.keySet());
             orphanBlocks.clear();
             return hashes;
         } finally {
@@ -551,6 +531,7 @@ private void connectBlock(final Block block, StoredBlock storedPrev, boolean exp
                 final Integer count = versionTally.getCountAtOrAbove(block.getVersion() + 1);
                 if (count != null
                     && count >= params.getMajorityRejectBlockOutdated()) {
+                    log.error("Block with hash {} has outdated version: version # = {}" , block.getHashAsString(), block.getVersion());
                     throw new VerificationException.BlockVersionOutOfDate(block.getVersion());
                 }
             }
@@ -563,7 +544,8 @@ private void connectBlock(final Block block, StoredBlock storedPrev, boolean exp
                     block.transactions == null ? block : block.cloneAsHeader(), txOutChanges);
             versionTally.add(block.getVersion());
             setChainHead(newStoredBlock);
-            log.debug("Chain is now {} blocks high, running listeners", newStoredBlock.getHeight());
+            if (log.isDebugEnabled())
+                log.debug("Chain is now {} blocks high, running listeners", newStoredBlock.getHeight());
             informListenersForNewBlock(block, NewBlockType.BEST_CHAIN, filteredTxHashList, filteredTxn, newStoredBlock);
         } else {
             // This block connects to somewhere other than the top of the best known chain. We treat these differently.
@@ -580,7 +562,7 @@ private void connectBlock(final Block block, StoredBlock storedPrev, boolean exp
                     // newStoredBlock is a part of the same chain, there's no fork. This happens when we receive a block
                     // that we already saw and linked into the chain previously, which isn't the chain head.
                     // Re-processing it is confusing for the wallet so just skip.
-                    log.warn("Saw duplicated block in main chain at height {}: {}",
+                    log.warn("Saw duplicated block in best chain at height {}: {}",
                             newBlock.getHeight(), newBlock.getHeader().getHash());
                     return;
                 }
@@ -756,7 +738,7 @@ private void handleNewBestChain(StoredBlock storedPrev, StoredBlock newChainHead
         // Then build a list of all blocks in the old part of the chain and the new part.
         final LinkedList<StoredBlock> oldBlocks = getPartialChain(head, splitPoint, blockStore);
         final LinkedList<StoredBlock> newBlocks = getPartialChain(newChainHead, splitPoint, blockStore);
-        // Disconnect each transaction in the previous main chain that is no longer in the new main chain
+        // Disconnect each transaction in the previous best chain that is no longer in the new best chain
         StoredBlock storedNewHead = splitPoint;
         if (shouldVerifyTransactions()) {
             for (StoredBlock oldBlock : oldBlocks) {
@@ -818,7 +800,7 @@ public void run() {
      */
     private static LinkedList<StoredBlock> getPartialChain(StoredBlock higher, StoredBlock lower, BlockStore store) throws BlockStoreException {
         checkArgument(higher.getHeight() > lower.getHeight(), "higher and lower are reversed");
-        LinkedList<StoredBlock> results = new LinkedList<StoredBlock>();
+        LinkedList<StoredBlock> results = new LinkedList<>();
         StoredBlock cursor = higher;
         while (true) {
             results.add(cursor);
@@ -856,7 +838,7 @@ private static StoredBlock findSplit(StoredBlock newChainHead, StoredBlock oldCh
     }
 
     /**
-     * @return the height of the best known chain, convenience for <tt>getChainHead().getHeight()</tt>.
+     * @return the height of the best known chain, convenience for {@code getChainHead().getHeight()}.
      */
     public final int getBestChainHeight() {
         return getChainHead().getHeight();
@@ -875,7 +857,7 @@ private static void sendTransactionsToListener(StoredBlock block, NewBlockType b
                                                    Set<Sha256Hash> falsePositives) throws VerificationException {
         for (Transaction tx : transactions) {
             try {
-                falsePositives.remove(tx.getHash());
+                falsePositives.remove(tx.getTxId());
                 if (clone)
                     tx = tx.params.getDefaultSerializer().makeTransaction(tx.bitcoinSerialize());
                 listener.receiveFromBlock(tx, block, blockType, relativityOffset++);
@@ -918,7 +900,8 @@ private void tryConnectingOrphans() throws VerificationException, BlockStoreExce
                 StoredBlock prev = getStoredBlockInCurrentScope(orphanBlock.block.getPrevBlockHash());
                 if (prev == null) {
                     // This is still an unconnected/orphan block.
-                    log.debug("Orphan block {} is not connectable right now", orphanBlock.block.getHash());
+                    if (log.isDebugEnabled())
+                        log.debug("Orphan block {} is not connectable right now", orphanBlock.block.getHash());
                     continue;
                 }
                 // Otherwise we can connect it now.
@@ -1062,7 +1045,7 @@ void trackFalsePositives(int count) {
         // Track false positives in batch by adding alpha to the false positive estimate once per count.
         // Each false positive counts as 1.0 towards the estimate.
         falsePositiveRate += FP_ESTIMATOR_ALPHA * count;
-        if (count > 0)
+        if (count > 0 && log.isDebugEnabled())
             log.debug("{} false positives, current rate = {} trend = {}", count, falsePositiveRate, falsePositiveTrend);
     }
 
diff --git a/core/src/main/java/org/bitcoinj/core/Address.java b/core/src/main/java/org/bitcoinj/core/Address.java
index 2b9d6a12701..9437a041905 100644
--- a/core/src/main/java/org/bitcoinj/core/Address.java
+++ b/core/src/main/java/org/bitcoinj/core/Address.java
@@ -1,7 +1,5 @@
 /*
- * Copyright 2011 Google Inc.
- * Copyright 2014 Giannis Dzegoutanis
- * Copyright 2015 Andreas Schildbach
+ * Copyright by the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,186 +16,89 @@
 
 package org.bitcoinj.core;
 
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import org.bitcoinj.params.Networks;
-import org.bitcoinj.script.Script;
-
 import javax.annotation.Nullable;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import org.bitcoinj.script.Script;
+import org.bitcoinj.script.Script.ScriptType;
 
 /**
- * <p>A Bitcoin address looks like 1MsScoe2fTJoq4ZPdQgqyhgWeoNamYPevy and is derived from an elliptic curve public key
- * plus a set of network parameters. Not to be confused with a {@link PeerAddress} or {@link AddressMessage}
- * which are about network (TCP) addresses.</p>
- *
- * <p>A standard address is built by taking the RIPE-MD160 hash of the public key bytes, with a version prefix and a
- * checksum suffix, then encoding it textually as base58. The version prefix is used to both denote the network for
- * which the address is valid (see {@link NetworkParameters}, and also to indicate how the bytes inside the address
- * should be interpreted. Whilst almost all addresses today are hashes of public keys, another (currently unsupported
- * type) can contain a hash of a script instead.</p>
+ * <p>
+ * Base class for addresses, e.g. native segwit addresses ({@link SegwitAddress}) or legacy addresses ({@link LegacyAddress}).
+ * </p>
+ * 
+ * <p>
+ * Use {@link #fromString(NetworkParameters, String)} to conveniently construct any kind of address from its textual
+ * form.
+ * </p>
  */
-public class Address extends VersionedChecksummedBytes {
-    /**
-     * An address is a RIPEMD160 hash of a public key, therefore is always 160 bits or 20 bytes.
-     */
-    public static final int LENGTH = 20;
-
-    private transient NetworkParameters params;
-
-    /**
-     * Construct an address from parameters, the address version, and the hash160 form. Example:<p>
-     *
-     * <pre>new Address(MainNetParams.get(), NetworkParameters.getAddressHeader(), Hex.decode("4a22c3c4cbb31e4d03b15550636762bda0baf85a"));</pre>
-     */
-    public Address(NetworkParameters params, int version, byte[] hash160) throws WrongNetworkException {
-        super(version, hash160);
-        checkNotNull(params);
-        checkArgument(hash160.length == 20, "Addresses are 160-bit hashes, so you must provide 20 bytes");
-        if (!isAcceptableVersion(params, version))
-            throw new WrongNetworkException(version, params.getAcceptableAddressCodes());
-        this.params = params;
-    }
-
-    /** Returns an Address that represents the given P2SH script hash. */
-    public static Address fromP2SHHash(NetworkParameters params, byte[] hash160) {
-        try {
-            return new Address(params, params.getP2SHHeader(), hash160);
-        } catch (WrongNetworkException e) {
-            throw new RuntimeException(e);  // Cannot happen.
-        }
-    }
-
-    /** Returns an Address that represents the script hash extracted from the given scriptPubKey */
-    public static Address fromP2SHScript(NetworkParameters params, Script scriptPubKey) {
-        checkArgument(scriptPubKey.isPayToScriptHash(), "Not a P2SH script");
-        return fromP2SHHash(params, scriptPubKey.getPubKeyHash());
+public abstract class Address extends PrefixedChecksummedBytes {
+    public Address(NetworkParameters params, byte[] bytes) {
+        super(params, bytes);
     }
 
     /**
-     * Construct an address from its Base58 representation.
+     * Construct an address from its textual form.
+     * 
      * @param params
-     *            The expected NetworkParameters or null if you don't want validation.
-     * @param base58
-     *            The textual form of the address, such as "17kzeh4N8g49GFvdDzSf8PjaPfyoD1MndL".
+     *            the expected network this address is valid for, or null if the network should be derived from the
+     *            textual form
+     * @param str
+     *            the textual form of the address, such as "17kzeh4N8g49GFvdDzSf8PjaPfyoD1MndL" or
+     *            "bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4"
+     * @return constructed address
      * @throws AddressFormatException
-     *             if the given base58 doesn't parse or the checksum is invalid
-     * @throws WrongNetworkException
-     *             if the given address is valid but for a different chain (eg testnet vs mainnet)
-     */
-    public static Address fromBase58(@Nullable NetworkParameters params, String base58) throws AddressFormatException {
-        return new Address(params, base58);
-    }
-
-    /**
-     * Construct an address from parameters and the hash160 form. Example:<p>
-     *
-     * <pre>new Address(MainNetParams.get(), Hex.decode("4a22c3c4cbb31e4d03b15550636762bda0baf85a"));</pre>
+     *             if the given string doesn't parse or the checksum is invalid
+     * @throws AddressFormatException.WrongNetwork
+     *             if the given string is valid but not for the expected network (eg testnet vs mainnet)
      */
-    public Address(NetworkParameters params, byte[] hash160) {
-        super(params.getAddressHeader(), hash160);
-        checkArgument(hash160.length == 20, "Addresses are 160-bit hashes, so you must provide 20 bytes");
-        this.params = params;
-    }
-
-    /** @deprecated Use {@link #fromBase58(NetworkParameters, String)} */
-    @Deprecated
-    public Address(@Nullable NetworkParameters params, String address) throws AddressFormatException {
-        super(address);
-        if (params != null) {
-            if (!isAcceptableVersion(params, version)) {
-                throw new WrongNetworkException(version, params.getAcceptableAddressCodes());
-            }
-            this.params = params;
-        } else {
-            NetworkParameters paramsFound = null;
-            for (NetworkParameters p : Networks.get()) {
-                if (isAcceptableVersion(p, version)) {
-                    paramsFound = p;
-                    break;
-                }
+    public static Address fromString(@Nullable NetworkParameters params, String str)
+            throws AddressFormatException {
+        try {
+            return LegacyAddress.fromBase58(params, str);
+        } catch (AddressFormatException.WrongNetwork x) {
+            throw x;
+        } catch (AddressFormatException x) {
+            try {
+                return SegwitAddress.fromBech32(params, str);
+            } catch (AddressFormatException.WrongNetwork x2) {
+                throw x;
+            } catch (AddressFormatException x2) {
+                throw new AddressFormatException(str);
             }
-            if (paramsFound == null)
-                throw new AddressFormatException("No network found for " + address);
-
-            this.params = paramsFound;
         }
     }
 
-    /** The (big endian) 20 byte hash that is the core of a Bitcoin address. */
-    public byte[] getHash160() {
-        return bytes;
-    }
-
-    /**
-     * Returns true if this address is a Pay-To-Script-Hash (P2SH) address.
-     * See also https://github.com/bitcoin/bips/blob/master/bip-0013.mediawiki: Address Format for pay-to-script-hash
-     */
-    public boolean isP2SHAddress() {
-        final NetworkParameters parameters = getParameters();
-        return parameters != null && this.version == parameters.p2shHeader;
-    }
-
-    /**
-     * Examines the version byte of the address and attempts to find a matching NetworkParameters. If you aren't sure
-     * which network the address is intended for (eg, it was provided by a user), you can use this to decide if it is
-     * compatible with the current wallet. You should be able to handle a null response from this method. Note that the
-     * parameters returned is not necessarily the same as the one the Address was created with.
-     *
-     * @return a NetworkParameters representing the network the address is intended for.
-     */
-    public NetworkParameters getParameters() {
-        return params;
-    }
-
     /**
-     * Given an address, examines the version byte and attempts to find a matching NetworkParameters. If you aren't sure
-     * which network the address is intended for (eg, it was provided by a user), you can use this to decide if it is
-     * compatible with the current wallet.
-     * @return a NetworkParameters of the address
-     * @throws AddressFormatException if the string wasn't of a known version
+     * Construct an {@link Address} that represents the public part of the given {@link ECKey}.
+     * 
+     * @param params
+     *            network this address is valid for
+     * @param key
+     *            only the public part is used
+     * @param outputScriptType
+     *            script type the address should use
+     * @return constructed address
      */
-    public static NetworkParameters getParametersFromAddress(String address) throws AddressFormatException {
-        try {
-            return Address.fromBase58(null, address).getParameters();
-        } catch (WrongNetworkException e) {
-            throw new RuntimeException(e);  // Cannot happen.
-        }
+    public static Address fromKey(final NetworkParameters params, final ECKey key, final ScriptType outputScriptType) {
+        if (outputScriptType == Script.ScriptType.P2PKH)
+            return LegacyAddress.fromKey(params, key);
+        else if (outputScriptType == Script.ScriptType.P2WPKH)
+            return SegwitAddress.fromKey(params, key);
+        else
+            throw new IllegalArgumentException(outputScriptType.toString());
     }
 
     /**
-     * Check if a given address version is valid given the NetworkParameters.
+     * Get either the public key hash or script hash that is encoded in the address.
+     * 
+     * @return hash that is encoded in the address
      */
-    private static boolean isAcceptableVersion(NetworkParameters params, int version) {
-        for (int v : params.getAcceptableAddressCodes()) {
-            if (version == v) {
-                return true;
-            }
-        }
-        return false;
-    }
+    public abstract byte[] getHash();
 
     /**
-     * This implementation narrows the return type to <code>Address</code>.
+     * Get the type of output script that will be used for sending to the address.
+     * 
+     * @return type of output script
      */
-    @Override
-    public Address clone() throws CloneNotSupportedException {
-        return (Address) super.clone();
-    }
-
-    // Java serialization
-
-    private void writeObject(ObjectOutputStream out) throws IOException {
-        out.defaultWriteObject();
-        out.writeUTF(params.id);
-    }
-
-    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
-        in.defaultReadObject();
-        params = NetworkParameters.fromID(in.readUTF());
-    }
+    public abstract ScriptType getOutputScriptType();
 }
diff --git a/core/src/main/java/org/bitcoinj/core/AddressFormatException.java b/core/src/main/java/org/bitcoinj/core/AddressFormatException.java
index 86528254318..e3b23e747cb 100644
--- a/core/src/main/java/org/bitcoinj/core/AddressFormatException.java
+++ b/core/src/main/java/org/bitcoinj/core/AddressFormatException.java
@@ -26,4 +26,81 @@ public AddressFormatException() {
     public AddressFormatException(String message) {
         super(message);
     }
+
+    /**
+     * This exception is thrown by {@link Base58}, {@link Bech32} and the {@link PrefixedChecksummedBytes} hierarchy of
+     * classes when you try to decode data and a character isn't valid. You shouldn't allow the user to proceed in this
+     * case.
+     */
+    public static class InvalidCharacter extends AddressFormatException {
+        public final char character;
+        public final int position;
+
+        public InvalidCharacter(char character, int position) {
+            super("Invalid character '" + Character.toString(character) + "' at position " + position);
+            this.character = character;
+            this.position = position;
+        }
+    }
+
+    /**
+     * This exception is thrown by {@link Base58}, {@link Bech32} and the {@link PrefixedChecksummedBytes} hierarchy of
+     * classes when you try to decode data and the data isn't of the right size. You shouldn't allow the user to proceed
+     * in this case.
+     */
+    public static class InvalidDataLength extends AddressFormatException {
+        public InvalidDataLength() {
+            super();
+        }
+
+        public InvalidDataLength(String message) {
+            super(message);
+        }
+    }
+
+    /**
+     * This exception is thrown by {@link Base58}, {@link Bech32} and the {@link PrefixedChecksummedBytes} hierarchy of
+     * classes when you try to decode data and the checksum isn't valid. You shouldn't allow the user to proceed in this
+     * case.
+     */
+    public static class InvalidChecksum extends AddressFormatException {
+        public InvalidChecksum() {
+            super("Checksum does not validate");
+        }
+
+        public InvalidChecksum(String message) {
+            super(message);
+        }
+    }
+
+    /**
+     * This exception is thrown by the {@link PrefixedChecksummedBytes} hierarchy of classes when you try and decode an
+     * address or private key with an invalid prefix (version header or human-readable part). You shouldn't allow the
+     * user to proceed in this case.
+     */
+    public static class InvalidPrefix extends AddressFormatException {
+        public InvalidPrefix() {
+            super();
+        }
+
+        public InvalidPrefix(String message) {
+            super(message);
+        }
+    }
+
+    /**
+     * This exception is thrown by the {@link PrefixedChecksummedBytes} hierarchy of classes when you try and decode an
+     * address with a prefix (version header or human-readable part) that used by another network (usually: mainnet vs
+     * testnet). You shouldn't allow the user to proceed in this case as they are trying to send money across different
+     * chains, an operation that is guaranteed to destroy the money.
+     */
+    public static class WrongNetwork extends InvalidPrefix {
+        public WrongNetwork(int versionHeader) {
+            super("Version code of address did not match acceptable versions for network: " + versionHeader);
+        }
+
+        public WrongNetwork(String hrp) {
+            super("Human readable part of address did not match acceptable HRPs for network: " + hrp);
+        }
+    }
 }
diff --git a/core/src/main/java/org/bitcoinj/core/AddressMessage.java b/core/src/main/java/org/bitcoinj/core/AddressMessage.java
index b4053852d56..04b3921bcc0 100644
--- a/core/src/main/java/org/bitcoinj/core/AddressMessage.java
+++ b/core/src/main/java/org/bitcoinj/core/AddressMessage.java
@@ -36,22 +36,20 @@ public class AddressMessage extends Message {
     private List<PeerAddress> addresses;
 
     /**
-     * Contruct a new 'addr' message.
+     * Construct a new 'addr' message.
      * @param params NetworkParameters object.
      * @param offset The location of the first payload byte within the array.
-     * @param parseRetain Whether to retain the backing byte array for quick reserialization.  
-     * If true and the backing byte array is invalidated due to modification of a field then 
-     * the cached bytes may be repopulated and retained if the message is serialized again in the future.
+     * @param serializer the serializer to use for this block.
      * @param length The length of message if known.  Usually this is provided when deserializing of the wire
      * as the length will be provided as part of the header.  If unknown then set to Message.UNKNOWN_LENGTH
      * @throws ProtocolException
      */
-    AddressMessage(NetworkParameters params, byte[] payload, int offset, MessageSerializer setSerializer, int length) throws ProtocolException {
-        super(params, payload, offset, setSerializer, length);
+    AddressMessage(NetworkParameters params, byte[] payload, int offset, MessageSerializer serializer, int length) throws ProtocolException {
+        super(params, payload, offset, serializer, length);
     }
 
     /**
-     * Contruct a new 'addr' message.
+     * Construct a new 'addr' message.
      * @param params NetworkParameters object.
      * @param serializer the serializer to use for this block.
      * @param length The length of message if known.  Usually this is provided when deserializing of the wire
@@ -76,7 +74,7 @@ protected void parse() throws ProtocolException {
         // Guard against ultra large messages that will crash us.
         if (numAddresses > MAX_ADDRESSES)
             throw new ProtocolException("Address message too large.");
-        addresses = new ArrayList<PeerAddress>((int) numAddresses);
+        addresses = new ArrayList<>((int) numAddresses);
         for (int i = 0; i < numAddresses; i++) {
             PeerAddress addr = new PeerAddress(params, payload, cursor, protocolVersion, this, serializer);
             addresses.add(addr);
@@ -126,6 +124,6 @@ public void removeAddress(int index) {
 
     @Override
     public String toString() {
-        return "addr: " + Utils.join(addresses);
+        return "addr: " + Utils.SPACE_JOINER.join(addresses);
     }
 }
diff --git a/core/src/main/java/org/bitcoinj/core/AlertMessage.java b/core/src/main/java/org/bitcoinj/core/AlertMessage.java
index 2e6e9e419a1..b4e1131265f 100644
--- a/core/src/main/java/org/bitcoinj/core/AlertMessage.java
+++ b/core/src/main/java/org/bitcoinj/core/AlertMessage.java
@@ -31,7 +31,7 @@
  * log, email), or if you decide to use alerts for notifications that are specific to your app in some way, to parse it.
  * For example, you could treat it as an upgrade notification specific to your app. Satoshi designed alerts to ensure
  * that software upgrades could be distributed independently of a hard-coded website, in order to allow everything to
- * be purely peer-to-peer. You don't have to use this of course, and indeed it often makes more sense not to.<p>
+ * be purely peer-to-peer. You don't have to use this of course, and indeed it often makes more sense not to.</p>
  *     
  * <p>Before doing anything with an alert, you should check {@link AlertMessage#isSignatureValid()}.</p>
  * 
@@ -87,7 +87,7 @@ protected void parse() throws ProtocolException {
         }
         // Using a hashset here is very inefficient given that this will normally be only one item. But Java doesn't
         // make it easy to do better. What we really want is just an array-backed set.
-        Set<Long> cancelSet = new HashSet<Long>((int) cancelSetSize);
+        Set<Long> cancelSet = new HashSet<>((int) cancelSetSize);
         for (long i = 0; i < cancelSetSize; i++) {
             cancelSet.add(readUint32());
         }
@@ -98,7 +98,7 @@ protected void parse() throws ProtocolException {
         if (subverSetSize < 0 || subverSetSize > MAX_SET_SIZE) {
             throw new ProtocolException("Bad subver set size: " + subverSetSize);
         }
-        Set<String> matchingSubVers = new HashSet<String>((int) subverSetSize);
+        Set<String> matchingSubVers = new HashSet<>((int) subverSetSize);
         for (long i = 0; i < subverSetSize; i++) {
             matchingSubVers.add(readStr());
         }
@@ -115,7 +115,11 @@ protected void parse() throws ProtocolException {
      * doesn't verify, because that would allow arbitrary attackers to spam your users.
      */
     public boolean isSignatureValid() {
-        return ECKey.verify(Sha256Hash.hashTwice(content), signature, params.getAlertSigningKey());
+        try {
+            return ECKey.verify(Sha256Hash.hashTwice(content), signature, params.getAlertSigningKey());
+        } catch (SignatureDecodeException e) {
+            return false;
+        }
     }
 
     /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/core/src/main/java/org/bitcoinj/core/Base58.java b/core/src/main/java/org/bitcoinj/core/Base58.java
index dc07b0236ed..6ec2c47ac13 100644
--- a/core/src/main/java/org/bitcoinj/core/Base58.java
+++ b/core/src/main/java/org/bitcoinj/core/Base58.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2011 Google Inc.
+ * Copyright 2018 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +25,7 @@
  * <p>
  * Note that this is not the same base58 as used by Flickr, which you may find referenced around the Internet.
  * <p>
- * You may want to consider working with {@link VersionedChecksummedBytes} instead, which
+ * You may want to consider working with {@link PrefixedChecksummedBytes} instead, which
  * adds support for testing the prefix and suffix bytes commonly found in addresses.
  * <p>
  * Satoshi explains: why base-58 instead of standard base-64 encoding?
@@ -90,6 +91,27 @@ public static String encode(byte[] input) {
         return new String(encoded, outputStart, encoded.length - outputStart);
     }
 
+    /**
+     * Encodes the given version and bytes as a base58 string. A checksum is appended.
+     * 
+     * @param version the version to encode
+     * @param payload the bytes to encode, e.g. pubkey hash
+     * @return the base58-encoded string
+     */
+    public static String encodeChecked(int version, byte[] payload) {
+        if (version < 0 || version > 255)
+            throw new IllegalArgumentException("Version not in range.");
+
+        // A stringified buffer is:
+        // 1 byte version + data bytes + 4 bytes check code (a truncated hash)
+        byte[] addressBytes = new byte[1 + payload.length + 4];
+        addressBytes[0] = (byte) version;
+        System.arraycopy(payload, 0, addressBytes, 1, payload.length);
+        byte[] checksum = Sha256Hash.hashTwice(addressBytes, 0, payload.length + 1);
+        System.arraycopy(checksum, 0, addressBytes, payload.length + 1, 4);
+        return Base58.encode(addressBytes);
+    }
+
     /**
      * Decodes the given base58 string into the original data bytes.
      *
@@ -107,7 +129,7 @@ public static byte[] decode(String input) throws AddressFormatException {
             char c = input.charAt(i);
             int digit = c < 128 ? INDEXES[c] : -1;
             if (digit < 0) {
-                throw new AddressFormatException("Illegal character " + c + " at position " + i);
+                throw new AddressFormatException.InvalidCharacter(c, i);
             }
             input58[i] = (byte) digit;
         }
@@ -148,12 +170,12 @@ public static BigInteger decodeToBigInteger(String input) throws AddressFormatEx
     public static byte[] decodeChecked(String input) throws AddressFormatException {
         byte[] decoded  = decode(input);
         if (decoded.length < 4)
-            throw new AddressFormatException("Input too short");
+            throw new AddressFormatException.InvalidDataLength("Input too short: " + decoded.length);
         byte[] data = Arrays.copyOfRange(decoded, 0, decoded.length - 4);
         byte[] checksum = Arrays.copyOfRange(decoded, decoded.length - 4, decoded.length);
         byte[] actualChecksum = Arrays.copyOfRange(Sha256Hash.hashTwice(data), 0, 4);
         if (!Arrays.equals(checksum, actualChecksum))
-            throw new AddressFormatException("Checksum does not validate");
+            throw new AddressFormatException.InvalidChecksum();
         return data;
     }
 
@@ -180,5 +202,4 @@ private static byte divmod(byte[] number, int firstDigit, int base, int divisor)
         }
         return (byte) remainder;
     }
-
 }
diff --git a/core/src/main/java/org/bitcoinj/core/Bech32.java b/core/src/main/java/org/bitcoinj/core/Bech32.java
new file mode 100644
index 00000000000..120056c9d8d
--- /dev/null
+++ b/core/src/main/java/org/bitcoinj/core/Bech32.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2018 Coinomi Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bitcoinj.core;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import java.util.Arrays;
+import java.util.Locale;
+
+public class Bech32 {
+    /** The Bech32 character set for encoding. */
+    private static final String CHARSET = "qpzry9x8gf2tvdw0s3jn54khce6mua7l";
+
+    /** The Bech32 character set for decoding. */
+    private static final byte[] CHARSET_REV = {
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            15, -1, 10, 17, 21, 20, 26, 30,  7,  5, -1, -1, -1, -1, -1, -1,
+            -1, 29, -1, 24, 13, 25,  9,  8, 23, -1, 18, 22, 31, 27, 19, -1,
+             1,  0,  3, 16, 11, 28, 12, 14,  6,  4,  2, -1, -1, -1, -1, -1,
+            -1, 29, -1, 24, 13, 25,  9,  8, 23, -1, 18, 22, 31, 27, 19, -1,
+             1,  0,  3, 16, 11, 28, 12, 14,  6,  4,  2, -1, -1, -1, -1, -1
+    };
+
+    public static class Bech32Data {
+        public final String hrp;
+        public final byte[] data;
+
+        private Bech32Data(final String hrp, final byte[] data) {
+            this.hrp = hrp;
+            this.data = data;
+        }
+    }
+
+    /** Find the polynomial with value coefficients mod the generator as 30-bit. */
+    private static int polymod(final byte[] values) {
+        int c = 1;
+        for (byte v_i: values) {
+            int c0 = (c >>> 25) & 0xff;
+            c = ((c & 0x1ffffff) << 5) ^ (v_i & 0xff);
+            if ((c0 &  1) != 0) c ^= 0x3b6a57b2;
+            if ((c0 &  2) != 0) c ^= 0x26508e6d;
+            if ((c0 &  4) != 0) c ^= 0x1ea119fa;
+            if ((c0 &  8) != 0) c ^= 0x3d4233dd;
+            if ((c0 & 16) != 0) c ^= 0x2a1462b3;
+        }
+        return c;
+    }
+
+    /** Expand a HRP for use in checksum computation. */
+    private static byte[] expandHrp(final String hrp) {
+        int hrpLength = hrp.length();
+        byte ret[] = new byte[hrpLength * 2 + 1];
+        for (int i = 0; i < hrpLength; ++i) {
+            int c = hrp.charAt(i) & 0x7f; // Limit to standard 7-bit ASCII
+            ret[i] = (byte) ((c >>> 5) & 0x07);
+            ret[i + hrpLength + 1] = (byte) (c & 0x1f);
+        }
+        ret[hrpLength] = 0;
+        return ret;
+    }
+
+    /** Verify a checksum. */
+    private static boolean verifyChecksum(final String hrp, final byte[] values) {
+        byte[] hrpExpanded = expandHrp(hrp);
+        byte[] combined = new byte[hrpExpanded.length + values.length];
+        System.arraycopy(hrpExpanded, 0, combined, 0, hrpExpanded.length);
+        System.arraycopy(values, 0, combined, hrpExpanded.length, values.length);
+        return polymod(combined) == 1;
+    }
+
+    /** Create a checksum. */
+    private static byte[] createChecksum(final String hrp, final byte[] values)  {
+        byte[] hrpExpanded = expandHrp(hrp);
+        byte[] enc = new byte[hrpExpanded.length + values.length + 6];
+        System.arraycopy(hrpExpanded, 0, enc, 0, hrpExpanded.length);
+        System.arraycopy(values, 0, enc, hrpExpanded.length, values.length);
+        int mod = polymod(enc) ^ 1;
+        byte[] ret = new byte[6];
+        for (int i = 0; i < 6; ++i) {
+            ret[i] = (byte) ((mod >>> (5 * (5 - i))) & 31);
+        }
+        return ret;
+    }
+
+    /** Encode a Bech32 string. */
+    public static String encode(final Bech32Data bech32) {
+        return encode(bech32.hrp, bech32.data);
+    }
+
+    /** Encode a Bech32 string. */
+    public static String encode(String hrp, final byte[] values) {
+        checkArgument(hrp.length() >= 1, "Human-readable part is too short");
+        checkArgument(hrp.length() <= 83, "Human-readable part is too long");
+        hrp = hrp.toLowerCase(Locale.ROOT);
+        byte[] checksum = createChecksum(hrp, values);
+        byte[] combined = new byte[values.length + checksum.length];
+        System.arraycopy(values, 0, combined, 0, values.length);
+        System.arraycopy(checksum, 0, combined, values.length, checksum.length);
+        StringBuilder sb = new StringBuilder(hrp.length() + 1 + combined.length);
+        sb.append(hrp);
+        sb.append('1');
+        for (byte b : combined) {
+            sb.append(CHARSET.charAt(b));
+        }
+        return sb.toString();
+    }
+
+    /** Decode a Bech32 string. */
+    public static Bech32Data decode(final String str) throws AddressFormatException {
+        boolean lower = false, upper = false;
+        if (str.length() < 8)
+            throw new AddressFormatException.InvalidDataLength("Input too short: " + str.length());
+        if (str.length() > 90)
+            throw new AddressFormatException.InvalidDataLength("Input too long: " + str.length());
+        for (int i = 0; i < str.length(); ++i) {
+            char c = str.charAt(i);
+            if (c < 33 || c > 126) throw new AddressFormatException.InvalidCharacter(c, i);
+            if (c >= 'a' && c <= 'z') {
+                if (upper)
+                    throw new AddressFormatException.InvalidCharacter(c, i);
+                lower = true;
+            }
+            if (c >= 'A' && c <= 'Z') {
+                if (lower)
+                    throw new AddressFormatException.InvalidCharacter(c, i);
+                upper = true;
+            }
+        }
+        final int pos = str.lastIndexOf('1');
+        if (pos < 1) throw new AddressFormatException.InvalidPrefix("Missing human-readable part");
+        final int dataPartLength = str.length() - 1 - pos;
+        if (dataPartLength < 6) throw new AddressFormatException.InvalidDataLength("Data part too short: " + dataPartLength);
+        byte[] values = new byte[dataPartLength];
+        for (int i = 0; i < dataPartLength; ++i) {
+            char c = str.charAt(i + pos + 1);
+            if (CHARSET_REV[c] == -1) throw new AddressFormatException.InvalidCharacter(c, i + pos + 1);
+            values[i] = CHARSET_REV[c];
+        }
+        String hrp = str.substring(0, pos).toLowerCase(Locale.ROOT);
+        if (!verifyChecksum(hrp, values)) throw new AddressFormatException.InvalidChecksum();
+        return new Bech32Data(hrp, Arrays.copyOfRange(values, 0, values.length - 6));
+    }
+}
diff --git a/core/src/main/java/org/bitcoinj/core/BitcoinSerializer.java b/core/src/main/java/org/bitcoinj/core/BitcoinSerializer.java
index 6f68e00c63b..c149a93d5f3 100644
--- a/core/src/main/java/org/bitcoinj/core/BitcoinSerializer.java
+++ b/core/src/main/java/org/bitcoinj/core/BitcoinSerializer.java
@@ -24,6 +24,7 @@
 import java.io.OutputStream;
 import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -48,7 +49,7 @@ public class BitcoinSerializer extends MessageSerializer {
     private final NetworkParameters params;
     private final boolean parseRetain;
 
-    private static final Map<Class<? extends Message>, String> names = new HashMap<Class<? extends Message>, String>();
+    private static final Map<Class<? extends Message>, String> names = new HashMap<>();
 
     static {
         names.put(VersionMessage.class, "version");
@@ -71,12 +72,13 @@ public class BitcoinSerializer extends MessageSerializer {
         names.put(RejectMessage.class, "reject");
         names.put(GetUTXOsMessage.class, "getutxos");
         names.put(UTXOsMessage.class, "utxos");
+        names.put(SendHeadersMessage.class, "sendheaders");
     }
 
     /**
      * Constructs a BitcoinSerializer with the given behavior.
      *
-     * @param params           networkParams used to create Messages instances and termining packetMagic
+     * @param params           networkParams used to create Messages instances and determining packetMagic
      * @param parseRetain      retain the backing byte array of a message for fast reserialization.
      */
     public BitcoinSerializer(NetworkParameters params, boolean parseRetain) {
@@ -229,6 +231,8 @@ private Message makeMessage(String command, int length, byte[] payloadBytes, byt
             return new UTXOsMessage(params, payloadBytes);
         } else if (command.equals("getutxos")) {
             return new GetUTXOsMessage(params, payloadBytes);
+        } else if (command.equals("sendheaders")) {
+            return new SendHeadersMessage(params, payloadBytes);
         } else {
             log.warn("No support for deserializing message with name {}", command);
             return new UnknownMessage(params, command, payloadBytes);
@@ -302,12 +306,9 @@ public InventoryMessage makeInventoryMessage(byte[] payloadBytes, int length) th
      * serialization format support.
      */
     @Override
-    public Transaction makeTransaction(byte[] payloadBytes, int offset,
-        int length, byte[] hash) throws ProtocolException {
-        Transaction tx = new Transaction(params, payloadBytes, offset, null, this, length);
-        if (hash != null)
-            tx.setHash(Sha256Hash.wrapReversed(hash));
-        return tx;
+    public Transaction makeTransaction(byte[] payloadBytes, int offset, int length, byte[] hashFromHeader)
+            throws ProtocolException {
+        return new Transaction(params, payloadBytes, offset, null, this, length, hashFromHeader);
     }
 
     @Override
@@ -361,7 +362,7 @@ public BitcoinPacketHeader(ByteBuffer in) throws ProtocolException, BufferUnderf
             for (; header[cursor] != 0 && cursor < COMMAND_LEN; cursor++) ;
             byte[] commandBytes = new byte[cursor];
             System.arraycopy(header, 0, commandBytes, 0, cursor);
-            command = Utils.toString(commandBytes, "US-ASCII");
+            command = new String(commandBytes, StandardCharsets.US_ASCII);
             cursor = COMMAND_LEN;
 
             size = (int) readUint32(header, cursor);
diff --git a/core/src/main/java/org/bitcoinj/core/Block.java b/core/src/main/java/org/bitcoinj/core/Block.java
index c97879dca1f..9de445a7784 100644
--- a/core/src/main/java/org/bitcoinj/core/Block.java
+++ b/core/src/main/java/org/bitcoinj/core/Block.java
@@ -28,6 +28,7 @@
 import java.math.*;
 import java.util.*;
 
+import static com.google.common.base.Preconditions.checkState;
 import static org.bitcoinj.core.Coin.*;
 import static org.bitcoinj.core.Sha256Hash.*;
 
@@ -36,7 +37,7 @@
  * It records a set of {@link Transaction}s together with some data that links it into a place in the global block
  * chain, and proves that a difficult calculation was done over its contents. See
  * <a href="http://www.bitcoin.org/bitcoin.pdf">the Bitcoin technical paper</a> for
- * more detail on blocks. <p/>
+ * more detail on blocks.</p>
  *
  * <p>To get a block, you can either build one from the raw bytes you can get from another implementation, or request one
  * specifically using {@link Peer#getBlock(Sha256Hash)}, or grab one from a downloaded {@link BlockChain}.</p>
@@ -92,7 +93,7 @@ public enum VerifyFlag {
     // Fields defined as part of the protocol format.
     private long version;
     private Sha256Hash prevBlockHash;
-    private Sha256Hash merkleRoot;
+    private Sha256Hash merkleRoot, witnessRoot;
     private long time;
     private long difficultyTarget; // "nBits"
     private long nonce;
@@ -118,7 +119,7 @@ public enum VerifyFlag {
         // Set up a few basic things. We are not complete after this though.
         version = setVersion;
         difficultyTarget = 0x1d07fff8L;
-        time = System.currentTimeMillis() / 1000;
+        time = Utils.currentTimeSeconds();
         prevBlockHash = Sha256Hash.ZERO_HASH;
 
         length = HEADER_SIZE;
@@ -201,7 +202,7 @@ public Block(NetworkParameters params, long version, Sha256Hash prevBlockHash, S
         this.time = time;
         this.difficultyTarget = difficultyTarget;
         this.nonce = nonce;
-        this.transactions = new LinkedList<Transaction>();
+        this.transactions = new LinkedList<>();
         this.transactions.addAll(transactions);
     }
 
@@ -212,7 +213,7 @@ public Block(NetworkParameters params, long version, Sha256Hash prevBlockHash, S
      * the system it was 50 coins per block, in late 2012 it went to 25 coins per block, and so on. The size of
      * a coinbase transaction is inflation plus fees.</p>
      *
-     * <p>The half-life is controlled by {@link org.bitcoinj.core.NetworkParameters#getSubsidyDecreaseBlockCount()}.
+     * <p>The half-life is controlled by {@link NetworkParameters#getSubsidyDecreaseBlockCount()}.
      * </p>
      */
     public Coin getBlockInflation(int height) {
@@ -237,9 +238,9 @@ protected void parseTransactions(final int transactionsOffset) throws ProtocolEx
 
         int numTransactions = (int) readVarInt();
         optimalEncodingMessageSize += VarInt.sizeOf(numTransactions);
-        transactions = new ArrayList<Transaction>(numTransactions);
+        transactions = new ArrayList<>(Math.min(numTransactions, Utils.MAX_INITIAL_ARRAY_LENGTH));
         for (int i = 0; i < numTransactions; i++) {
-            Transaction tx = new Transaction(params, payload, cursor, this, serializer, UNKNOWN_LENGTH);
+            Transaction tx = new Transaction(params, payload, cursor, this, serializer, UNKNOWN_LENGTH, null);
             // Label the transaction as coming from the P2P network, so code that cares where we first saw it knows.
             tx.getConfidence().setSource(TransactionConfidence.Source.NETWORK);
             transactions.add(tx);
@@ -314,8 +315,6 @@ private void writeTransactions(OutputStream stream) throws IOException {
     /**
      * Special handling to check if we have a valid byte array for both header
      * and transactions
-     *
-     * @throws IOException
      */
     @Override
     public byte[] bitcoinSerialize() {
@@ -486,14 +485,15 @@ public String toString() {
             s.append(" (").append(bips).append(')');
         s.append('\n');
         s.append("   previous block: ").append(getPrevBlockHash()).append("\n");
-        s.append("   merkle root: ").append(getMerkleRoot()).append("\n");
         s.append("   time: ").append(time).append(" (").append(Utils.dateTimeFormat(time * 1000)).append(")\n");
         s.append("   difficulty target (nBits): ").append(difficultyTarget).append("\n");
         s.append("   nonce: ").append(nonce).append("\n");
         if (transactions != null && transactions.size() > 0) {
+            s.append("   merkle root: ").append(getMerkleRoot()).append("\n");
+            s.append("   witness root: ").append(getWitnessRoot()).append("\n");
             s.append("   with ").append(transactions.size()).append(" transaction(s):\n");
             for (Transaction tx : transactions) {
-                s.append(tx);
+                s.append(tx).append('\n');
             }
         }
         return s.toString();
@@ -541,7 +541,7 @@ protected boolean checkProofOfWork(boolean throwException) throws VerificationEx
         // ridiculously easy difficulty and this function would accept them.
         //
         // To prevent this attack from being possible, elsewhere we check that the difficultyTarget
-        // field is of the right value. This requires us to have the preceeding blocks.
+        // field is of the right value. This requires us to have the preceding blocks.
         BigInteger target = getDifficultyTargetAsInteger();
 
         BigInteger h = getHash().toBigInteger();
@@ -557,10 +557,11 @@ protected boolean checkProofOfWork(boolean throwException) throws VerificationEx
     }
 
     private void checkTimestamp() throws VerificationException {
-        // Allow injection of a fake clock to allow unit testing.
-        long currentTime = Utils.currentTimeSeconds();
-        if (time > currentTime + ALLOWED_TIME_DRIFT)
-            throw new VerificationException(String.format(Locale.US, "Block too far in future: %d vs %d", time, currentTime + ALLOWED_TIME_DRIFT));
+        final long allowedTime = Utils.currentTimeSeconds() + ALLOWED_TIME_DRIFT;
+        if (time > allowedTime)
+            throw new VerificationException(String.format(Locale.US,
+                    "Block too far in future: %s (%d) vs allowed %s (%d)", Utils.dateTimeFormat(time * 1000), time,
+                    Utils.dateTimeFormat(allowedTime * 1000), allowedTime));
     }
 
     private void checkSigOps() throws VerificationException {
@@ -582,12 +583,43 @@ private void checkMerkleRoot() throws VerificationException {
         }
     }
 
+    @VisibleForTesting
+    void checkWitnessRoot() throws VerificationException {
+        Transaction coinbase = transactions.get(0);
+        checkState(coinbase.isCoinBase());
+        Sha256Hash witnessCommitment = coinbase.findWitnessCommitment();
+        if (witnessCommitment != null) {
+            byte[] witnessReserved = null;
+            TransactionWitness witness = coinbase.getInput(0).getWitness();
+            if (witness.getPushCount() != 1)
+                throw new VerificationException("Coinbase witness reserved invalid: push count");
+            witnessReserved = witness.getPush(0);
+            if (witnessReserved.length != 32)
+                throw new VerificationException("Coinbase witness reserved invalid: length");
+
+            Sha256Hash witnessRootHash = Sha256Hash.twiceOf(getWitnessRoot().getReversedBytes(), witnessReserved);
+            if (!witnessRootHash.equals(witnessCommitment))
+                throw new VerificationException("Witness merkle root invalid. Expected " + witnessCommitment.toString()
+                        + " but got " + witnessRootHash.toString());
+        } else {
+            for (Transaction tx : transactions) {
+                if (tx.hasWitnesses())
+                    throw new VerificationException("Transaction witness found but no witness commitment present");
+            }
+        }
+    }
+
     private Sha256Hash calculateMerkleRoot() {
-        List<byte[]> tree = buildMerkleTree();
+        List<byte[]> tree = buildMerkleTree(false);
+        return Sha256Hash.wrap(tree.get(tree.size() - 1));
+    }
+
+    private Sha256Hash calculateWitnessRoot() {
+        List<byte[]> tree = buildMerkleTree(true);
         return Sha256Hash.wrap(tree.get(tree.size() - 1));
     }
 
-    private List<byte[]> buildMerkleTree() {
+    private List<byte[]> buildMerkleTree(boolean useWTxId) {
         // The Merkle root is based on a tree of hashes calculated from the transactions:
         //
         //     root
@@ -600,7 +632,7 @@ private List<byte[]> buildMerkleTree() {
         // entry is a hash.
         //
         // The hashing algorithm is double SHA-256. The leaves are a hash of the serialized contents of the transaction.
-        // The interior nodes are hashes of the concenation of the two child hashes.
+        // The interior nodes are hashes of the concatenation of the two child hashes.
         //
         // This structure allows the creation of proof that a transaction was included into a block without having to
         // provide the full block contents. Instead, you can provide only a Merkle branch. For example to prove tx2 was
@@ -618,10 +650,15 @@ private List<byte[]> buildMerkleTree() {
         //    2     3    4  4
         //  / \   / \   / \
         // t1 t2 t3 t4 t5 t5
-        ArrayList<byte[]> tree = new ArrayList<byte[]>();
+        ArrayList<byte[]> tree = new ArrayList<>(transactions.size());
         // Start by adding all the hashes of the transactions as leaves of the tree.
-        for (Transaction t : transactions) {
-            tree.add(t.getHash().getBytes());
+        for (Transaction tx : transactions) {
+            final Sha256Hash id;
+            if (useWTxId && tx.isCoinBase())
+                id = Sha256Hash.ZERO_HASH;
+            else
+                id = useWTxId ? tx.getWTxId() : tx.getTxId();
+            tree.add(id.getBytes());
         }
         int levelOffset = 0; // Offset in the list where the currently processed level starts.
         // Step through each level, stopping when we reach the root (levelSize == 1).
@@ -633,7 +670,7 @@ private List<byte[]> buildMerkleTree() {
                 int right = Math.min(left + 1, levelSize - 1);
                 byte[] leftBytes = Utils.reverseBytes(tree.get(levelOffset + left));
                 byte[] rightBytes = Utils.reverseBytes(tree.get(levelOffset + right));
-                tree.add(Utils.reverseBytes(hashTwice(leftBytes, 0, 32, rightBytes, 0, 32)));
+                tree.add(Utils.reverseBytes(hashTwice(leftBytes, rightBytes)));
             }
             // Move to the next level.
             levelOffset += levelSize;
@@ -694,7 +731,7 @@ public void verifyTransactions(final int height, final EnumSet<VerifyFlag> flags
         // Now we need to check that the body of the block actually matches the headers. The network won't generate
         // an invalid block, but if we didn't validate this then an untrusted man-in-the-middle could obtain the next
         // valid block from the network and simply replace the transactions in it with their own fictional
-        // transactions that reference spent or non-existant inputs.
+        // transactions that reference spent or non-existent inputs.
         if (transactions.isEmpty())
             throw new VerificationException("Block had no transactions");
         if (this.getOptimalEncodingMessageSize() > MAX_BLOCK_SIZE)
@@ -750,6 +787,15 @@ void setMerkleRoot(Sha256Hash value) {
         hash = null;
     }
 
+    /**
+     * Returns the witness root in big endian form, calculating it from transactions if necessary.
+     */
+    public Sha256Hash getWitnessRoot() {
+        if (witnessRoot == null)
+            witnessRoot = calculateWitnessRoot();
+        return witnessRoot;
+    }
+
     /** Adds a transaction to this block. The nonce and merkle root are invalid after this. */
     public void addTransaction(Transaction t) {
         addTransaction(t, true);
@@ -759,7 +805,7 @@ public void addTransaction(Transaction t) {
     void addTransaction(Transaction t, boolean runSanityChecks) {
         unCacheTransactions();
         if (transactions == null) {
-            transactions = new ArrayList<Transaction>();
+            transactions = new ArrayList<>();
         }
         t.setParent(this);
         if (runSanityChecks && transactions.size() == 0 && !t.isCoinBase())
@@ -816,7 +862,7 @@ public void setTime(long time) {
      * Returns the difficulty of the proof of work that this block should meet encoded <b>in compact form</b>. The {@link
      * BlockChain} verifies that this is not too easy by looking at the length of the chain when the block is added.
      * To find the actual value the hash should be compared against, use
-     * {@link org.bitcoinj.core.Block#getDifficultyTargetAsInteger()}. Note that this is <b>not</b> the same as
+     * {@link Block#getDifficultyTargetAsInteger()}. Note that this is <b>not</b> the same as
      * the difficulty value reported by the Bitcoin "getdifficulty" RPC that you may see on various block explorers.
      * That number is the result of applying a formula to the underlying difficulty to normalize the minimum to 1.
      * Calculating the difficulty that way is currently unsupported.
@@ -866,7 +912,7 @@ public List<Transaction> getTransactions() {
     @VisibleForTesting
     void addCoinbaseTransaction(byte[] pubKeyTo, Coin value, final int height) {
         unCacheTransactions();
-        transactions = new ArrayList<Transaction>();
+        transactions = new ArrayList<>();
         Transaction coinbase = new Transaction(params);
         final ScriptBuilder inputBuilder = new ScriptBuilder();
 
@@ -883,7 +929,7 @@ void addCoinbaseTransaction(byte[] pubKeyTo, Coin value, final int height) {
         coinbase.addInput(new TransactionInput(params, coinbase,
                 inputBuilder.build().getProgram()));
         coinbase.addOutput(new TransactionOutput(params, coinbase, value,
-                ScriptBuilder.createOutputScript(ECKey.fromPublicOnly(pubKeyTo)).getProgram()));
+                ScriptBuilder.createP2PKOutputScript(ECKey.fromPublicOnly(pubKeyTo)).getProgram()));
         transactions.add(coinbase);
         coinbase.setParent(this);
         coinbase.length = coinbase.unsafeBitcoinSerialize().length;
@@ -1004,7 +1050,7 @@ boolean isTransactionBytesValid() {
      * purely a header).
      */
     public boolean hasTransactions() {
-        return !this.transactions.isEmpty();
+        return (this.transactions != null) && !this.transactions.isEmpty();
     }
 
     /**
diff --git a/core/src/main/java/org/bitcoinj/core/BlockChain.java b/core/src/main/java/org/bitcoinj/core/BlockChain.java
index 6fd6ca2237e..bb49547d2bc 100644
--- a/core/src/main/java/org/bitcoinj/core/BlockChain.java
+++ b/core/src/main/java/org/bitcoinj/core/BlockChain.java
@@ -21,8 +21,12 @@
 
 import org.bitcoinj.store.BlockStore;
 import org.bitcoinj.store.BlockStoreException;
+import org.bitcoinj.store.MemoryBlockStore;
+import org.bitcoinj.store.SPVBlockStore;
 import org.bitcoinj.wallet.Wallet;
+import org.bitcoinj.wallet.WalletExtension;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -40,10 +44,10 @@ public class BlockChain extends AbstractBlockChain {
     /**
      * <p>Constructs a BlockChain connected to the given wallet and store. To obtain a {@link Wallet} you can construct
      * one from scratch, or you can deserialize a saved wallet from disk using
-     * {@link Wallet#loadFromFile(java.io.File, WalletExtension...)}</p>
+     * {@link Wallet#loadFromFile(File, WalletExtension...)}</p>
      *
-     * <p>For the store, you should use {@link org.bitcoinj.store.SPVBlockStore} or you could also try a
-     * {@link org.bitcoinj.store.MemoryBlockStore} if you want to hold all headers in RAM and don't care about
+     * <p>For the store, you should use {@link SPVBlockStore} or you could also try a
+     * {@link MemoryBlockStore} if you want to hold all headers in RAM and don't care about
      * disk serialization (this is rare).</p>
      */
     public BlockChain(Context context, Wallet wallet, BlockStore blockStore) throws BlockStoreException {
diff --git a/core/src/main/java/org/bitcoinj/core/BlockLocator.java b/core/src/main/java/org/bitcoinj/core/BlockLocator.java
new file mode 100644
index 00000000000..74a33a4eb2b
--- /dev/null
+++ b/core/src/main/java/org/bitcoinj/core/BlockLocator.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright by the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.bitcoinj.core;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+
+/**
+ * Represents Block Locator in GetBlocks and GetHeaders messages
+ **/
+public final class BlockLocator {
+    private final ImmutableList<Sha256Hash> hashes;
+
+    public BlockLocator() {
+        hashes = ImmutableList.of();
+    }
+
+    /**
+     * Creates a Block locator with defined list of hashes.
+     */
+    public BlockLocator(ImmutableList<Sha256Hash> hashes) {
+        this.hashes = hashes;
+    }
+
+    /**
+     * Add a {@link Sha256Hash} to a newly created block locator.
+     */
+    public BlockLocator add(Sha256Hash hash) {
+        return new BlockLocator(new ImmutableList.Builder<Sha256Hash>().addAll(this.hashes).add(hash).build());
+    }
+
+    /**
+     * Returns the number of hashes in this block locator.
+     */
+    public int size() {
+        return hashes.size();
+    }
+
+    /**
+     * Returns List of Block locator hashes.
+     */
+    public List<Sha256Hash> getHashes() {
+        return hashes;
+    }
+
+    /**
+     * Get hash by index from this block locator.
+     */
+    public Sha256Hash get(int i) {
+        return hashes.get(i);
+    }
+
+    @Override
+    public String toString() {
+        return "Block locator with " + size() + " blocks\n " + Utils.SPACE_JOINER.join(hashes);
+    }
+
+    @Override
+    public int hashCode() {
+        int hashCode = 0;
+        for (Sha256Hash i : hashes) {
+            hashCode ^= i.hashCode();
+        }
+        return hashCode;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        return ((BlockLocator) o).getHashes().equals(hashes);
+    }
+}
diff --git a/core/src/main/java/org/bitcoinj/core/BloomFilter.java b/core/src/main/java/org/bitcoinj/core/BloomFilter.java
index 7a149ea8e6c..69fffe64654 100644
--- a/core/src/main/java/org/bitcoinj/core/BloomFilter.java
+++ b/core/src/main/java/org/bitcoinj/core/BloomFilter.java
@@ -19,6 +19,9 @@
 
 import org.bitcoinj.script.Script;
 import org.bitcoinj.script.ScriptChunk;
+import org.bitcoinj.script.ScriptPattern;
+
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.collect.Lists;
 
@@ -45,11 +48,11 @@
  */
 public class BloomFilter extends Message {
     /** The BLOOM_UPDATE_* constants control when the bloom filter is auto-updated by the peer using
-        it as a filter, either never, for all outputs or only for pay-2-pubkey outputs (default) */
+        it as a filter, either never, for all outputs or only for P2PK outputs (default) */
     public enum BloomUpdate {
         UPDATE_NONE, // 0
         UPDATE_ALL, // 1
-        /** Only adds outpoints to the filter if the output is a pay-to-pubkey/pay-to-multisig script */
+        /** Only adds outpoints to the filter if the output is a P2PK/pay-to-multisig script */
         UPDATE_P2PUBKEY_ONLY //2
     }
     
@@ -72,7 +75,7 @@ public BloomFilter(NetworkParameters params, byte[] payloadBytes) throws Protoco
     }
     
     /**
-     * Constructs a filter with the given parameters which is updated on pay2pubkey outputs only.
+     * Constructs a filter with the given parameters which is updated on P2PK outputs only.
      */
     public BloomFilter(int elements, double falsePositiveRate, long randomNonce) {
         this(elements, falsePositiveRate, randomNonce, BloomUpdate.UPDATE_P2PUBKEY_ONLY);
@@ -103,7 +106,7 @@ public BloomFilter(int elements, double falsePositiveRate, long randomNonce) {
      * It should be a random value, however secureness of the random value is of no great consequence.</p>
      * 
      * <p>updateFlag is used to control filter behaviour on the server (remote node) side when it encounters a hit.
-     * See {@link org.bitcoinj.core.BloomFilter.BloomUpdate} for a brief description of each mode. The purpose
+     * See {@link BloomFilter.BloomUpdate} for a brief description of each mode. The purpose
      * of this flag is to reduce network round-tripping and avoid over-dirtying the filter for the most common
      * wallet configurations.</p>
      */
@@ -129,7 +132,11 @@ public double getFalsePositiveRate(int elements) {
 
     @Override
     public String toString() {
-        return "Bloom Filter of size " + data.length + " with " + hashFuncs + " hash functions.";
+        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(this).omitNullValues();
+        helper.add("data length", data.length);
+        helper.add("hashFuncs", hashFuncs);
+        helper.add("nFlags", getUpdateFlag());
+        return helper.toString();
     }
 
     @Override
@@ -163,7 +170,7 @@ private static int rotateLeft32(int x, int r) {
 
     /**
      * Applies the MurmurHash3 (x86_32) algorithm to the given data.
-     * See this <a href="http://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp">C++ code for the original.</a>
+     * See this <a href="https://github.com/aappleby/smhasher/blob/master/src/MurmurHash3.cpp">C++ code for the original.</a>
      */
     public static int murmurHash3(byte[] data, long nTweak, int hashNum, byte[] object) {
         int h1 = (int)(hashNum * 0xFBA4C795L + nTweak);
@@ -240,6 +247,11 @@ public synchronized void insert(ECKey key) {
         insert(key.getPubKeyHash());
     }
 
+    /** Inserts the given transaction outpoint. */
+    public synchronized void insert(TransactionOutPoint outpoint) {
+        insert(outpoint.unsafeBitcoinSerialize());
+    }
+
     /**
      * Sets this filter to match all objects. A Bloom filter which matches everything may seem pointless, however,
      * it is useful in order to reduce steady state bandwidth usage when you want full blocks. Instead of receiving
@@ -268,7 +280,7 @@ public synchronized void merge(BloomFilter filter) {
     }
 
     /**
-     * Returns true if this filter will match anything. See {@link org.bitcoinj.core.BloomFilter#setMatchAll()}
+     * Returns true if this filter will match anything. See {@link BloomFilter#setMatchAll()}
      * for when this can be a useful thing to do.
      */
     public synchronized boolean matchesAll() {
@@ -301,12 +313,12 @@ else if (nFlags == 2)
      */
     public synchronized FilteredBlock applyAndUpdate(Block block) {
         List<Transaction> txns = block.getTransactions();
-        List<Sha256Hash> txHashes = new ArrayList<Sha256Hash>(txns.size());
+        List<Sha256Hash> txHashes = new ArrayList<>(txns.size());
         List<Transaction> matched = Lists.newArrayList();
         byte[] bits = new byte[(int) Math.ceil(txns.size() / 8.0)];
         for (int i = 0; i < txns.size(); i++) {
             Transaction tx = txns.get(i);
-            txHashes.add(tx.getHash());
+            txHashes.add(tx.getTxId());
             if (applyAndUpdate(tx)) {
                 Utils.setBitLE(bits, i);
                 matched.add(tx);
@@ -320,7 +332,7 @@ public synchronized FilteredBlock applyAndUpdate(Block block) {
     }
 
     public synchronized boolean applyAndUpdate(Transaction tx) {
-        if (contains(tx.getHash().getBytes()))
+        if (contains(tx.getTxId().getBytes()))
             return true;
         boolean found = false;
         BloomUpdate flag = getUpdateFlag();
@@ -330,9 +342,9 @@ public synchronized boolean applyAndUpdate(Transaction tx) {
                 if (!chunk.isPushData())
                     continue;
                 if (contains(chunk.data)) {
-                    boolean isSendingToPubKeys = script.isSentToRawPubKey() || script.isSentToMultiSig();
+                    boolean isSendingToPubKeys = ScriptPattern.isP2PK(script) || ScriptPattern.isSentToMultisig(script);
                     if (flag == BloomUpdate.UPDATE_ALL || (flag == BloomUpdate.UPDATE_P2PUBKEY_ONLY && isSendingToPubKeys))
-                        insert(output.getOutPointFor().unsafeBitcoinSerialize());
+                        insert(output.getOutPointFor());
                     found = true;
                 }
             }
diff --git a/core/src/main/java/org/bitcoinj/core/CheckpointManager.java b/core/src/main/java/org/bitcoinj/core/CheckpointManager.java
index c9d3628c61f..8b8db387dfd 100644
--- a/core/src/main/java/org/bitcoinj/core/CheckpointManager.java
+++ b/core/src/main/java/org/bitcoinj/core/CheckpointManager.java
@@ -19,12 +19,12 @@
 import org.bitcoinj.store.BlockStore;
 import org.bitcoinj.store.BlockStoreException;
 import org.bitcoinj.store.FullPrunedBlockStore;
-import com.google.common.base.Charsets;
 import com.google.common.hash.HashCode;
 import com.google.common.hash.Hasher;
 import com.google.common.hash.Hashing;
 import com.google.common.io.BaseEncoding;
 
+import org.bitcoinj.store.SPVBlockStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,6 +37,7 @@
 import java.io.InputStreamReader;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
 import java.security.DigestInputStream;
 import java.security.MessageDigest;
 import java.util.Arrays;
@@ -55,7 +56,7 @@
  * </ol>
  *
  * <p>Checkpoints are used by the SPV {@link BlockChain} to initialize fresh
- * {@link org.bitcoinj.store.SPVBlockStore}s. They are not used by fully validating mode, which instead has a
+ * {@link SPVBlockStore}s. They are not used by fully validating mode, which instead has a
  * different concept of checkpoints that are used to hard-code the validity of blocks that violate BIP30 (duplicate
  * coinbase transactions). Those "checkpoints" can be found in NetworkParameters.</p>
  *
@@ -75,8 +76,8 @@ public class CheckpointManager {
     private static final String TEXTUAL_MAGIC = "TXT CHECKPOINTS 1";
     private static final int MAX_SIGNATURES = 256;
 
-    // Map of block header time to data.
-    protected final TreeMap<Long, StoredBlock> checkpoints = new TreeMap<Long, StoredBlock>();
+    // Map of block header time (in seconds) to data.
+    protected final TreeMap<Long, StoredBlock> checkpoints = new TreeMap<>();
 
     protected final NetworkParameters params;
     protected final Sha256Hash dataHash;
@@ -120,7 +121,7 @@ private Sha256Hash readBinary(InputStream inputStream) throws IOException {
             digestInputStream.on(false);
             byte[] header = new byte[BINARY_MAGIC.length()];
             dis.readFully(header);
-            if (!Arrays.equals(header, BINARY_MAGIC.getBytes("US-ASCII")))
+            if (!Arrays.equals(header, BINARY_MAGIC.getBytes(StandardCharsets.US_ASCII)))
                 throw new IOException("Header bytes did not match expected version");
             int numSignatures = checkPositionIndex(dis.readInt(), MAX_SIGNATURES, "Num signatures out of range");
             for (int i = 0; i < numSignatures; i++) {
@@ -141,7 +142,8 @@ private Sha256Hash readBinary(InputStream inputStream) throws IOException {
                 checkpoints.put(block.getHeader().getTimeSeconds(), block);
             }
             Sha256Hash dataHash = Sha256Hash.wrap(digest.digest());
-            log.info("Read {} checkpoints, hash is {}", checkpoints.size(), dataHash);
+            log.info("Read {} checkpoints up to time {}, hash is {}", checkpoints.size(),
+                    Utils.dateTimeFormat(checkpoints.lastEntry().getKey() * 1000), dataHash);
             return dataHash;
         } catch (ProtocolException e) {
             throw new IOException(e);
@@ -155,7 +157,7 @@ private Sha256Hash readTextual(InputStream inputStream) throws IOException {
         Hasher hasher = Hashing.sha256().newHasher();
         BufferedReader reader = null;
         try {
-            reader = new BufferedReader(new InputStreamReader(inputStream, Charsets.US_ASCII));
+            reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.US_ASCII));
             String magic = reader.readLine();
             if (!TEXTUAL_MAGIC.equals(magic))
                 throw new IOException("unexpected magic: " + magic);
@@ -178,7 +180,8 @@ private Sha256Hash readTextual(InputStream inputStream) throws IOException {
                 checkpoints.put(block.getHeader().getTimeSeconds(), block);
             }
             HashCode hash = hasher.hash();
-            log.info("Read {} checkpoints, hash is {}", checkpoints.size(), hash);
+            log.info("Read {} checkpoints up to time {}, hash is {}", checkpoints.size(),
+                    Utils.dateTimeFormat(checkpoints.lastEntry().getKey() * 1000), hash);
             return Sha256Hash.wrap(hash.asBytes());
         } finally {
             if (reader != null) reader.close();
@@ -189,11 +192,11 @@ private Sha256Hash readTextual(InputStream inputStream) throws IOException {
      * Returns a {@link StoredBlock} representing the last checkpoint before the given time, for example, normally
      * you would want to know the checkpoint before the earliest wallet birthday.
      */
-    public StoredBlock getCheckpointBefore(long time) {
+    public StoredBlock getCheckpointBefore(long timeSecs) {
         try {
-            checkArgument(time > params.getGenesisBlock().getTimeSeconds());
+            checkArgument(timeSecs > params.getGenesisBlock().getTimeSeconds());
             // This is thread safe because the map never changes after creation.
-            Map.Entry<Long, StoredBlock> entry = checkpoints.floorEntry(time);
+            Map.Entry<Long, StoredBlock> entry = checkpoints.floorEntry(timeSecs);
             if (entry != null) return entry.getValue();
             Block genesis = params.getGenesisBlock().cloneAsHeader();
             return new StoredBlock(genesis, genesis.getWork(), 0);
@@ -217,22 +220,23 @@ public Sha256Hash getDataHash() {
      * time, then inserts it into the store and sets that to be the chain head. Useful when you have just created
      * a new store from scratch and want to use configure it all in one go.</p>
      *
-     * <p>Note that time is adjusted backwards by a week to account for possible clock drift in the block headers.</p>
+     * <p>Note that timeSecs is adjusted backwards by a week to account for possible clock drift in the block headers.</p>
      */
-    public static void checkpoint(NetworkParameters params, InputStream checkpoints, BlockStore store, long time)
+    public static void checkpoint(NetworkParameters params, InputStream checkpoints, BlockStore store, long timeSecs)
             throws IOException, BlockStoreException {
         checkNotNull(params);
         checkNotNull(store);
         checkArgument(!(store instanceof FullPrunedBlockStore), "You cannot use checkpointing with a full store.");
 
-        time -= 86400 * 7;
+        timeSecs -= 60 * 60 * 24 * 7; // one week in seconds
 
-        checkArgument(time > 0);
-        log.info("Attempting to initialize a new block store with a checkpoint for time {} ({})", time, Utils.dateTimeFormat(time * 1000));
+        checkArgument(timeSecs > 0);
+        log.info("Attempting to initialize a new block store with a checkpoint for time {} ({})", timeSecs,
+                Utils.dateTimeFormat(timeSecs * 1000));
 
         BufferedInputStream stream = new BufferedInputStream(checkpoints);
         CheckpointManager manager = new CheckpointManager(params, stream);
-        StoredBlock checkpoint = manager.getCheckpointBefore(time);
+        StoredBlock checkpoint = manager.getCheckpointBefore(timeSecs);
         store.put(checkpoint);
         store.setChainHead(checkpoint);
     }
diff --git a/core/src/main/java/org/bitcoinj/core/ChildMessage.java b/core/src/main/java/org/bitcoinj/core/ChildMessage.java
index 87576d311a6..38caea80c72 100644
--- a/core/src/main/java/org/bitcoinj/core/ChildMessage.java
+++ b/core/src/main/java/org/bitcoinj/core/ChildMessage.java
@@ -29,7 +29,7 @@ public abstract class ChildMessage extends Message {
     @Nullable protected Message parent;
 
     /**
-     * @deprecated Use {@link #ChildMessage(NetworkParameters) instead.
+     * @deprecated Use {@link #ChildMessage(NetworkParameters)} instead.
      */
     @Deprecated
     protected ChildMessage() {
@@ -43,7 +43,8 @@ public ChildMessage(NetworkParameters params, byte[] payload, int offset, int pr
         super(params, payload, offset, protocolVersion);
     }
 
-    public ChildMessage(NetworkParameters params, byte[] payload, int offset, int protocolVersion, Message parent, MessageSerializer setSerializer, int length) throws ProtocolException {
+    public ChildMessage(NetworkParameters params, byte[] payload, int offset, int protocolVersion,
+                        @Nullable Message parent, MessageSerializer setSerializer, int length) throws ProtocolException {
         super(params, payload, offset, protocolVersion, setSerializer, length);
         this.parent = parent;
     }
diff --git a/core/src/main/java/org/bitcoinj/core/Coin.java b/core/src/main/java/org/bitcoinj/core/Coin.java
index a1a22b4a353..370f15dbcf7 100644
--- a/core/src/main/java/org/bitcoinj/core/Coin.java
+++ b/core/src/main/java/org/bitcoinj/core/Coin.java
@@ -116,16 +116,33 @@ public static Coin valueOf(final int coins, final int cents) {
     }
 
     /**
-     * Parses an amount expressed in the way humans are used to.<p>
-     * <p/>
-     * This takes string in a format understood by {@link BigDecimal#BigDecimal(String)},
-     * for example "0", "1", "0.10", "1.23E3", "1234.5E-5".
+     * <p>Parses an amount expressed in the way humans are used to.</p>
+     * <p>This takes string in a format understood by {@link BigDecimal#BigDecimal(String)}, for example "0", "1", "0.10",
+     * "1.23E3", "1234.5E-5".</p>
      *
-     * @throws IllegalArgumentException if you try to specify fractional satoshis, or a value out of range.
+     * @throws IllegalArgumentException
+     *             if you try to specify fractional satoshis, or a value out of range.
      */
     public static Coin parseCoin(final String str) {
         try {
-            long satoshis = new BigDecimal(str).movePointRight(SMALLEST_UNIT_EXPONENT).toBigIntegerExact().longValue();
+            long satoshis = new BigDecimal(str).movePointRight(SMALLEST_UNIT_EXPONENT).longValueExact();
+            return Coin.valueOf(satoshis);
+        } catch (ArithmeticException e) {
+            throw new IllegalArgumentException(e); // Repackage exception to honor method contract
+        }
+    }
+
+    /**
+     * <p>Parses an amount expressed in the way humans are used to. The amount is cut to satoshi precision.</p>
+     * <p>This takes string in a format understood by {@link BigDecimal#BigDecimal(String)}, for example "0", "1", "0.10",
+     * "1.23E3", "1234.5E-5".</p>
+     *
+     * @throws IllegalArgumentException
+     *             if you try to specify a value out of range.
+     */
+    public static Coin parseCoinInexact(final String str) {
+        try {
+            long satoshis = new BigDecimal(str).movePointRight(SMALLEST_UNIT_EXPONENT).longValue();
             return Coin.valueOf(satoshis);
         } catch (ArithmeticException e) {
             throw new IllegalArgumentException(e); // Repackage exception to honor method contract
diff --git a/core/src/main/java/org/bitcoinj/core/Context.java b/core/src/main/java/org/bitcoinj/core/Context.java
index 709b98d66e3..26954dbd44d 100644
--- a/core/src/main/java/org/bitcoinj/core/Context.java
+++ b/core/src/main/java/org/bitcoinj/core/Context.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -14,6 +16,8 @@
 
 package org.bitcoinj.core;
 
+import org.bitcoinj.utils.ContextPropagatingThreadFactory;
+import org.bitcoinj.wallet.SendRequest;
 import org.slf4j.*;
 
 import static com.google.common.base.Preconditions.*;
@@ -25,7 +29,6 @@
 // TODO: Move Threading.USER_THREAD to here and leave behind just a source code stub. Allow different instantiations of the library to use different user threads.
 // TODO: Keep a URI to where library internal data files can be found, to abstract over the lack of JAR files on Android.
 // TODO: Stash anything else that resembles global library configuration in here and use it to clean up the rest of the API without breaking people.
-// TODO: Move the TorClient into Context, so different parts of the library can read data over Tor without having to request it directly. (or maybe a general socket factory??)
 
 /**
  * <p>The Context object holds various objects and pieces of configuration that are scoped to a specific instantiation of
@@ -41,11 +44,13 @@
 public class Context {
     private static final Logger log = LoggerFactory.getLogger(Context.class);
 
-    private TxConfidenceTable confidenceTable;
-    private NetworkParameters params;
-    private int eventHorizon = 100;
-    private boolean ensureMinRequiredFee = true;
-    private Coin feePerKb = Transaction.DEFAULT_TX_FEE;
+    public static final int DEFAULT_EVENT_HORIZON = 100;
+
+    final private TxConfidenceTable confidenceTable;
+    final private NetworkParameters params;
+    final private int eventHorizon;
+    final private boolean ensureMinRequiredFee;
+    final private Coin feePerKb;
 
     /**
      * Creates a new context object. For now, this will be done for you by the framework. Eventually you will be
@@ -54,31 +59,31 @@ public class Context {
      * @param params The network parameters that will be associated with this context.
      */
     public Context(NetworkParameters params) {
-        this.confidenceTable = new TxConfidenceTable();
-        this.params = params;
-        lastConstructed = this;
-        // We may already have a context in our TLS slot. This can happen a lot during unit tests, so just ignore it.
-        slot.set(this);
+        this(params, DEFAULT_EVENT_HORIZON, Transaction.DEFAULT_TX_FEE, true);
     }
 
     /**
      * Creates a new custom context object. This is mainly meant for unit tests for now.
      *
      * @param params The network parameters that will be associated with this context.
-     * @param eventHorizon Number of blocks after which the library will delete data and be unable to always process reorgs (see {@link #getEventHorizon()}.
-     * @param feePerKb The default fee per 1000 bytes of transaction data to pay when completing transactions. For details, see {@link SendRequest#feePerKb}.
+     * @param eventHorizon Number of blocks after which the library will delete data and be unable to always process reorgs. See {@link #getEventHorizon()}.
+     * @param feePerKb The default fee per 1000 virtual bytes of transaction data to pay when completing transactions. For details, see {@link SendRequest#feePerKb}.
      * @param ensureMinRequiredFee Whether to ensure the minimum required fee by default when completing transactions. For details, see {@link SendRequest#ensureMinRequiredFee}.
      */
     public Context(NetworkParameters params, int eventHorizon, Coin feePerKb, boolean ensureMinRequiredFee) {
-        this(params);
+        log.info("Creating bitcoinj {} context.", VersionMessage.BITCOINJ_VERSION);
+        this.confidenceTable = new TxConfidenceTable();
+        this.params = params;
         this.eventHorizon = eventHorizon;
-        this.feePerKb = feePerKb;
         this.ensureMinRequiredFee = ensureMinRequiredFee;
+        this.feePerKb = feePerKb;
+        lastConstructed = this;
+        slot.set(this);
     }
 
     private static volatile Context lastConstructed;
     private static boolean isStrictMode;
-    private static final ThreadLocal<Context> slot = new ThreadLocal<Context>();
+    private static final ThreadLocal<Context> slot = new ThreadLocal<>();
 
     /**
      * Returns the current context that is associated with the <b>calling thread</b>. BitcoinJ is an API that has thread
@@ -115,7 +120,7 @@ public static Context get() {
     }
 
     /**
-     * Require that new threads use {@link #propagate(Context)} or {@link org.bitcoinj.utils.ContextPropagatingThreadFactory},
+     * Require that new threads use {@link #propagate(Context)} or {@link ContextPropagatingThreadFactory},
      * rather than using a heuristic for the desired context.
      */
     public static void enableStrictMode() {
@@ -141,7 +146,7 @@ public static Context getOrCreate(NetworkParameters params) {
      * Sets the given context as the current thread context. You should use this if you create your own threads that
      * want to create core BitcoinJ objects. Generally, if a class can accept a Context in its constructor and might
      * be used (even indirectly) by a thread, you will want to call this first. Your task may be simplified by using
-     * a {@link org.bitcoinj.utils.ContextPropagatingThreadFactory}.
+     * a {@link ContextPropagatingThreadFactory}.
      */
     public static void propagate(Context context) {
         slot.set(checkNotNull(context));
@@ -158,7 +163,7 @@ public TxConfidenceTable getConfidenceTable() {
     }
 
     /**
-     * Returns the {@link org.bitcoinj.core.NetworkParameters} specified when this context was (auto) created. The
+     * Returns the {@link NetworkParameters} specified when this context was (auto) created. The
      * network parameters defines various hard coded constants for a specific instance of a Bitcoin network, such as
      * main net, testnet, etc.
      */
@@ -176,7 +181,7 @@ public int getEventHorizon() {
     }
 
     /**
-     * The default fee per 1000 bytes of transaction data to pay when completing transactions. For details, see {@link SendRequest#feePerKb}.
+     * The default fee per 1000 virtual bytes of transaction data to pay when completing transactions. For details, see {@link SendRequest#feePerKb}.
      */
     public Coin getFeePerKb() {
         return feePerKb;
diff --git a/core/src/main/java/org/bitcoinj/core/DumpedPrivateKey.java b/core/src/main/java/org/bitcoinj/core/DumpedPrivateKey.java
index 7c9895c242a..3594daaa149 100644
--- a/core/src/main/java/org/bitcoinj/core/DumpedPrivateKey.java
+++ b/core/src/main/java/org/bitcoinj/core/DumpedPrivateKey.java
@@ -17,20 +17,20 @@
 
 package org.bitcoinj.core;
 
-import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 
 import java.util.Arrays;
 
 import javax.annotation.Nullable;
 
+import org.bitcoinj.params.Networks;
+
 /**
  * Parses and generates private keys in the form used by the Bitcoin "dumpprivkey" command. This is the private key
  * bytes with a header byte and 4 checksum bytes at the end. If there are 33 private key bytes instead of 32, then
  * the last byte is a discriminator value for the compressed pubkey.
  */
-public class DumpedPrivateKey extends VersionedChecksummedBytes {
-    private boolean compressed;
+public class DumpedPrivateKey extends PrefixedChecksummedBytes {
 
     /**
      * Construct a private key from its Base58 representation.
@@ -40,17 +40,45 @@ public class DumpedPrivateKey extends VersionedChecksummedBytes {
      *            The textual form of the private key.
      * @throws AddressFormatException
      *             if the given base58 doesn't parse or the checksum is invalid
-     * @throws WrongNetworkException
+     * @throws AddressFormatException.WrongNetwork
      *             if the given private key is valid but for a different chain (eg testnet vs mainnet)
      */
-    public static DumpedPrivateKey fromBase58(@Nullable NetworkParameters params,String base58) throws AddressFormatException {
-        return new DumpedPrivateKey(params, base58);
+    public static DumpedPrivateKey fromBase58(@Nullable NetworkParameters params, String base58)
+            throws AddressFormatException, AddressFormatException.WrongNetwork {
+        byte[] versionAndDataBytes = Base58.decodeChecked(base58);
+        int version = versionAndDataBytes[0] & 0xFF;
+        byte[] bytes = Arrays.copyOfRange(versionAndDataBytes, 1, versionAndDataBytes.length);
+        if (params == null) {
+            for (NetworkParameters p : Networks.get())
+                if (version == p.getDumpedPrivateKeyHeader())
+                    return new DumpedPrivateKey(p, bytes);
+            throw new AddressFormatException.InvalidPrefix("No network found for version " + version);
+        } else {
+            if (version == params.getDumpedPrivateKeyHeader())
+                return new DumpedPrivateKey(params, bytes);
+            throw new AddressFormatException.WrongNetwork(version);
+        }
+    }
+
+    private DumpedPrivateKey(NetworkParameters params, byte[] bytes) {
+        super(params, bytes);
+        if (bytes.length != 32 && bytes.length != 33)
+            throw new AddressFormatException.InvalidDataLength(
+                    "Wrong number of bytes for a private key (32 or 33): " + bytes.length);
     }
 
     // Used by ECKey.getPrivateKeyEncoded()
     DumpedPrivateKey(NetworkParameters params, byte[] keyBytes, boolean compressed) {
-        super(params.getDumpedPrivateKeyHeader(), encode(keyBytes, compressed));
-        this.compressed = compressed;
+        this(params, encode(keyBytes, compressed));
+    }
+
+    /**
+     * Returns the base58-encoded textual form, including version and checksum bytes.
+     * 
+     * @return textual form
+     */
+    public String toBase58() {
+        return Base58.encodeChecked(params.getDumpedPrivateKeyHeader(), bytes);
     }
 
     private static byte[] encode(byte[] keyBytes, boolean compressed) {
@@ -66,40 +94,22 @@ private static byte[] encode(byte[] keyBytes, boolean compressed) {
         }
     }
 
-    /** @deprecated Use {@link #fromBase58(NetworkParameters, String)} */
-    @Deprecated
-    public DumpedPrivateKey(@Nullable NetworkParameters params, String encoded) throws AddressFormatException {
-        super(encoded);
-        if (params != null && version != params.getDumpedPrivateKeyHeader())
-            throw new WrongNetworkException(version, new int[]{ params.getDumpedPrivateKeyHeader() });
-        if (bytes.length == 33 && bytes[32] == 1) {
-            compressed = true;
-            bytes = Arrays.copyOf(bytes, 32);  // Chop off the additional marker byte.
-        } else if (bytes.length == 32) {
-            compressed = false;
-        } else {
-            throw new AddressFormatException("Wrong number of bytes for a private key, not 32 or 33");
-        }
-    }
-
     /**
      * Returns an ECKey created from this encoded private key.
      */
     public ECKey getKey() {
-        final ECKey key = ECKey.fromPrivate(bytes);
-        return compressed ? key : key.decompress();
+        return ECKey.fromPrivate(Arrays.copyOf(bytes, 32), isPubKeyCompressed());
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        DumpedPrivateKey other = (DumpedPrivateKey) o;
-        return version == other.version && compressed == other.compressed && Arrays.equals(bytes, other.bytes);
+    /**
+     * Returns true if the public key corresponding to this private key is compressed.
+     */
+    public boolean isPubKeyCompressed() {
+        return bytes.length == 33 && bytes[32] == 1;
     }
 
     @Override
-    public int hashCode() {
-        return Objects.hashCode(version, compressed, Arrays.hashCode(bytes));
+    public String toString() {
+        return toBase58();
     }
 }
diff --git a/core/src/main/java/org/bitcoinj/core/ECKey.java b/core/src/main/java/org/bitcoinj/core/ECKey.java
index 7334a208ab0..926936e36a0 100644
--- a/core/src/main/java/org/bitcoinj/core/ECKey.java
+++ b/core/src/main/java/org/bitcoinj/core/ECKey.java
@@ -19,11 +19,12 @@
 package org.bitcoinj.core;
 
 import org.bitcoinj.crypto.*;
+import org.bitcoinj.script.Script;
+
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
-import com.google.common.primitives.Ints;
 import com.google.common.primitives.UnsignedBytes;
 import org.bitcoin.NativeSecp256k1;
 import org.bitcoin.NativeSecp256k1Util;
@@ -32,28 +33,29 @@
 import org.bitcoinj.wallet.Wallet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.spongycastle.asn1.*;
-import org.spongycastle.asn1.x9.X9ECParameters;
-import org.spongycastle.asn1.x9.X9IntegerConverter;
-import org.spongycastle.crypto.AsymmetricCipherKeyPair;
-import org.spongycastle.crypto.digests.SHA256Digest;
-import org.spongycastle.crypto.ec.CustomNamedCurves;
-import org.spongycastle.crypto.generators.ECKeyPairGenerator;
-import org.spongycastle.crypto.params.*;
-import org.spongycastle.crypto.signers.ECDSASigner;
-import org.spongycastle.crypto.signers.HMacDSAKCalculator;
-import org.spongycastle.math.ec.ECAlgorithms;
-import org.spongycastle.math.ec.ECPoint;
-import org.spongycastle.math.ec.FixedPointCombMultiplier;
-import org.spongycastle.math.ec.FixedPointUtil;
-import org.spongycastle.math.ec.custom.sec.SecP256K1Curve;
-import org.spongycastle.util.encoders.Base64;
+import org.bouncycastle.asn1.*;
+import org.bouncycastle.asn1.x9.X9ECParameters;
+import org.bouncycastle.asn1.x9.X9IntegerConverter;
+import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
+import org.bouncycastle.crypto.digests.SHA256Digest;
+import org.bouncycastle.crypto.ec.CustomNamedCurves;
+import org.bouncycastle.crypto.generators.ECKeyPairGenerator;
+import org.bouncycastle.crypto.params.*;
+import org.bouncycastle.crypto.signers.ECDSASigner;
+import org.bouncycastle.crypto.signers.HMacDSAKCalculator;
+import org.bouncycastle.math.ec.ECAlgorithms;
+import org.bouncycastle.math.ec.ECPoint;
+import org.bouncycastle.math.ec.FixedPointCombMultiplier;
+import org.bouncycastle.math.ec.FixedPointUtil;
+import org.bouncycastle.math.ec.custom.sec.SecP256K1Curve;
+import org.bouncycastle.util.Properties;
+import org.bouncycastle.util.encoders.Base64;
 
 import javax.annotation.Nullable;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.math.BigInteger;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.security.SecureRandom;
 import java.security.SignatureException;
 import java.util.Arrays;
@@ -62,7 +64,7 @@
 import static com.google.common.base.Preconditions.*;
 
 // TODO: Move this class to tracking compression state itself.
-// The Bouncy Castle guys are deprecating their own tracking of the compression state.
+// The Bouncy Castle developers are deprecating their own tracking of the compression state.
 
 /**
  * <p>Represents an elliptic curve public and (optionally) private key, usable for digital signatures but not encryption.
@@ -136,10 +138,8 @@ public int compare(ECKey k1, ECKey k2) {
         if (Utils.isAndroidRuntime())
             new LinuxSecureRandom();
 
-        // Tell Bouncy Castle to precompute data that's needed during secp256k1 calculations. Increasing the width
-        // number makes calculations faster, but at a cost of extra memory usage and with decreasing returns. 12 was
-        // picked after consulting with the BC team.
-        FixedPointUtil.precompute(CURVE_PARAMS.getG(), 12);
+        // Tell Bouncy Castle to precompute data that's needed during secp256k1 calculations.
+        FixedPointUtil.precompute(CURVE_PARAMS.getG());
         CURVE = new ECDomainParameters(CURVE_PARAMS.getCurve(), CURVE_PARAMS.getG(), CURVE_PARAMS.getN(),
                 CURVE_PARAMS.getH());
         HALF_CURVE_ORDER = CURVE_PARAMS.getN().shiftRight(1);
@@ -148,7 +148,7 @@ public int compare(ECKey k1, ECKey k2) {
 
     // The two parts of the key. If "priv" is set, "pub" can always be calculated. If "pub" is set but not "priv", we
     // can only verify signatures not make them.
-    protected final BigInteger priv;  // A field element.
+    @Nullable protected final BigInteger priv;  // A field element.
     protected final LazyECPoint pub;
 
     // Creation time of the key in seconds since the epoch, or zero if the key was deserialized from a version that did
@@ -185,18 +185,18 @@ public ECKey(SecureRandom secureRandom) {
     }
 
     protected ECKey(@Nullable BigInteger priv, ECPoint pub) {
+        this(priv, new LazyECPoint(checkNotNull(pub)));
+    }
+
+    protected ECKey(@Nullable BigInteger priv, LazyECPoint pub) {
         if (priv != null) {
+            checkArgument(priv.bitLength() <= 32 * 8, "private key exceeds 32 bytes: %s bits", priv.bitLength());
             // Try and catch buggy callers or bad key imports, etc. Zero and one are special because these are often
             // used as sentinel values and because scripting languages have a habit of auto-casting true and false to
             // 1 and 0 or vice-versa. Type confusion bugs could therefore result in private keys with these values.
             checkArgument(!priv.equals(BigInteger.ZERO));
             checkArgument(!priv.equals(BigInteger.ONE));
         }
-        this.priv = priv;
-        this.pub = new LazyECPoint(checkNotNull(pub));
-    }
-
-    protected ECKey(@Nullable BigInteger priv, LazyECPoint pub) {
         this.priv = priv;
         this.pub = checkNotNull(pub);
     }
@@ -446,8 +446,8 @@ public byte[] toASN1() {
     }
 
     /**
-     * Returns public key bytes from the given private key. To convert a byte array into a BigInteger, use <tt>
-     * new BigInteger(1, bytes);</tt>
+     * Returns public key bytes from the given private key. To convert a byte array into a BigInteger,
+     * use {@code new BigInteger(1, bytes);}
      */
     public static byte[] publicKeyFromPrivate(BigInteger privKey, boolean compressed) {
         ECPoint point = publicPointFromPrivate(privKey);
@@ -455,8 +455,8 @@ public static byte[] publicKeyFromPrivate(BigInteger privKey, boolean compressed
     }
 
     /**
-     * Returns public key point from the given private key. To convert a byte array into a BigInteger, use <tt>
-     * new BigInteger(1, bytes);</tt>
+     * Returns public key point from the given private key. To convert a byte array into a BigInteger,
+     * use {@code new BigInteger(1, bytes);}
      */
     public static ECPoint publicPointFromPrivate(BigInteger privKey) {
         /*
@@ -508,14 +508,6 @@ public boolean isCompressed() {
         return pub.isCompressed();
     }
 
-    /**
-     * Returns the address that corresponds to the public part of this ECKey. Note that an address is derived from
-     * the RIPEMD-160 hash of the public key and is not the public key itself (which is too large to be convenient).
-     */
-    public Address toAddress(NetworkParameters params) {
-        return new Address(params, getPubKeyHash());
-    }
-
     /**
      * Groups the two components that make up a signature, and provides a way to encode to DER form, which is
      * how ECDSA signatures are represented when embedded in other data structures in the Bitcoin protocol. The raw
@@ -574,28 +566,38 @@ public byte[] encodeToDER() {
             }
         }
 
-        public static ECDSASignature decodeFromDER(byte[] bytes) {
+        /**
+         * @throws SignatureDecodeException if the signature is unparseable in some way.
+         */
+        public static ECDSASignature decodeFromDER(byte[] bytes) throws SignatureDecodeException {
             ASN1InputStream decoder = null;
             try {
+                // BouncyCastle by default is strict about parsing ASN.1 integers. We relax this check, because some
+                // Bitcoin signatures would not parse.
+                Properties.setThreadOverride("org.bouncycastle.asn1.allow_unsafe_integer", true);
                 decoder = new ASN1InputStream(bytes);
-                DLSequence seq = (DLSequence) decoder.readObject();
-                if (seq == null)
-                    throw new RuntimeException("Reached past end of ASN.1 stream.");
+                final ASN1Primitive seqObj = decoder.readObject();
+                if (seqObj == null)
+                    throw new SignatureDecodeException("Reached past end of ASN.1 stream.");
+                if (!(seqObj instanceof DLSequence))
+                    throw new SignatureDecodeException("Read unexpected class: " + seqObj.getClass().getName());
+                final DLSequence seq = (DLSequence) seqObj;
                 ASN1Integer r, s;
                 try {
                     r = (ASN1Integer) seq.getObjectAt(0);
                     s = (ASN1Integer) seq.getObjectAt(1);
                 } catch (ClassCastException e) {
-                    throw new IllegalArgumentException(e);
+                    throw new SignatureDecodeException(e);
                 }
                 // OpenSSL deviates from the DER spec by interpreting these values as unsigned, though they should not be
                 // Thus, we always use the positive versions. See: http://r6.ca/blog/20111119T211504Z.html
                 return new ECDSASignature(r.getPositiveValue(), s.getPositiveValue());
             } catch (IOException e) {
-                throw new RuntimeException(e);
+                throw new SignatureDecodeException(e);
             } finally {
                 if (decoder != null)
                     try { decoder.close(); } catch (IOException x) {}
+                Properties.removeThreadOverride("org.bouncycastle.asn1.allow_unsafe_integer");
             }
         }
 
@@ -625,7 +627,7 @@ public int hashCode() {
 
     /**
      * Signs the given hash and returns the R and S components as BigIntegers. In the Bitcoin protocol, they are
-     * usually encoded using ASN.1 format, so you want {@link org.bitcoinj.core.ECKey.ECDSASignature#toASN1()}
+     * usually encoded using ASN.1 format, so you want {@link ECKey.ECDSASignature#toASN1()}
      * instead. However sometimes the independent components can be useful, for instance, if you're going to do
      * further EC maths on them.
      * @throws KeyCrypterException if this ECKey doesn't have a private part.
@@ -644,7 +646,7 @@ public ECDSASignature sign(Sha256Hash input) throws KeyCrypterException {
 
     /**
      * Signs the given hash and returns the R and S components as BigIntegers. In the Bitcoin protocol, they are
-     * usually encoded using DER format, so you want {@link org.bitcoinj.core.ECKey.ECDSASignature#encodeToDER()}
+     * usually encoded using DER format, so you want {@link ECKey.ECDSASignature#encodeToDER()}
      * instead. However sometimes the independent components can be useful, for instance, if you're doing to do further
      * EC maths on them.
      *
@@ -677,6 +679,8 @@ protected ECDSASignature doSign(Sha256Hash input, BigInteger privateKeyForSignin
             } catch (NativeSecp256k1Util.AssertFailException e) {
                 log.error("Caught AssertFailException inside secp256k1", e);
                 throw new RuntimeException(e);
+            } catch (SignatureDecodeException e) {
+                throw new RuntimeException(e); // cannot happen
             }
         }
         if (FAKE_SIGNATURES)
@@ -731,8 +735,9 @@ public static boolean verify(byte[] data, ECDSASignature signature, byte[] pub)
      * @param data      Hash of the data to verify.
      * @param signature ASN.1 encoded signature.
      * @param pub       The public key bytes to use.
+     * @throws SignatureDecodeException if the signature is unparseable in some way.
      */
-    public static boolean verify(byte[] data, byte[] signature, byte[] pub) {
+    public static boolean verify(byte[] data, byte[] signature, byte[] pub) throws SignatureDecodeException {
         if (Secp256k1Context.isEnabled()) {
             try {
                 return NativeSecp256k1.verify(data, signature, pub);
@@ -749,8 +754,9 @@ public static boolean verify(byte[] data, byte[] signature, byte[] pub) {
      *
      * @param hash      Hash of the data to verify.
      * @param signature ASN.1 encoded signature.
+     * @throws SignatureDecodeException if the signature is unparseable in some way.
      */
-    public boolean verify(byte[] hash, byte[] signature) {
+    public boolean verify(byte[] hash, byte[] signature) throws SignatureDecodeException {
         return ECKey.verify(hash, signature, getPubKey());
     }
 
@@ -764,9 +770,10 @@ public boolean verify(Sha256Hash sigHash, ECDSASignature signature) {
     /**
      * Verifies the given ASN.1 encoded ECDSA signature against a hash using the public key, and throws an exception
      * if the signature doesn't match
+     * @throws SignatureDecodeException if the signature is unparseable in some way.
      * @throws java.security.SignatureException if the signature does not match.
      */
-    public void verifyOrThrow(byte[] hash, byte[] signature) throws SignatureException {
+    public void verifyOrThrow(byte[] hash, byte[] signature) throws SignatureDecodeException, SignatureException {
         if (!verify(hash, signature))
             throw new SignatureException();
     }
@@ -863,26 +870,16 @@ public String signMessage(String message) throws KeyCrypterException {
      * @throws KeyCrypterException if this ECKey is encrypted and no AESKey is provided or it does not decrypt the ECKey.
      */
     public String signMessage(String message, @Nullable KeyParameter aesKey) throws KeyCrypterException {
-        byte[] data = Utils.formatMessageForSigning(message);
+        byte[] data = formatMessageForSigning(message);
         Sha256Hash hash = Sha256Hash.twiceOf(data);
         ECDSASignature sig = sign(hash, aesKey);
-        // Now we have to work backwards to figure out the recId needed to recover the signature.
-        int recId = -1;
-        for (int i = 0; i < 4; i++) {
-            ECKey k = ECKey.recoverFromSignature(i, sig, hash, isCompressed());
-            if (k != null && k.pub.equals(pub)) {
-                recId = i;
-                break;
-            }
-        }
-        if (recId == -1)
-            throw new RuntimeException("Could not construct a recoverable key. This should never happen.");
+        byte recId = findRecoveryId(hash, sig);
         int headerByte = recId + 27 + (isCompressed() ? 4 : 0);
         byte[] sigData = new byte[65];  // 1 header + 32 bytes for R + 32 bytes for S
         sigData[0] = (byte)headerByte;
         System.arraycopy(Utils.bigIntegerToBytes(sig.r, 32), 0, sigData, 1, 32);
         System.arraycopy(Utils.bigIntegerToBytes(sig.s, 32), 0, sigData, 33, 32);
-        return new String(Base64.encode(sigData), Charset.forName("UTF-8"));
+        return new String(Base64.encode(sigData), StandardCharsets.UTF_8);
     }
 
     /**
@@ -915,7 +912,7 @@ public static ECKey signedMessageToKey(String message, String signatureBase64) t
         BigInteger r = new BigInteger(1, Arrays.copyOfRange(signatureEncoded, 1, 33));
         BigInteger s = new BigInteger(1, Arrays.copyOfRange(signatureEncoded, 33, 65));
         ECDSASignature sig = new ECDSASignature(r, s);
-        byte[] messageBytes = Utils.formatMessageForSigning(message);
+        byte[] messageBytes = formatMessageForSigning(message);
         // Note that the C++ code doesn't actually seem to specify any character encoding. Presumably it's whatever
         // JSON-SPIRIT hands back. Assume UTF-8 for now.
         Sha256Hash messageHash = Sha256Hash.twiceOf(messageBytes);
@@ -941,6 +938,26 @@ public void verifyMessage(String message, String signatureBase64) throws Signatu
             throw new SignatureException("Signature did not match for message");
     }
 
+    /**
+     * Returns the recovery ID, a byte with value between 0 and 3, inclusive, that specifies which of 4 possible
+     * curve points was used to sign a message. This value is also referred to as "v".
+     *
+     * @throws RuntimeException if no recovery ID can be found.
+     */
+    public byte findRecoveryId(Sha256Hash hash, ECDSASignature sig) {
+        byte recId = -1;
+        for (byte i = 0; i < 4; i++) {
+            ECKey k = ECKey.recoverFromSignature(i, sig, hash, isCompressed());
+            if (k != null && k.pub.equals(pub)) {
+                recId = i;
+                break;
+            }
+        }
+        if (recId == -1)
+            throw new RuntimeException("Could not construct a recoverable key. This should never happen.");
+        return recId;
+    }
+
     /**
      * <p>Given the components of a signature and a selector value, recover and return the public key
      * that generated the signature according to the algorithm in SEC1v2 section 4.1.6.</p>
@@ -975,7 +992,7 @@ public static ECKey recoverFromSignature(int recId, ECDSASignature sig, Sha256Ha
         //   1.2. Convert the integer x to an octet string X of length mlen using the conversion routine
         //        specified in Section 2.3.7, where mlen = ⌈(log2 p)/8⌉ or mlen = ⌈m/8⌉.
         //   1.3. Convert the octet string (16 set binary digits)||X to an elliptic curve point R using the
-        //        conversion routine specified in Section 2.3.4. If this conversion routine outputs “invalid”, then
+        //        conversion routine specified in Section 2.3.4. If this conversion routine outputs "invalid", then
         //        do another iteration of Step 1.
         //
         // More concisely, what these points mean is to use X as a compressed public key.
@@ -1029,7 +1046,7 @@ public byte[] getPrivKeyBytes() {
 
     /**
      * Exports the private key in the form used by Bitcoin Core's "dumpprivkey" and "importprivkey" commands. Use
-     * the {@link org.bitcoinj.core.DumpedPrivateKey#toString()} method to get the string.
+     * the {@link DumpedPrivateKey#toString()} method to get the string.
      *
      * @param params The network this key is intended for use on.
      * @return Private key bytes as a {@link DumpedPrivateKey}.
@@ -1090,6 +1107,9 @@ public ECKey decrypt(KeyCrypter keyCrypter, KeyParameter aesKey) throws KeyCrypt
             throw new KeyCrypterException("The keyCrypter being used to decrypt the key is different to the one that was used to encrypt it");
         checkState(encryptedPrivateKey != null, "This key is not encrypted");
         byte[] unencryptedPrivateKey = keyCrypter.decrypt(encryptedPrivateKey, aesKey);
+        if (unencryptedPrivateKey.length != 32)
+            throw new KeyCrypterException.InvalidCipherText(
+                    "Decrypted key must be 32 bytes long, but is " + unencryptedPrivateKey.length);
         ECKey key = ECKey.fromPrivate(unencryptedPrivateKey);
         if (!isCompressed())
             key = key.decompress();
@@ -1219,23 +1239,20 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        // Public keys are random already so we can just use a part of them as the hashcode. Read from the start to
-        // avoid picking up the type code (compressed vs uncompressed) which is tacked on the end.
-        byte[] bits = getPubKey();
-        return Ints.fromBytes(bits[0], bits[1], bits[2], bits[3]);
+        return pub.hashCode();
     }
 
     @Override
     public String toString() {
-        return toString(false, null);
+        return toString(false, null, null);
     }
 
     /**
      * Produce a string rendering of the ECKey INCLUDING the private key.
      * Unless you absolutely need the private key it is better for security reasons to just use {@link #toString()}.
      */
-    public String toStringWithPrivate(NetworkParameters params) {
-        return toString(true, params);
+    public String toStringWithPrivate(@Nullable KeyParameter aesKey, NetworkParameters params) {
+        return toString(true, aesKey, params);
     }
 
     public String getPrivateKeyAsHex() {
@@ -1250,15 +1267,19 @@ public String getPrivateKeyAsWiF(NetworkParameters params) {
         return getPrivateKeyEncoded(params).toString();
     }
 
-    private String toString(boolean includePrivate, NetworkParameters params) {
+    private String toString(boolean includePrivate, @Nullable KeyParameter aesKey, @Nullable NetworkParameters params) {
         final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(this).omitNullValues();
         helper.add("pub HEX", getPublicKeyAsHex());
         if (includePrivate) {
+            ECKey decryptedKey = isEncrypted() ? decrypt(checkNotNull(aesKey)) : this;
             try {
-                helper.add("priv HEX", getPrivateKeyAsHex());
-                helper.add("priv WIF", getPrivateKeyAsWiF(params));
+                helper.add("priv HEX", decryptedKey.getPrivateKeyAsHex());
+                helper.add("priv WIF", decryptedKey.getPrivateKeyAsWiF(params));
             } catch (IllegalStateException e) {
                 // TODO: Make hasPrivKey() work for deterministic keys and fix this.
+            } catch (Exception e) {
+                final String message = e.getMessage();
+                helper.add("priv EXCEPTION", e.getClass().getName() + (message != null ? ": " + message : ""));
             }
         }
         if (creationTimeSeconds > 0)
@@ -1271,19 +1292,53 @@ private String toString(boolean includePrivate, NetworkParameters params) {
         return helper.toString();
     }
 
-    public void formatKeyWithAddress(boolean includePrivateKeys, StringBuilder builder, NetworkParameters params) {
-        final Address address = toAddress(params);
+    public void formatKeyWithAddress(boolean includePrivateKeys, @Nullable KeyParameter aesKey, StringBuilder builder,
+            NetworkParameters params, Script.ScriptType outputScriptType, @Nullable String comment) {
         builder.append("  addr:");
-        builder.append(address.toString());
+        if (outputScriptType != null) {
+            builder.append(Address.fromKey(params, this, outputScriptType));
+        } else {
+            builder.append(LegacyAddress.fromKey(params, this));
+            if (isCompressed())
+                builder.append(',').append(SegwitAddress.fromKey(params, this));
+        }
+        if (!isCompressed())
+            builder.append("  UNCOMPRESSED");
         builder.append("  hash160:");
         builder.append(Utils.HEX.encode(getPubKeyHash()));
         if (creationTimeSeconds > 0)
-            builder.append("  creationTimeSeconds:").append(creationTimeSeconds);
+            builder.append("  creationTimeSeconds:").append(creationTimeSeconds).append(" [")
+                    .append(Utils.dateTimeFormat(creationTimeSeconds * 1000)).append("]");
+        if (comment != null)
+            builder.append("  (").append(comment).append(")");
         builder.append("\n");
         if (includePrivateKeys) {
             builder.append("  ");
-            builder.append(toStringWithPrivate(params));
+            builder.append(toStringWithPrivate(aesKey, params));
             builder.append("\n");
         }
     }
+
+    /** The string that prefixes all text messages signed using Bitcoin keys. */
+    private static final String BITCOIN_SIGNED_MESSAGE_HEADER = "Bitcoin Signed Message:\n";
+    private static final byte[] BITCOIN_SIGNED_MESSAGE_HEADER_BYTES = BITCOIN_SIGNED_MESSAGE_HEADER.getBytes(StandardCharsets.UTF_8);
+
+    /**
+     * <p>Given a textual message, returns a byte buffer formatted as follows:</p>
+     * <p>{@code [24] "Bitcoin Signed Message:\n" [message.length as a varint] message}</p>
+     */
+    private static byte[] formatMessageForSigning(String message) {
+        try {
+            ByteArrayOutputStream bos = new ByteArrayOutputStream();
+            bos.write(BITCOIN_SIGNED_MESSAGE_HEADER_BYTES.length);
+            bos.write(BITCOIN_SIGNED_MESSAGE_HEADER_BYTES);
+            byte[] messageBytes = message.getBytes(StandardCharsets.UTF_8);
+            VarInt size = new VarInt(messageBytes.length);
+            bos.write(size.encode());
+            bos.write(messageBytes);
+            return bos.toByteArray();
+        } catch (IOException e) {
+            throw new RuntimeException(e);  // Cannot happen.
+        }
+    }
 }
diff --git a/core/src/main/java/org/bitcoinj/core/FilteredBlock.java b/core/src/main/java/org/bitcoinj/core/FilteredBlock.java
index 84def7e4d83..bb570617a09 100644
--- a/core/src/main/java/org/bitcoinj/core/FilteredBlock.java
+++ b/core/src/main/java/org/bitcoinj/core/FilteredBlock.java
@@ -36,7 +36,7 @@ public class FilteredBlock extends Message {
     
     // A set of transactions whose hashes are a subset of getTransactionHashes()
     // These were relayed as a part of the filteredblock getdata, ie likely weren't previously received as loose transactions
-    private Map<Sha256Hash, Transaction> associatedTransactions = new HashMap<Sha256Hash, Transaction>();
+    private Map<Sha256Hash, Transaction> associatedTransactions = new HashMap<>();
     
     public FilteredBlock(NetworkParameters params, byte[] payloadBytes) throws ProtocolException {
         super(params, payloadBytes, 0);
@@ -70,13 +70,13 @@ protected void parse() throws ProtocolException {
     
     /**
      * Gets a list of leaf hashes which are contained in the partial merkle tree in this filtered block
-     * 
-     * @throws ProtocolException If the partial merkle block is invalid or the merkle root of the partial merkle block doesnt match the block header
+     *
+     * @throws ProtocolException If the partial merkle block is invalid or the merkle root of the partial merkle block doesn't match the block header
      */
     public List<Sha256Hash> getTransactionHashes() throws VerificationException {
         if (cachedTransactionHashes != null)
             return Collections.unmodifiableList(cachedTransactionHashes);
-        List<Sha256Hash> hashesMatched = new LinkedList<Sha256Hash>();
+        List<Sha256Hash> hashesMatched = new LinkedList<>();
         if (header.getMerkleRoot().equals(merkleTree.getTxnHashAndMerkleRoot(hashesMatched))) {
             cachedTransactionHashes = hashesMatched;
             return Collections.unmodifiableList(cachedTransactionHashes);
@@ -102,7 +102,7 @@ public Sha256Hash getHash() {
      * @return false if the tx is not relevant to this FilteredBlock
      */
     public boolean provideTransaction(Transaction tx) throws VerificationException {
-        Sha256Hash hash = tx.getHash();
+        Sha256Hash hash = tx.getTxId();
         if (getTransactionHashes().contains(hash)) {
             associatedTransactions.put(hash, tx);
             return true;
diff --git a/core/src/main/java/org/bitcoinj/core/FullPrunedBlockChain.java b/core/src/main/java/org/bitcoinj/core/FullPrunedBlockChain.java
index 4bdebbce2db..1d39e7dc5ae 100644
--- a/core/src/main/java/org/bitcoinj/core/FullPrunedBlockChain.java
+++ b/core/src/main/java/org/bitcoinj/core/FullPrunedBlockChain.java
@@ -19,14 +19,17 @@
 
 import org.bitcoinj.script.Script;
 import org.bitcoinj.script.Script.VerifyFlag;
+import org.bitcoinj.script.ScriptPattern;
 import org.bitcoinj.store.BlockStoreException;
 import org.bitcoinj.store.FullPrunedBlockStore;
 import org.bitcoinj.utils.*;
 import org.bitcoinj.wallet.Wallet;
+import org.bitcoinj.wallet.WalletExtension;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nullable;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
@@ -58,7 +61,7 @@ public class FullPrunedBlockChain extends AbstractBlockChain {
     /**
      * Constructs a block chain connected to the given wallet and store. To obtain a {@link Wallet} you can construct
      * one from scratch, or you can deserialize a saved wallet from disk using
-     * {@link Wallet#loadFromFile(java.io.File, WalletExtension...)}
+     * {@link Wallet#loadFromFile(File, WalletExtension...)}
      */
     public FullPrunedBlockChain(Context context, Wallet wallet, FullPrunedBlockStore blockStore) throws BlockStoreException {
         this(context, new ArrayList<Wallet>(), blockStore);
@@ -68,7 +71,7 @@ public FullPrunedBlockChain(Context context, Wallet wallet, FullPrunedBlockStore
     /**
      * Constructs a block chain connected to the given wallet and store. To obtain a {@link Wallet} you can construct
      * one from scratch, or you can deserialize a saved wallet from disk using
-     * {@link Wallet#loadFromFile(java.io.File, WalletExtension...)}
+     * {@link Wallet#loadFromFile(File, WalletExtension...)}
      */
     public FullPrunedBlockChain(NetworkParameters params, Wallet wallet, FullPrunedBlockStore blockStore) throws BlockStoreException {
         this(Context.getOrCreate(params), wallet, blockStore);
@@ -217,14 +220,14 @@ protected TransactionOutputChanges connectTransactions(int height, Block block)
 
         blockStore.beginDatabaseBatchWrite();
 
-        LinkedList<UTXO> txOutsSpent = new LinkedList<UTXO>();
-        LinkedList<UTXO> txOutsCreated = new LinkedList<UTXO>();
+        LinkedList<UTXO> txOutsSpent = new LinkedList<>();
+        LinkedList<UTXO> txOutsCreated = new LinkedList<>();
         long sigOps = 0;
 
         if (scriptVerificationExecutor.isShutdown())
             scriptVerificationExecutor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
 
-        List<Future<VerificationException>> listScriptVerificationResults = new ArrayList<Future<VerificationException>>(block.transactions.size());
+        List<Future<VerificationException>> listScriptVerificationResults = new ArrayList<>(block.transactions.size());
         try {
             if (!params.isCheckpoint(height)) {
                 // BIP30 violator blocks are ones that contain a duplicated transaction. They are all in the
@@ -232,7 +235,7 @@ protected TransactionOutputChanges connectTransactions(int height, Block block)
                 // BIP30 document for more details on this: https://github.com/bitcoin/bips/blob/master/bip-0030.mediawiki
                 for (Transaction tx : block.transactions) {
                     final Set<VerifyFlag> verifyFlags = params.getTransactionVerificationFlags(block, tx, getVersionTally(), height);
-                    Sha256Hash hash = tx.getHash();
+                    Sha256Hash hash = tx.getTxId();
                     // If we already have unspent outputs for this hash, we saw the tx already. Either the block is
                     // being added twice (bug) or the block is a BIP30 violator.
                     if (blockStore.hasUnspentOutputs(hash, tx.getOutputs().size()))
@@ -247,7 +250,7 @@ protected TransactionOutputChanges connectTransactions(int height, Block block)
                 boolean isCoinBase = tx.isCoinBase();
                 Coin valueIn = Coin.ZERO;
                 Coin valueOut = Coin.ZERO;
-                final List<Script> prevOutScripts = new LinkedList<Script>();
+                final List<Script> prevOutScripts = new LinkedList<>();
                 final Set<VerifyFlag> verifyFlags = params.getTransactionVerificationFlags(block, tx, getVersionTally(), height);
                 if (!isCoinBase) {
                     // For each input of the transaction remove the corresponding output from the set of unspent
@@ -269,7 +272,7 @@ protected TransactionOutputChanges connectTransactions(int height, Block block)
                         // TODO: Check we're not spending the genesis transaction here. Bitcoin Core won't allow it.
                         valueIn = valueIn.add(prevOut.getValue());
                         if (verifyFlags.contains(VerifyFlag.P2SH)) {
-                            if (prevOut.getScript().isPayToScriptHash())
+                            if (ScriptPattern.isP2SH(prevOut.getScript()))
                                 sigOps += Script.getP2SHSigOpCount(in.getScriptBytes());
                             if (sigOps > Block.MAX_BLOCK_SIGOPS)
                                 throw new VerificationException("Too many P2SH SigOps in block");
@@ -280,7 +283,7 @@ protected TransactionOutputChanges connectTransactions(int height, Block block)
                         txOutsSpent.add(prevOut);
                     }
                 }
-                Sha256Hash hash = tx.getHash();
+                Sha256Hash hash = tx.getTxId();
                 for (TransactionOutput out : tx.getOutputs()) {
                     valueOut = valueOut.add(out.getValue());
                     // For each output, add it to the set of unspent outputs so it can be consumed in future.
@@ -308,7 +311,7 @@ protected TransactionOutputChanges connectTransactions(int height, Block block)
 
                 if (!isCoinBase && runScripts) {
                     // Because correctlySpends modifies transactions, this must come after we are done with tx
-                    FutureTask<VerificationException> future = new FutureTask<VerificationException>(new Verifier(tx, prevOutScripts, verifyFlags));
+                    FutureTask<VerificationException> future = new FutureTask<>(new Verifier(tx, prevOutScripts, verifyFlags));
                     scriptVerificationExecutor.execute(future);
                     listScriptVerificationResults.add(future);
                 }
@@ -340,10 +343,10 @@ protected TransactionOutputChanges connectTransactions(int height, Block block)
         return new TransactionOutputChanges(txOutsCreated, txOutsSpent);
     }
 
-    @Override
     /**
      * Used during reorgs to connect a block previously on a fork
      */
+    @Override
     protected synchronized TransactionOutputChanges connectTransactions(StoredBlock newBlock)
             throws VerificationException, BlockStoreException, PrunedException {
         checkState(lock.isHeldByCurrentThread());
@@ -361,13 +364,13 @@ protected synchronized TransactionOutputChanges connectTransactions(StoredBlock
         try {
             List<Transaction> transactions = block.getTransactions();
             if (transactions != null) {
-                LinkedList<UTXO> txOutsSpent = new LinkedList<UTXO>();
-                LinkedList<UTXO> txOutsCreated = new LinkedList<UTXO>();
+                LinkedList<UTXO> txOutsSpent = new LinkedList<>();
+                LinkedList<UTXO> txOutsCreated = new LinkedList<>();
                 long sigOps = 0;
 
                 if (!params.isCheckpoint(newBlock.getHeight())) {
                     for (Transaction tx : transactions) {
-                        Sha256Hash hash = tx.getHash();
+                        Sha256Hash hash = tx.getTxId();
                         if (blockStore.hasUnspentOutputs(hash, tx.getOutputs().size()))
                             throw new VerificationException("Block failed BIP30 test!");
                     }
@@ -377,14 +380,14 @@ protected synchronized TransactionOutputChanges connectTransactions(StoredBlock
 
                 if (scriptVerificationExecutor.isShutdown())
                     scriptVerificationExecutor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
-                List<Future<VerificationException>> listScriptVerificationResults = new ArrayList<Future<VerificationException>>(transactions.size());
+                List<Future<VerificationException>> listScriptVerificationResults = new ArrayList<>(transactions.size());
                 for (final Transaction tx : transactions) {
                     final Set<VerifyFlag> verifyFlags =
                         params.getTransactionVerificationFlags(newBlock.getHeader(), tx, getVersionTally(), Integer.SIZE);
                     boolean isCoinBase = tx.isCoinBase();
                     Coin valueIn = Coin.ZERO;
                     Coin valueOut = Coin.ZERO;
-                    final List<Script> prevOutScripts = new LinkedList<Script>();
+                    final List<Script> prevOutScripts = new LinkedList<>();
 
                     if (!isCoinBase) {
                         for (int index = 0; index < tx.getInputs().size(); index++) {
@@ -397,7 +400,7 @@ protected synchronized TransactionOutputChanges connectTransactions(StoredBlock
                                 throw new VerificationException("Tried to spend coinbase at depth " + (newBlock.getHeight() - prevOut.getHeight()));
                             valueIn = valueIn.add(prevOut.getValue());
                             if (verifyFlags.contains(VerifyFlag.P2SH)) {
-                                if (prevOut.getScript().isPayToScriptHash())
+                                if (ScriptPattern.isP2SH(prevOut.getScript()))
                                     sigOps += Script.getP2SHSigOpCount(in.getScriptBytes());
                                 if (sigOps > Block.MAX_BLOCK_SIGOPS)
                                     throw new VerificationException("Too many P2SH SigOps in block");
@@ -411,7 +414,7 @@ protected synchronized TransactionOutputChanges connectTransactions(StoredBlock
                             txOutsSpent.add(prevOut);
                         }
                     }
-                    Sha256Hash hash = tx.getHash();
+                    Sha256Hash hash = tx.getTxId();
                     for (TransactionOutput out : tx.getOutputs()) {
                         valueOut = valueOut.add(out.getValue());
                         Script script = getScript(out.getScriptBytes());
@@ -439,7 +442,7 @@ protected synchronized TransactionOutputChanges connectTransactions(StoredBlock
 
                     if (!isCoinBase) {
                         // Because correctlySpends modifies transactions, this must come after we are done with tx
-                        FutureTask<VerificationException> future = new FutureTask<VerificationException>(new Verifier(tx, prevOutScripts, verifyFlags));
+                        FutureTask<VerificationException> future = new FutureTask<>(new Verifier(tx, prevOutScripts, verifyFlags));
                         scriptVerificationExecutor.execute(future);
                         listScriptVerificationResults.add(future);
                     }
diff --git a/core/src/main/java/org/bitcoinj/core/GetBlocksMessage.java b/core/src/main/java/org/bitcoinj/core/GetBlocksMessage.java
index 4a1bcedb695..a18fb26a6dd 100644
--- a/core/src/main/java/org/bitcoinj/core/GetBlocksMessage.java
+++ b/core/src/main/java/org/bitcoinj/core/GetBlocksMessage.java
@@ -19,8 +19,6 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * <p>Represents the "getblocks" P2P network message, which requests the hashes of the parts of the block chain we're
@@ -31,10 +29,10 @@
 public class GetBlocksMessage extends Message {
 
     protected long version;
-    protected List<Sha256Hash> locator;
+    protected BlockLocator locator;
     protected Sha256Hash stopHash;
 
-    public GetBlocksMessage(NetworkParameters params, List<Sha256Hash> locator, Sha256Hash stopHash) {
+    public GetBlocksMessage(NetworkParameters params, BlockLocator locator, Sha256Hash stopHash) {
         super(params);
         this.version = protocolVersion;
         this.locator = locator;
@@ -53,14 +51,14 @@ protected void parse() throws ProtocolException {
         if (startCount > 500)
             throw new ProtocolException("Number of locators cannot be > 500, received: " + startCount);
         length = cursor - offset + ((startCount + 1) * 32);
-        locator = new ArrayList<Sha256Hash>(startCount);
+        locator = new BlockLocator();
         for (int i = 0; i < startCount; i++) {
-            locator.add(readHash());
+            locator = locator.add(readHash());
         }
         stopHash = readHash();
     }
 
-    public List<Sha256Hash> getLocator() {
+    public BlockLocator getLocator() {
         return locator;
     }
 
@@ -70,7 +68,7 @@ public Sha256Hash getStopHash() {
 
     @Override
     public String toString() {
-        return "getblocks: " + Utils.join(locator);
+        return "getblocks: " + locator.toString();
     }
 
     @Override
@@ -81,7 +79,7 @@ protected void bitcoinSerializeToStream(OutputStream stream) throws IOException
         // identifiers that spans the entire chain with exponentially increasing gaps between
         // them, until we end up at the genesis block. See CBlockLocator::Set()
         stream.write(new VarInt(locator.size()).encode());
-        for (Sha256Hash hash : locator) {
+        for (Sha256Hash hash : locator.getHashes()) {
             // Have to reverse as wire format is little endian.
             stream.write(hash.getReversedBytes());
         }
@@ -95,13 +93,12 @@ public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) return false;
         GetBlocksMessage other = (GetBlocksMessage) o;
         return version == other.version && stopHash.equals(other.stopHash) &&
-            locator.size() == other.locator.size() && locator.containsAll(other.locator); // ignores locator ordering
+            locator.size() == other.locator.size() && locator.equals(other.locator); // ignores locator ordering
     }
 
     @Override
     public int hashCode() {
-        int hashCode = (int)version ^ "getblocks".hashCode() ^ stopHash.hashCode();
-        for (Sha256Hash aLocator : locator) hashCode ^= aLocator.hashCode(); // ignores locator ordering
-        return hashCode;
+        int hashCode = (int) version ^ "getblocks".hashCode() ^ stopHash.hashCode();
+        return hashCode ^= locator.hashCode();
     }
 }
diff --git a/core/src/main/java/org/bitcoinj/core/GetDataMessage.java b/core/src/main/java/org/bitcoinj/core/GetDataMessage.java
index 09442b1e916..2019f6c04dd 100644
--- a/core/src/main/java/org/bitcoinj/core/GetDataMessage.java
+++ b/core/src/main/java/org/bitcoinj/core/GetDataMessage.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2011 Google Inc.
+ * Copyright 2019 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,16 +47,17 @@ public GetDataMessage(NetworkParameters params) {
         super(params);
     }
 
-    public void addTransaction(Sha256Hash hash) {
-        addItem(new InventoryItem(InventoryItem.Type.Transaction, hash));
+    public void addTransaction(Sha256Hash hash, boolean includeWitness) {
+        addItem(new InventoryItem(
+                includeWitness ? InventoryItem.Type.WITNESS_TRANSACTION : InventoryItem.Type.TRANSACTION, hash));
     }
 
-    public void addBlock(Sha256Hash hash) {
-        addItem(new InventoryItem(InventoryItem.Type.Block, hash));
+    public void addBlock(Sha256Hash hash, boolean includeWitness) {
+        addItem(new InventoryItem(includeWitness ? InventoryItem.Type.WITNESS_BLOCK : InventoryItem.Type.BLOCK, hash));
     }
 
     public void addFilteredBlock(Sha256Hash hash) {
-        addItem(new InventoryItem(InventoryItem.Type.FilteredBlock, hash));
+        addItem(new InventoryItem(InventoryItem.Type.FILTERED_BLOCK, hash));
     }
 
     public Sha256Hash getHashOf(int i) {
diff --git a/core/src/main/java/org/bitcoinj/core/GetHeadersMessage.java b/core/src/main/java/org/bitcoinj/core/GetHeadersMessage.java
index 2302c5ca91f..35f8ab59e01 100644
--- a/core/src/main/java/org/bitcoinj/core/GetHeadersMessage.java
+++ b/core/src/main/java/org/bitcoinj/core/GetHeadersMessage.java
@@ -16,8 +16,6 @@
 
 package org.bitcoinj.core;
 
-import java.util.List;
-
 /**
  * <p>The "getheaders" command is structurally identical to "getblocks", but has different meaning. On receiving this
  * message a Bitcoin node returns matching blocks up to the limit, but without the bodies. It is useful as an
@@ -27,7 +25,7 @@
  * <p>Instances of this class are not safe for use by multiple threads.</p>
  */
 public class GetHeadersMessage extends GetBlocksMessage {
-    public GetHeadersMessage(NetworkParameters params, List<Sha256Hash> locator, Sha256Hash stopHash) {
+    public GetHeadersMessage(NetworkParameters params, BlockLocator locator, Sha256Hash stopHash) {
         super(params, locator, stopHash);
     }
 
@@ -37,7 +35,7 @@ public GetHeadersMessage(NetworkParameters params, byte[] payload) throws Protoc
 
     @Override
     public String toString() {
-        return "getheaders: " + Utils.join(locator);
+        return "getheaders: " + locator.toString();
     }
 
     /**
@@ -50,13 +48,12 @@ public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) return false;
         GetHeadersMessage other = (GetHeadersMessage) o;
         return version == other.version && stopHash.equals(other.stopHash) &&
-            locator.size() == other.locator.size() && locator.containsAll(other.locator);  // ignores locator ordering
+            locator.size() == other.locator.size() && locator.equals(other.locator);  // ignores locator ordering
     }
 
     @Override
     public int hashCode() {
-        int hashCode = (int)version ^ "getheaders".hashCode() ^ stopHash.hashCode();
-        for (Sha256Hash aLocator : locator) hashCode ^= aLocator.hashCode(); // ignores locator ordering
-        return hashCode;
+        int hashCode = (int) version ^ "getheaders".hashCode() ^ stopHash.hashCode();
+        return hashCode ^= locator.hashCode();
     }
 }
diff --git a/core/src/main/java/org/bitcoinj/core/HeadersMessage.java b/core/src/main/java/org/bitcoinj/core/HeadersMessage.java
index 0c899c8b0ff..cc3a749fe55 100644
--- a/core/src/main/java/org/bitcoinj/core/HeadersMessage.java
+++ b/core/src/main/java/org/bitcoinj/core/HeadersMessage.java
@@ -71,7 +71,7 @@ protected void parse() throws ProtocolException {
             throw new ProtocolException("Too many headers: got " + numHeaders + " which is larger than " +
                                          MAX_HEADERS);
 
-        blockHeaders = new ArrayList<Block>();
+        blockHeaders = new ArrayList<>();
         final BitcoinSerializer serializer = this.params.getSerializer(true);
 
         for (int i = 0; i < numHeaders; ++i) {
diff --git a/core/src/main/java/org/bitcoinj/core/InventoryItem.java b/core/src/main/java/org/bitcoinj/core/InventoryItem.java
index a505bc5c20f..ea01df40643 100644
--- a/core/src/main/java/org/bitcoinj/core/InventoryItem.java
+++ b/core/src/main/java/org/bitcoinj/core/InventoryItem.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2011 Google Inc.
+ * Copyright 2019 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,10 +27,24 @@ public class InventoryItem {
     static final int MESSAGE_LENGTH = 36;
     
     public enum Type {
-        Error,
-        Transaction,
-        Block,
-        FilteredBlock
+        ERROR(0x0), TRANSACTION(0x1), BLOCK(0x2),
+        // BIP37 extension:
+        FILTERED_BLOCK(0x3),
+        // BIP44 extensions:
+        WITNESS_TRANSACTION(0x40000001), WITNESS_BLOCK(0x40000002), WITNESS_FILTERED_BLOCK(0x40000003);
+
+        public final int code;
+
+        private Type(int code) {
+            this.code = code;
+        }
+
+        public static Type ofCode(int code) {
+            for (Type type : values())
+                if (type.code == code)
+                    return type;
+            return null;
+        }
     }
 
     public final Type type;
diff --git a/core/src/main/java/org/bitcoinj/core/InventoryMessage.java b/core/src/main/java/org/bitcoinj/core/InventoryMessage.java
index 1660dd7c3f6..5d81eeedb55 100644
--- a/core/src/main/java/org/bitcoinj/core/InventoryMessage.java
+++ b/core/src/main/java/org/bitcoinj/core/InventoryMessage.java
@@ -54,11 +54,11 @@ public InventoryMessage(NetworkParameters params) {
     }
 
     public void addBlock(Block block) {
-        addItem(new InventoryItem(InventoryItem.Type.Block, block.getHash()));
+        addItem(new InventoryItem(InventoryItem.Type.BLOCK, block.getHash()));
     }
 
     public void addTransaction(Transaction tx) {
-        addItem(new InventoryItem(InventoryItem.Type.Transaction, tx.getHash()));
+        addItem(new InventoryItem(InventoryItem.Type.TRANSACTION, tx.getTxId()));
     }
 
     /** Creates a new inv message for the given transactions. */
diff --git a/core/src/main/java/org/bitcoinj/core/LegacyAddress.java b/core/src/main/java/org/bitcoinj/core/LegacyAddress.java
new file mode 100644
index 00000000000..85c9d020419
--- /dev/null
+++ b/core/src/main/java/org/bitcoinj/core/LegacyAddress.java
@@ -0,0 +1,255 @@
+/*
+ * Copyright 2011 Google Inc.
+ * Copyright 2014 Giannis Dzegoutanis
+ * Copyright 2015 Andreas Schildbach
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bitcoinj.core;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import java.util.Arrays;
+
+import javax.annotation.Nullable;
+
+import org.bitcoinj.params.Networks;
+import org.bitcoinj.script.Script;
+import org.bitcoinj.script.Script.ScriptType;
+import org.bitcoinj.script.ScriptPattern;
+
+import com.google.common.base.Objects;
+
+/**
+ * <p>A Bitcoin address looks like 1MsScoe2fTJoq4ZPdQgqyhgWeoNamYPevy and is derived from an elliptic curve public key
+ * plus a set of network parameters. Not to be confused with a {@link PeerAddress} or {@link AddressMessage}
+ * which are about network (TCP) addresses.</p>
+ *
+ * <p>A standard address is built by taking the RIPE-MD160 hash of the public key bytes, with a version prefix and a
+ * checksum suffix, then encoding it textually as base58. The version prefix is used to both denote the network for
+ * which the address is valid (see {@link NetworkParameters}, and also to indicate how the bytes inside the address
+ * should be interpreted. Whilst almost all addresses today are hashes of public keys, another (currently unsupported
+ * type) can contain a hash of a script instead.</p>
+ */
+public class LegacyAddress extends Address {
+    /**
+     * An address is a RIPEMD160 hash of a public key, therefore is always 160 bits or 20 bytes.
+     */
+    public static final int LENGTH = 20;
+
+    /** True if P2SH, false if P2PKH. */
+    public final boolean p2sh;
+
+    /**
+     * Private constructor. Use {@link #fromBase58(NetworkParameters, String)},
+     * {@link #fromPubKeyHash(NetworkParameters, byte[])}, {@link #fromScriptHash(NetworkParameters, byte[])} or
+     * {@link #fromKey(NetworkParameters, ECKey)}.
+     * 
+     * @param params
+     *            network this address is valid for
+     * @param p2sh
+     *            true if hash160 is hash of a script, false if it is hash of a pubkey
+     * @param hash160
+     *            20-byte hash of pubkey or script
+     */
+    private LegacyAddress(NetworkParameters params, boolean p2sh, byte[] hash160) throws AddressFormatException {
+        super(params, hash160);
+        if (hash160.length != 20)
+            throw new AddressFormatException.InvalidDataLength(
+                    "Legacy addresses are 20 byte (160 bit) hashes, but got: " + hash160.length);
+        this.p2sh = p2sh;
+    }
+
+    /**
+     * Construct a {@link LegacyAddress} that represents the given pubkey hash. The resulting address will be a P2PKH type of
+     * address.
+     * 
+     * @param params
+     *            network this address is valid for
+     * @param hash160
+     *            20-byte pubkey hash
+     * @return constructed address
+     */
+    public static LegacyAddress fromPubKeyHash(NetworkParameters params, byte[] hash160) throws AddressFormatException {
+        return new LegacyAddress(params, false, hash160);
+    }
+
+    /**
+     * Construct a {@link LegacyAddress} that represents the public part of the given {@link ECKey}. Note that an address is
+     * derived from a hash of the public key and is not the public key itself.
+     * 
+     * @param params
+     *            network this address is valid for
+     * @param key
+     *            only the public part is used
+     * @return constructed address
+     */
+    public static LegacyAddress fromKey(NetworkParameters params, ECKey key) {
+        return fromPubKeyHash(params, key.getPubKeyHash());
+    }
+
+    /**
+     * Construct a {@link LegacyAddress} that represents the given P2SH script hash.
+     * 
+     * @param params
+     *            network this address is valid for
+     * @param hash160
+     *            P2SH script hash
+     * @return constructed address
+     */
+    public static LegacyAddress fromScriptHash(NetworkParameters params, byte[] hash160) throws AddressFormatException {
+        return new LegacyAddress(params, true, hash160);
+    }
+
+    /** @deprecated use {@link #fromScriptHash(NetworkParameters, byte[])} */
+    @Deprecated
+    public static LegacyAddress fromP2SHHash(NetworkParameters params, byte[] hash160) {
+        return fromScriptHash(params, hash160);
+    }
+
+    /**
+     * @deprecated use {@link #fromScriptHash(NetworkParameters, byte[])} in combination with
+     *             {@link ScriptPattern#extractHashFromP2SH(Script)}
+     */
+    @Deprecated
+    public static LegacyAddress fromP2SHScript(NetworkParameters params, Script scriptPubKey) {
+        checkArgument(ScriptPattern.isP2SH(scriptPubKey), "Not a P2SH script");
+        return fromScriptHash(params, ScriptPattern.extractHashFromP2SH(scriptPubKey));
+    }
+
+    /**
+     * Construct a {@link LegacyAddress} from its base58 form.
+     * 
+     * @param params
+     *            expected network this address is valid for, or null if if the network should be derived from the
+     *            base58
+     * @param base58
+     *            base58-encoded textual form of the address
+     * @throws AddressFormatException
+     *             if the given base58 doesn't parse or the checksum is invalid
+     * @throws AddressFormatException.WrongNetwork
+     *             if the given address is valid but for a different chain (eg testnet vs mainnet)
+     */
+    public static LegacyAddress fromBase58(@Nullable NetworkParameters params, String base58)
+            throws AddressFormatException, AddressFormatException.WrongNetwork {
+        byte[] versionAndDataBytes = Base58.decodeChecked(base58);
+        int version = versionAndDataBytes[0] & 0xFF;
+        byte[] bytes = Arrays.copyOfRange(versionAndDataBytes, 1, versionAndDataBytes.length);
+        if (params == null) {
+            for (NetworkParameters p : Networks.get()) {
+                if (version == p.getAddressHeader())
+                    return new LegacyAddress(p, false, bytes);
+                else if (version == p.getP2SHHeader())
+                    return new LegacyAddress(p, true, bytes);
+            }
+            throw new AddressFormatException.InvalidPrefix("No network found for " + base58);
+        } else {
+            if (version == params.getAddressHeader())
+                return new LegacyAddress(params, false, bytes);
+            else if (version == params.getP2SHHeader())
+                return new LegacyAddress(params, true, bytes);
+            throw new AddressFormatException.WrongNetwork(version);
+        }
+    }
+
+    /** @deprecated use {@link #fromPubKeyHash(NetworkParameters, byte[])} */
+    @Deprecated
+    public LegacyAddress(NetworkParameters params, byte[] hash160) throws AddressFormatException {
+        this(params, false, hash160);
+    }
+
+    /**
+     * Get the version header of an address. This is the first byte of a base58 encoded address.
+     * 
+     * @return version header as one byte
+     */
+    public int getVersion() {
+        return p2sh ? params.getP2SHHeader() : params.getAddressHeader();
+    }
+
+    /**
+     * Returns the base58-encoded textual form, including version and checksum bytes.
+     * 
+     * @return textual form
+     */
+    public String toBase58() {
+        return Base58.encodeChecked(getVersion(), bytes);
+    }
+
+    /** @deprecated use {@link #getHash()} */
+    @Deprecated
+    public byte[] getHash160() {
+        return getHash();
+    }
+
+    /** The (big endian) 20 byte hash that is the core of a Bitcoin address. */
+    @Override
+    public byte[] getHash() {
+        return bytes;
+    }
+
+    /**
+     * Get the type of output script that will be used for sending to the address. This is either
+     * {@link ScriptType#P2PKH} or {@link ScriptType#P2SH}.
+     * 
+     * @return type of output script
+     */
+    @Override
+    public ScriptType getOutputScriptType() {
+        return p2sh ? ScriptType.P2SH : ScriptType.P2PKH;
+    }
+
+    /** @deprecated Use {@link #getOutputScriptType()} */
+    @Deprecated
+    public boolean isP2SHAddress() {
+        return p2sh;
+    }
+
+    /**
+     * Given an address, examines the version byte and attempts to find a matching NetworkParameters. If you aren't sure
+     * which network the address is intended for (eg, it was provided by a user), you can use this to decide if it is
+     * compatible with the current wallet.
+     * 
+     * @return network the address is valid for
+     * @throws AddressFormatException if the given base58 doesn't parse or the checksum is invalid
+     */
+    public static NetworkParameters getParametersFromAddress(String address) throws AddressFormatException {
+        return LegacyAddress.fromBase58(null, address).getParameters();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        LegacyAddress other = (LegacyAddress) o;
+        return super.equals(other) && this.p2sh == other.p2sh;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(super.hashCode(), p2sh);
+    }
+
+    @Override
+    public String toString() {
+        return toBase58();
+    }
+
+    @Override
+    public LegacyAddress clone() throws CloneNotSupportedException {
+        return (LegacyAddress) super.clone();
+    }
+}
diff --git a/core/src/main/java/org/bitcoinj/core/ListMessage.java b/core/src/main/java/org/bitcoinj/core/ListMessage.java
index 0a7dafe8037..1a65c4774f1 100644
--- a/core/src/main/java/org/bitcoinj/core/ListMessage.java
+++ b/core/src/main/java/org/bitcoinj/core/ListMessage.java
@@ -23,6 +23,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import com.google.common.base.MoreObjects;
+
 /**
  * <p>Abstract superclass of classes with list based payload, ie InventoryMessage and GetDataMessage.</p>
  * 
@@ -47,7 +49,7 @@ public ListMessage(NetworkParameters params, byte[] payload, MessageSerializer s
 
     public ListMessage(NetworkParameters params) {
         super(params);
-        items = new ArrayList<InventoryItem>();
+        items = new ArrayList<>();
         length = 1; //length of 0 varint;
     }
 
@@ -77,30 +79,15 @@ protected void parse() throws ProtocolException {
         length = (int) (cursor - offset + (arrayLen * InventoryItem.MESSAGE_LENGTH));
 
         // An inv is vector<CInv> where CInv is int+hash. The int is either 1 or 2 for tx or block.
-        items = new ArrayList<InventoryItem>((int) arrayLen);
+        items = new ArrayList<>((int) arrayLen);
         for (int i = 0; i < arrayLen; i++) {
             if (cursor + InventoryItem.MESSAGE_LENGTH > payload.length) {
                 throw new ProtocolException("Ran off the end of the INV");
             }
             int typeCode = (int) readUint32();
-            InventoryItem.Type type;
-            // See ppszTypeName in net.h
-            switch (typeCode) {
-                case 0:
-                    type = InventoryItem.Type.Error;
-                    break;
-                case 1:
-                    type = InventoryItem.Type.Transaction;
-                    break;
-                case 2:
-                    type = InventoryItem.Type.Block;
-                    break;
-                case 3:
-                    type = InventoryItem.Type.FilteredBlock;
-                    break;
-                default:
-                    throw new ProtocolException("Unknown CInv type: " + typeCode);
-            }
+            InventoryItem.Type type = InventoryItem.Type.ofCode(typeCode);
+            if (type == null)
+                throw new ProtocolException("Unknown CInv type: " + typeCode);
             InventoryItem item = new InventoryItem(type, readHash());
             items.add(item);
         }
@@ -112,7 +99,7 @@ public void bitcoinSerializeToStream(OutputStream stream) throws IOException {
         stream.write(new VarInt(items.size()).encode());
         for (InventoryItem i : items) {
             // Write out the type code.
-            Utils.uint32ToByteStreamLE(i.type.ordinal(), stream);
+            Utils.uint32ToByteStreamLE(i.type.code, stream);
             // And now the hash.
             stream.write(i.hash.getReversedBytes());
         }
@@ -129,4 +116,11 @@ public boolean equals(Object o) {
     public int hashCode() {
         return items.hashCode();
     }
+
+    @Override
+    public String toString() {
+        MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(this);
+        helper.addValue(items);
+        return helper.toString();
+    }
 }
diff --git a/core/src/main/java/org/bitcoinj/core/Message.java b/core/src/main/java/org/bitcoinj/core/Message.java
index e6f5cd2be3a..a3bb506a328 100644
--- a/core/src/main/java/org/bitcoinj/core/Message.java
+++ b/core/src/main/java/org/bitcoinj/core/Message.java
@@ -22,6 +22,7 @@
 
 import java.io.*;
 import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
 import static com.google.common.base.Preconditions.checkState;
@@ -67,7 +68,8 @@ protected Message() {
 
     protected Message(NetworkParameters params) {
         this.params = params;
-        serializer = params.getDefaultSerializer();
+        this.protocolVersion = params.getProtocolVersionNum(NetworkParameters.ProtocolVersion.CURRENT);
+        this.serializer = params.getDefaultSerializer();
     }
 
     protected Message(NetworkParameters params, byte[] payload, int offset, int protocolVersion) throws ProtocolException {
@@ -135,7 +137,7 @@ protected Message(NetworkParameters params, byte[] payload, int offset, MessageS
 
     /**
      * <p>To be called before any change of internal values including any setters. This ensures any cached byte array is
-     * removed.<p/>
+     * removed.</p>
      * <p>Child messages of this object(e.g. Transactions belonging to a Block) will not have their internal byte caches
      * invalidated unless they are also modified internally.</p>
      */
@@ -185,19 +187,20 @@ public byte[] bitcoinSerialize() {
     }
 
     /**
-     * Serialize this message to a byte array that conforms to the bitcoin wire protocol.
-     * <br/>
-     * This method may return the original byte array used to construct this message if the
-     * following conditions are met:
+     * <p>Serialize this message to a byte array that conforms to the bitcoin wire protocol.</p>
+     *
+     * <p>This method may return the original byte array used to construct this message if the
+     * following conditions are met:</p>
+     *
      * <ol>
      * <li>1) The message was parsed from a byte array with parseRetain = true</li>
      * <li>2) The message has not been modified</li>
      * <li>3) The array had an offset of 0 and no surplus bytes</li>
      * </ol>
      *
-     * If condition 3 is not met then an copy of the relevant portion of the array will be returned.
+     * <p>If condition 3 is not met then an copy of the relevant portion of the array will be returned.
      * Otherwise a full serialize will occur. For this reason you should only use this API if you can guarantee you
-     * will treat the resulting array as read only.
+     * will treat the resulting array as read only.</p>
      *
      * @return a byte array owned by this object, do NOT mutate it.
      */
@@ -327,7 +330,7 @@ protected long readVarInt(int offset) throws ProtocolException {
     }
 
     protected byte[] readBytes(int length) throws ProtocolException {
-        if (length > MAX_SIZE) {
+        if ((length > MAX_SIZE) || (cursor + length > payload.length)) {
             throw new ProtocolException("Claimed value length too large: " + length);
         }
         try {
@@ -347,7 +350,7 @@ protected byte[] readByteArray() throws ProtocolException {
 
     protected String readStr() throws ProtocolException {
         long length = readVarInt();
-        return length == 0 ? "" : Utils.toString(readBytes((int) length), "UTF-8"); // optimization for empty strings
+        return length == 0 ? "" : new String(readBytes((int) length), StandardCharsets.UTF_8); // optimization for empty strings
     }
 
     protected Sha256Hash readHash() throws ProtocolException {
@@ -368,7 +371,7 @@ public NetworkParameters getParams() {
     /**
      * Set the serializer for this message when deserialized by Java.
      */
-    private void readObject(java.io.ObjectInputStream in)
+    private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
         if (null != params) {
diff --git a/core/src/main/java/org/bitcoinj/core/NetworkParameters.java b/core/src/main/java/org/bitcoinj/core/NetworkParameters.java
index 0e51278f33a..2dc8d8bf2b1 100644
--- a/core/src/main/java/org/bitcoinj/core/NetworkParameters.java
+++ b/core/src/main/java/org/bitcoinj/core/NetworkParameters.java
@@ -77,11 +77,14 @@ public abstract class NetworkParameters {
     protected int addressHeader;
     protected int p2shHeader;
     protected int dumpedPrivateKeyHeader;
+    protected String segwitAddressHrp;
     protected int interval;
     protected int targetTimespan;
     protected byte[] alertSigningKey;
-    protected int bip32HeaderPub;
-    protected int bip32HeaderPriv;
+    protected int bip32HeaderP2PKHpub;
+    protected int bip32HeaderP2PKHpriv;
+    protected int bip32HeaderP2WPKHpub;
+    protected int bip32HeaderP2WPKHpriv;
 
     /** Used to check majorities for block version upgrade */
     protected int majorityEnforceBlockUpgrade;
@@ -100,12 +103,11 @@ public abstract class NetworkParameters {
     protected int spendableCoinbaseDepth;
     protected int subsidyDecreaseBlockCount;
     
-    protected int[] acceptableAddressCodes;
     protected String[] dnsSeeds;
     protected int[] addrSeeds;
     protected HttpDiscovery.Details[] httpSeeds = {};
-    protected Map<Integer, Sha256Hash> checkpoints = new HashMap<Integer, Sha256Hash>();
-    protected transient MessageSerializer defaultSerializer = null;
+    protected Map<Integer, Sha256Hash> checkpoints = new HashMap<>();
+    protected volatile transient MessageSerializer defaultSerializer = null;
 
     protected NetworkParameters() {
         alertSigningKey = SATOSHI_KEY;
@@ -156,42 +158,6 @@ private static Block createGenesis(NetworkParameters n) {
      */
     public static final Coin MAX_MONEY = COIN.multiply(MAX_COINS);
 
-    /** Alias for TestNet3Params.get(), use that instead. */
-    @Deprecated
-    public static NetworkParameters testNet() {
-        return TestNet3Params.get();
-    }
-
-    /** Alias for TestNet2Params.get(), use that instead. */
-    @Deprecated
-    public static NetworkParameters testNet2() {
-        return TestNet2Params.get();
-    }
-
-    /** Alias for TestNet3Params.get(), use that instead. */
-    @Deprecated
-    public static NetworkParameters testNet3() {
-        return TestNet3Params.get();
-    }
-
-    /** Alias for MainNetParams.get(), use that instead */
-    @Deprecated
-    public static NetworkParameters prodNet() {
-        return MainNetParams.get();
-    }
-
-    /** Returns a testnet params modified to allow any difficulty target. */
-    @Deprecated
-    public static NetworkParameters unitTests() {
-        return UnitTestParams.get();
-    }
-
-    /** Returns a standard regression test params (similar to unitTests) */
-    @Deprecated
-    public static NetworkParameters regTests() {
-        return RegTestParams.get();
-    }
-
     /**
      * A Java package style string acting as unique ID for these parameters
      */
@@ -286,7 +252,7 @@ public int[] getAddrSeeds() {
         return addrSeeds;
     }
 
-    /** Returns discovery objects for seeds implementing the Cartographer protocol. See {@link org.bitcoinj.net.discovery.HttpDiscovery} for more info. */
+    /** Returns discovery objects for seeds implementing the Cartographer protocol. See {@link HttpDiscovery} for more info. */
     public HttpDiscovery.Details[] getHttpSeeds() {
         return httpSeeds;
     }
@@ -294,7 +260,7 @@ public HttpDiscovery.Details[] getHttpSeeds() {
     /**
      * <p>Genesis block for this chain.</p>
      *
-     * <p>The first block in every chain is a well known constant shared between all Bitcoin implemenetations. For a
+     * <p>The first block in every chain is a well known constant shared between all Bitcoin implementations. For a
      * block to be valid, it must be eventually possible to work backwards to the genesis block by following the
      * prevBlockHash pointers in the block headers.</p>
      *
@@ -317,7 +283,7 @@ public long getPacketMagic() {
     }
 
     /**
-     * First byte of a base58 encoded address. See {@link org.bitcoinj.core.Address}. This is the same as acceptableAddressCodes[0] and
+     * First byte of a base58 encoded address. See {@link LegacyAddress}. This is the same as acceptableAddressCodes[0] and
      * is the one used for "normal" addresses. Other types of address may be encountered with version codes found in
      * the acceptableAddressCodes array.
      */
@@ -332,11 +298,16 @@ public int getP2SHHeader() {
         return p2shHeader;
     }
 
-    /** First byte of a base58 encoded dumped private key. See {@link org.bitcoinj.core.DumpedPrivateKey}. */
+    /** First byte of a base58 encoded dumped private key. See {@link DumpedPrivateKey}. */
     public int getDumpedPrivateKeyHeader() {
         return dumpedPrivateKeyHeader;
     }
 
+    /** Human readable part of bech32 encoded segwit address. */
+    public String getSegwitAddressHrp() {
+        return segwitAddressHrp;
+    }
+
     /**
      * How much time in seconds is supposed to pass between "interval" blocks. If the actual elapsed time is
      * significantly different from this value, the network difficulty formula will produce a different value. Both
@@ -346,15 +317,6 @@ public int getTargetTimespan() {
         return targetTimespan;
     }
 
-    /**
-     * The version codes that prefix addresses which are acceptable on this network. Although Satoshi intended these to
-     * be used for "versioning", in fact they are today used to discriminate what kind of data is contained in the
-     * address and to prevent accidentally sending coins across chains which would destroy them.
-     */
-    public int[] getAcceptableAddressCodes() {
-        return acceptableAddressCodes;
-    }
-
     /**
      * If we are running in testnet-in-a-box mode, we allow connections to nodes with 0 non-genesis blocks.
      */
@@ -362,7 +324,7 @@ public boolean allowEmptyPeerChain() {
         return true;
     }
 
-    /** How many blocks pass between difficulty adjustment periods. Bitcoin standardises this to be 2015. */
+    /** How many blocks pass between difficulty adjustment periods. Bitcoin standardises this to be 2016. */
     public int getInterval() {
         return interval;
     }
@@ -373,23 +335,32 @@ public BigInteger getMaxTarget() {
     }
 
     /**
-     * The key used to sign {@link org.bitcoinj.core.AlertMessage}s. You can use {@link org.bitcoinj.core.ECKey#verify(byte[], byte[], byte[])} to verify
+     * The key used to sign {@link AlertMessage}s. You can use {@link ECKey#verify(byte[], byte[], byte[])} to verify
      * signatures using it.
      */
     public byte[] getAlertSigningKey() {
         return alertSigningKey;
     }
 
-    /** Returns the 4 byte header for BIP32 (HD) wallet - public key part. */
-    public int getBip32HeaderPub() {
-        return bip32HeaderPub;
+    /** Returns the 4 byte header for BIP32 wallet P2PKH - public key part. */
+    public int getBip32HeaderP2PKHpub() {
+        return bip32HeaderP2PKHpub;
     }
 
-    /** Returns the 4 byte header for BIP32 (HD) wallet - private key part. */
-    public int getBip32HeaderPriv() {
-        return bip32HeaderPriv;
+    /** Returns the 4 byte header for BIP32 wallet P2PKH - private key part. */
+    public int getBip32HeaderP2PKHpriv() {
+        return bip32HeaderP2PKHpriv;
     }
 
+    /** Returns the 4 byte header for BIP32 wallet P2WPKH - public key part. */
+    public int getBip32HeaderP2WPKHpub() {
+        return bip32HeaderP2WPKHpub;
+    }
+
+    /** Returns the 4 byte header for BIP32 wallet P2WPKH - private key part. */
+    public int getBip32HeaderP2WPKHpriv() {
+        return bip32HeaderP2WPKHpriv;
+    }
     /**
      * Returns the number of coins that will be produced in total, on this
      * network. Where not applicable, a very large number of coins is returned
@@ -398,7 +369,7 @@ public int getBip32HeaderPriv() {
     public abstract Coin getMaxMoney();
 
     /**
-     * Any standard (ie pay-to-address) output smaller than this value will
+     * Any standard (ie P2PKH) output smaller than this value will
      * most likely be rejected by the network.
      */
     public abstract Coin getMinNonDustOutput();
@@ -415,14 +386,14 @@ public int getBip32HeaderPriv() {
 
     /**
      * Returns whether this network has a maximum number of coins (finite supply) or
-     * not. Always returns true for Bitcoin, but exists to be overriden for other
+     * not. Always returns true for Bitcoin, but exists to be overridden for other
      * networks.
      */
     public abstract boolean hasMaxMoney();
 
     /**
      * Return the default serializer for this network. This is a shared serializer.
-     * @return 
+     * @return the default serializer for this network.
      */
     public final MessageSerializer getDefaultSerializer() {
         // Construct a default serializer if we don't have one
@@ -448,7 +419,7 @@ public final MessageSerializer getDefaultSerializer() {
     public abstract BitcoinSerializer getSerializer(boolean parseRetain);
 
     /**
-     * The number of blocks in the last {@link getMajorityWindow()} blocks
+     * The number of blocks in the last {@link #getMajorityWindow()} blocks
      * at which to trigger a notice to the user to upgrade their client, where
      * the client does not understand those blocks.
      */
@@ -457,7 +428,7 @@ public int getMajorityEnforceBlockUpgrade() {
     }
 
     /**
-     * The number of blocks in the last {@link getMajorityWindow()} blocks
+     * The number of blocks in the last {@link #getMajorityWindow()} blocks
      * at which to enforce the requirement that all new blocks are of the
      * newer type (i.e. outdated blocks are rejected).
      */
@@ -526,8 +497,10 @@ public EnumSet<Script.VerifyFlag> getTransactionVerificationFlags(final Block bl
     public static enum ProtocolVersion {
         MINIMUM(70000),
         PONG(60001),
-        BLOOM_FILTER(70000),
-        CURRENT(70001);
+        BLOOM_FILTER(70000), // BIP37
+        BLOOM_FILTER_BIP111(70011), // BIP111
+        WITNESS_VERSION(70012),
+        CURRENT(70012);
 
         private final int bitcoinProtocol;
 
diff --git a/core/src/main/java/org/bitcoinj/core/NotFoundMessage.java b/core/src/main/java/org/bitcoinj/core/NotFoundMessage.java
index bf9c77ae1af..e5646bddcda 100644
--- a/core/src/main/java/org/bitcoinj/core/NotFoundMessage.java
+++ b/core/src/main/java/org/bitcoinj/core/NotFoundMessage.java
@@ -38,6 +38,6 @@ public NotFoundMessage(NetworkParameters params, byte[] payloadBytes) throws Pro
 
     public NotFoundMessage(NetworkParameters params, List<InventoryItem> items) {
         super(params);
-        this.items = new ArrayList<InventoryItem>(items);
+        this.items = new ArrayList<>(items);
     }
 }
diff --git a/core/src/main/java/org/bitcoinj/core/PartialMerkleTree.java b/core/src/main/java/org/bitcoinj/core/PartialMerkleTree.java
index 832e1b75c93..d1590085cf8 100644
--- a/core/src/main/java/org/bitcoinj/core/PartialMerkleTree.java
+++ b/core/src/main/java/org/bitcoinj/core/PartialMerkleTree.java
@@ -37,7 +37,7 @@
  * depth-first traversal is performed, consuming bits and hashes as they were written during encoding.</p>
  *
  * <p>The serialization is fixed and provides a hard guarantee about the encoded size,
- * <tt>SIZE &lt;= 10 + ceil(32.25*N)</tt> where N represents the number of leaf nodes of the partial tree. N itself
+ * {@code SIZE <= 10 + ceil(32.25*N)} where N represents the number of leaf nodes of the partial tree. N itself
  * is bounded by:</p>
  *
  * <p>
@@ -45,14 +45,16 @@
  * N &lt;= 1 + matched_transactions*tree_height
  * </p>
  *
- * <p><pre>The serialization format:
+ * <p>The serialization format:</p>
+ * <pre>
  *  - uint32     total_transactions (4 bytes)
  *  - varint     number of hashes   (1-3 bytes)
  *  - uint256[]  hashes in depth-first order (&lt;= 32*N bytes)
  *  - varint     number of bytes of flag bits (1-3 bytes)
  *  - byte[]     flag bits, packed per 8 in a byte, least significant bit first (&lt;= 2*N-1 bits)
- * The size constraints follow from this.</pre></p>
- * 
+ * </pre>
+ * <p>The size constraints follow from this.</p>
+ *
  * <p>Instances of this class are not safe for use by multiple threads.</p>
  */
 public class PartialMerkleTree extends Message {
@@ -89,8 +91,8 @@ public static PartialMerkleTree buildFromLeaves(NetworkParameters params, byte[]
         int height = 0;
         while (getTreeWidth(allLeafHashes.size(), height) > 1)
             height++;
-        List<Boolean> bitList = new ArrayList<Boolean>();
-        List<Sha256Hash> hashes = new ArrayList<Sha256Hash>();
+        List<Boolean> bitList = new ArrayList<>();
+        List<Sha256Hash> hashes = new ArrayList<>();
         traverseAndBuild(height, 0, allLeafHashes, includeBits, bitList, hashes);
         byte[] bits = new byte[(int)Math.ceil(bitList.size() / 8.0)];
         for (int i = 0; i < bitList.size(); i++)
@@ -116,7 +118,7 @@ protected void parse() throws ProtocolException {
         transactionCount = (int)readUint32();
 
         int nHashes = (int) readVarInt();
-        hashes = new ArrayList<Sha256Hash>(nHashes);
+        hashes = new ArrayList<>(Math.min(nHashes, Utils.MAX_INITIAL_ARRAY_LENGTH));
         for (int i = 0; i < nHashes; i++)
             hashes.add(readHash());
 
@@ -213,9 +215,7 @@ private Sha256Hash recursiveExtractHashes(int height, int pos, ValuesUsed used,
     }
 
     private static Sha256Hash combineLeftRight(byte[] left, byte[] right) {
-        return Sha256Hash.wrapReversed(Sha256Hash.hashTwice(
-            reverseBytes(left), 0, 32,
-            reverseBytes(right), 0, 32));
+        return Sha256Hash.wrapReversed(Sha256Hash.hashTwice(reverseBytes(left), reverseBytes(right)));
     }
 
     /**
diff --git a/core/src/main/java/org/bitcoinj/core/Peer.java b/core/src/main/java/org/bitcoinj/core/Peer.java
index f79dacdbc26..f6b216909e4 100644
--- a/core/src/main/java/org/bitcoinj/core/Peer.java
+++ b/core/src/main/java/org/bitcoinj/core/Peer.java
@@ -16,9 +16,12 @@
 
 package org.bitcoinj.core;
 
-import com.google.common.base.*;
 import com.google.common.base.Objects;
+import com.google.common.collect.Lists;
 import org.bitcoinj.core.listeners.*;
+import org.bitcoinj.net.AbstractTimeoutHandler;
+import org.bitcoinj.net.NioClient;
+import org.bitcoinj.net.NioClientManager;
 import org.bitcoinj.net.StreamConnection;
 import org.bitcoinj.store.BlockStore;
 import org.bitcoinj.store.BlockStoreException;
@@ -26,16 +29,22 @@
 import org.bitcoinj.utils.Threading;
 import org.bitcoinj.wallet.Wallet;
 
-import com.google.common.collect.Lists;
+import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
+import com.google.common.base.Throwables;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
 import net.jcip.annotations.GuardedBy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nullable;
+import java.net.SocketAddress;
 import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CopyOnWriteArraySet;
@@ -51,8 +60,8 @@
  * handles low-level message (de)serialization.</p>
  *
  * <p>Note that timeouts are handled by the extended
- * {@link org.bitcoinj.net.AbstractTimeoutHandler} and timeout is automatically disabled (using
- * {@link org.bitcoinj.net.AbstractTimeoutHandler#setTimeoutEnabled(boolean)}) once the version
+ * {@link AbstractTimeoutHandler} and timeout is automatically disabled (using
+ * {@link AbstractTimeoutHandler#setTimeoutEnabled(boolean)}) once the version
  * handshake completes.</p>
  */
 public class Peer extends PeerSocketHandler {
@@ -62,22 +71,25 @@ public class Peer extends PeerSocketHandler {
 
     private final NetworkParameters params;
     private final AbstractBlockChain blockChain;
+    private final long requiredServices;
     private final Context context;
 
     private final CopyOnWriteArrayList<ListenerRegistration<BlocksDownloadedEventListener>> blocksDownloadedEventListeners
-        = new CopyOnWriteArrayList<ListenerRegistration<BlocksDownloadedEventListener>>();
+        = new CopyOnWriteArrayList<>();
     private final CopyOnWriteArrayList<ListenerRegistration<ChainDownloadStartedEventListener>> chainDownloadStartedEventListeners
-        = new CopyOnWriteArrayList<ListenerRegistration<ChainDownloadStartedEventListener>>();
+        = new CopyOnWriteArrayList<>();
+    protected final CopyOnWriteArrayList<ListenerRegistration<VersionMessageReceivedEventListener>> versionMessageReceivedEventListeners
+        = new CopyOnWriteArrayList<ListenerRegistration<VersionMessageReceivedEventListener>>();
     private final CopyOnWriteArrayList<ListenerRegistration<PeerConnectedEventListener>> connectedEventListeners
-        = new CopyOnWriteArrayList<ListenerRegistration<PeerConnectedEventListener>>();
+        = new CopyOnWriteArrayList<>();
     private final CopyOnWriteArrayList<ListenerRegistration<PeerDisconnectedEventListener>> disconnectedEventListeners
-        = new CopyOnWriteArrayList<ListenerRegistration<PeerDisconnectedEventListener>>();
+        = new CopyOnWriteArrayList<>();
     private final CopyOnWriteArrayList<ListenerRegistration<GetDataEventListener>> getDataEventListeners
-        = new CopyOnWriteArrayList<ListenerRegistration<GetDataEventListener>>();
+        = new CopyOnWriteArrayList<>();
     private final CopyOnWriteArrayList<ListenerRegistration<PreMessageReceivedEventListener>> preMessageReceivedEventListeners
-        = new CopyOnWriteArrayList<ListenerRegistration<PreMessageReceivedEventListener>>();
+        = new CopyOnWriteArrayList<>();
     private final CopyOnWriteArrayList<ListenerRegistration<OnTransactionBroadcastListener>> onTransactionEventListeners
-        = new CopyOnWriteArrayList<ListenerRegistration<OnTransactionBroadcastListener>>();
+        = new CopyOnWriteArrayList<>();
     // Whether to try and download blocks and transactions from this peer. Set to false by PeerGroup if not the
     // primary peer. This is to avoid redundant work and concurrency problems with downloading the same chain
     // in parallel.
@@ -105,32 +117,25 @@ public class Peer extends PeerSocketHandler {
     private volatile BloomFilter vBloomFilter;
     // The last filtered block we received, we're waiting to fill it out with transactions.
     private FilteredBlock currentFilteredBlock = null;
-    // How many filtered blocks have been received during the lifetime of this connection. Used to decide when to
-    // refresh the server-side side filter by sending a new one (it degrades over time as false positives are added
-    // on the remote side, see BIP 37 for a discussion of this).
-    // TODO: Is this still needed? It should not be since the auto FP tracking logic was added.
-    private int filteredBlocksReceived;
     // If non-null, we should discard incoming filtered blocks because we ran out of keys and are awaiting a new filter
     // to be calculated by the PeerGroup. The discarded block hashes should be added here so we can re-request them
     // once we've recalculated and resent a new filter.
     @GuardedBy("lock") @Nullable private List<Sha256Hash> awaitingFreshFilter;
-    // How frequently to refresh the filter. This should become dynamic in future and calculated depending on the
-    // actual false positive rate. For now a good value was determined empirically around January 2013.
-    private static final int RESEND_BLOOM_FILTER_BLOCK_COUNT = 25000;
     // Keeps track of things we requested internally with getdata but didn't receive yet, so we can avoid re-requests.
     // It's not quite the same as getDataFutures, as this is used only for getdatas done as part of downloading
     // the chain and so is lighter weight (we just keep a bunch of hashes not futures).
     //
     // It is important to avoid a nasty edge case where we can end up with parallel chain downloads proceeding
     // simultaneously if we were to receive a newly solved block whilst parts of the chain are streaming to us.
-    private final HashSet<Sha256Hash> pendingBlockDownloads = new HashSet<Sha256Hash>();
+    private final HashSet<Sha256Hash> pendingBlockDownloads = new HashSet<>();
     // Keep references to TransactionConfidence objects for transactions that were announced by a remote peer, but
     // which we haven't downloaded yet. These objects are de-duplicated by the TxConfidenceTable class.
     // Once the tx is downloaded (by some peer), the Transaction object that is created will have a reference to
     // the confidence object held inside it, and it's then up to the event listeners that receive the Transaction
     // to keep it pinned to the root set if they care about this data.
     @SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
-    private final HashSet<TransactionConfidence> pendingTxDownloads = new HashSet<TransactionConfidence>();
+    private final HashSet<TransactionConfidence> pendingTxDownloads = new HashSet<>();
+    private static final int PENDING_TX_DOWNLOADS_LIMIT = 100;
     // The lowest version number we're willing to accept. Lower than this will result in an immediate disconnect.
     private volatile int vMinProtocolVersion;
     // When an API user explicitly requests a block or transaction from a peer, the InventoryItem is put here
@@ -152,6 +157,8 @@ public GetDataRequest(Sha256Hash hash, SettableFuture future) {
     private final ReentrantLock lastPingTimesLock = new ReentrantLock();
     @GuardedBy("lastPingTimesLock") private long[] lastPingTimes = null;
     private final CopyOnWriteArrayList<PendingPing> pendingPings;
+    // Disconnect from a peer that is not responding to Pings
+    private static final int PENDING_PINGS_LIMIT = 50;
     private static final int PING_MOVING_AVERAGE_WINDOW = 20;
 
     private volatile VersionMessage vPeerVersionMessage;
@@ -160,17 +167,27 @@ public GetDataRequest(Sha256Hash hash, SettableFuture future) {
     private final SettableFuture<Peer> connectionOpenFuture = SettableFuture.create();
     private final SettableFuture<Peer> outgoingVersionHandshakeFuture = SettableFuture.create();
     private final SettableFuture<Peer> incomingVersionHandshakeFuture = SettableFuture.create();
-    private final ListenableFuture<List<Peer>> versionHandshakeFuture = Futures
-            .allAsList(outgoingVersionHandshakeFuture, incomingVersionHandshakeFuture);
+    private final ListenableFuture<Peer> versionHandshakeFuture = Futures.transform(
+            Futures.allAsList(outgoingVersionHandshakeFuture, incomingVersionHandshakeFuture),
+            new Function<List<Peer>, Peer>() {
+
+                @Override
+                @Nullable
+                public Peer apply(@Nullable List<Peer> peers) {
+                    checkNotNull(peers);
+                    checkState(peers.size() == 2 && peers.get(0) == peers.get(1));
+                    return peers.get(0);
+                }
+            }, MoreExecutors.directExecutor());
 
     /**
      * <p>Construct a peer that reads/writes from the given block chain.</p>
      *
      * <p>Note that this does <b>NOT</b> make a connection to the given remoteAddress, it only creates a handler for a
      * connection. If you want to create a one-off connection, create a Peer and pass it to
-     * {@link org.bitcoinj.net.NioClientManager#openConnection(java.net.SocketAddress, StreamConnection)}
+     * {@link NioClientManager#openConnection(SocketAddress, StreamConnection)}
      * or
-     * {@link org.bitcoinj.net.NioClient#NioClient(java.net.SocketAddress, StreamConnection, int)}.</p>
+     * {@link NioClient#NioClient(SocketAddress, StreamConnection, int)}.</p>
      *
      * <p>The remoteAddress provided should match the remote address of the peer which is being connected to, and is
      * used to keep track of which peers relayed transactions and offer more descriptive logging.</p>
@@ -180,52 +197,53 @@ public Peer(NetworkParameters params, VersionMessage ver, @Nullable AbstractBloc
     }
 
     /**
-     * <p>Construct a peer that reads/writes from the given block chain. Transactions stored in a {@link org.bitcoinj.core.TxConfidenceTable}
-     * will have their confidence levels updated when a peer announces it, to reflect the greater likelyhood that
+     * <p>Construct a peer that reads/writes from the given block chain. Transactions stored in a {@link TxConfidenceTable}
+     * will have their confidence levels updated when a peer announces it, to reflect the greater likelihood that
      * the transaction is valid.</p>
      *
      * <p>Note that this does <b>NOT</b> make a connection to the given remoteAddress, it only creates a handler for a
      * connection. If you want to create a one-off connection, create a Peer and pass it to
-     * {@link org.bitcoinj.net.NioClientManager#openConnection(java.net.SocketAddress, StreamConnection)}
+     * {@link NioClientManager#openConnection(SocketAddress, StreamConnection)}
      * or
-     * {@link org.bitcoinj.net.NioClient#NioClient(java.net.SocketAddress, StreamConnection, int)}.</p>
+     * {@link NioClient#NioClient(SocketAddress, StreamConnection, int)}.</p>
      *
      * <p>The remoteAddress provided should match the remote address of the peer which is being connected to, and is
      * used to keep track of which peers relayed transactions and offer more descriptive logging.</p>
      */
     public Peer(NetworkParameters params, VersionMessage ver, PeerAddress remoteAddress,
                 @Nullable AbstractBlockChain chain) {
-        this(params, ver, remoteAddress, chain, Integer.MAX_VALUE);
+        this(params, ver, remoteAddress, chain, 0, Integer.MAX_VALUE);
     }
 
     /**
-     * <p>Construct a peer that reads/writes from the given block chain. Transactions stored in a {@link org.bitcoinj.core.TxConfidenceTable}
-     * will have their confidence levels updated when a peer announces it, to reflect the greater likelyhood that
+     * <p>Construct a peer that reads/writes from the given block chain. Transactions stored in a {@link TxConfidenceTable}
+     * will have their confidence levels updated when a peer announces it, to reflect the greater likelihood that
      * the transaction is valid.</p>
      *
      * <p>Note that this does <b>NOT</b> make a connection to the given remoteAddress, it only creates a handler for a
      * connection. If you want to create a one-off connection, create a Peer and pass it to
-     * {@link org.bitcoinj.net.NioClientManager#openConnection(java.net.SocketAddress, StreamConnection)}
+     * {@link NioClientManager#openConnection(SocketAddress, StreamConnection)}
      * or
-     * {@link org.bitcoinj.net.NioClient#NioClient(java.net.SocketAddress, StreamConnection, int)}.</p>
+     * {@link NioClient#NioClient(SocketAddress, StreamConnection, int)}.</p>
      *
      * <p>The remoteAddress provided should match the remote address of the peer which is being connected to, and is
      * used to keep track of which peers relayed transactions and offer more descriptive logging.</p>
      */
     public Peer(NetworkParameters params, VersionMessage ver, PeerAddress remoteAddress,
-                @Nullable AbstractBlockChain chain, int downloadTxDependencyDepth) {
+                @Nullable AbstractBlockChain chain, long requiredServices, int downloadTxDependencyDepth) {
         super(params, remoteAddress);
         this.params = Preconditions.checkNotNull(params);
         this.versionMessage = Preconditions.checkNotNull(ver);
         this.vDownloadTxDependencyDepth = chain != null ? downloadTxDependencyDepth : 0;
         this.blockChain = chain;  // Allowed to be null.
+        this.requiredServices = requiredServices;
         this.vDownloadData = chain != null;
-        this.getDataFutures = new CopyOnWriteArrayList<GetDataRequest>();
-        this.getAddrFutures = new LinkedList<SettableFuture<AddressMessage>>();
+        this.getDataFutures = new CopyOnWriteArrayList<>();
+        this.getAddrFutures = new LinkedList<>();
         this.fastCatchupTimeSecs = params.getGenesisBlock().getTimeSeconds();
-        this.pendingPings = new CopyOnWriteArrayList<PendingPing>();
+        this.pendingPings = new CopyOnWriteArrayList<>();
         this.vMinProtocolVersion = params.getProtocolVersionNum(NetworkParameters.ProtocolVersion.PONG);
-        this.wallets = new CopyOnWriteArrayList<Wallet>();
+        this.wallets = new CopyOnWriteArrayList<>();
         this.context = Context.get();
 
         this.versionHandshakeFuture.addListener(new Runnable() {
@@ -243,9 +261,9 @@ public void run() {
      *
      * <p>Note that this does <b>NOT</b> make a connection to the given remoteAddress, it only creates a handler for a
      * connection. If you want to create a one-off connection, create a Peer and pass it to
-     * {@link org.bitcoinj.net.NioClientManager#openConnection(java.net.SocketAddress, StreamConnection)}
+     * {@link NioClientManager#openConnection(SocketAddress, StreamConnection)}
      * or
-     * {@link org.bitcoinj.net.NioClient#NioClient(java.net.SocketAddress, StreamConnection, int)}.</p>
+     * {@link NioClient#NioClient(SocketAddress, StreamConnection, int)}.</p>
      *
      * <p>The remoteAddress provided should match the remote address of the peer which is being connected to, and is
      * used to keep track of which peers relayed transactions and offer more descriptive logging.</p>
@@ -255,42 +273,6 @@ public Peer(NetworkParameters params, AbstractBlockChain blockChain, PeerAddress
         this.versionMessage.appendToSubVer(thisSoftwareName, thisSoftwareVersion, null);
     }
 
-    /** Deprecated: use the more specific event handler methods instead */
-    @Deprecated @SuppressWarnings("deprecation")
-    public void addEventListener(AbstractPeerEventListener listener) {
-        addBlocksDownloadedEventListener(Threading.USER_THREAD, listener);
-        addChainDownloadStartedEventListener(Threading.USER_THREAD, listener);
-        addConnectedEventListener(Threading.USER_THREAD, listener);
-        addDisconnectedEventListener(Threading.USER_THREAD, listener);
-        addGetDataEventListener(Threading.USER_THREAD, listener);
-        addOnTransactionBroadcastListener(Threading.USER_THREAD, listener);
-        addPreMessageReceivedEventListener(Threading.USER_THREAD, listener);
-    }
-
-    /** Deprecated: use the more specific event handler methods instead */
-    @Deprecated
-    public void addEventListener(AbstractPeerEventListener listener, Executor executor) {
-        addBlocksDownloadedEventListener(executor, listener);
-        addChainDownloadStartedEventListener(executor, listener);
-        addConnectedEventListener(executor, listener);
-        addDisconnectedEventListener(executor, listener);
-        addGetDataEventListener(executor, listener);
-        addOnTransactionBroadcastListener(executor, listener);
-        addPreMessageReceivedEventListener(executor, listener);
-    }
-
-    /** Deprecated: use the more specific event handler methods instead */
-    @Deprecated
-    public void removeEventListener(AbstractPeerEventListener listener) {
-        removeBlocksDownloadedEventListener(listener);
-        removeChainDownloadStartedEventListener(listener);
-        removeConnectedEventListener(listener);
-        removeDisconnectedEventListener(listener);
-        removeGetDataEventListener(listener);
-        removeOnTransactionBroadcastListener(listener);
-        removePreMessageReceivedEventListener(listener);
-    }
-
     /** Registers a listener that is invoked when new blocks are downloaded. */
     public void addBlocksDownloadedEventListener(BlocksDownloadedEventListener listener) {
         addBlocksDownloadedEventListener(Threading.USER_THREAD, listener);
@@ -311,6 +293,16 @@ public void addChainDownloadStartedEventListener(Executor executor, ChainDownloa
         chainDownloadStartedEventListeners.add(new ListenerRegistration(listener, executor));
     }
 
+    /** Registers a listener that is invoked when a VersionMessage is received. */
+    public void addVersionMessageReceivedEventListener(VersionMessageReceivedEventListener listener) {
+        addVersionMessageReceivedEventListener(Threading.USER_THREAD, listener);
+    }
+
+    /** Registers a listener that is invoked when a VersionMessage is received. */
+    public void addVersionMessageReceivedEventListener(Executor executor, VersionMessageReceivedEventListener listener) {
+        versionMessageReceivedEventListeners.add(new ListenerRegistration<VersionMessageReceivedEventListener>(listener, executor));
+    }
+
     /** Registers a listener that is invoked when a peer is connected. */
     public void addConnectedEventListener(PeerConnectedEventListener listener) {
         addConnectedEventListener(Threading.USER_THREAD, listener);
@@ -338,7 +330,7 @@ public void addGetDataEventListener(GetDataEventListener listener) {
 
     /** Registers a listener that is called when messages are received. */
     public void addGetDataEventListener(Executor executor, GetDataEventListener listener) {
-        getDataEventListeners.add(new ListenerRegistration<GetDataEventListener>(listener, executor));
+        getDataEventListeners.add(new ListenerRegistration<>(listener, executor));
     }
 
     /** Registers a listener that is called when a transaction is broadcast across the network */
@@ -348,7 +340,7 @@ public void addOnTransactionBroadcastListener(OnTransactionBroadcastListener lis
 
     /** Registers a listener that is called when a transaction is broadcast across the network */
     public void addOnTransactionBroadcastListener(Executor executor, OnTransactionBroadcastListener listener) {
-        onTransactionEventListeners.add(new ListenerRegistration<OnTransactionBroadcastListener>(listener, executor));
+        onTransactionEventListeners.add(new ListenerRegistration<>(listener, executor));
     }
 
     /** Registers a listener that is called immediately before a message is received */
@@ -358,7 +350,7 @@ public void addPreMessageReceivedEventListener(PreMessageReceivedEventListener l
 
     /** Registers a listener that is called immediately before a message is received */
     public void addPreMessageReceivedEventListener(Executor executor, PreMessageReceivedEventListener listener) {
-        preMessageReceivedEventListeners.add(new ListenerRegistration<PreMessageReceivedEventListener>(listener, executor));
+        preMessageReceivedEventListeners.add(new ListenerRegistration<>(listener, executor));
     }
 
     public boolean removeBlocksDownloadedEventListener(BlocksDownloadedEventListener listener) {
@@ -369,6 +361,10 @@ public boolean removeChainDownloadStartedEventListener(ChainDownloadStartedEvent
         return ListenerRegistration.removeFromList(listener, chainDownloadStartedEventListeners);
     }
 
+    public boolean removeVersionMessageReceivedEventListener(VersionMessageReceivedEventListener listener) {
+        return ListenerRegistration.removeFromList(listener, versionMessageReceivedEventListeners);
+    }
+
     public boolean removeConnectedEventListener(PeerConnectedEventListener listener) {
         return ListenerRegistration.removeFromList(listener, connectedEventListeners);
     }
@@ -391,9 +387,22 @@ public boolean removePreMessageReceivedEventListener(PreMessageReceivedEventList
 
     @Override
     public String toString() {
-        PeerAddress addr = getAddress();
-        // if null, it's a user-provided NetworkConnection object
-        return addr == null ? "Peer()" : addr.toString();
+        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(this).omitNullValues();
+        helper.addValue(getAddress());
+        helper.add("version", vPeerVersionMessage.clientVersion);
+        helper.add("subVer", vPeerVersionMessage.subVer);
+        String servicesStr = Strings.emptyToNull(VersionMessage.toStringServices(vPeerVersionMessage.localServices));
+        helper.add("services",
+                vPeerVersionMessage.localServices + (servicesStr != null ? " (" + servicesStr + ")" : ""));
+        long peerTime = vPeerVersionMessage.time * 1000;
+        helper.add("time", String.format(Locale.US, "%tF %tT", peerTime, peerTime));
+        helper.add("height", vPeerVersionMessage.bestHeight);
+        return helper.toString();
+    }
+
+    @Deprecated
+    public String toStringServices(long services) {
+        return VersionMessage.toStringServices(services);
     }
 
     @Override
@@ -436,7 +445,7 @@ public ListenableFuture<Peer> getConnectionOpenFuture() {
         return connectionOpenFuture;
     }
 
-    public ListenableFuture<List<Peer>> getVersionHandshakeFuture() {
+    public ListenableFuture<Peer> getVersionHandshakeFuture() {
         return versionHandshakeFuture;
     }
 
@@ -461,8 +470,8 @@ protected void processMessage(Message m) throws Exception {
             currentFilteredBlock = null;
         }
 
-        // No further communication is possible until version handshake is complete.
-        if (!(m instanceof VersionMessage || m instanceof VersionAck
+        // Most further communication isn't possible until version handshake is complete.
+        if (!(m instanceof VersionMessage || m instanceof VersionAck || m instanceof AlertMessage
                 || (versionHandshakeFuture.isDone() && !versionHandshakeFuture.isCancelled())))
             throw new ProtocolException(
                     "Received " + m.getClass().getSimpleName() + " before version handshake is complete.");
@@ -502,6 +511,8 @@ protected void processMessage(Message m) throws Exception {
             processUTXOMessage((UTXOsMessage) m);
         } else if (m instanceof RejectMessage) {
             log.error("{} {}: Received {}", this, getPeerVersionMessage().subVer, m);
+        } else if (m instanceof SendHeadersMessage) {
+            // We ignore this message, because we don't announce new blocks.
         } else {
             log.warn("{}: Received unhandled message: {}", this, m);
         }
@@ -530,37 +541,52 @@ private void processAddressMessage(AddressMessage m) {
         future.set(m);
     }
 
-    private void processVersionMessage(VersionMessage m) throws ProtocolException {
+    private void processVersionMessage(VersionMessage peerVersionMessage) throws ProtocolException {
         if (vPeerVersionMessage != null)
             throw new ProtocolException("Got two version messages from peer");
-        vPeerVersionMessage = m;
+        vPeerVersionMessage = peerVersionMessage;
         // Switch to the new protocol version.
-        long peerTime = vPeerVersionMessage.time * 1000;
-        log.info("{}: Got version={}, subVer='{}', services=0x{}, time={}, blocks={}",
-                this,
-                vPeerVersionMessage.clientVersion,
-                vPeerVersionMessage.subVer,
-                vPeerVersionMessage.localServices,
-                String.format(Locale.US, "%tF %tT", peerTime, peerTime),
-                vPeerVersionMessage.bestHeight);
+        log.info(toString());
+        for (final ListenerRegistration<VersionMessageReceivedEventListener> registration : versionMessageReceivedEventListeners) {
+            registration.executor.execute(new Runnable() {
+                @Override
+                public void run() {
+                    registration.listener.onVersionMessageReceived(Peer.this, vPeerVersionMessage);
+                }
+            });
+        }
         // bitcoinj is a client mode implementation. That means there's not much point in us talking to other client
         // mode nodes because we can't download the data from them we need to find/verify transactions. Some bogus
         // implementations claim to have a block chain in their services field but then report a height of zero, filter
         // them out here.
-        if (!vPeerVersionMessage.hasBlockChain() ||
-                (!params.allowEmptyPeerChain() && vPeerVersionMessage.bestHeight == 0)) {
+        if (!peerVersionMessage.hasLimitedBlockChain() ||
+                (!params.allowEmptyPeerChain() && peerVersionMessage.bestHeight == 0)) {
+            // Shut down the channel gracefully.
+            log.info("{}: Peer does not have at least a recent part of the block chain.", this);
+            close();
+            return;
+        }
+        if ((peerVersionMessage.localServices & requiredServices) != requiredServices) {
+            log.info("{}: Peer doesn't support these required services: {}", this,
+                    VersionMessage.toStringServices(requiredServices & ~peerVersionMessage.localServices));
+            // Shut down the channel gracefully.
+            close();
+            return;
+        }
+        if ((peerVersionMessage.localServices & VersionMessage.NODE_BITCOIN_CASH) == VersionMessage.NODE_BITCOIN_CASH) {
+            log.info("{}: Peer follows an incompatible block chain.", this);
             // Shut down the channel gracefully.
-            log.info("{}: Peer does not have a copy of the block chain.", this);
             close();
             return;
         }
-        if (vPeerVersionMessage.bestHeight < 0)
+        if (peerVersionMessage.bestHeight < 0)
             // In this case, it's a protocol violation.
-            throw new ProtocolException("Peer reports invalid best height: " + vPeerVersionMessage.bestHeight);
+            throw new ProtocolException("Peer reports invalid best height: " + peerVersionMessage.bestHeight);
         // Now it's our turn ...
         // Send an ACK message stating we accept the peers protocol version.
         sendMessage(new VersionAck());
-        log.debug("{}: Incoming version handshake complete.", this);
+        if (log.isDebugEnabled())
+            log.debug("{}: Incoming version handshake complete.", this);
         incomingVersionHandshakeFuture.set(this);
     }
 
@@ -571,12 +597,14 @@ private void processVersionAck(VersionAck m) throws ProtocolException {
         if (outgoingVersionHandshakeFuture.isDone()) {
             throw new ProtocolException("got more than one version ack");
         }
-        log.debug("{}: Outgoing version handshake complete.", this);
+        if (log.isDebugEnabled())
+            log.debug("{}: Outgoing version handshake complete.", this);
         outgoingVersionHandshakeFuture.set(this);
     }
 
     private void versionHandshakeComplete() {
-        log.debug("{}: Handshake complete.", this);
+        if (log.isDebugEnabled())
+            log.debug("{}: Handshake complete.", this);
         setTimeoutEnabled(false);
         for (final ListenerRegistration<PeerConnectedEventListener> registration : connectedEventListeners) {
             registration.executor.execute(new Runnable() {
@@ -602,13 +630,6 @@ protected void startFilteredBlock(FilteredBlock m) {
         // FilteredBlock) or when a tx that isn't needed by that block is found. A ping message is sent after
         // a getblocks, to force the non-tx message path.
         currentFilteredBlock = m;
-        // Potentially refresh the server side filter. Because the remote node adds hits back into the filter
-        // to save round-tripping back through us, the filter degrades over time as false positives get added,
-        // triggering yet more false positives. We refresh it every so often to get the FP rate back down.
-        filteredBlocksReceived++;
-        if (filteredBlocksReceived % RESEND_BLOOM_FILTER_BLOCK_COUNT == RESEND_BLOOM_FILTER_BLOCK_COUNT - 1) {
-            sendMessage(vBloomFilter);
-        }
     }
 
     protected void processNotFoundMessage(NotFoundMessage m) {
@@ -632,10 +653,11 @@ protected void processNotFoundMessage(NotFoundMessage m) {
 
     protected void processAlert(AlertMessage m) {
         try {
-            if (m.isSignatureValid()) {
-                log.info("Received alert from peer {}: {}", this, m.getStatusBar());
-            } else {
-                log.warn("Received alert with invalid signature from peer {}: {}", this, m.getStatusBar());
+            if (log.isDebugEnabled()) {
+                if (m.isSignatureValid())
+                    log.debug("Received alert from peer {}: {}", this, m.getStatusBar());
+                else
+                    log.debug("Received alert with invalid signature from peer {}: {}", this, m.getStatusBar());
             }
         } catch (Throwable t) {
             // Signature checking can FAIL on Android platforms before Gingerbread apparently due to bugs in their
@@ -695,7 +717,9 @@ protected void processHeaders(HeadersMessage m) throws ProtocolException {
                 } else {
                     lock.lock();
                     try {
-                        log.info("Passed the fast catchup time, discarding {} headers and requesting full blocks",
+                        log.info(
+                                "Passed the fast catchup time ({}) at height {}, discarding {} headers and requesting full blocks",
+                                Utils.dateTimeFormat(fastCatchupTimeSecs * 1000), blockChain.getBestChainHeight() + 1,
                                 m.getBlockHeaders().size() - i);
                         this.downloadBlockBodies = true;
                         // Prevent this request being seen as a duplicate.
@@ -727,7 +751,7 @@ protected void processHeaders(HeadersMessage m) throws ProtocolException {
 
     protected void processGetData(GetDataMessage getdata) {
         log.info("{}: Received getdata message: {}", getAddress(), getdata.toString());
-        ArrayList<Message> items = new ArrayList<Message>();
+        ArrayList<Message> items = new ArrayList<>();
         for (ListenerRegistration<GetDataEventListener> registration : getDataEventListeners) {
             if (registration.executor != Threading.SAME_THREAD) continue;
             List<Message> listenerItems = registration.listener.getData(this, getdata);
@@ -748,7 +772,8 @@ protected void processTransaction(final Transaction tx) throws VerificationExcep
         tx.verify();
         lock.lock();
         try {
-            log.debug("{}: Received tx {}", getAddress(), tx.getHashAsString());
+            if (log.isDebugEnabled())
+                log.debug("{}: Received tx {}", getAddress(), tx.getTxId());
             // Label the transaction as coming in from the P2P network (as opposed to being created by us, direct import,
             // etc). This helps the wallet decide how to risk analyze it later.
             //
@@ -799,7 +824,7 @@ public void onSuccess(List<Transaction> dependencies) {
                                         log.info("{}: Dependency download complete!", getAddress());
                                         wallet.receivePending(tx, dependencies);
                                     } catch (VerificationException e) {
-                                        log.error("{}: Wallet failed to process pending transaction {}", getAddress(), tx.getHash());
+                                        log.error("{}: Wallet failed to process pending transaction {}", getAddress(), tx.getTxId());
                                         log.error("Error was: ", e);
                                         // Not much more we can do at this point.
                                     }
@@ -807,11 +832,11 @@ public void onSuccess(List<Transaction> dependencies) {
 
                                 @Override
                                 public void onFailure(Throwable throwable) {
-                                    log.error("Could not download dependencies of tx {}", tx.getHashAsString());
+                                    log.error("Could not download dependencies of tx {}", tx.getTxId());
                                     log.error("Error was: ", throwable);
                                     // Not much more we can do at this point.
                                 }
-                            });
+                            }, MoreExecutors.directExecutor());
                         } else {
                             wallet.receivePending(tx, null);
                         }
@@ -855,8 +880,8 @@ public void run() {
     public ListenableFuture<List<Transaction>> downloadDependencies(Transaction tx) {
         TransactionConfidence.ConfidenceType txConfidence = tx.getConfidence().getConfidenceType();
         Preconditions.checkArgument(txConfidence != TransactionConfidence.ConfidenceType.BUILDING);
-        log.info("{}: Downloading dependencies of {}", getAddress(), tx.getHashAsString());
-        final LinkedList<Transaction> results = new LinkedList<Transaction>();
+        log.info("{}: Downloading dependencies of {}", getAddress(), tx.getTxId());
+        final LinkedList<Transaction> results = new LinkedList<>();
         // future will be invoked when the entire dependency tree has been walked and the results compiled.
         final ListenableFuture<Object> future = downloadDependenciesInternal(vDownloadTxDependencyDepth, 0, tx,
                 new Object(), results);
@@ -871,7 +896,7 @@ public void onSuccess(Object ignored) {
             public void onFailure(Throwable throwable) {
                 resultFuture.setException(throwable);
             }
-        });
+        }, MoreExecutors.directExecutor());
         return resultFuture;
     }
 
@@ -880,13 +905,13 @@ protected ListenableFuture<Object> downloadDependenciesInternal(final int maxDep
             final Transaction tx, final Object marker, final List<Transaction> results) {
 
         final SettableFuture<Object> resultFuture = SettableFuture.create();
-        final Sha256Hash rootTxHash = tx.getHash();
+        final Sha256Hash rootTxHash = tx.getTxId();
         // We want to recursively grab its dependencies. This is so listeners can learn important information like
         // whether a transaction is dependent on a timelocked transaction or has an unexpectedly deep dependency tree
         // or depends on a no-fee transaction.
 
         // We may end up requesting transactions that we've already downloaded and thrown away here.
-        Set<Sha256Hash> needToRequest = new CopyOnWriteArraySet<Sha256Hash>();
+        Set<Sha256Hash> needToRequest = new CopyOnWriteArraySet<>();
         for (TransactionInput input : tx.getInputs()) {
             // There may be multiple inputs that connect to the same transaction.
             needToRequest.add(input.getOutpoint().getHash());
@@ -899,7 +924,7 @@ protected ListenableFuture<Object> downloadDependenciesInternal(final int maxDep
             if (needToRequest.size() > 1)
                 log.info("{}: Requesting {} transactions for depth {} dep resolution", getAddress(), needToRequest.size(), depth + 1);
             for (Sha256Hash hash : needToRequest) {
-                getdata.addTransaction(hash);
+                getdata.addTransaction(hash, vPeerVersionMessage.isWitnessSupported());
                 GetDataRequest req = new GetDataRequest(hash, SettableFuture.create());
                 futures.add(req.future);
                 getDataFutures.add(req);
@@ -913,7 +938,7 @@ public void onSuccess(List<Transaction> transactions) {
                     List<ListenableFuture<Object>> childFutures = Lists.newLinkedList();
                     for (Transaction tx : transactions) {
                         if (tx == null) continue;
-                        log.info("{}: Downloaded dependency of {}: {}", getAddress(), rootTxHash, tx.getHashAsString());
+                        log.info("{}: Downloaded dependency of {}: {}", getAddress(), rootTxHash, tx.getTxId());
                         results.add(tx);
                         // Now recurse into the dependencies of this transaction too.
                         if (depth + 1 < maxDepth)
@@ -935,7 +960,7 @@ public void onSuccess(List<Object> objects) {
                             public void onFailure(Throwable throwable) {
                                 resultFuture.setException(throwable);
                             }
-                        });
+                        }, MoreExecutors.directExecutor());
                     }
                 }
 
@@ -943,11 +968,11 @@ public void onFailure(Throwable throwable) {
                 public void onFailure(Throwable throwable) {
                     resultFuture.setException(throwable);
                 }
-            });
+            }, MoreExecutors.directExecutor());
             // Start the operation.
             sendMessage(getdata);
         } catch (Exception e) {
-            log.error("{}: Couldn't send getdata in downloadDependencies({})", this, tx.getHash());
+            log.error("{}: Couldn't send getdata in downloadDependencies({})", this, tx.getTxId(), e);
             resultFuture.setException(e);
             return resultFuture;
         } finally {
@@ -957,18 +982,19 @@ public void onFailure(Throwable throwable) {
     }
 
     protected void processBlock(Block m) {
-        if (log.isDebugEnabled()) {
+        if (log.isDebugEnabled())
             log.debug("{}: Received broadcast block {}", getAddress(), m.getHashAsString());
-        }
         // Was this block requested by getBlock()?
         if (maybeHandleRequestedData(m)) return;
         if (blockChain == null) {
-            log.debug("Received block but was not configured with an AbstractBlockChain");
+            if (log.isDebugEnabled())
+                log.debug("Received block but was not configured with an AbstractBlockChain");
             return;
         }
         // Did we lose download peer status after requesting block data?
         if (!vDownloadData) {
-            log.debug("{}: Received block we did not ask for: {}", getAddress(), m.getHashAsString());
+            if (log.isDebugEnabled())
+                log.debug("{}: Received block we did not ask for: {}", getAddress(), m.getHashAsString());
             return;
         }
         pendingBlockDownloads.remove(m.getHash());
@@ -1022,11 +1048,13 @@ protected void endFilteredBlock(FilteredBlock m) {
         if (log.isDebugEnabled())
             log.debug("{}: Received broadcast filtered block {}", getAddress(), m.getHash().toString());
         if (!vDownloadData) {
-            log.debug("{}: Received block we did not ask for: {}", getAddress(), m.getHash().toString());
+            if (log.isDebugEnabled())
+                log.debug("{}: Received block we did not ask for: {}", getAddress(), m.getHash().toString());
             return;
         }
         if (blockChain == null) {
-            log.debug("Received filtered block but was not configured with an AbstractBlockChain");
+            if (log.isDebugEnabled())
+                log.debug("Received filtered block but was not configured with an AbstractBlockChain");
             return;
         }
         // Note that we currently do nothing about peers which maliciously do not include transactions which
@@ -1069,7 +1097,7 @@ protected void endFilteredBlock(FilteredBlock m) {
                     // that the new filter is now in use (which we have to simulate with a ping/pong), and then we can
                     // safely restart the chain download with the new filter that contains a new set of lookahead keys.
                     log.info("Bloom filter exhausted whilst processing block {}, discarding", m.getHash());
-                    awaitingFreshFilter = new LinkedList<Sha256Hash>();
+                    awaitingFreshFilter = new LinkedList<>();
                     awaitingFreshFilter.add(m.getHash());
                     awaitingFreshFilter.addAll(blockChain.drainOrphanBlocks());
                     return;   // Chain download process is restarted via a call to setBloomFilter.
@@ -1157,15 +1185,15 @@ protected void processInv(InventoryMessage inv) {
         List<InventoryItem> items = inv.getItems();
 
         // Separate out the blocks and transactions, we'll handle them differently
-        List<InventoryItem> transactions = new LinkedList<InventoryItem>();
-        List<InventoryItem> blocks = new LinkedList<InventoryItem>();
+        List<InventoryItem> transactions = new LinkedList<>();
+        List<InventoryItem> blocks = new LinkedList<>();
 
         for (InventoryItem item : items) {
             switch (item.type) {
-                case Transaction:
+                case TRANSACTION:
                     transactions.add(item);
                     break;
-                case Block:
+                case BLOCK:
                     blocks.add(item);
                     break;
                 default:
@@ -1210,8 +1238,14 @@ protected void processInv(InventoryMessage inv) {
                 // We created this transaction ourselves, so don't download.
                 it.remove();
             } else {
-                log.debug("{}: getdata on tx {}", getAddress(), item.hash);
-                getdata.addItem(item);
+                if (log.isDebugEnabled())
+                    log.debug("{}: getdata on tx {}", getAddress(), item.hash);
+                getdata.addTransaction(item.hash, vPeerVersionMessage.isWitnessSupported());
+                if (pendingTxDownloads.size() > PENDING_TX_DOWNLOADS_LIMIT) {
+                    log.info("{}: Too many pending transactions, disconnecting", this);
+                    close();
+                    return;
+                }
                 // Register with the garbage collector that we care about the confidence data for a while.
                 pendingTxDownloads.add(conf);
             }
@@ -1240,7 +1274,7 @@ protected void processInv(InventoryMessage inv) {
                         // previous one: whilst the stopHash is the same (because we use the orphan root), the start hash
                         // will be different and so the getblocks req won't be dropped as a duplicate. We'll end up
                         // requesting a subset of what we already requested, which can lead to parallel chain downloads
-                        // and other nastyness. So we just do a quick removal of redundant getdatas here too.
+                        // and other nastiness. So we just do a quick removal of redundant getdatas here too.
                         //
                         // Note that as of June 2012 Bitcoin Core won't actually ever interleave blocks pushed as
                         // part of chain download with newly announced blocks, so it should always be taken care of by
@@ -1251,7 +1285,7 @@ protected void processInv(InventoryMessage inv) {
                                 getdata.addFilteredBlock(item.hash);
                                 pingAfterGetData = true;
                             } else {
-                                getdata.addItem(item);
+                                getdata.addBlock(item.hash, vPeerVersionMessage.isWitnessSupported());
                             }
                             pendingBlockDownloads.add(item.hash);
                         }
@@ -1289,7 +1323,7 @@ public ListenableFuture<Block> getBlock(Sha256Hash blockHash) {
         // This does not need to be locked.
         log.info("Request to fetch block {}", blockHash);
         GetDataMessage getdata = new GetDataMessage(params);
-        getdata.addBlock(blockHash);
+        getdata.addBlock(blockHash, true);
         return sendSingleGetData(getdata);
     }
 
@@ -1307,7 +1341,7 @@ public ListenableFuture<Transaction> getPeerMempoolTransaction(Sha256Hash hash)
         // TODO: Unit test this method.
         log.info("Request to fetch peer mempool tx  {}", hash);
         GetDataMessage getdata = new GetDataMessage(params);
-        getdata.addTransaction(hash);
+        getdata.addTransaction(hash, vPeerVersionMessage.isWitnessSupported());
         return sendSingleGetData(getdata);
     }
 
@@ -1414,8 +1448,7 @@ private void blockChainDownloadLocked(Sha256Hash toHash) {
         // headers and then request the blocks from that point onwards. "getheaders" does not send us an inv, it just
         // sends us the data we requested in a "headers" message.
 
-        // TODO: Block locators should be abstracted out rather than special cased here.
-        List<Sha256Hash> blockLocator = new ArrayList<Sha256Hash>(51);
+        BlockLocator blockLocator = new BlockLocator();
         // For now we don't do the exponential thinning as suggested here:
         //
         //   https://en.bitcoin.it/wiki/Protocol_specification#getblocks
@@ -1439,7 +1472,7 @@ private void blockChainDownloadLocked(Sha256Hash toHash) {
                     this, toHash, chainHead.getHeader().getHashAsString());
         StoredBlock cursor = chainHead;
         for (int i = 100; cursor != null && i > 0; i--) {
-            blockLocator.add(cursor.getHeader().getHash());
+            blockLocator = blockLocator.add(cursor.getHeader().getHash());
             try {
                 cursor = cursor.getPrev(store);
             } catch (BlockStoreException e) {
@@ -1449,7 +1482,7 @@ private void blockChainDownloadLocked(Sha256Hash toHash) {
         }
         // Only add the locator if we didn't already do so. If the chain is < 50 blocks we already reached it.
         if (cursor != null)
-            blockLocator.add(params.getGenesisBlock().getHash());
+            blockLocator = blockLocator.add(params.getGenesisBlock().getHash());
 
         // Record that we requested this range of blocks so we can filter out duplicate requests in the event of a
         // block being solved during chain download.
@@ -1496,23 +1529,24 @@ public void run() {
 
     private class PendingPing {
         // The future that will be invoked when the pong is heard back.
-        public SettableFuture<Long> future;
+        public final SettableFuture<Long> future;
         // The random nonce that lets us tell apart overlapping pings/pongs.
         public final long nonce;
         // Measurement of the time elapsed.
         public final long startTimeMsec;
 
         public PendingPing(long nonce) {
-            future = SettableFuture.create();
+            this.future = SettableFuture.create();
             this.nonce = nonce;
-            startTimeMsec = Utils.currentTimeMillis();
+            this.startTimeMsec = Utils.currentTimeMillis();
         }
 
         public void complete() {
             if (!future.isDone()) {
-                Long elapsed = Utils.currentTimeMillis() - startTimeMsec;
+                long elapsed = Utils.currentTimeMillis() - startTimeMsec;
                 Peer.this.addPingTimeData(elapsed);
-                log.debug("{}: ping time is {} msec", Peer.this.toString(), elapsed);
+                if (log.isDebugEnabled())
+                    log.debug("{}: ping time is {} ms", Peer.this.toString(), elapsed);
                 future.set(elapsed);
             }
         }
@@ -1540,7 +1574,7 @@ private void addPingTimeData(long sample) {
     /**
      * Sends the peer a ping message and returns a future that will be invoked when the pong is received back.
      * The future provides a number which is the number of milliseconds elapsed between the ping and the pong.
-     * Once the pong is received the value returned by {@link org.bitcoinj.core.Peer#getLastPingTime()} is
+     * Once the pong is received the value returned by {@link Peer#getLastPingTime()} is
      * updated.
      * @throws ProtocolException if the peer version is too low to support measurable pings.
      */
@@ -1552,6 +1586,10 @@ protected ListenableFuture<Long> ping(long nonce) throws ProtocolException {
         final VersionMessage ver = vPeerVersionMessage;
         if (!ver.isPingPongSupported())
             throw new ProtocolException("Peer version is too low for measurable pings: " + ver);
+        if (pendingPings.size() > PENDING_PINGS_LIMIT) {
+            log.info("{}: Too many pending pings, disconnecting", this);
+            close();
+        }
         PendingPing pendingPing = new PendingPing(nonce);
         pendingPings.add(pendingPing);
         sendMessage(new Ping(pendingPing.nonce));
@@ -1559,7 +1597,7 @@ protected ListenableFuture<Long> ping(long nonce) throws ProtocolException {
     }
 
     /**
-     * Returns the elapsed time of the last ping/pong cycle. If {@link org.bitcoinj.core.Peer#ping()} has never
+     * Returns the elapsed time of the last ping/pong cycle. If {@link Peer#ping()} has never
      * been called or we did not hear back the "pong" message yet, returns {@link Long#MAX_VALUE}.
      */
     public long getLastPingTime() {
@@ -1574,7 +1612,7 @@ public long getLastPingTime() {
     }
 
     /**
-     * Returns a moving average of the last N ping/pong cycles. If {@link org.bitcoinj.core.Peer#ping()} has never
+     * Returns a moving average of the last N ping/pong cycles. If {@link Peer#ping()} has never
      * been called or we did not hear back the "pong" message yet, returns {@link Long#MAX_VALUE}. The moving average
      * window is 5 buckets.
      */
@@ -1712,15 +1750,19 @@ public void setBloomFilter(BloomFilter filter) {
      */
     public void setBloomFilter(BloomFilter filter, boolean andQueryMemPool) {
         checkNotNull(filter, "Clearing filters is not currently supported");
-        final VersionMessage ver = vPeerVersionMessage;
-        if (ver == null || !ver.isBloomFilteringSupported())
-            return;
-        vBloomFilter = filter;
-        log.debug("{}: Sending Bloom filter{}", this, andQueryMemPool ? " and querying mempool" : "");
-        sendMessage(filter);
-        if (andQueryMemPool)
-            sendMessage(new MemoryPoolMessage());
-        maybeRestartChainDownload();
+        final VersionMessage version = vPeerVersionMessage;
+        checkNotNull(version, "Cannot set filter before version handshake is complete");
+        if (version.isBloomFilteringSupported()) {
+            vBloomFilter = filter;
+            log.info("{}: Sending Bloom filter{}", this, andQueryMemPool ? " and querying mempool" : "");
+            sendMessage(filter);
+            if (andQueryMemPool)
+                sendMessage(new MemoryPoolMessage());
+            maybeRestartChainDownload();
+        } else {
+            log.info("{}: Peer does not support bloom filtering.", this);
+            close();
+        }
     }
 
     private void maybeRestartChainDownload() {
@@ -1801,7 +1843,7 @@ public ListenableFuture<UTXOsMessage> getUTXOs(List<TransactionOutPoint> outPoin
             SettableFuture<UTXOsMessage> future = SettableFuture.create();
             // Add to the list of in flight requests.
             if (getutxoFutures == null)
-                getutxoFutures = new LinkedList<SettableFuture<UTXOsMessage>>();
+                getutxoFutures = new LinkedList<>();
             getutxoFutures.add(future);
             sendMessage(new GetUTXOsMessage(params, outPoints, includeMempool));
             return future;
diff --git a/core/src/main/java/org/bitcoinj/core/PeerAddress.java b/core/src/main/java/org/bitcoinj/core/PeerAddress.java
index 7d5017ca3a8..c9d5ea25f9e 100644
--- a/core/src/main/java/org/bitcoinj/core/PeerAddress.java
+++ b/core/src/main/java/org/bitcoinj/core/PeerAddress.java
@@ -17,9 +17,10 @@
 
 package org.bitcoinj.core;
 
-import org.bitcoinj.params.MainNetParams;
-import com.google.common.base.Objects;
-import com.google.common.net.InetAddresses;
+import org.bitcoinj.net.OnionCatAddressChecker;
+import org.bitcoinj.net.OnionCatConverter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -28,8 +29,6 @@
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 
-import static org.bitcoinj.core.Utils.uint32ToByteStreamLE;
-import static org.bitcoinj.core.Utils.uint64ToByteStreamLE;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
@@ -39,11 +38,14 @@
  * <p>Instances of this class are not safe for use by multiple threads.</p>
  */
 public class PeerAddress extends ChildMessage {
-
+    private static final Logger log = LoggerFactory.getLogger(PeerAddress.class);
+    
     static final int MESSAGE_SIZE = 30;
 
+    //addr and hostname are alternatives and should not be used together.
     private InetAddress addr;
-    private String hostname; // Used for .onion addresses
+    private String hostname;
+
     private int port;
     private BigInteger services;
     private long time;
@@ -71,53 +73,47 @@ public PeerAddress(NetworkParameters params, byte[] payload, int offset, int pro
     /**
      * Construct a peer address from a memorized or hardcoded address.
      */
-    public PeerAddress(InetAddress addr, int port, int protocolVersion) {
+    public PeerAddress(NetworkParameters params, InetAddress addr, int port, int protocolVersion, BigInteger services) {
+        super(params);
         this.addr = checkNotNull(addr);
         this.port = port;
         this.protocolVersion = protocolVersion;
-        this.services = BigInteger.ZERO;
-        length = protocolVersion > 31402 ? MESSAGE_SIZE : MESSAGE_SIZE - 4;
-    }
-
-    /**
-     * Constructs a peer address from the given IP address and port. Protocol version is the default
-     * for Bitcoin.
-     */
-    public PeerAddress(InetAddress addr, int port) {
-        this(addr, port, NetworkParameters.ProtocolVersion.CURRENT.getBitcoinProtocolVersion());
+        this.services = services;
+        length = isSerializeTime() ? MESSAGE_SIZE : MESSAGE_SIZE - 4;
     }
 
     /**
-     * Constructs a peer address from the given IP address and port.
+     * Constructs a peer address from the given IP address and port. Version number is default for the given parameters.
      */
     public PeerAddress(NetworkParameters params, InetAddress addr, int port) {
-        this(addr, port, params.getProtocolVersionNum(NetworkParameters.ProtocolVersion.CURRENT));
-    }
-
-    /**
-     * Constructs a peer address from the given IP address. Port and version number
-     * are default for Bitcoin mainnet.
-     */
-    public PeerAddress(InetAddress addr) {
-        this(addr, MainNetParams.get().getPort());
+        this(params, addr, port, params.getProtocolVersionNum(NetworkParameters.ProtocolVersion.CURRENT),
+                BigInteger.ZERO);
     }
 
     /**
-     * Constructs a peer address from the given IP address. Port is default for
-     * Bitcoin mainnet, version number is default for the given parameters.
+     * Constructs a peer address from the given IP address. Port and version number are default for the given
+     * parameters.
      */
     public PeerAddress(NetworkParameters params, InetAddress addr) {
-        this(params, addr, MainNetParams.get().getPort());
+        this(params, addr, params.getPort());
     }
 
     /**
      * Constructs a peer address from an {@link InetSocketAddress}. An InetSocketAddress can take in as parameters an
      * InetAddress or a String hostname. If you want to connect to a .onion, set the hostname to the .onion address.
-     * Protocol version is the default.  Protocol version is the default
-     * for Bitcoin.
+     * Protocol version is the default for Bitcoin.
      */
     public PeerAddress(InetSocketAddress addr) {
-        this(addr.getAddress(), addr.getPort(), NetworkParameters.ProtocolVersion.CURRENT.getBitcoinProtocolVersion());
+        InetAddress inetAddress = addr.getAddress();
+        if(inetAddress != null) {
+            this.addr = inetAddress;
+        } else {
+            this.hostname = checkNotNull(addr.getHostString());
+        }
+        this.port = addr.getPort();
+        this.protocolVersion = NetworkParameters.ProtocolVersion.CURRENT.getBitcoinProtocolVersion();
+        this.services = BigInteger.ZERO;
+        length = protocolVersion > 31402 ? MESSAGE_SIZE : MESSAGE_SIZE - 4;
     }
 
     /**
@@ -125,11 +121,21 @@ public PeerAddress(InetSocketAddress addr) {
      * InetAddress or a String hostname. If you want to connect to a .onion, set the hostname to the .onion address.
      */
     public PeerAddress(NetworkParameters params, InetSocketAddress addr) {
-        this(params, addr.getAddress(), addr.getPort());
+        super(params);
+        InetAddress inetAddress = addr.getAddress();
+        if(inetAddress != null) {
+            this.addr = inetAddress;
+        } else {
+            this.hostname = checkNotNull(addr.getHostString());
+        }
+        this.port = addr.getPort();
+        this.protocolVersion = params.getProtocolVersionNum(NetworkParameters.ProtocolVersion.CURRENT);
+        this.services = BigInteger.ZERO;
+        length = protocolVersion > 31402 ? MESSAGE_SIZE : MESSAGE_SIZE - 4;
     }
 
     /**
-     * Constructs a peer address from a stringified hostname+port. Use this if you want to connect to a Tor .onion address.
+     * Constructs a peer address from a stringified hostname+port.
      * Protocol version is the default for Bitcoin.
      */
     public PeerAddress(String hostname, int port) {
@@ -140,7 +146,7 @@ public PeerAddress(String hostname, int port) {
     }
 
     /**
-     * Constructs a peer address from a stringified hostname+port. Use this if you want to connect to a Tor .onion address.
+     * Constructs a peer address from a stringified hostname+port.
      */
     public PeerAddress(NetworkParameters params, String hostname, int port) {
         super(params);
@@ -150,33 +156,60 @@ public PeerAddress(NetworkParameters params, String hostname, int port) {
         this.services = BigInteger.ZERO;
     }
 
+    /**
+     * Construct a peer address from a memorized or hardcoded hostname.
+     */
+    public PeerAddress(NetworkParameters params, String hostname, int port, int protocolVersion, BigInteger services) {
+        super(params);
+        this.hostname = hostname;
+        this.port = port;
+        this.protocolVersion = protocolVersion;
+        this.services = services;
+        length = isSerializeTime() ? MESSAGE_SIZE : MESSAGE_SIZE - 4;
+    }
+
     public static PeerAddress localhost(NetworkParameters params) {
-        return new PeerAddress(params, InetAddresses.forString("127.0.0.1"), params.getPort());
+        return new PeerAddress(params, InetAddress.getLoopbackAddress(), params.getPort());
     }
 
     @Override
     protected void bitcoinSerializeToStream(OutputStream stream) throws IOException {
-        if (protocolVersion >= 31402) {
+        if (isSerializeTime()) {
             //TODO this appears to be dynamic because the client only ever sends out it's own address
             //so assumes itself to be up.  For a fuller implementation this needs to be dynamic only if
             //the address refers to this client.
             int secs = (int) (Utils.currentTimeSeconds());
-            uint32ToByteStreamLE(secs, stream);
+            Utils.uint32ToByteStreamLE(secs, stream);
         }
-        uint64ToByteStreamLE(services, stream);  // nServices.
-        // Java does not provide any utility to map an IPv4 address into IPv6 space, so we have to do it by hand.
-        byte[] ipBytes = addr.getAddress();
-        if (ipBytes.length == 4) {
-            byte[] v6addr = new byte[16];
-            System.arraycopy(ipBytes, 0, v6addr, 12, 4);
-            v6addr[10] = (byte) 0xFF;
-            v6addr[11] = (byte) 0xFF;
-            ipBytes = v6addr;
+        Utils.uint64ToByteStreamLE(services, stream);  // nServices.
+
+        byte[] ipBytes;
+        if (hostname!=null) {
+            if (hostname.endsWith(".onion")) {
+                ipBytes = OnionCatConverter.onionHostToIPV6Bytes(hostname);
+            } else {
+                ipBytes = new byte[16];
+            }
+        } else if( addr != null ) {
+            // Java does not provide any utility to map an IPv4 address into IPv6 space, so we have to do it by hand.
+            ipBytes = addr.getAddress();
+            if (ipBytes.length == 4) {
+                byte[] v6addr = new byte[16];
+                System.arraycopy(ipBytes, 0, v6addr, 12, 4);
+                v6addr[10] = (byte) 0xFF;
+                v6addr[11] = (byte) 0xFF;
+                ipBytes = v6addr;
+            }
+        } else {
+            throw new IllegalStateException("Either hostname or addr should be not null");
         }
         stream.write(ipBytes);
         // And write out the port. Unlike the rest of the protocol, address and port is in big endian byte order.
-        stream.write((byte) (0xFF & port >> 8));
-        stream.write((byte) (0xFF & port));
+        Utils.uint16ToByteStreamBE(port, stream);
+    }
+
+    private boolean isSerializeTime() {
+        return protocolVersion >= 31402 && !(parent instanceof VersionMessage);
     }
 
     @Override
@@ -186,20 +219,27 @@ protected void parse() throws ProtocolException {
         //   uint64 services   (flags determining what the node can do)
         //   16 bytes ip address
         //   2 bytes port num
-        if (protocolVersion > 31402)
+        if (isSerializeTime())
             time = readUint32();
         else
             time = -1;
         services = readUint64();
         byte[] addrBytes = readBytes(16);
+        InetAddress inetAddress;
         try {
-            addr = InetAddress.getByAddress(addrBytes);
+            inetAddress = InetAddress.getByAddress(addrBytes);
         } catch (UnknownHostException e) {
             throw new RuntimeException(e);  // Cannot happen.
         }
-        port = ((0xFF & payload[cursor++]) << 8) | (0xFF & payload[cursor++]);
-        // The 4 byte difference is the uint32 timestamp that was introduced in version 31402 
-        length = protocolVersion > 31402 ? MESSAGE_SIZE : MESSAGE_SIZE - 4;
+        if(OnionCatAddressChecker.isOnionCatTor(inetAddress)) {
+            hostname = OnionCatConverter.IPV6BytesToOnionHost(inetAddress.getAddress());
+        } else {
+            addr = inetAddress;
+        }
+        port = Utils.readUint16BE(payload, cursor);
+        cursor += 2;
+        // The 4 byte difference is the uint32 timestamp that was introduced in version 31402
+        length = isSerializeTime() ? MESSAGE_SIZE : MESSAGE_SIZE - 4;
     }
 
     public String getHostname() {
@@ -214,60 +254,68 @@ public InetSocketAddress getSocketAddress() {
         return new InetSocketAddress(getAddr(), getPort());
     }
 
-    public void setAddr(InetAddress addr) {
-        unCache();
-        this.addr = addr;
-    }
-
     public int getPort() {
         return port;
     }
 
-    public void setPort(int port) {
-        unCache();
-        this.port = port;
-    }
-
     public BigInteger getServices() {
         return services;
     }
 
-    public void setServices(BigInteger services) {
-        unCache();
-        this.services = services;
-    }
-
     public long getTime() {
         return time;
     }
 
-    public void setTime(long time) {
-        unCache();
-        this.time = time;
-    }
-
     @Override
     public String toString() {
         if (hostname != null) {
             return "[" + hostname + "]:" + port;
         }
-        return "[" + addr.getHostAddress() + "]:" + port;
+        if(addr != null ) {
+            return "[" + addr.getHostAddress() + "]:" + port;
+        }
+        return "[]";
     }
 
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        PeerAddress other = (PeerAddress) o;
-        return other.addr.equals(addr) && other.port == port && other.time == time && other.services.equals(services);
-        //TODO: including services and time could cause same peer to be added multiple times in collections
+        PeerAddress that = (PeerAddress) o;
+
+        if (port != that.port) return false;
+        if (time != that.time) return false;
+        if (addr != null ? !addr.equals(that.addr) : that.addr != null) return false;
+        if (hostname != null ? !hostname.equals(that.hostname) : that.hostname != null) return false;
+        return !(services != null ? !services.equals(that.services) : that.services != null);
+    }
+
+    public boolean equalsIgnoringMetadata(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        PeerAddress that = (PeerAddress) o;
+
+        if (port != that.port) return false;
+        // Don't compare the time field
+        // if (time != that.time) return false;
+        if (addr != null ? !addr.equals(that.addr) : that.addr != null) return false;
+        if (hostname != null ? !hostname.equals(that.hostname) : that.hostname != null) return false;
+        // Don't compare the services field
+        // return !(services != null ? !services.equals(that.services) : that.services != null);
+        return true;
     }
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(addr, port, time, services);
+        int result = addr != null ? addr.hashCode() : 0;
+        result = 31 * result + (hostname != null ? hostname.hashCode() : 0);
+        result = 31 * result + port;
+        result = 31 * result + (services != null ? services.hashCode() : 0);
+        result = 31 * result + (int) (time ^ (time >>> 32));
+        return result;
     }
-    
+
     public InetSocketAddress toSocketAddress() {
         // Reconstruct the InetSocketAddress properly
         if (hostname != null) {
diff --git a/core/src/main/java/org/bitcoinj/core/PeerFilterProvider.java b/core/src/main/java/org/bitcoinj/core/PeerFilterProvider.java
index ebc72076d80..84a362a007a 100644
--- a/core/src/main/java/org/bitcoinj/core/PeerFilterProvider.java
+++ b/core/src/main/java/org/bitcoinj/core/PeerFilterProvider.java
@@ -19,7 +19,7 @@
 
 /**
  * An interface which provides the information required to properly filter data downloaded from Peers.
- * Note that an implementer is responsible for calling {@link PeerGroup#recalculateFastCatchupAndFilter(org.bitcoinj.core.PeerGroup.FilterRecalculateMode)}
+ * Note that an implementer is responsible for calling {@link PeerGroup#recalculateFastCatchupAndFilter(PeerGroup.FilterRecalculateMode)}
  * whenever a change occurs which effects the data provided via this interface.
  */
 public interface PeerFilterProvider {
diff --git a/core/src/main/java/org/bitcoinj/core/PeerGroup.java b/core/src/main/java/org/bitcoinj/core/PeerGroup.java
index 2fa379824cf..b9f30c1f34f 100644
--- a/core/src/main/java/org/bitcoinj/core/PeerGroup.java
+++ b/core/src/main/java/org/bitcoinj/core/PeerGroup.java
@@ -20,14 +20,10 @@
 import com.google.common.annotations.*;
 import com.google.common.base.*;
 import com.google.common.collect.*;
-import com.google.common.net.*;
 import com.google.common.primitives.*;
 import com.google.common.util.concurrent.*;
-import com.squareup.okhttp.*;
-import com.subgraph.orchid.*;
 import net.jcip.annotations.*;
 import org.bitcoinj.core.listeners.*;
-import org.bitcoinj.crypto.*;
 import org.bitcoinj.net.*;
 import org.bitcoinj.net.discovery.*;
 import org.bitcoinj.script.*;
@@ -37,6 +33,7 @@
 import org.bitcoinj.wallet.listeners.KeyChainEventListener;
 import org.bitcoinj.wallet.listeners.ScriptsChangeEventListener;
 import org.bitcoinj.wallet.listeners.WalletCoinsReceivedEventListener;
+import org.bitcoinj.wallet.listeners.WalletCoinsSentEventListener;
 import org.slf4j.*;
 
 import javax.annotation.*;
@@ -51,22 +48,22 @@
 /**
  * <p>Runs a set of connections to the P2P network, brings up connections to replace disconnected nodes and manages
  * the interaction between them all. Most applications will want to use one of these.</p>
- * 
+ *
  * <p>PeerGroup tries to maintain a constant number of connections to a set of distinct peers.
  * Each peer runs a network listener in its own thread.  When a connection is lost, a new peer
  * will be tried after a delay as long as the number of connections less than the maximum.</p>
- * 
+ *
  * <p>Connections are made to addresses from a provided list.  When that list is exhausted,
  * we start again from the head of the list.</p>
- * 
+ *
  * <p>The PeerGroup can broadcast a transaction to the currently connected set of peers.  It can
  * also handle download of the blockchain from peers, restarting the process when peers die.</p>
  *
- * <p>A PeerGroup won't do anything until you call the {@link PeerGroup#start()} method 
- * which will block until peer discovery is completed and some outbound connections 
- * have been initiated (it will return before handshaking is done, however). 
+ * <p>A PeerGroup won't do anything until you call the {@link PeerGroup#start()} method
+ * which will block until peer discovery is completed and some outbound connections
+ * have been initiated (it will return before handshaking is done, however).
  * You should call {@link PeerGroup#stop()} when finished. Note that not all methods
- * of PeerGroup are safe to call from a UI thread as some may do network IO, 
+ * of PeerGroup are safe to call from a UI thread as some may do network IO,
  * but starting and stopping the service should be fine.</p>
  */
 public class PeerGroup implements TransactionBroadcaster {
@@ -84,7 +81,6 @@ public class PeerGroup implements TransactionBroadcaster {
      * get through.
      */
     public static final int DEFAULT_CONNECTIONS = 12;
-    private static final int TOR_TIMEOUT_SECONDS = 60;
     private volatile int vMaxPeersToDiscoverCount = 100;
     private static final long DEFAULT_PEER_DISCOVERY_TIMEOUT_MILLIS = 5000;
     private volatile long vPeerDiscoveryTimeoutMillis = DEFAULT_PEER_DISCOVERY_TIMEOUT_MILLIS;
@@ -107,38 +103,41 @@ public class PeerGroup implements TransactionBroadcaster {
     // Addresses to try to connect to, excluding active peers.
     @GuardedBy("lock") private final PriorityQueue<PeerAddress> inactives;
     @GuardedBy("lock") private final Map<PeerAddress, ExponentialBackoff> backoffMap;
+    @GuardedBy("lock") private final Map<PeerAddress, Integer> priorityMap;
 
     // Currently active peers. This is an ordered list rather than a set to make unit tests predictable.
     private final CopyOnWriteArrayList<Peer> peers;
     // Currently connecting peers.
     private final CopyOnWriteArrayList<Peer> pendingPeers;
     private final ClientConnectionManager channels;
-    @Nullable private final TorClient torClient;
 
     // The peer that has been selected for the purposes of downloading announced data.
     @GuardedBy("lock") private Peer downloadPeer;
     // Callback for events related to chain download.
     @Nullable @GuardedBy("lock") private PeerDataEventListener downloadListener;
     private final CopyOnWriteArrayList<ListenerRegistration<BlocksDownloadedEventListener>> peersBlocksDownloadedEventListeners
-        = new CopyOnWriteArrayList<ListenerRegistration<BlocksDownloadedEventListener>>();
+        = new CopyOnWriteArrayList<>();
     private final CopyOnWriteArrayList<ListenerRegistration<ChainDownloadStartedEventListener>> peersChainDownloadStartedEventListeners
-        = new CopyOnWriteArrayList<ListenerRegistration<ChainDownloadStartedEventListener>>();
+        = new CopyOnWriteArrayList<>();
+    /** Callbacks for events related to a peer receiving a VersionMessage */
+    protected final CopyOnWriteArrayList<ListenerRegistration<VersionMessageReceivedEventListener>> versionMessageReceivedEventListeners
+        = new CopyOnWriteArrayList<ListenerRegistration<VersionMessageReceivedEventListener>>();
     /** Callbacks for events related to peers connecting */
     protected final CopyOnWriteArrayList<ListenerRegistration<PeerConnectedEventListener>> peerConnectedEventListeners
-        = new CopyOnWriteArrayList<ListenerRegistration<PeerConnectedEventListener>>();
+        = new CopyOnWriteArrayList<>();
     /** Callbacks for events related to peer connection/disconnection */
     protected final CopyOnWriteArrayList<ListenerRegistration<PeerDiscoveredEventListener>> peerDiscoveredEventListeners
-        = new CopyOnWriteArrayList<ListenerRegistration<PeerDiscoveredEventListener>>();
+        = new CopyOnWriteArrayList<>();
     /** Callbacks for events related to peers disconnecting */
     protected final CopyOnWriteArrayList<ListenerRegistration<PeerDisconnectedEventListener>> peerDisconnectedEventListeners
-        = new CopyOnWriteArrayList<ListenerRegistration<PeerDisconnectedEventListener>>();
+        = new CopyOnWriteArrayList<>();
     /** Callbacks for events related to peer data being received */
     private final CopyOnWriteArrayList<ListenerRegistration<GetDataEventListener>> peerGetDataEventListeners
-        = new CopyOnWriteArrayList<ListenerRegistration<GetDataEventListener>>();
+        = new CopyOnWriteArrayList<>();
     private final CopyOnWriteArrayList<ListenerRegistration<PreMessageReceivedEventListener>> peersPreMessageReceivedEventListeners
-        = new CopyOnWriteArrayList<ListenerRegistration<PreMessageReceivedEventListener>>();
+        = new CopyOnWriteArrayList<>();
     protected final CopyOnWriteArrayList<ListenerRegistration<OnTransactionBroadcastListener>> peersTransactionBroadastEventListeners
-        = new CopyOnWriteArrayList<ListenerRegistration<OnTransactionBroadcastListener>>();
+        = new CopyOnWriteArrayList<>();
     // Peer discovery sources, will be polled occasionally if there aren't enough inactives.
     private final CopyOnWriteArraySet<PeerDiscovery> peerDiscoverers;
     // The version message to use for new connections.
@@ -148,6 +147,10 @@ public class PeerGroup implements TransactionBroadcaster {
     // How many connections we want to have open at the current time. If we lose connections, we'll try opening more
     // until we reach this count.
     @GuardedBy("lock") private int maxConnections;
+    // if true, we will listen to "addr" network messages and add nodes discovered this way.
+    // if false, only nodes found by discovery process are used/added.
+    @GuardedBy("lock")
+    private boolean addPeersFromAddressMessage = true;
     // Minimum protocol version we will allow ourselves to connect to: require Bloom filtering.
     private volatile int vMinRequiredProtocolVersion;
 
@@ -162,6 +165,13 @@ public class PeerGroup implements TransactionBroadcaster {
     private final CopyOnWriteArrayList<Wallet> wallets;
     private final CopyOnWriteArrayList<PeerFilterProvider> peerFilterProviders;
 
+    // Give the client the option to disable HttpSeeds
+    private static boolean ignoreHttpSeeds;
+
+    public static void setIgnoreHttpSeeds(boolean ignoreHttpSeeds) {
+        PeerGroup.ignoreHttpSeeds = ignoreHttpSeeds;
+    }
+
     // This event listener is added to every peer. It's here so when we announce transactions via an "inv", every
     // peer can fetch them.
     private final PeerListener peerListener = new PeerListener();
@@ -182,30 +192,45 @@ public class PeerGroup implements TransactionBroadcaster {
     private final WalletCoinsReceivedEventListener walletCoinsReceivedEventListener = new WalletCoinsReceivedEventListener() {
         @Override
         public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coin newBalance) {
-            // We received a relevant transaction. We MAY need to recalculate and resend the Bloom filter, but only
-            // if we have received a transaction that includes a relevant pay-to-pubkey output.
-            //
-            // The reason is that pay-to-pubkey outputs, when spent, will not repeat any data we can predict in their
-            // inputs. So a remote peer will update the Bloom filter for us when such an output is seen matching the
-            // existing filter, so that it includes the tx hash in which the pay-to-pubkey output was observed. Thus
-            // the spending transaction will always match (due to the outpoint structure).
-            //
-            // Unfortunately, whilst this is required for correct sync of the chain in blocks, there are two edge cases.
-            //
-            // (1) If a wallet receives a relevant, confirmed p2pubkey output that was not broadcast across the network,
-            // for example in a coinbase transaction, then the node that's serving us the chain will update its filter
-            // but the rest will not. If another transaction then spends it, the other nodes won't match/relay it.
-            //
-            // (2) If we receive a p2pubkey output broadcast across the network, all currently connected nodes will see
-            // it and update their filter themselves, but any newly connected nodes will receive the last filter we
-            // calculated, which would not include this transaction.
-            //
-            // For this reason we check if the transaction contained any relevant pay to pubkeys and force a recalc
-            // and possibly retransmit if so. The recalculation process will end up including the tx hash into the
-            // filter. In case (1), we need to retransmit the filter to the connected peers. In case (2), we don't
-            // and shouldn't, we should just recalculate and cache the new filter for next time.
-            for (TransactionOutput output : tx.getOutputs()) {
-                if (output.getScriptPubKey().isSentToRawPubKey() && output.isMine(wallet)) {
+            onCoinsReceivedOrSent(wallet, tx);
+        }
+    };
+
+    private final WalletCoinsSentEventListener walletCoinsSentEventListener = new WalletCoinsSentEventListener() {
+        @Override
+        public void onCoinsSent(Wallet wallet, Transaction tx, Coin prevBalance, Coin newBalance) {
+            onCoinsReceivedOrSent(wallet, tx);
+        }
+    };
+
+
+    private void onCoinsReceivedOrSent(Wallet wallet, Transaction tx) {
+        // We received a relevant transaction. We MAY need to recalculate and resend the Bloom filter, but only
+        // if we have received a transaction that includes a relevant P2PK or P2WPKH output.
+        //
+        // The reason is that P2PK and P2WPKH outputs, when spent, will not repeat any data we can predict in their
+        // inputs. So a remote peer will update the Bloom filter for us when such an output is seen matching the
+        // existing filter, so that it includes the tx hash in which the P2PK/P2WPKH output was observed. Thus
+        // the spending transaction will always match (due to the outpoint structure).
+        //
+        // Unfortunately, whilst this is required for correct sync of the chain in blocks, there are two edge cases.
+        //
+        // (1) If a wallet receives a relevant, confirmed P2PK/P2WPKH output that was not broadcast across the network,
+        // for example in a coinbase transaction, then the node that's serving us the chain will update its filter
+        // but the rest will not. If another transaction then spends it, the other nodes won't match/relay it.
+        //
+        // (2) If we receive a P2PK/P2WPKH output broadcast across the network, all currently connected nodes will see
+        // it and update their filter themselves, but any newly connected nodes will receive the last filter we
+        // calculated, which would not include this transaction.
+        //
+        // For this reason we check if the transaction contained any relevant P2PKs or P2WPKHs and force a recalc
+        // and possibly retransmit if so. The recalculation process will end up including the tx hash into the
+        // filter. In case (1), we need to retransmit the filter to the connected peers. In case (2), we don't
+        // and shouldn't, we should just recalculate and cache the new filter for next time.
+        for (TransactionOutput output : tx.getOutputs()) {
+            Script scriptPubKey = output.getScriptPubKey();
+            if (ScriptPattern.isP2PK(scriptPubKey) || ScriptPattern.isP2WPKH(scriptPubKey)) {
+                if (output.isMine(wallet)) {
                     if (tx.getConfidence().getConfidenceType() == TransactionConfidence.ConfidenceType.BUILDING)
                         recalculateFastCatchupAndFilter(FilterRecalculateMode.SEND_IF_CHANGED);
                     else
@@ -214,7 +239,7 @@ public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coi
                 }
             }
         }
-    };
+    }
 
     // Exponential backoff for peers starts at 1 second and maxes at 10 minutes.
     private final ExponentialBackoff.Params peerBackoffParams = new ExponentialBackoff.Params(1000, 1.5f, 10 * 60 * 1000);
@@ -243,14 +268,13 @@ public void onBlocksDownloaded(Peer peer, Block block, @Nullable FilteredBlock f
             final double target = bloomFilterMerger.getBloomFilterFPRate() * MAX_FP_RATE_INCREASE;
             if (rate > target) {
                 // TODO: Avoid hitting this path if the remote peer didn't acknowledge applying a new filter yet.
-                if (log.isDebugEnabled())
-                    log.debug("Force update Bloom filter due to high false positive rate ({} vs {})", rate, target);
+                log.info("Force update Bloom filter due to high false positive rate ({} vs {})", rate, target);
                 recalculateFastCatchupAndFilter(FilterRecalculateMode.FORCE_SEND_FOR_REFRESH);
             }
         }
     }
 
-    private class PeerStartupListener implements PeerConnectedEventListener, PeerDisconnectedEventListener {
+    private class PeerStartupListener implements PeerConnectedEventListener, PeerDisconnectedEventListener, PreMessageReceivedEventListener {
         @Override
         public void onPeerConnected(Peer peer, int peerCount) {
             handleNewPeer(peer);
@@ -261,6 +285,19 @@ public void onPeerDisconnected(Peer peer, int peerCount) {
             // The channel will be automatically removed from channels.
             handlePeerDeath(peer, null);
         }
+
+        @Override
+        public Message onPreMessageReceived(Peer peer, Message m) {
+            // See https://github.com/bisq-network/bitcoinj/issues/28 for more info on addr msg handling
+            if (m instanceof AddressMessage && addPeersFromAddressMessage) {
+                for( PeerAddress peerAddress : ((AddressMessage)m).getAddresses() ) {
+                    addInactive(peerAddress, 0);
+                }
+            }
+
+            // Just pass the message right through for further processing.
+            return m;
+        }
     }
 
     private final PeerStartupListener startupListener = new PeerStartupListener();
@@ -283,7 +320,7 @@ public void onPeerDisconnected(Peer peer, int peerCount) {
     /** The default timeout between when a connection attempt begins and version message exchange completes */
     public static final int DEFAULT_CONNECT_TIMEOUT_MILLIS = 5000;
     private volatile int vConnectTimeoutMillis = DEFAULT_CONNECT_TIMEOUT_MILLIS;
-    
+
     /** Whether bloom filter support is enabled when using a non FullPrunedBlockchain*/
     private volatile boolean vBloomFilteringEnabled = true;
 
@@ -314,95 +351,22 @@ public PeerGroup(Context context, @Nullable AbstractBlockChain chain) {
         this(context, chain, new NioClientManager());
     }
 
-    /** See {@link #newWithTor(Context, AbstractBlockChain, TorClient)} */
-    public static PeerGroup newWithTor(NetworkParameters params, @Nullable AbstractBlockChain chain, TorClient torClient) throws TimeoutException {
-        return newWithTor(Context.getOrCreate(params), chain, torClient);
-    }
-
-    /**
-     * <p>Creates a PeerGroup that accesses the network via the Tor network. The provided TorClient is used so you can
-     * preconfigure it beforehand. It should not have been already started. You can just use "new TorClient()" if
-     * you don't have any particular configuration requirements.</p>
-     *
-     * <p>Peer discovery is automatically configured to use DNS seeds resolved via a random selection of exit nodes.
-     * If running on the Oracle JDK the unlimited strength jurisdiction checks will also be overridden,
-     * as they no longer apply anyway and can cause startup failures due to the requirement for AES-256.</p>
-     *
-     * <p>The user does not need any additional software for this: it's all pure Java. As of April 2014 <b>this mode
-     * is experimental</b>.</p>
-     *
-     * @throws TimeoutException if Tor fails to start within 20 seconds.
-     */
-    public static PeerGroup newWithTor(Context context, @Nullable AbstractBlockChain chain, TorClient torClient) throws TimeoutException {
-        return newWithTor(context, chain, torClient, true);
-    }
-
-    /**
-     * <p>Creates a PeerGroup that accesses the network via the Tor network. The provided TorClient is used so you can
-     * preconfigure it beforehand. It should not have been already started. You can just use "new TorClient()" if
-     * you don't have any particular configuration requirements.</p>
-     *
-     * <p>If running on the Oracle JDK the unlimited strength jurisdiction checks will also be overridden,
-     * as they no longer apply anyway and can cause startup failures due to the requirement for AES-256.</p>
-     *
-     * <p>The user does not need any additional software for this: it's all pure Java. As of April 2014 <b>this mode
-     * is experimental</b>.</p>
-     *
-     * @param doDiscovery if true, DNS or HTTP peer discovery will be performed via Tor: this is almost always what you want.
-     * @throws java.util.concurrent.TimeoutException if Tor fails to start within 20 seconds.
-     */
-    public static PeerGroup newWithTor(Context context, @Nullable AbstractBlockChain chain, TorClient torClient, boolean doDiscovery) throws TimeoutException {
-        checkNotNull(torClient);
-        DRMWorkaround.maybeDisableExportControls();
-        BlockingClientManager manager = new BlockingClientManager(torClient.getSocketFactory());
-        final int CONNECT_TIMEOUT_MSEC = TOR_TIMEOUT_SECONDS * 1000;
-        manager.setConnectTimeoutMillis(CONNECT_TIMEOUT_MSEC);
-        PeerGroup result = new PeerGroup(context, chain, manager, torClient);
-        result.setConnectTimeoutMillis(CONNECT_TIMEOUT_MSEC);
-
-        if (doDiscovery) {
-            NetworkParameters params = context.getParams();
-            HttpDiscovery.Details[] httpSeeds = params.getHttpSeeds();
-            if (httpSeeds.length > 0) {
-                // Use HTTP discovery when Tor is active and there is a Cartographer seed, for a much needed speed boost.
-                OkHttpClient httpClient = new OkHttpClient();
-                httpClient.setSocketFactory(torClient.getSocketFactory());
-                List<PeerDiscovery> discoveries = Lists.newArrayList();
-                for (HttpDiscovery.Details httpSeed : httpSeeds)
-                    discoveries.add(new HttpDiscovery(params, httpSeed, httpClient));
-                result.addPeerDiscovery(new MultiplexingDiscovery(params, discoveries));
-            } else {
-                result.addPeerDiscovery(new TorDiscovery(params, torClient));
-            }
-        }
-        return result;
-    }
-
     /** See {@link #PeerGroup(Context, AbstractBlockChain, ClientConnectionManager)} */
     public PeerGroup(NetworkParameters params, @Nullable AbstractBlockChain chain, ClientConnectionManager connectionManager) {
-        this(Context.getOrCreate(params), chain, connectionManager, null);
+        this(Context.getOrCreate(params), chain, connectionManager);
     }
 
     /**
      * Creates a new PeerGroup allowing you to specify the {@link ClientConnectionManager} which is used to create new
      * connections and keep track of existing ones.
      */
-    public PeerGroup(Context context, @Nullable AbstractBlockChain chain, ClientConnectionManager connectionManager) {
-        this(context, chain, connectionManager, null);
-    }
-
-    /**
-     * Creates a new PeerGroup allowing you to specify the {@link ClientConnectionManager} which is used to create new
-     * connections and keep track of existing ones.
-     */
-    private PeerGroup(Context context, @Nullable AbstractBlockChain chain, ClientConnectionManager connectionManager, @Nullable TorClient torClient) {
+    private PeerGroup(Context context, @Nullable AbstractBlockChain chain, ClientConnectionManager connectionManager) {
         checkNotNull(context);
         this.params = context.getParams();
         this.chain = chain;
         fastCatchupTimeSecs = params.getGenesisBlock().getTimeSeconds();
-        wallets = new CopyOnWriteArrayList<Wallet>();
-        peerFilterProviders = new CopyOnWriteArrayList<PeerFilterProvider>();
-        this.torClient = torClient;
+        wallets = new CopyOnWriteArrayList<>();
+        peerFilterProviders = new CopyOnWriteArrayList<>();
 
         executor = createPrivateExecutor();
 
@@ -418,23 +382,28 @@ private PeerGroup(Context context, @Nullable AbstractBlockChain chain, ClientCon
 
         downloadTxDependencyDepth = Integer.MAX_VALUE;
 
-        inactives = new PriorityQueue<PeerAddress>(1, new Comparator<PeerAddress>() {
+        inactives = new PriorityQueue<>(1, new Comparator<PeerAddress>() {
             @SuppressWarnings("FieldAccessNotGuarded")   // only called when inactives is accessed, and lock is held then.
             @Override
             public int compare(PeerAddress a, PeerAddress b) {
                 checkState(lock.isHeldByCurrentThread());
                 int result = backoffMap.get(a).compareTo(backoffMap.get(b));
+                if (result != 0)
+                    return result;
+                result = Ints.compare(getPriority(a), getPriority(b));
+                if (result != 0)
+                    return result;
                 // Sort by port if otherwise equals - for testing
-                if (result == 0)
-                    result = Ints.compare(a.getPort(), b.getPort());
+                result = Ints.compare(a.getPort(), b.getPort());
                 return result;
             }
         });
-        backoffMap = new HashMap<PeerAddress, ExponentialBackoff>();
-        peers = new CopyOnWriteArrayList<Peer>();
-        pendingPeers = new CopyOnWriteArrayList<Peer>();
+        backoffMap = new HashMap<>();
+        priorityMap = new ConcurrentHashMap<>();
+        peers = new CopyOnWriteArrayList<>();
+        pendingPeers = new CopyOnWriteArrayList<>();
         channels = connectionManager;
-        peerDiscoverers = new CopyOnWriteArraySet<PeerDiscovery>();
+        peerDiscoverers = new CopyOnWriteArraySet<>();
         runningBroadcasts = Collections.synchronizedSet(new HashSet<TransactionBroadcast>());
         bloomFilterMerger = new FilterMerger(DEFAULT_BLOOM_FILTER_FP_RATE);
         vMinRequiredProtocolVersion = params.getProtocolVersionNum(NetworkParameters.ProtocolVersion.BLOOM_FILTER);
@@ -487,6 +456,20 @@ public void setMaxConnections(int maxConnections) {
             channels.closeConnections(-adjustment);
     }
 
+    /**
+     * Switch for enabling network peer discovery.
+     *   if true, we will listen to "addr" network messages and add nodes discovered this way.
+     *   if false, only nodes found by discovery process are used/added.
+     */
+    public void setAddPeersFromAddressMessage(boolean addPeersFromAddressMessage) {
+        lock.lock();
+        try {
+            this.addPeersFromAddressMessage = addPeersFromAddressMessage;
+        } finally {
+            lock.unlock();
+        }
+    }
+
     /**
      * Configure download of pending transaction dependencies. A change of values only takes effect for newly connected
      * peers.
@@ -540,11 +523,7 @@ public void go() {
             // Don't hold the lock across discovery as this process can be very slow.
             boolean discoverySuccess = false;
             if (doDiscovery) {
-                try {
-                    discoverySuccess = discoverPeers() > 0;
-                } catch (PeerDiscoveryException e) {
-                    log.error("Peer discovery failure", e);
-                }
+                discoverySuccess = discoverPeers() > 0;
             }
 
             long retryTime;
@@ -581,12 +560,17 @@ public void go() {
                 retryTime = Math.max(retryTime, groupBackoff.getRetryTime());
                 if (retryTime > now) {
                     long delay = retryTime - now;
-                    log.info("Waiting {} msec before next connect attempt {}", delay, addrToTry == null ? "" : "to " + addrToTry);
+                    log.info("Waiting {} ms before next connect attempt {}", delay, addrToTry == null ? "" : "to " + addrToTry);
                     inactives.add(addrToTry);
                     executor.schedule(this, delay, TimeUnit.MILLISECONDS);
                     return;
                 }
-                connectTo(addrToTry, false, vConnectTimeoutMillis);
+
+                // BitcoinJ gets too many connections after a connection loss and reconnect as it adds up a lot of
+                // potential candidates and then try to connect to all of those when getting connection again.
+                // A check for maxConnections is required to not exceed connections.
+                if (countConnectedAndPendingPeers() < getMaxConnections())
+                    connectTo(addrToTry, false, vConnectTimeoutMillis);
             } finally {
                 lock.unlock();
             }
@@ -617,8 +601,8 @@ private List<Message> handleGetData(GetDataMessage m) {
         // Runs on peer threads.
         lock.lock();
         try {
-            LinkedList<Message> transactions = new LinkedList<Message>();
-            LinkedList<InventoryItem> items = new LinkedList<InventoryItem>(m.getItems());
+            LinkedList<Message> transactions = new LinkedList<>();
+            LinkedList<InventoryItem> items = new LinkedList<>(m.getItems());
             Iterator<InventoryItem> it = items.iterator();
             while (it.hasNext()) {
                 InventoryItem item = it.next();
@@ -668,7 +652,7 @@ public VersionMessage getVersionMessage() {
     }
 
     /**
-     * Sets information that identifies this software to remote nodes. This is a convenience wrapper for creating 
+     * Sets information that identifies this software to remote nodes. This is a convenience wrapper for creating
      * a new {@link VersionMessage}, calling {@link VersionMessage#appendToSubVer(String, String, String)} on it,
      * and then calling {@link PeerGroup#setVersionMessage(VersionMessage)} on the result of that. See the docs for
      * {@link VersionMessage#appendToSubVer(String, String, String)} for information on what the fields should contain.
@@ -682,7 +666,7 @@ public void setUserAgent(String name, String version, @Nullable String comments)
         ver.appendToSubVer(name, version, comments);
         setVersionMessage(ver);
     }
-    
+
     // Updates the relayTxesBeforeFilter flag of ver
     private void updateVersionMessageRelayTxesBeforeFilter(VersionMessage ver) {
         // We will provide the remote node with a bloom filter (ie they shouldn't relay yet)
@@ -708,32 +692,6 @@ public void setUserAgent(String name, String version) {
         setUserAgent(name, version, null);
     }
 
-    /** Use the more specific listener methods instead */
-    @Deprecated @SuppressWarnings("deprecation")
-    public void addEventListener(AbstractPeerEventListener listener, Executor executor) {
-        addBlocksDownloadedEventListener(Threading.USER_THREAD, listener);
-        addChainDownloadStartedEventListener(Threading.USER_THREAD, listener);
-        addConnectedEventListener(Threading.USER_THREAD, listener);
-        addDisconnectedEventListener(Threading.USER_THREAD, listener);
-        addDiscoveredEventListener(Threading.USER_THREAD, listener);
-        addGetDataEventListener(Threading.USER_THREAD, listener);
-        addOnTransactionBroadcastListener(Threading.USER_THREAD, listener);
-        addPreMessageReceivedEventListener(Threading.USER_THREAD, listener);
-    }
-
-    /** Use the more specific listener methods instead */
-    @Deprecated @SuppressWarnings("deprecation")
-    public void addEventListener(AbstractPeerEventListener listener) {
-        addBlocksDownloadedEventListener(executor, listener);
-        addChainDownloadStartedEventListener(executor, listener);
-        addConnectedEventListener(executor, listener);
-        addDisconnectedEventListener(executor, listener);
-        addDiscoveredEventListener(executor, listener);
-        addGetDataEventListener(executor, listener);
-        addOnTransactionBroadcastListener(executor, listener);
-        addPreMessageReceivedEventListener(executor, listener);
-    }
-
     /** See {@link Peer#addBlocksDownloadedEventListener(BlocksDownloadedEventListener)} */
     public void addBlocksDownloadedEventListener(BlocksDownloadedEventListener listener) {
         addBlocksDownloadedEventListener(Threading.USER_THREAD, listener);
@@ -745,7 +703,7 @@ public void addBlocksDownloadedEventListener(BlocksDownloadedEventListener liste
      * @see Peer#addBlocksDownloadedEventListener(Executor, BlocksDownloadedEventListener)
      */
     public void addBlocksDownloadedEventListener(Executor executor, BlocksDownloadedEventListener listener) {
-        peersBlocksDownloadedEventListeners.add(new ListenerRegistration<BlocksDownloadedEventListener>(checkNotNull(listener), executor));
+        peersBlocksDownloadedEventListeners.add(new ListenerRegistration<>(checkNotNull(listener), executor));
         for (Peer peer : getConnectedPeers())
             peer.addBlocksDownloadedEventListener(executor, listener);
         for (Peer peer : getPendingPeers())
@@ -762,13 +720,32 @@ public void addChainDownloadStartedEventListener(ChainDownloadStartedEventListen
      * chain download starts.</p>
      */
     public void addChainDownloadStartedEventListener(Executor executor, ChainDownloadStartedEventListener listener) {
-        peersChainDownloadStartedEventListeners.add(new ListenerRegistration<ChainDownloadStartedEventListener>(checkNotNull(listener), executor));
+        peersChainDownloadStartedEventListeners.add(new ListenerRegistration<>(checkNotNull(listener), executor));
         for (Peer peer : getConnectedPeers())
             peer.addChainDownloadStartedEventListener(executor, listener);
         for (Peer peer : getPendingPeers())
             peer.addChainDownloadStartedEventListener(executor, listener);
     }
 
+    /**
+     * <p>Adds a listener that will be notified on the USER_THREAD when
+     * a VersionMessage is received.</p>
+     */
+    public void addVersionMessageReceivedEventListener(VersionMessageReceivedEventListener listener) {
+        addVersionMessageReceivedEventListener(Threading.USER_THREAD, listener);
+    }
+
+    /**
+     * <p>Adds a listener that will be notified on the given executor when
+     * a VersionMessage is received.</p>
+     */
+    public void addVersionMessageReceivedEventListener(Executor executor, VersionMessageReceivedEventListener listener) {
+        versionMessageReceivedEventListeners.add(new ListenerRegistration<VersionMessageReceivedEventListener>(checkNotNull(listener), executor));
+        // A pending peer can still not have received a version message.
+        for (Peer peer : getPendingPeers())
+            peer.addVersionMessageReceivedEventListener(executor, listener);
+    }
+
     /** See {@link Peer#addConnectedEventListener(PeerConnectedEventListener)} */
     public void addConnectedEventListener(PeerConnectedEventListener listener) {
         addConnectedEventListener(Threading.USER_THREAD, listener);
@@ -779,7 +756,7 @@ public void addConnectedEventListener(PeerConnectedEventListener listener) {
      * new peers are connected to.</p>
      */
     public void addConnectedEventListener(Executor executor, PeerConnectedEventListener listener) {
-        peerConnectedEventListeners.add(new ListenerRegistration<PeerConnectedEventListener>(checkNotNull(listener), executor));
+        peerConnectedEventListeners.add(new ListenerRegistration<>(checkNotNull(listener), executor));
         for (Peer peer : getConnectedPeers())
             peer.addConnectedEventListener(executor, listener);
         for (Peer peer : getPendingPeers())
@@ -796,14 +773,14 @@ public void addDisconnectedEventListener(PeerDisconnectedEventListener listener)
      * peers are disconnected from.</p>
      */
     public void addDisconnectedEventListener(Executor executor, PeerDisconnectedEventListener listener) {
-        peerDisconnectedEventListeners.add(new ListenerRegistration<PeerDisconnectedEventListener>(checkNotNull(listener), executor));
+        peerDisconnectedEventListeners.add(new ListenerRegistration<>(checkNotNull(listener), executor));
         for (Peer peer : getConnectedPeers())
             peer.addDisconnectedEventListener(executor, listener);
         for (Peer peer : getPendingPeers())
             peer.addDisconnectedEventListener(executor, listener);
     }
 
-    /** See {@link Peer#addDiscoveredEventListener(PeerDiscoveredEventListener)} */
+    /** See {@link PeerGroup#addDiscoveredEventListener(Executor, PeerDiscoveredEventListener)} */
     public void addDiscoveredEventListener(PeerDiscoveredEventListener listener) {
         addDiscoveredEventListener(Threading.USER_THREAD, listener);
     }
@@ -813,7 +790,7 @@ public void addDiscoveredEventListener(PeerDiscoveredEventListener listener) {
      * peers are discovered.</p>
      */
     public void addDiscoveredEventListener(Executor executor, PeerDiscoveredEventListener listener) {
-        peerDiscoveredEventListeners.add(new ListenerRegistration<PeerDiscoveredEventListener>(checkNotNull(listener), executor));
+        peerDiscoveredEventListeners.add(new ListenerRegistration<>(checkNotNull(listener), executor));
     }
 
     /** See {@link Peer#addGetDataEventListener(GetDataEventListener)} */
@@ -823,7 +800,7 @@ public void addGetDataEventListener(GetDataEventListener listener) {
 
     /** See {@link Peer#addGetDataEventListener(Executor, GetDataEventListener)} */
     public void addGetDataEventListener(final Executor executor, final GetDataEventListener listener) {
-        peerGetDataEventListeners.add(new ListenerRegistration<GetDataEventListener>(checkNotNull(listener), executor));
+        peerGetDataEventListeners.add(new ListenerRegistration<>(checkNotNull(listener), executor));
         for (Peer peer : getConnectedPeers())
             peer.addGetDataEventListener(executor, listener);
         for (Peer peer : getPendingPeers())
@@ -837,7 +814,7 @@ public void addOnTransactionBroadcastListener(OnTransactionBroadcastListener lis
 
     /** See {@link Peer#addOnTransactionBroadcastListener(OnTransactionBroadcastListener)} */
     public void addOnTransactionBroadcastListener(Executor executor, OnTransactionBroadcastListener listener) {
-        peersTransactionBroadastEventListeners.add(new ListenerRegistration<OnTransactionBroadcastListener>(checkNotNull(listener), executor));
+        peersTransactionBroadastEventListeners.add(new ListenerRegistration<>(checkNotNull(listener), executor));
         for (Peer peer : getConnectedPeers())
             peer.addOnTransactionBroadcastListener(executor, listener);
         for (Peer peer : getPendingPeers())
@@ -851,26 +828,13 @@ public void addPreMessageReceivedEventListener(PreMessageReceivedEventListener l
 
     /** See {@link Peer#addPreMessageReceivedEventListener(Executor, PreMessageReceivedEventListener)} */
     public void addPreMessageReceivedEventListener(Executor executor, PreMessageReceivedEventListener listener) {
-        peersPreMessageReceivedEventListeners.add(new ListenerRegistration<PreMessageReceivedEventListener>(checkNotNull(listener), executor));
+        peersPreMessageReceivedEventListeners.add(new ListenerRegistration<>(checkNotNull(listener), executor));
         for (Peer peer : getConnectedPeers())
             peer.addPreMessageReceivedEventListener(executor, listener);
         for (Peer peer : getPendingPeers())
             peer.addPreMessageReceivedEventListener(executor, listener);
     }
 
-    /** Use the more specific listener methods instead */
-    @Deprecated @SuppressWarnings("deprecation")
-    public void removeEventListener(AbstractPeerEventListener listener) {
-        removeBlocksDownloadedEventListener(listener);
-        removeChainDownloadStartedEventListener(listener);
-        removeConnectedEventListener(listener);
-        removeDisconnectedEventListener(listener);
-        removeDiscoveredEventListener(listener);
-        removeGetDataEventListener(listener);
-        removeOnTransactionBroadcastListener(listener);
-        removePreMessageReceivedEventListener(listener);
-    }
-
     public boolean removeBlocksDownloadedEventListener(BlocksDownloadedEventListener listener) {
         boolean result = ListenerRegistration.removeFromList(listener, peersBlocksDownloadedEventListeners);
         for (Peer peer : getConnectedPeers())
@@ -889,6 +853,16 @@ public boolean removeChainDownloadStartedEventListener(ChainDownloadStartedEvent
         return result;
     }
 
+    /** The given event listener will no longer be called with events. */
+    public boolean removeVersionMessageReceivedEventListener(VersionMessageReceivedEventListener listener) {
+        boolean result = ListenerRegistration.removeFromList(listener, versionMessageReceivedEventListeners);
+        for (Peer peer : getConnectedPeers())
+            peer.removeVersionMessageReceivedEventListener(listener);
+        for (Peer peer : getPendingPeers())
+            peer.removeVersionMessageReceivedEventListener(listener);
+        return result;
+    }
+
     /** The given event listener will no longer be called with events. */
     public boolean removeConnectedEventListener(PeerConnectedEventListener listener) {
         boolean result = ListenerRegistration.removeFromList(listener, peerConnectedEventListeners);
@@ -951,7 +925,7 @@ public boolean removePreMessageReceivedEventListener(PreMessageReceivedEventList
     public List<Peer> getConnectedPeers() {
         lock.lock();
         try {
-            return new ArrayList<Peer>(peers);
+            return new ArrayList<>(peers);
         } finally {
             lock.unlock();
         }
@@ -963,7 +937,7 @@ public List<Peer> getConnectedPeers() {
     public List<Peer> getPendingPeers() {
         lock.lock();
         try {
-            return new ArrayList<Peer>(pendingPeers);
+            return new ArrayList<>(pendingPeers);
         } finally {
             lock.unlock();
         }
@@ -976,30 +950,60 @@ public List<Peer> getPendingPeers() {
      * @param peerAddress IP/port to use.
      */
     public void addAddress(PeerAddress peerAddress) {
+        addAddress(peerAddress, 0);
+    }
+
+    /**
+     * Add an address to the list of potential peers to connect to. It won't necessarily be used unless there's a need
+     * to build new connections to reach the max connection count.
+     *
+     * @param peerAddress IP/port to use.
+     * @param priority for connecting and being picked as a download peer
+     */
+    public void addAddress(PeerAddress peerAddress, int priority) {
         int newMax;
         lock.lock();
         try {
-            addInactive(peerAddress);
-            newMax = getMaxConnections() + 1;
+            if (addInactive(peerAddress, priority)) {
+                newMax = getMaxConnections() + 1;
+                setMaxConnections(newMax);
+            }
         } finally {
             lock.unlock();
         }
-        setMaxConnections(newMax);
     }
 
-    private void addInactive(PeerAddress peerAddress) {
+    // Adds peerAddress to backoffMap map and inactives queue.
+    // Returns true if it was added, false if it was already there.
+    private boolean addInactive(PeerAddress peerAddress, int priority) {
         lock.lock();
         try {
             // Deduplicate
-            if (backoffMap.containsKey(peerAddress))
-                return;
+            boolean backoffMapContainsPeerAddress = false;
+            for (PeerAddress a : backoffMap.keySet()) {
+                if (a.equalsIgnoringMetadata(peerAddress)) {
+                    backoffMapContainsPeerAddress = true;
+                    break;
+                }
+            }
+            if (backoffMapContainsPeerAddress)
+                return false;
             backoffMap.put(peerAddress, new ExponentialBackoff(peerBackoffParams));
+            if (priority != 0)
+                priorityMap.put(peerAddress, priority);
             inactives.offer(peerAddress);
+
+            return true;
         } finally {
             lock.unlock();
         }
     }
 
+    private int getPriority(PeerAddress peerAddress) {
+        Integer priority = priorityMap.get(peerAddress);
+        return priority != null ? priority : 0;
+    }
+
     /**
      * Convenience for connecting only to peers that can serve specific services. It will configure suitable peer
      * discoveries.
@@ -1010,17 +1014,22 @@ public void setRequiredServices(long requiredServices) {
         try {
             this.requiredServices = requiredServices;
             peerDiscoverers.clear();
-            addPeerDiscovery(MultiplexingDiscovery.forServices(params, requiredServices));
+            addPeerDiscovery(MultiplexingDiscovery.forServices(params, requiredServices, ignoreHttpSeeds));
         } finally {
             lock.unlock();
         }
     }
 
-    /** Convenience method for addAddress(new PeerAddress(address, params.port)); */
+    /** Convenience method for {@link #addAddress(PeerAddress)}. */
     public void addAddress(InetAddress address) {
         addAddress(new PeerAddress(params, address, params.getPort()));
     }
 
+    /** Convenience method for {@link #addAddress(PeerAddress, int)}. */
+    public void addAddress(InetAddress address, int priority) {
+        addAddress(new PeerAddress(params, address, params.getPort()), priority);
+    }
+
     /**
      * Add addresses from a discovery source to the list of potential peers to connect to. If max connections has not
      * been configured, or set to zero, then it's set to the default at this point.
@@ -1037,7 +1046,7 @@ public void addPeerDiscovery(PeerDiscovery peerDiscovery) {
     }
 
     /** Returns number of discovered peers. */
-    protected int discoverPeers() throws PeerDiscoveryException {
+    protected int discoverPeers() {
         // Don't hold the lock whilst doing peer discovery: it can take a long time and cause high API latency.
         checkState(!lock.isHeldByCurrentThread());
         int maxPeersToDiscoverCount = this.vMaxPeersToDiscoverCount;
@@ -1046,13 +1055,18 @@ protected int discoverPeers() throws PeerDiscoveryException {
         final List<PeerAddress> addressList = Lists.newLinkedList();
         for (PeerDiscovery peerDiscovery : peerDiscoverers /* COW */) {
             InetSocketAddress[] addresses;
-            addresses = peerDiscovery.getPeers(requiredServices, peerDiscoveryTimeoutMillis, TimeUnit.MILLISECONDS);
+            try {
+                addresses = peerDiscovery.getPeers(requiredServices, peerDiscoveryTimeoutMillis, TimeUnit.MILLISECONDS);
+            } catch (PeerDiscoveryException e) {
+                log.warn(e.getMessage());
+                continue;
+            }
             for (InetSocketAddress address : addresses) addressList.add(new PeerAddress(params, address));
             if (addressList.size() >= maxPeersToDiscoverCount) break;
         }
         if (!addressList.isEmpty()) {
             for (PeerAddress address : addressList) {
-                addInactive(address);
+                addInactive(address, 0);
             }
             final ImmutableSet<PeerAddress> peersDiscoveredSet = ImmutableSet.copyOf(addressList);
             for (final ListenerRegistration<PeerDiscoveredEventListener> registration : peerDiscoveredEventListeners /* COW */) {
@@ -1098,8 +1112,12 @@ private boolean maybeCheckForLocalhostPeer() {
             Socket socket = null;
             try {
                 socket = new Socket();
-                socket.connect(new InetSocketAddress(InetAddresses.forString("127.0.0.1"), params.getPort()), vConnectTimeoutMillis);
+                socket.connect(new InetSocketAddress(InetAddress.getLoopbackAddress(), params.getPort()), vConnectTimeoutMillis);
                 localhostCheckState = LocalhostCheckState.FOUND;
+
+                // If we are connected to localhost we don't want to get other peers added from AddressMessage calls.
+                setAddPeersFromAddressMessage(false);
+
                 return true;
             } catch (IOException e) {
                 log.info("Localhost peer not detected.");
@@ -1137,16 +1155,6 @@ public ListenableFuture startAsync() {
             public void run() {
                 try {
                     log.info("Starting ...");
-                    if (torClient != null) {
-                        log.info("Starting Tor/Orchid ...");
-                        torClient.start();
-                        try {
-                            torClient.waitUntilReady(TOR_TIMEOUT_SECONDS * 1000);
-                        } catch (Exception e) {
-                            throw new RuntimeException(e);
-                        }
-                        log.info("Tor ready");
-                    }
                     channels.startAsync();
                     channels.awaitRunning();
                     triggerConnections();
@@ -1163,12 +1171,6 @@ public void start() {
         Futures.getUnchecked(startAsync());
     }
 
-    /** Can just use start() for a blocking start here instead of startAsync/awaitRunning: PeerGroup is no longer a Guava service. */
-    @Deprecated
-    public void awaitRunning() {
-        waitForJobQueue();
-    }
-
     public ListenableFuture stopAsync() {
         checkState(vRunning);
         vRunning = false;
@@ -1177,17 +1179,17 @@ public ListenableFuture stopAsync() {
             public void run() {
                 try {
                     log.info("Stopping ...");
+                    Stopwatch watch = Stopwatch.createStarted();
+                    // The log output this creates can be useful.
+                    setDownloadPeer(null);
                     // Blocking close of all sockets.
                     channels.stopAsync();
                     channels.awaitTerminated();
                     for (PeerDiscovery peerDiscovery : peerDiscoverers) {
                         peerDiscovery.shutdown();
                     }
-                    if (torClient != null) {
-                        torClient.stop();
-                    }
                     vRunning = false;
-                    log.info("Stopped.");
+                    log.info("Stopped, took {}.", watch);
                 } catch (Throwable e) {
                     log.error("Exception when shutting down", e);  // The executor swallows exceptions :(
                 }
@@ -1200,21 +1202,26 @@ public void run() {
     /** Does a blocking stop */
     public void stop() {
         try {
+            Stopwatch watch = Stopwatch.createStarted();
             stopAsync();
             log.info("Awaiting PeerGroup shutdown ...");
             executor.awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS);
+            log.info("... took {}", watch);
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
     }
 
-    /** Can just use stop() here instead of stopAsync/awaitTerminated: PeerGroup is no longer a Guava service. */
-    @Deprecated
-    public void awaitTerminated() {
+    /**
+     * Gracefully drops all connected peers.
+     */
+    public void dropAllPeers() {
+        lock.lock();
         try {
-            executor.awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
+            for (Peer peer : peers)
+                peer.close();
+        } finally {
+            lock.unlock();
         }
     }
 
@@ -1242,6 +1249,7 @@ public void addWallet(Wallet wallet) {
             wallets.add(wallet);
             wallet.setTransactionBroadcaster(this);
             wallet.addCoinsReceivedEventListener(Threading.SAME_THREAD, walletCoinsReceivedEventListener);
+            wallet.addCoinsSentEventListener(Threading.SAME_THREAD, walletCoinsSentEventListener);
             wallet.addKeyChainEventListener(Threading.SAME_THREAD, walletKeyEventListener);
             wallet.addScriptChangeEventListener(Threading.SAME_THREAD, walletScriptEventListener);
             addPeerFilterProvider(wallet);
@@ -1261,10 +1269,10 @@ public void addWallet(Wallet wallet) {
      * than the current chain head, the relevant parts of the chain won't be redownloaded for you.</p>
      *
      * <p>This method invokes {@link PeerGroup#recalculateFastCatchupAndFilter(FilterRecalculateMode)}.
-     * The return value of this method is the <code>ListenableFuture</code> returned by that invocation.</p>
+     * The return value of this method is the {@code ListenableFuture} returned by that invocation.</p>
      *
-     * @return a future that completes once each <code>Peer</code> in this group has had its
-     *         <code>BloomFilter</code> (re)set.
+     * @return a future that completes once each {@code Peer} in this group has had its
+     *         {@code BloomFilter} (re)set.
      */
     public ListenableFuture<BloomFilter> addPeerFilterProvider(PeerFilterProvider provider) {
         lock.lock();
@@ -1314,12 +1322,13 @@ public void removeWallet(Wallet wallet) {
         wallets.remove(checkNotNull(wallet));
         peerFilterProviders.remove(wallet);
         wallet.removeCoinsReceivedEventListener(walletCoinsReceivedEventListener);
+        wallet.removeCoinsSentEventListener(walletCoinsSentEventListener);
         wallet.removeKeyChainEventListener(walletKeyEventListener);
         wallet.removeScriptChangeEventListener(walletScriptEventListener);
         wallet.setTransactionBroadcaster(null);
         for (Peer peer : peers) {
             peer.removeWallet(wallet);
-        }        
+        }
     }
 
     public enum FilterRecalculateMode {
@@ -1403,13 +1412,13 @@ public void go() {
         }
         return future;
     }
-    
+
     /**
      * <p>Sets the false positive rate of bloom filters given to peers. The default is {@link #DEFAULT_BLOOM_FILTER_FP_RATE}.</p>
      *
      * <p>Be careful regenerating the bloom filter too often, as it decreases anonymity because remote nodes can
      * compare transactions against both the new and old filters to significantly decrease the false positive rate.</p>
-     * 
+     *
      * <p>See the docs for {@link BloomFilter#BloomFilter(int, double, long, BloomFilter.BloomUpdate)} for a brief
      * explanation of anonymity when using bloom filters.</p>
      */
@@ -1424,8 +1433,8 @@ public void setBloomFilterFalsePositiveRate(double bloomFilterFPRate) {
     }
 
     /**
-     * Returns the number of currently connected peers. To be informed when this count changes, register a 
-     * {@link org.bitcoinj.core.listeners.PeerConnectionEventListener} and use the onPeerConnected/onPeerDisconnected methods.
+     * Returns the number of currently connected peers. To be informed when this count changes, use
+     * {@link PeerConnectedEventListener#onPeerConnected} and {@link PeerDisconnectedEventListener#onPeerDisconnected}.
      */
     public int numConnectedPeers() {
         return peers.size();
@@ -1434,10 +1443,10 @@ public int numConnectedPeers() {
     /**
      * Connect to a peer by creating a channel to the destination address.  This should not be
      * used normally - let the PeerGroup manage connections through {@link #start()}
-     * 
+     *
      * @param address destination IP and port.
      * @return The newly created Peer object or null if the peer could not be connected.
-     *         Use {@link org.bitcoinj.core.Peer#getConnectionOpenFuture()} if you
+     *         Use {@link Peer#getConnectionOpenFuture()} if you
      *         want a future which completes when the connection is open.
      */
     @Nullable
@@ -1481,8 +1490,17 @@ protected Peer connectTo(PeerAddress address, boolean incrementMaxConnections, i
         VersionMessage ver = getVersionMessage().duplicate();
         ver.bestHeight = chain == null ? 0 : chain.getBestChainHeight();
         ver.time = Utils.currentTimeSeconds();
+        ver.receivingAddr = address;
+        ver.receivingAddr.setParent(ver);
 
         Peer peer = createPeer(address, ver);
+
+        // We attach versionMessageReceivedEventListeners early, because the other listeners are triggered after
+        // the handshake. Further, even if a VersionMessage is received, the Peer may close itself before any of
+        // the other listeners are triggered.
+        for (ListenerRegistration<VersionMessageReceivedEventListener> registration : versionMessageReceivedEventListeners)
+            peer.addVersionMessageReceivedEventListener(registration.executor, registration.listener);
+
         peer.addConnectedEventListener(Threading.SAME_THREAD, startupListener);
         peer.addDisconnectedEventListener(Threading.SAME_THREAD, startupListener);
         peer.setMinProtocolVersion(vMinRequiredProtocolVersion);
@@ -1514,7 +1532,7 @@ protected Peer connectTo(PeerAddress address, boolean incrementMaxConnections, i
     /** You can override this to customise the creation of {@link Peer} objects. */
     @GuardedBy("lock")
     protected Peer createPeer(PeerAddress address, VersionMessage ver) {
-        return new Peer(params, ver, address, chain, downloadTxDependencyDepth);
+        return new Peer(params, ver, address, chain, requiredServices, downloadTxDependencyDepth);
     }
 
     /**
@@ -1526,7 +1544,7 @@ public void setConnectTimeoutMillis(int connectTimeoutMillis) {
     }
 
     /**
-     * <p>Start downloading the blockchain from the first available peer.</p>
+     * <p>Start downloading the blockchain.</p>
      *
      * <p>If no peers are currently connected, the download will be started once a peer starts.  If the peer dies,
      * the download will resume with another peer.</p>
@@ -1545,12 +1563,6 @@ public void startBlockChainDownload(PeerDataEventListener listener) {
                 }
             }
             this.downloadListener = listener;
-            // TODO: be more nuanced about which peer to download from.  We can also try
-            // downloading from multiple peers and handle the case when a new peer comes along
-            // with a longer chain after we thought we were done.
-            if (!peers.isEmpty()) {
-                startBlockChainDownloadFromPeer(peers.iterator().next()); // Will add the new download listener
-            }
         } finally {
             lock.unlock();
         }
@@ -1582,7 +1594,7 @@ private static void removeDataEventListenerFromPeer(Peer peer, PeerDataEventList
 
     /**
      * Download the blockchain from peers. Convenience that uses a {@link DownloadProgressTracker} for you.<p>
-     * 
+     *
      * This method waits until the download is complete.  "Complete" is defined as downloading
      * from at least one peer all the blocks that are in that peer's inventory.
      */
@@ -1616,12 +1628,17 @@ protected void handleNewPeer(final Peer peer) {
             // TODO: The peer should calculate the fast catchup time from the added wallets here.
             for (Wallet wallet : wallets)
                 peer.addWallet(wallet);
-            if (downloadPeer == null) {
-                // Kick off chain download if we aren't already doing it.
-                setDownloadPeer(selectDownloadPeer(peers));
-                boolean shouldDownloadChain = downloadListener != null && chain != null;
-                if (shouldDownloadChain) {
-                    startBlockChainDownloadFromPeer(downloadPeer);
+            if (downloadPeer == null && newSize > maxConnections / 2) {
+                Peer newDownloadPeer = selectDownloadPeer(peers);
+                if (newDownloadPeer != null) {
+                    setDownloadPeer(newDownloadPeer);
+                    // Kick off chain download if we aren't already doing it.
+                    boolean shouldDownloadChain = downloadListener != null && chain != null;
+                    if (shouldDownloadChain) {
+                        startBlockChainDownloadFromPeer(downloadPeer);
+                    }
+                } else {
+                    log.info("Not yet setting download peer because there is no clear candidate.");
                 }
             }
             // Make sure the peer knows how to upload transactions that are requested from us.
@@ -1722,9 +1739,9 @@ public TxConfidenceTable getMemoryPool() {
     }
 
     /**
-     * Tells the PeerGroup to download only block headers before a certain time and bodies after that. Call this
+     * Tells the {@link PeerGroup} to download only block headers before a certain time and bodies after that. Call this
      * before starting block chain download.
-     * Do not use a time > NOW - 1 block, as it will break some block download logic.
+     * Do not use a {@code time > NOW - 1} block, as it will break some block download logic.
      */
     public void setFastCatchupTimeSecs(long secondsSinceEpoch) {
         lock.lock();
@@ -1793,7 +1810,16 @@ protected void handlePeerDeath(final Peer peer, @Nullable Throwable exception) {
             } else {
                 backoffMap.get(address).trackFailure();
                 // Put back on inactive list
-                inactives.offer(address);
+                boolean inactiveContainsAddress = false;
+                for (PeerAddress a : inactives) {
+                    if (a.equalsIgnoringMetadata(address)) {
+                        inactiveContainsAddress = true;
+                        break;
+                    }
+                }
+                if (!inactiveContainsAddress) {
+                    inactives.offer(address);
+                }
             }
 
             if (numPeers < getMaxConnections()) {
@@ -1811,6 +1837,8 @@ protected void handlePeerDeath(final Peer peer, @Nullable Throwable exception) {
 
         final int fNumConnectedPeers = numConnectedPeers;
 
+        for (ListenerRegistration<VersionMessageReceivedEventListener> registration : versionMessageReceivedEventListeners)
+            peer.removeVersionMessageReceivedEventListener(registration.listener);
         for (ListenerRegistration<BlocksDownloadedEventListener> registration: peersBlocksDownloadedEventListeners)
             peer.removeBlocksDownloadedEventListener(registration.listener);
         for (ListenerRegistration<ChainDownloadStartedEventListener> registration: peersChainDownloadStartedEventListeners)
@@ -1833,7 +1861,7 @@ public void run() {
     }
 
     @GuardedBy("lock") private int stallPeriodSeconds = 10;
-    @GuardedBy("lock") private int stallMinSpeedBytesSec = Block.HEADER_SIZE * 20;
+    @GuardedBy("lock") private int stallMinSpeedBytesSec = Block.HEADER_SIZE * 10;
 
     /**
      * Configures the stall speed: the speed at which a peer is considered to be serving us the block chain
@@ -1844,7 +1872,7 @@ public void run() {
      * avoid false stalls.
      *
      * @param periodSecs How many seconds the download speed must be below blocksPerSec, defaults to 10.
-     * @param bytesPerSecond Download speed (only blocks/txns count) must be consistently below this for a stall, defaults to the bandwidth required for 20 block headers per second.
+     * @param bytesPerSecond Download speed (only blocks/txns count) must be consistently below this for a stall, defaults to the bandwidth required for 10 block headers per second.
      */
     public void setStallThreshold(int periodSecs, int bytesPerSecond) {
         lock.lock();
@@ -1862,7 +1890,7 @@ private class ChainDownloadSpeedCalculator implements BlocksDownloadedEventListe
 
         // If we take more stalls than this, we assume we're on some kind of terminally slow network and the
         // stall threshold just isn't set properly. We give up on stall disconnects after that.
-        private int maxStalls = 3;
+        private int maxStalls = 10;
 
         // How many seconds the peer has until we start measuring its speed.
         private int warmupSeconds = -1;
@@ -1873,6 +1901,8 @@ private class ChainDownloadSpeedCalculator implements BlocksDownloadedEventListe
 
         private boolean syncDone;
 
+        private final Logger log = LoggerFactory.getLogger(ChainDownloadSpeedCalculator.class);
+
         @Override
         public synchronized void onBlocksDownloaded(Peer peer, Block block, @Nullable FilteredBlock filteredBlock, int blocksLeft) {
             blocksInLastSecond++;
@@ -1921,47 +1951,70 @@ private void calculate() {
                     warmupSeconds = 15;
                 }
 
-                boolean behindPeers = chain != null && chain.getBestChainHeight() < getMostCommonChainHeight();
-                if (!behindPeers)
+                int chainHeight = chain != null ? chain.getBestChainHeight() : -1;
+                int mostCommonChainHeight = getMostCommonChainHeight();
+                if (!syncDone && mostCommonChainHeight > 0 && chainHeight >= mostCommonChainHeight) {
+                    log.info("End of sync detected at height {}.", chainHeight);
                     syncDone = true;
+                }
+
                 if (!syncDone) {
-                    if (warmupSeconds < 0) {
-                        // Calculate the moving average.
-                        samples[cursor++] = bytesInLastSecond;
-                        if (cursor == samples.length) cursor = 0;
-                        long average = 0;
-                        for (long sample : samples) average += sample;
-                        average /= samples.length;
-
-                        log.info(String.format(Locale.US, "%d blocks/sec, %d tx/sec, %d pre-filtered tx/sec, avg/last %.2f/%.2f kilobytes per sec (stall threshold <%.2f KB/sec for %d seconds)",
-                                blocksInLastSecond, txnsInLastSecond, origTxnsInLastSecond, average / 1024.0, bytesInLastSecond / 1024.0,
-                                minSpeedBytesPerSec / 1024.0, samples.length));
-
-                        if (average < minSpeedBytesPerSec && maxStalls > 0) {
-                            maxStalls--;
-                            if (maxStalls == 0) {
-                                // We could consider starting to drop the Bloom filtering FP rate at this point, because
-                                // we tried a bunch of peers and no matter what we don't seem to be able to go any faster.
-                                // This implies we're bandwidth bottlenecked and might want to start using bandwidth
-                                // more effectively. Of course if there's a MITM that is deliberately throttling us,
-                                // this is a good way to make us take away all the FPs from our Bloom filters ... but
-                                // as they don't give us a whole lot of privacy either way that's not inherently a big
-                                // deal.
-                                log.warn("This network seems to be slower than the requested stall threshold - won't do stall disconnects any more.");
-                            } else {
-                                Peer peer = getDownloadPeer();
-                                log.warn(String.format(Locale.US, "Chain download stalled: received %.2f KB/sec for %d seconds, require average of %.2f KB/sec, disconnecting %s", average / 1024.0, samples.length, minSpeedBytesPerSec / 1024.0, peer));
-                                peer.close();
-                                // Reset the sample buffer and give the next peer time to get going.
-                                samples = null;
-                                warmupSeconds = period;
-                            }
-                        }
-                    } else {
+                    // Calculate the moving average.
+                    samples[cursor++] = bytesInLastSecond;
+                    if (cursor == samples.length) cursor = 0;
+                    long average = 0;
+                    for (long sample : samples) average += sample;
+                    average /= samples.length;
+
+                    String statsString = String.format(Locale.US,
+                            "%d blocks/sec, %d tx/sec, %d pre-filtered tx/sec, avg/last %.2f/%.2f kilobytes per sec, chain/common height %d/%d",
+                            blocksInLastSecond, txnsInLastSecond, origTxnsInLastSecond, average / 1024.0,
+                            bytesInLastSecond / 1024.0, chainHeight, mostCommonChainHeight);
+                    String thresholdString = String.format(Locale.US, "(threshold <%.2f KB/sec for %d seconds)",
+                            minSpeedBytesPerSec / 1024.0, samples.length);
+                    double txnsPercentage = (double) txnsInLastSecond / (double) origTxnsInLastSecond;
+                    if (txnsInLastSecond > 1000 && txnsPercentage > 0.99) {
+                        // If bitcoin-core is sending more than 99% of the txs, disconnect the peer.
+                        Peer peer = getDownloadPeer();
+                        log.warn(String.format(Locale.US,
+                                "%d tx/sec is too high compared to %d pre-filtered tx/sec, disconnecting %s.",
+                                txnsInLastSecond, origTxnsInLastSecond, peer, maxStalls));
+                        peer.close();
+                        // Reset the sample buffer and give the next peer time to get going.
+                        samples = null;
+                        warmupSeconds = period;
+                    }
+                    if (maxStalls <= 0) {
+                        log.info(statsString + ", stall disabled " + thresholdString);
+                    } else if (warmupSeconds > 0) {
                         warmupSeconds--;
                         if (bytesInLastSecond > 0)
-                            log.info(String.format(Locale.US, "%d blocks/sec, %d tx/sec, %d pre-filtered tx/sec, last %.2f kilobytes per sec",
-                                    blocksInLastSecond, txnsInLastSecond, origTxnsInLastSecond, bytesInLastSecond / 1024.0));
+                            log.info(statsString
+                                    + String.format(Locale.US, " (warming up %d more seconds)", warmupSeconds));
+                    } else if (average < minSpeedBytesPerSec) {
+                        log.info(statsString + ", STALLED " + thresholdString);
+                        maxStalls--;
+                        if (maxStalls == 0) {
+                            // We could consider starting to drop the Bloom filtering FP rate at this point, because
+                            // we tried a bunch of peers and no matter what we don't seem to be able to go any faster.
+                            // This implies we're bandwidth bottlenecked and might want to start using bandwidth
+                            // more effectively. Of course if there's a MITM that is deliberately throttling us,
+                            // this is a good way to make us take away all the FPs from our Bloom filters ... but
+                            // as they don't give us a whole lot of privacy either way that's not inherently a big
+                            // deal.
+                            log.warn("This network seems to be slower than the requested stall threshold - won't do stall disconnects any more.");
+                        } else {
+                            Peer peer = getDownloadPeer();
+                            log.warn(String.format(Locale.US,
+                                    "Chain download stalled: received %.2f KB/sec for %d seconds, require average of %.2f KB/sec, disconnecting %s, %d stalls left",
+                                    average / 1024.0, samples.length, minSpeedBytesPerSec / 1024.0, peer, maxStalls));
+                            peer.close();
+                            // Reset the sample buffer and give the next peer time to get going.
+                            samples = null;
+                            warmupSeconds = period;
+                        }
+                    } else {
+                        log.info(statsString + ", not stalled " + thresholdString);
                     }
                 }
                 blocksInLastSecond = 0;
@@ -1973,7 +2026,8 @@ private void calculate() {
     }
     @Nullable private ChainDownloadSpeedCalculator chainDownloadSpeedCalculator;
 
-    private void startBlockChainDownloadFromPeer(Peer peer) {
+    @VisibleForTesting
+    void startBlockChainDownloadFromPeer(Peer peer) {
         lock.lock();
         try {
             setDownloadPeer(peer);
@@ -1994,12 +2048,12 @@ private void startBlockChainDownloadFromPeer(Peer peer) {
 
     /**
      * Returns a future that is triggered when the number of connected peers is equal to the given number of
-     * peers. By using this with {@link org.bitcoinj.core.PeerGroup#getMaxConnections()} you can wait until the
+     * peers. By using this with {@link PeerGroup#getMaxConnections()} you can wait until the
      * network is fully online. To block immediately, just call get() on the result. Just calls
      * {@link #waitForPeersOfVersion(int, long)} with zero as the protocol version.
      *
      * @param numPeers How many peers to wait for.
-     * @return a future that will be triggered when the number of connected peers >= numPeers
+     * @return a future that will be triggered when the number of connected peers is greater than or equals numPeers
      */
     public ListenableFuture<List<Peer>> waitForPeers(final int numPeers) {
         return waitForPeersOfVersion(numPeers, 0);
@@ -2011,7 +2065,7 @@ public ListenableFuture<List<Peer>> waitForPeers(final int numPeers) {
      *
      * @param numPeers How many peers to wait for.
      * @param protocolVersion The protocol version the awaited peers must implement (or better).
-     * @return a future that will be triggered when the number of connected peers implementing protocolVersion or higher >= numPeers
+     * @return a future that will be triggered when the number of connected peers implementing protocolVersion or higher is greater than or equals numPeers
      */
     public ListenableFuture<List<Peer>> waitForPeersOfVersion(final int numPeers, final long protocolVersion) {
         List<Peer> foundPeers = findPeersOfAtLeastVersion(protocolVersion);
@@ -2038,7 +2092,7 @@ public void onPeerConnected(Peer peer, int peerCount) {
     public List<Peer> findPeersOfAtLeastVersion(long protocolVersion) {
         lock.lock();
         try {
-            ArrayList<Peer> results = new ArrayList<Peer>(peers.size());
+            ArrayList<Peer> results = new ArrayList<>(peers.size());
             for (Peer peer : peers)
                 if (peer.getPeerVersionMessage().clientVersion >= protocolVersion)
                     results.add(peer);
@@ -2054,7 +2108,7 @@ public List<Peer> findPeersOfAtLeastVersion(long protocolVersion) {
      *
      * @param numPeers How many peers to wait for.
      * @param mask An integer representing a bit mask that will be ANDed with the peers advertised service masks.
-     * @return a future that will be triggered when the number of connected peers implementing protocolVersion or higher >= numPeers
+     * @return a future that will be triggered when the number of connected peers implementing protocolVersion or higher is greater than or equals numPeers
      */
     public ListenableFuture<List<Peer>> waitForPeersWithServiceMask(final int numPeers, final int mask) {
         lock.lock();
@@ -2085,7 +2139,7 @@ public void onPeerConnected(Peer peer, int peerCount) {
     public List<Peer> findPeersWithServiceMask(int mask) {
         lock.lock();
         try {
-            ArrayList<Peer> results = new ArrayList<Peer>(peers.size());
+            ArrayList<Peer> results = new ArrayList<>(peers.size());
             for (Peer peer : peers)
                 if ((peer.getPeerVersionMessage().localServices & mask) == mask)
                     results.add(peer);
@@ -2100,7 +2154,7 @@ public List<Peer> findPeersWithServiceMask(int mask) {
      * enough, {@link PeerGroup#broadcastTransaction(Transaction)} will wait until the minimum number is reached so
      * propagation across the network can be observed. If no value has been set using
      * {@link PeerGroup#setMinBroadcastConnections(int)} a default of 80% of whatever
-     * {@link org.bitcoinj.core.PeerGroup#getMaxConnections()} returns is used.
+     * {@link PeerGroup#getMaxConnections()} returns is used.
      */
     public int getMinBroadcastConnections() {
         lock.lock();
@@ -2119,7 +2173,7 @@ public int getMinBroadcastConnections() {
     }
 
     /**
-     * See {@link org.bitcoinj.core.PeerGroup#getMinBroadcastConnections()}.
+     * See {@link PeerGroup#getMinBroadcastConnections()}.
      */
     public void setMinBroadcastConnections(int value) {
         lock.lock();
@@ -2131,22 +2185,26 @@ public void setMinBroadcastConnections(int value) {
     }
 
     /**
-     * Calls {@link PeerGroup#broadcastTransaction(Transaction,int)} with getMinBroadcastConnections() as the number
-     * of connections to wait for before commencing broadcast.
+     * Calls {@link PeerGroup#broadcastTransaction(Transaction, int, boolean)} with getMinBroadcastConnections() as
+     * the number of connections to wait for before commencing broadcast. Also, if the transaction has no broadcast
+     * confirmations yet the peers will be dropped after the transaction has been sent.
      */
     @Override
     public TransactionBroadcast broadcastTransaction(final Transaction tx) {
-        return broadcastTransaction(tx, Math.max(1, getMinBroadcastConnections()));
+        return broadcastTransaction(tx, Math.max(1, getMinBroadcastConnections()), true);
     }
 
     /**
      * <p>Given a transaction, sends it un-announced to one peer and then waits for it to be received back from other
      * peers. Once all connected peers have announced the transaction, the future available via the
-     * {@link org.bitcoinj.core.TransactionBroadcast#future()} method will be completed. If anything goes
+     * {@link TransactionBroadcast#future()} method will be completed. If anything goes
      * wrong the exception will be thrown when get() is called, or you can receive it via a callback on the
      * {@link ListenableFuture}. This method returns immediately, so if you want it to block just call get() on the
      * result.</p>
      *
+     * <p>Optionally, peers will be dropped after they have been used for broadcasting the transaction and they have
+     * no broadcast confirmations yet.</p>
+     *
      * <p>Note that if the PeerGroup is limited to only one connection (discovery is not activated) then the future
      * will complete as soon as the transaction was successfully written to that peer.</p>
      *
@@ -2154,18 +2212,20 @@ public TransactionBroadcast broadcastTransaction(final Transaction tx) {
      * A good choice for proportion would be between 0.5 and 0.8 but if you want faster transmission during initial
      * bringup of the peer group you can lower it.</p>
      *
-     * <p>The returned {@link org.bitcoinj.core.TransactionBroadcast} object can be used to get progress feedback,
+     * <p>The returned {@link TransactionBroadcast} object can be used to get progress feedback,
      * which is calculated by watching the transaction propagate across the network and be announced by peers.</p>
      */
-    public TransactionBroadcast broadcastTransaction(final Transaction tx, final int minConnections) {
+    public TransactionBroadcast broadcastTransaction(final Transaction tx, final int minConnections,
+                                                     final boolean dropPeersAfterBroadcast) {
         // If we don't have a record of where this tx came from already, set it to be ourselves so Peer doesn't end up
         // redownloading it from the network redundantly.
         if (tx.getConfidence().getSource().equals(TransactionConfidence.Source.UNKNOWN)) {
-            log.info("Transaction source unknown, setting to SELF: {}", tx.getHashAsString());
+            log.info("Transaction source unknown, setting to SELF: {}", tx.getTxId());
             tx.getConfidence().setSource(TransactionConfidence.Source.SELF);
         }
         final TransactionBroadcast broadcast = new TransactionBroadcast(this, tx);
         broadcast.setMinConnections(minConnections);
+        broadcast.setDropPeersAfterBroadcast(dropPeersAfterBroadcast && tx.getConfidence().numBroadcastPeers() == 0);
         // Send the TX to the wallet once we have a successful broadcast.
         Futures.addCallback(broadcast.future(), new FutureCallback<Transaction>() {
             @Override
@@ -2193,7 +2253,7 @@ public void onFailure(Throwable throwable) {
                 // This can happen if we get a reject message from a peer.
                 runningBroadcasts.remove(broadcast);
             }
-        });
+        }, MoreExecutors.directExecutor());
         // Keep a reference to the TransactionBroadcast object. This is important because otherwise, the entire tree
         // of objects we just created would become garbage if the user doesn't hold on to the returned future, and
         // eventually be collected. This in turn could result in the transaction not being committed to the wallet
@@ -2205,8 +2265,8 @@ public void onFailure(Throwable throwable) {
 
     /**
      * Returns the period between pings for an individual peer. Setting this lower means more accurate and timely ping
-     * times are available via {@link org.bitcoinj.core.Peer#getLastPingTime()} but it increases load on the
-     * remote node. It defaults to 5000.
+     * times are available via {@link Peer#getLastPingTime()} but it increases load on the
+     * remote node. It defaults to {@link PeerGroup#DEFAULT_PING_INTERVAL_MSEC}.
      */
     public long getPingIntervalMsec() {
         lock.lock();
@@ -2219,10 +2279,10 @@ public long getPingIntervalMsec() {
 
     /**
      * Sets the period between pings for an individual peer. Setting this lower means more accurate and timely ping
-     * times are available via {@link org.bitcoinj.core.Peer#getLastPingTime()} but it increases load on the
+     * times are available via {@link Peer#getLastPingTime()} but it increases load on the
      * remote node. It defaults to {@link PeerGroup#DEFAULT_PING_INTERVAL_MSEC}.
-     * Setting the value to be <= 0 disables pinging entirely, although you can still request one yourself
-     * using {@link org.bitcoinj.core.Peer#ping()}.
+     * Setting the value to be smaller or equals 0 disables pinging entirely, although you can still request one yourself
+     * using {@link Peer#ping()}.
      */
     public void setPingIntervalMsec(long pingIntervalMsec) {
         lock.lock();
@@ -2251,8 +2311,8 @@ public int getMinRequiredProtocolVersion() {
     }
 
     /**
-     * Returns our peers most commonly reported chain height. If multiple heights are tied, the highest is returned.
-     * If no peers are connected, returns zero.
+     * Returns our peers most commonly reported chain height.
+     * If the most common heights are tied, or no peers are connected, returns {@code 0}.
      */
     public int getMostCommonChainHeight() {
         lock.lock();
@@ -2265,14 +2325,49 @@ public int getMostCommonChainHeight() {
 
     /**
      * Returns most commonly reported chain height from the given list of {@link Peer}s.
-     * If multiple heights are tied, the highest is returned. If no peers are connected, returns zero.
+     * If the most common heights are tied, or no peers are connected, returns {@code 0}.
      */
     public static int getMostCommonChainHeight(final List<Peer> peers) {
         if (peers.isEmpty())
             return 0;
-        List<Integer> heights = new ArrayList<Integer>(peers.size());
+        List<Integer> heights = new ArrayList<>(peers.size());
         for (Peer peer : peers) heights.add((int) peer.getBestHeight());
-        return Utils.maxOfMostFreq(heights);
+        return maxOfMostFreq(heights);
+    }
+
+    private static class Pair implements Comparable<Pair> {
+        final int item;
+        int count = 0;
+        public Pair(int item) { this.item = item; }
+        // note that in this implementation compareTo() is not consistent with equals()
+        @Override public int compareTo(Pair o) { return -Integer.compare(count, o.count); }
+    }
+
+    static int maxOfMostFreq(List<Integer> items) {
+        if (items.isEmpty())
+            return 0;
+        // This would be much easier in a functional language (or in Java 8).
+        items = Ordering.natural().reverse().sortedCopy(items);
+        LinkedList<Pair> pairs = new LinkedList<>();
+        pairs.add(new Pair(items.get(0)));
+        for (int item : items) {
+            Pair pair = pairs.getLast();
+            if (pair.item != item)
+                pairs.add((pair = new Pair(item)));
+            pair.count++;
+        }
+        // pairs now contains a uniquified list of the sorted inputs, with counts for how often that item appeared.
+        // Now sort by how frequently they occur, and pick the most frequent. If the first place is tied between two,
+        // don't pick any.
+        Collections.sort(pairs);
+        final Pair firstPair = pairs.get(0);
+        if (pairs.size() == 1)
+            return firstPair.item;
+        final Pair secondPair = pairs.get(1);
+        if (firstPair.count > secondPair.count)
+            return firstPair.item;
+        checkState(firstPair.count == secondPair.count);
+        return 0;
     }
 
     /**
@@ -2287,31 +2382,43 @@ protected Peer selectDownloadPeer(List<Peer> peers) {
         //  - Randomly, to try and spread the load.
         if (peers.isEmpty())
             return null;
-        // Make sure we don't select a peer that is behind/synchronizing itself.
+
         int mostCommonChainHeight = getMostCommonChainHeight(peers);
-        List<Peer> candidates = new ArrayList<Peer>();
+        // Make sure we don't select a peer if there is no consensus about block height.
+        if (mostCommonChainHeight == 0)
+            return null;
+
+        // Only select peers that announce the minimum protocol and services and that we think is fully synchronized.
+        List<Peer> candidates = new LinkedList<>();
+        int highestPriority = Integer.MIN_VALUE;
+        final int MINIMUM_VERSION = params.getProtocolVersionNum(NetworkParameters.ProtocolVersion.WITNESS_VERSION);
         for (Peer peer : peers) {
-            if (peer.getBestHeight() == mostCommonChainHeight) candidates.add(peer);
-        }
-        // Of the candidates, find the peers that meet the minimum protocol version we want to target. We could select
-        // the highest version we've seen on the assumption that newer versions are always better but we don't want to
-        // zap peers if they upgrade early. If we can't find any peers that have our preferred protocol version or
-        // better then we'll settle for the highest we found instead.
-        int highestVersion = 0, preferredVersion = 0;
-        // If/when PREFERRED_VERSION is not equal to vMinRequiredProtocolVersion, reenable the last test in PeerGroupTest.downloadPeerSelection
-        final int PREFERRED_VERSION = params.getProtocolVersionNum(NetworkParameters.ProtocolVersion.BLOOM_FILTER);
-        for (Peer peer : candidates) {
-            highestVersion = Math.max(peer.getPeerVersionMessage().clientVersion, highestVersion);
-            preferredVersion = Math.min(highestVersion, PREFERRED_VERSION);
-        }
-        ArrayList<Peer> candidates2 = new ArrayList<Peer>(candidates.size());
-        for (Peer peer : candidates) {
-            if (peer.getPeerVersionMessage().clientVersion >= preferredVersion) {
-                candidates2.add(peer);
-            }
+            final VersionMessage versionMessage = peer.getPeerVersionMessage();
+            if (versionMessage.clientVersion < MINIMUM_VERSION)
+                continue;
+            if (!versionMessage.hasBlockChain())
+                continue;
+            if (!versionMessage.isWitnessSupported())
+                continue;
+            final long peerHeight = peer.getBestHeight();
+            if (peerHeight < mostCommonChainHeight || peerHeight > mostCommonChainHeight + 1)
+                continue;
+            candidates.add(peer);
+            highestPriority = Math.max(highestPriority, getPriority(peer.peerAddress));
+        }
+        if (candidates.isEmpty())
+            return null;
+
+        // If there is a difference in priority, consider only the highest.
+        for (Iterator<Peer> i = candidates.iterator(); i.hasNext(); ) {
+            Peer peer = i.next();
+            if (getPriority(peer.peerAddress) < highestPriority)
+                i.remove();
         }
-        int index = (int) (Math.random() * candidates2.size());
-        return candidates2.get(index);
+
+        // Random poll.
+        int index = (int) (Math.random() * candidates.size());
+        return candidates.get(index);
     }
 
     /**
@@ -2327,14 +2434,6 @@ public Peer getDownloadPeer() {
         }
     }
 
-    /**
-     * Returns the {@link com.subgraph.orchid.TorClient} object for this peer group, if Tor is in use, null otherwise.
-     */
-    @Nullable
-    public TorClient getTorClient() {
-        return torClient;
-    }
-
     /**
      * Returns the maximum number of {@link Peer}s to discover. This maximum is checked after
      * each {@link PeerDiscovery} so this max number can be surpassed.
diff --git a/core/src/main/java/org/bitcoinj/core/PeerSocketHandler.java b/core/src/main/java/org/bitcoinj/core/PeerSocketHandler.java
index 2bbd977fd7e..b8146addbb7 100644
--- a/core/src/main/java/org/bitcoinj/core/PeerSocketHandler.java
+++ b/core/src/main/java/org/bitcoinj/core/PeerSocketHandler.java
@@ -16,8 +16,12 @@
 
 package org.bitcoinj.core;
 
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 import org.bitcoinj.net.AbstractTimeoutHandler;
 import org.bitcoinj.net.MessageWriteTarget;
+import org.bitcoinj.net.NioClient;
+import org.bitcoinj.net.NioClientManager;
 import org.bitcoinj.net.StreamConnection;
 import org.bitcoinj.utils.Threading;
 import com.google.common.annotations.VisibleForTesting;
@@ -37,7 +41,7 @@
 
 /**
  * Handles high-level message (de)serialization for peers, acting as the bridge between the
- * {@link org.bitcoinj.net} classes and {@link Peer}.
+ * {@code org.bitcoinj.net} classes and {@link Peer}.
  */
 public abstract class PeerSocketHandler extends AbstractTimeoutHandler implements StreamConnection {
     private static final Logger log = LoggerFactory.getLogger(PeerSocketHandler.class);
@@ -75,7 +79,7 @@ public PeerSocketHandler(NetworkParameters params, PeerAddress peerAddress) {
      * the peer will have received it. Throws NotYetConnectedException if we are not yet connected to the remote peer.
      * TODO: Maybe use something other than the unchecked NotYetConnectedException here
      */
-    public void sendMessage(Message message) throws NotYetConnectedException {
+    public ListenableFuture sendMessage(Message message) throws NotYetConnectedException {
         lock.lock();
         try {
             if (writeTarget == null)
@@ -87,9 +91,10 @@ public void sendMessage(Message message) throws NotYetConnectedException {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         try {
             serializer.serialize(message, out);
-            writeTarget.writeBytes(out.toByteArray());
+            return writeTarget.writeBytes(out.toByteArray());
         } catch (IOException e) {
             exceptionCaught(e);
+            return Futures.immediateFailedFuture(e);
         }
     }
 
@@ -190,8 +195,8 @@ public int receiveBytes(ByteBuffer buff) {
 
     /**
      * Sets the {@link MessageWriteTarget} used to write messages to the peer. This should almost never be called, it is
-     * called automatically by {@link org.bitcoinj.net.NioClient} or
-     * {@link org.bitcoinj.net.NioClientManager} once the socket finishes initialization.
+     * called automatically by {@link NioClient} or
+     * {@link NioClientManager} once the socket finishes initialization.
      */
     @Override
     public void setWriteTarget(MessageWriteTarget writeTarget) {
diff --git a/core/src/main/java/org/bitcoinj/core/Ping.java b/core/src/main/java/org/bitcoinj/core/Ping.java
index fa4faa1fc7d..0a7f74b0ba3 100644
--- a/core/src/main/java/org/bitcoinj/core/Ping.java
+++ b/core/src/main/java/org/bitcoinj/core/Ping.java
@@ -33,7 +33,7 @@ public Ping(NetworkParameters params, byte[] payloadBytes) throws ProtocolExcept
     
     /**
      * Create a Ping with a nonce value.
-     * Only use this if the remote node has a protocol version > 60000
+     * Only use this if the remote node has a protocol version greater than 60000
      */
     public Ping(long nonce) {
         this.nonce = nonce;
@@ -42,7 +42,7 @@ public Ping(long nonce) {
     
     /**
      * Create a Ping without a nonce value.
-     * Only use this if the remote node has a protocol version <= 60000
+     * Only use this if the remote node has a protocol version lower than or equal 60000
      */
     public Ping() {
         this.hasNonce = false;
diff --git a/core/src/main/java/org/bitcoinj/core/Pong.java b/core/src/main/java/org/bitcoinj/core/Pong.java
index eaffa3a8daf..d5a170dd9eb 100644
--- a/core/src/main/java/org/bitcoinj/core/Pong.java
+++ b/core/src/main/java/org/bitcoinj/core/Pong.java
@@ -32,7 +32,7 @@ public Pong(NetworkParameters params, byte[] payloadBytes) throws ProtocolExcept
     
     /**
      * Create a Pong with a nonce value.
-     * Only use this if the remote node has a protocol version > 60000
+     * Only use this if the remote node has a protocol version greater than 60000
      */
     public Pong(long nonce) {
         this.nonce = nonce;
diff --git a/core/src/main/java/org/bitcoinj/core/PrefixedChecksummedBytes.java b/core/src/main/java/org/bitcoinj/core/PrefixedChecksummedBytes.java
new file mode 100644
index 00000000000..d88f016231c
--- /dev/null
+++ b/core/src/main/java/org/bitcoinj/core/PrefixedChecksummedBytes.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2011 Google Inc.
+ * Copyright 2018 Andreas Schildbach
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bitcoinj.core;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+
+import com.google.common.base.Objects;
+import com.google.common.primitives.UnsignedBytes;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * <p>
+ * The following format is often used to represent some type of data (e.g. key or hash of key):
+ * </p>
+ * 
+ * <pre>
+ * [prefix] [data bytes] [checksum]
+ * </pre>
+ * <p>
+ * and the result is then encoded with some variant of base. This format is most commonly used for addresses and private
+ * keys exported using Bitcoin Core's dumpprivkey command.
+ * </p>
+ */
+public abstract class PrefixedChecksummedBytes implements Serializable, Cloneable, Comparable<PrefixedChecksummedBytes> {
+    protected final transient NetworkParameters params;
+    protected final byte[] bytes;
+
+    protected PrefixedChecksummedBytes(NetworkParameters params, byte[] bytes) {
+        this.params = checkNotNull(params);
+        this.bytes = checkNotNull(bytes);
+    }
+
+    /**
+     * @return network this data is valid for
+     */
+    public final NetworkParameters getParameters() {
+        return params;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(params, Arrays.hashCode(bytes));
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        PrefixedChecksummedBytes other = (PrefixedChecksummedBytes) o;
+        return this.params.equals(other.params) && Arrays.equals(this.bytes, other.bytes);
+    }
+
+    /**
+     * This implementation narrows the return type to {@link PrefixedChecksummedBytes}
+     * and allows subclasses to throw {@link CloneNotSupportedException} even though it
+     * is never thrown by this implementation.
+     */
+    @Override
+    public PrefixedChecksummedBytes clone() throws CloneNotSupportedException {
+        return (PrefixedChecksummedBytes) super.clone();
+    }
+
+    /**
+     * This implementation uses an optimized Google Guava method to compare {@code bytes}.
+     */
+    @Override
+    public int compareTo(PrefixedChecksummedBytes o) {
+        int result = this.params.getId().compareTo(o.params.getId());
+        return result != 0 ? result : UnsignedBytes.lexicographicalComparator().compare(this.bytes, o.bytes);
+    }
+
+    // Java serialization
+
+    private void writeObject(ObjectOutputStream out) throws IOException {
+        out.defaultWriteObject();
+        out.writeUTF(params.getId());
+    }
+
+    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+        in.defaultReadObject();
+        try {
+            Field paramsField = PrefixedChecksummedBytes.class.getDeclaredField("params");
+            paramsField.setAccessible(true);
+            paramsField.set(this, checkNotNull(NetworkParameters.fromID(in.readUTF())));
+            paramsField.setAccessible(false);
+        } catch (NoSuchFieldException | IllegalAccessException x) {
+            throw new RuntimeException(x);
+        }
+    }
+}
diff --git a/core/src/main/java/org/bitcoinj/core/RejectMessage.java b/core/src/main/java/org/bitcoinj/core/RejectMessage.java
index 1d332f0dd7d..f71906de3d6 100644
--- a/core/src/main/java/org/bitcoinj/core/RejectMessage.java
+++ b/core/src/main/java/org/bitcoinj/core/RejectMessage.java
@@ -20,6 +20,7 @@
 import com.google.common.base.Objects;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Locale;
 
 /**
@@ -97,11 +98,11 @@ protected void parse() throws ProtocolException {
 
     @Override
     public void bitcoinSerializeToStream(OutputStream stream) throws IOException {
-        byte[] messageBytes = message.getBytes("UTF-8");
+        byte[] messageBytes = message.getBytes(StandardCharsets.UTF_8);
         stream.write(new VarInt(messageBytes.length).encode());
         stream.write(messageBytes);
         stream.write(code.code);
-        byte[] reasonBytes = reason.getBytes("UTF-8");
+        byte[] reasonBytes = reason.getBytes(StandardCharsets.UTF_8);
         stream.write(new VarInt(reasonBytes.length).encode());
         stream.write(reasonBytes);
         if ("block".equals(message) || "tx".equals(message))
diff --git a/core/src/main/java/org/bitcoinj/core/SegwitAddress.java b/core/src/main/java/org/bitcoinj/core/SegwitAddress.java
new file mode 100644
index 00000000000..0601e7ded38
--- /dev/null
+++ b/core/src/main/java/org/bitcoinj/core/SegwitAddress.java
@@ -0,0 +1,250 @@
+/*
+ * Copyright by the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bitcoinj.core;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+
+import java.io.ByteArrayOutputStream;
+
+import javax.annotation.Nullable;
+
+import org.bitcoinj.params.Networks;
+import org.bitcoinj.script.Script;
+import org.bitcoinj.script.Script.ScriptType;
+
+/**
+ * <p>Implementation of native segwit addresses. They are composed of two parts:</p>
+ *
+ * <ul>
+ * <li>A human-readable part (HRP) which is a string the specifies the network. See
+ * {@link NetworkParameters#getSegwitAddressHrp()}.</li>
+ * <li>A data part, containing the witness version (encoded as an OP_N operator) and program (encoded by re-arranging
+ * bits into groups of 5).</li>
+ * </ul>
+ *
+ * <p>See <a href="https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki">BIP173</a> for details.</p>
+ *
+ * <p>However, you don't need to care about the internals. Use {@link #fromBech32(NetworkParameters, String)},
+ * {@link #fromHash(NetworkParameters, byte[])} or {@link #fromKey(NetworkParameters, ECKey)} to construct a native
+ * segwit address.</p>
+ */
+public class SegwitAddress extends Address {
+    public static final int WITNESS_PROGRAM_LENGTH_PKH = 20;
+    public static final int WITNESS_PROGRAM_LENGTH_SH = 32;
+    public static final int WITNESS_PROGRAM_MIN_LENGTH = 2;
+    public static final int WITNESS_PROGRAM_MAX_LENGTH = 40;
+
+    /**
+     * Private constructor. Use {@link #fromBech32(NetworkParameters, String)},
+     * {@link #fromHash(NetworkParameters, byte[])} or {@link #fromKey(NetworkParameters, ECKey)}.
+     * 
+     * @param params
+     *            network this address is valid for
+     * @param witnessVersion
+     *            version number between 0 and 16
+     * @param witnessProgram
+     *            hash of pubkey or script (for version 0)
+     */
+    private SegwitAddress(NetworkParameters params, int witnessVersion, byte[] witnessProgram)
+            throws AddressFormatException {
+        this(params, encode(witnessVersion, witnessProgram));
+    }
+
+    /**
+     * Helper for the above constructor.
+     */
+    private static byte[] encode(int witnessVersion, byte[] witnessProgram) throws AddressFormatException {
+        byte[] convertedProgram = convertBits(witnessProgram, 0, witnessProgram.length, 8, 5, true);
+        byte[] bytes = new byte[1 + convertedProgram.length];
+        bytes[0] = (byte) (witnessVersion & 0xff);
+        System.arraycopy(convertedProgram, 0, bytes, 1, convertedProgram.length);
+        return bytes;
+    }
+
+    /**
+     * Private constructor. Use {@link #fromBech32(NetworkParameters, String)},
+     * {@link #fromHash(NetworkParameters, byte[])} or {@link #fromKey(NetworkParameters, ECKey)}.
+     * 
+     * @param params
+     *            network this address is valid for
+     * @param data
+     *            in segwit address format, before bit re-arranging and bech32 encoding
+     * @throws AddressFormatException
+     *             if any of the sanity checks fail
+     */
+    private SegwitAddress(NetworkParameters params, byte[] data) throws AddressFormatException {
+        super(params, data);
+        if (data.length < 1)
+            throw new AddressFormatException.InvalidDataLength("Zero data found");
+        final int witnessVersion = getWitnessVersion();
+        if (witnessVersion < 0 || witnessVersion > 16)
+            throw new AddressFormatException("Invalid script version: " + witnessVersion);
+        byte[] witnessProgram = getWitnessProgram();
+        if (witnessProgram.length < WITNESS_PROGRAM_MIN_LENGTH || witnessProgram.length > WITNESS_PROGRAM_MAX_LENGTH)
+            throw new AddressFormatException.InvalidDataLength("Invalid length: " + witnessProgram.length);
+        // Check script length for version 0
+        if (witnessVersion == 0 && witnessProgram.length != WITNESS_PROGRAM_LENGTH_PKH
+                && witnessProgram.length != WITNESS_PROGRAM_LENGTH_SH)
+            throw new AddressFormatException.InvalidDataLength(
+                    "Invalid length for address version 0: " + witnessProgram.length);
+    }
+
+    /**
+     * Returns the witness version in decoded form. Only version 0 is in use right now.
+     * 
+     * @return witness version, between 0 and 16
+     */
+    public int getWitnessVersion() {
+        return bytes[0] & 0xff;
+    }
+
+    /**
+     * Returns the witness program in decoded form.
+     * 
+     * @return witness program
+     */
+    public byte[] getWitnessProgram() {
+        // skip version byte
+        return convertBits(bytes, 1, bytes.length - 1, 5, 8, false);
+    }
+
+    @Override
+    public byte[] getHash() {
+        return getWitnessProgram();
+    }
+
+    /**
+     * Get the type of output script that will be used for sending to the address. This is either
+     * {@link ScriptType#P2WPKH} or {@link ScriptType#P2WSH}.
+     * 
+     * @return type of output script
+     */
+    @Override
+    public ScriptType getOutputScriptType() {
+        int version = getWitnessVersion();
+        checkState(version == 0);
+        int programLength = getWitnessProgram().length;
+        if (programLength == WITNESS_PROGRAM_LENGTH_PKH)
+            return ScriptType.P2WPKH;
+        if (programLength == WITNESS_PROGRAM_LENGTH_SH)
+            return ScriptType.P2WSH;
+        throw new IllegalStateException("Cannot happen.");
+    }
+
+    @Override
+    public String toString() {
+        return toBech32();
+    }
+
+    /**
+     * Construct a {@link SegwitAddress} from its textual form.
+     * 
+     * @param params
+     *            expected network this address is valid for, or null if the network should be derived from the bech32
+     * @param bech32
+     *            bech32-encoded textual form of the address
+     * @return constructed address
+     * @throws AddressFormatException
+     *             if something about the given bech32 address isn't right
+     */
+    public static SegwitAddress fromBech32(@Nullable NetworkParameters params, String bech32)
+            throws AddressFormatException {
+        Bech32.Bech32Data bechData = Bech32.decode(bech32);
+        if (params == null) {
+            for (NetworkParameters p : Networks.get()) {
+                if (bechData.hrp.equals(p.getSegwitAddressHrp()))
+                    return new SegwitAddress(p, bechData.data);
+            }
+            throw new AddressFormatException.InvalidPrefix("No network found for " + bech32);
+        } else {
+            if (bechData.hrp.equals(params.getSegwitAddressHrp()))
+                return new SegwitAddress(params, bechData.data);
+            throw new AddressFormatException.WrongNetwork(bechData.hrp);
+        }
+    }
+
+    /**
+     * Construct a {@link SegwitAddress} that represents the given hash, which is either a pubkey hash or a script hash.
+     * The resulting address will be either a P2WPKH or a P2WSH type of address.
+     * 
+     * @param params
+     *            network this address is valid for
+     * @param hash
+     *            20-byte pubkey hash or 32-byte script hash
+     * @return constructed address
+     */
+    public static SegwitAddress fromHash(NetworkParameters params, byte[] hash) {
+        return new SegwitAddress(params, 0, hash);
+    }
+
+    /**
+     * Construct a {@link SegwitAddress} that represents the public part of the given {@link ECKey}. Note that an
+     * address is derived from a hash of the public key and is not the public key itself.
+     * 
+     * @param params
+     *            network this address is valid for
+     * @param key
+     *            only the public part is used
+     * @return constructed address
+     */
+    public static SegwitAddress fromKey(NetworkParameters params, ECKey key) {
+        checkArgument(key.isCompressed(), "only compressed keys allowed");
+        return fromHash(params, key.getPubKeyHash());
+    }
+
+    /**
+     * Returns the textual form of the address.
+     * 
+     * @return textual form encoded in bech32
+     */
+    public String toBech32() {
+        return Bech32.encode(params.getSegwitAddressHrp(), bytes);
+    }
+
+    /**
+     * Helper for re-arranging bits into groups.
+     */
+    private static byte[] convertBits(final byte[] in, final int inStart, final int inLen, final int fromBits,
+            final int toBits, final boolean pad) throws AddressFormatException {
+        int acc = 0;
+        int bits = 0;
+        ByteArrayOutputStream out = new ByteArrayOutputStream(64);
+        final int maxv = (1 << toBits) - 1;
+        final int max_acc = (1 << (fromBits + toBits - 1)) - 1;
+        for (int i = 0; i < inLen; i++) {
+            int value = in[i + inStart] & 0xff;
+            if ((value >>> fromBits) != 0) {
+                throw new AddressFormatException(
+                        String.format("Input value '%X' exceeds '%d' bit size", value, fromBits));
+            }
+            acc = ((acc << fromBits) | value) & max_acc;
+            bits += fromBits;
+            while (bits >= toBits) {
+                bits -= toBits;
+                out.write((acc >>> bits) & maxv);
+            }
+        }
+        if (pad) {
+            if (bits > 0)
+                out.write((acc << (toBits - bits)) & maxv);
+        } else if (bits >= fromBits || ((acc << (toBits - bits)) & maxv) != 0) {
+            throw new AddressFormatException("Could not convert bits, invalid padding");
+        }
+        return out.toByteArray();
+    }
+}
diff --git a/core/src/main/java/org/bitcoinj/wallet/listeners/WalletEventListener.java b/core/src/main/java/org/bitcoinj/core/SendHeadersMessage.java
similarity index 50%
rename from core/src/main/java/org/bitcoinj/wallet/listeners/WalletEventListener.java
rename to core/src/main/java/org/bitcoinj/core/SendHeadersMessage.java
index 74b715b5042..a5cd0a0dc1b 100644
--- a/core/src/main/java/org/bitcoinj/wallet/listeners/WalletEventListener.java
+++ b/core/src/main/java/org/bitcoinj/core/SendHeadersMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Google Inc.
+ * Copyright 2017 Anton Kumaigorodski
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +14,23 @@
  * limitations under the License.
  */
 
-package org.bitcoinj.wallet.listeners;
-
-import org.bitcoinj.core.listeners.TransactionConfidenceEventListener;
+package org.bitcoinj.core;
 
 /**
- * <p>Common interface for wallet changes and transactions.</p>
- * @deprecated Use the superinterfaces directly instead.
+ * <p>
+ * A new message, "sendheaders", which indicates that a node prefers to receive new block announcements via a "headers"
+ * message rather than an "inv".
+ * </p>
+ *
+ * <p>
+ * See <a href="https://github.com/bitcoin/bips/blob/master/bip-0130.mediawiki">BIP 130</a>.
+ * </p>
  */
-@Deprecated
-public interface WalletEventListener extends
-        KeyChainEventListener, WalletChangeEventListener,
-        WalletCoinsReceivedEventListener, WalletCoinsSentEventListener,
-        WalletReorganizeEventListener, ScriptsChangeEventListener,
-        TransactionConfidenceEventListener {
+public class SendHeadersMessage extends EmptyMessage {
+    public SendHeadersMessage() {
+    }
+
+    // this is needed by the BitcoinSerializer
+    public SendHeadersMessage(NetworkParameters params, byte[] payload) {
+    }
 }
diff --git a/core/src/main/java/org/bitcoinj/core/Sha256Hash.java b/core/src/main/java/org/bitcoinj/core/Sha256Hash.java
index 1e741492e4a..a21539ba526 100644
--- a/core/src/main/java/org/bitcoinj/core/Sha256Hash.java
+++ b/core/src/main/java/org/bitcoinj/core/Sha256Hash.java
@@ -41,24 +41,11 @@ public class Sha256Hash implements Serializable, Comparable<Sha256Hash> {
 
     private final byte[] bytes;
 
-    /**
-     * Use {@link #wrap(byte[])} instead.
-     */
-    @Deprecated
-    public Sha256Hash(byte[] rawHashBytes) {
+    private Sha256Hash(byte[] rawHashBytes) {
         checkArgument(rawHashBytes.length == LENGTH);
         this.bytes = rawHashBytes;
     }
 
-    /**
-     * Use {@link #wrap(String)} instead.
-     */
-    @Deprecated
-    public Sha256Hash(String hexString) {
-        checkArgument(hexString.length() == LENGTH * 2);
-        this.bytes = Utils.HEX.decode(hexString);
-    }
-
     /**
      * Creates a new instance that wraps the given hash value.
      *
@@ -66,7 +53,6 @@ public Sha256Hash(String hexString) {
      * @return a new instance
      * @throws IllegalArgumentException if the given array length is not exactly 32
      */
-    @SuppressWarnings("deprecation") // the constructor will be made private in the future
     public static Sha256Hash wrap(byte[] rawHashBytes) {
         return new Sha256Hash(rawHashBytes);
     }
@@ -90,17 +76,10 @@ public static Sha256Hash wrap(String hexString) {
      * @return a new instance
      * @throws IllegalArgumentException if the given array length is not exactly 32
      */
-    @SuppressWarnings("deprecation") // the constructor will be made private in the future
     public static Sha256Hash wrapReversed(byte[] rawHashBytes) {
         return wrap(Utils.reverseBytes(rawHashBytes));
     }
 
-    /** Use {@link #of(byte[])} instead: this old name is ambiguous. */
-    @Deprecated
-    public static Sha256Hash create(byte[] contents) {
-        return of(contents);
-    }
-
     /**
      * Creates a new instance containing the calculated (one-time) hash of the given bytes.
      *
@@ -111,12 +90,6 @@ public static Sha256Hash of(byte[] contents) {
         return wrap(hash(contents));
     }
 
-    /** Use {@link #twiceOf(byte[])} instead: this old name is ambiguous. */
-    @Deprecated
-    public static Sha256Hash createDouble(byte[] contents) {
-        return twiceOf(contents);
-    }
-
     /**
      * Creates a new instance containing the hash of the calculated hash of the given bytes.
      *
@@ -127,6 +100,17 @@ public static Sha256Hash twiceOf(byte[] contents) {
         return wrap(hashTwice(contents));
     }
 
+    /**
+     * Creates a new instance containing the hash of the calculated hash of the given bytes.
+     *
+     * @param content1 first bytes on which the hash value is calculated
+     * @param content2 second bytes on which the hash value is calculated
+     * @return a new instance containing the calculated (two-time) hash
+     */
+    public static Sha256Hash twiceOf(byte[] content1, byte[] content2) {
+        return wrap(hashTwice(content1, content2));
+    }
+
     /**
      * Creates a new instance containing the calculated (one-time) hash of the given file's contents.
      *
@@ -196,6 +180,17 @@ public static byte[] hashTwice(byte[] input) {
         return hashTwice(input, 0, input.length);
     }
 
+    /**
+     * Calculates the hash of hash on the given chunks of bytes. This is equivalent to concatenating the two
+     * chunks and then passing the result to {@link #hashTwice(byte[])}.
+     */
+    public static byte[] hashTwice(byte[] input1, byte[] input2) {
+        MessageDigest digest = newDigest();
+        digest.update(input1);
+        digest.update(input2);
+        return digest.digest(digest.digest());
+    }
+
     /**
      * Calculates the SHA-256 hash of the given byte range,
      * and then hashes the resulting hash again.
diff --git a/core/src/main/java/org/bitcoinj/signers/StatelessTransactionSigner.java b/core/src/main/java/org/bitcoinj/core/SignatureDecodeException.java
similarity index 55%
rename from core/src/main/java/org/bitcoinj/signers/StatelessTransactionSigner.java
rename to core/src/main/java/org/bitcoinj/core/SignatureDecodeException.java
index 393804bf0bc..40a5dab6a1f 100644
--- a/core/src/main/java/org/bitcoinj/signers/StatelessTransactionSigner.java
+++ b/core/src/main/java/org/bitcoinj/core/SignatureDecodeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Kosta Korenkov
+ * Copyright by the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +14,22 @@
  * limitations under the License.
  */
 
-package org.bitcoinj.signers;
+package org.bitcoinj.core;
 
-/**
- * A signer that doesn't have any state to be serialized.
- */
-public abstract class StatelessTransactionSigner implements TransactionSigner {
-    @Override
-    public void deserialize(byte[] data) {
+public class SignatureDecodeException extends Exception {
+    public SignatureDecodeException() {
+        super();
+    }
+
+    public SignatureDecodeException(String message) {
+        super(message);
+    }
+
+    public SignatureDecodeException(Throwable cause) {
+        super(cause);
     }
 
-    @Override
-    public byte[] serialize() {
-        return new byte[0];
+    public SignatureDecodeException(String message, Throwable cause) {
+        super(message, cause);
     }
 }
diff --git a/core/src/main/java/org/bitcoinj/core/StoredBlock.java b/core/src/main/java/org/bitcoinj/core/StoredBlock.java
index 4bc8153009f..0aaee08a8c5 100644
--- a/core/src/main/java/org/bitcoinj/core/StoredBlock.java
+++ b/core/src/main/java/org/bitcoinj/core/StoredBlock.java
@@ -107,7 +107,7 @@ public StoredBlock build(Block block) throws VerificationException {
 
     /**
      * Given a block store, looks up the previous block in this chain. Convenience method for doing
-     * <tt>store.get(this.getHeader().getPrevBlockHash())</tt>.
+     * {@code store.get(this.getHeader().getPrevBlockHash())}.
      *
      * @return the previous block in the chain or null if it was not found in the store.
      */
diff --git a/core/src/main/java/org/bitcoinj/core/StoredUndoableBlock.java b/core/src/main/java/org/bitcoinj/core/StoredUndoableBlock.java
index 7ed60dd2dea..22474af397f 100644
--- a/core/src/main/java/org/bitcoinj/core/StoredUndoableBlock.java
+++ b/core/src/main/java/org/bitcoinj/core/StoredUndoableBlock.java
@@ -20,7 +20,7 @@
 import java.util.List;
 
 /**
- * Contains minimal data neccessary to disconnect/connect the transactions
+ * Contains minimal data necessary to disconnect/connect the transactions
  * in the stored block at will. Can either store the full set of
  * transactions (if the inputs for the block have not been tested to work)
  * or the set of transaction outputs created/destroyed when the block is
diff --git a/core/src/main/java/org/bitcoinj/core/Transaction.java b/core/src/main/java/org/bitcoinj/core/Transaction.java
index 1ada0805507..054e7922465 100644
--- a/core/src/main/java/org/bitcoinj/core/Transaction.java
+++ b/core/src/main/java/org/bitcoinj/core/Transaction.java
@@ -20,17 +20,25 @@
 import org.bitcoinj.core.TransactionConfidence.ConfidenceType;
 import org.bitcoinj.crypto.TransactionSignature;
 import org.bitcoinj.script.Script;
+import org.bitcoinj.script.Script.ScriptType;
 import org.bitcoinj.script.ScriptBuilder;
+import org.bitcoinj.script.ScriptError;
+import org.bitcoinj.script.ScriptException;
 import org.bitcoinj.script.ScriptOpCodes;
+import org.bitcoinj.script.ScriptPattern;
+import org.bitcoinj.signers.TransactionSigner;
 import org.bitcoinj.utils.ExchangeRate;
 import org.bitcoinj.wallet.Wallet;
 import org.bitcoinj.wallet.WalletTransaction.Pool;
 
+import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
 import com.google.common.primitives.Ints;
 import com.google.common.primitives.Longs;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import javax.annotation.Nullable;
 import java.io.*;
@@ -46,7 +54,7 @@
  * the minting of new coins. A Transaction object corresponds to the equivalent in the Bitcoin C++ implementation.</p>
  *
  * <p>Transactions are the fundamental atoms of Bitcoin and have many powerful features. Read
- * <a href="http://code.google.com/p/bitcoinj/wiki/WorkingWithTransactions">"Working with transactions"</a> in the
+ * <a href="https://bitcoinj.github.io/working-with-transactions">"Working with transactions"</a> in the
  * documentation to learn more about how to use this class.</p>
  *
  * <p>All Bitcoin transactions are at risk of being reversed, though the risk is much less than with traditional payment
@@ -69,18 +77,22 @@ public int compare(final Transaction tx1, final Transaction tx2) {
             final long time2 = tx2.getUpdateTime().getTime();
             final int updateTimeComparison = -(Longs.compare(time1, time2));
             //If time1==time2, compare by tx hash to make comparator consistent with equals
-            return updateTimeComparison != 0 ? updateTimeComparison : tx1.getHash().compareTo(tx2.getHash());
+            return updateTimeComparison != 0 ? updateTimeComparison : tx1.getTxId().compareTo(tx2.getTxId());
         }
     };
     /** A comparator that can be used to sort transactions by their chain height. */
     public static final Comparator<Transaction> SORT_TX_BY_HEIGHT = new Comparator<Transaction>() {
         @Override
         public int compare(final Transaction tx1, final Transaction tx2) {
-            final int height1 = tx1.getConfidence().getAppearedAtChainHeight();
-            final int height2 = tx2.getConfidence().getAppearedAtChainHeight();
+            final TransactionConfidence confidence1 = tx1.getConfidence();
+            final int height1 = confidence1.getConfidenceType() == ConfidenceType.BUILDING
+                    ? confidence1.getAppearedAtChainHeight() : Block.BLOCK_HEIGHT_UNKNOWN;
+            final TransactionConfidence confidence2 = tx2.getConfidence();
+            final int height2 = confidence2.getConfidenceType() == ConfidenceType.BUILDING
+                    ? confidence2.getAppearedAtChainHeight() : Block.BLOCK_HEIGHT_UNKNOWN;
             final int heightComparison = -(Ints.compare(height1, height2));
             //If height1==height2, compare by tx hash to make comparator consistent with equals
-            return heightComparison != 0 ? heightComparison : tx1.getHash().compareTo(tx2.getHash());
+            return heightComparison != 0 ? heightComparison : tx1.getTxId().compareTo(tx2.getTxId());
         }
     };
     private static final Logger log = LoggerFactory.getLogger(Transaction.class);
@@ -96,20 +108,20 @@ public int compare(final Transaction tx1, final Transaction tx2) {
     /**
      * If feePerKb is lower than this, Bitcoin Core will treat it as if there were no fee.
      */
-    public static final Coin REFERENCE_DEFAULT_MIN_TX_FEE = Coin.valueOf(5000); // 0.05 mBTC
+    public static final Coin REFERENCE_DEFAULT_MIN_TX_FEE = Coin.valueOf(1000); // 0.01 mBTC
 
     /**
      * If using this feePerKb, transactions will get confirmed within the next couple of blocks.
-     * This should be adjusted from time to time. Last adjustment: March 2016.
+     * This should be adjusted from time to time. Last adjustment: February 2017.
      */
-    public static final Coin DEFAULT_TX_FEE = Coin.valueOf(50000); // 0.5 mBTC
+    public static final Coin DEFAULT_TX_FEE = Coin.valueOf(100000); // 1 mBTC
 
     /**
-     * Any standard (ie pay-to-address) output smaller than this value (in satoshis) will most likely be rejected by the network.
+     * Any standard (ie P2PKH) output smaller than this value (in satoshis) will most likely be rejected by the network.
      * This is calculated by assuming a standard output will be 34 bytes, and then using the formula used in
      * {@link TransactionOutput#getMinNonDustValue(Coin)}.
      */
-    public static final Coin MIN_NONDUST_OUTPUT = Coin.valueOf(2730); // satoshis
+    public static final Coin MIN_NONDUST_OUTPUT = Coin.valueOf(546); // satoshis
 
     // These are bitcoin serialized.
     private long version;
@@ -124,8 +136,13 @@ public int compare(final Transaction tx1, final Transaction tx2) {
     // list of transactions from a wallet, which is helpful for presenting to users.
     private Date updatedAt;
 
-    // This is an in memory helper only.
-    private Sha256Hash hash;
+    // Date of the block that includes this transaction on the best chain
+    @Nullable
+    private Date includedInBestChainAt;
+
+    // These are in memory helpers only. They contain the transaction hashes without and with witness.
+    private Sha256Hash cachedTxId;
+    private Sha256Hash cachedWTxId;
 
     // Data about how confirmed this tx is. Serialized, may be null.
     @Nullable private TransactionConfidence confidence;
@@ -188,8 +205,8 @@ public enum Purpose {
     public Transaction(NetworkParameters params) {
         super(params);
         version = 1;
-        inputs = new ArrayList<TransactionInput>();
-        outputs = new ArrayList<TransactionOutput>();
+        inputs = new ArrayList<>();
+        outputs = new ArrayList<>();
         // We don't initialize appearsIn deliberately as it's only useful for transactions stored in the wallet.
         length = 8; // 8 for std fields
     }
@@ -214,16 +231,23 @@ public Transaction(NetworkParameters params, byte[] payload, int offset) throws
      * @param params NetworkParameters object.
      * @param payload Bitcoin protocol formatted byte array containing message content.
      * @param offset The location of the first payload byte within the array.
-     * @param parseRetain Whether to retain the backing byte array for quick reserialization.
-     * If true and the backing byte array is invalidated due to modification of a field then
-     * the cached bytes may be repopulated and retained if the message is serialized again in the future.
+     * @param parent The parent of the transaction.
+     * @param setSerializer The serializer to use for this transaction.
      * @param length The length of message if known.  Usually this is provided when deserializing of the wire
      * as the length will be provided as part of the header.  If unknown then set to Message.UNKNOWN_LENGTH
+     * @param hashFromHeader Used by BitcoinSerializer. The serializer has to calculate a hash for checksumming so to
+     * avoid wasting the considerable effort a set method is provided so the serializer can set it. No verification
+     * is performed on this hash.
      * @throws ProtocolException
      */
-    public Transaction(NetworkParameters params, byte[] payload, int offset, @Nullable Message parent, MessageSerializer setSerializer, int length)
-            throws ProtocolException {
+    public Transaction(NetworkParameters params, byte[] payload, int offset, @Nullable Message parent,
+            MessageSerializer setSerializer, int length, @Nullable byte[] hashFromHeader) throws ProtocolException {
         super(params, payload, offset, parent, setSerializer, length);
+        if (hashFromHeader != null) {
+            cachedWTxId = Sha256Hash.wrapReversed(hashFromHeader);
+            if (!hasWitnesses())
+                cachedTxId = cachedWTxId;
+        }
     }
 
     /**
@@ -234,29 +258,82 @@ public Transaction(NetworkParameters params, byte[] payload, @Nullable Message p
         super(params, payload, 0, parent, setSerializer, length);
     }
 
-    /**
-     * Returns the transaction hash as you see them in the block explorer.
-     */
+    /** @deprecated use {@link #getTxId()} */
     @Override
+    @Deprecated
     public Sha256Hash getHash() {
-        if (hash == null) {
-            hash = Sha256Hash.wrapReversed(Sha256Hash.hashTwice(unsafeBitcoinSerialize()));
+        return getTxId();
+    }
+
+    /** @deprecated use {@link #getTxId()}.toString() */
+    @Deprecated
+    public String getHashAsString() {
+        return getTxId().toString();
+    }
+
+    /**
+     * Returns the transaction id as you see them in block explorers. It is used as a reference by transaction inputs
+     * via outpoints.
+     */
+    public Sha256Hash getTxId() {
+        if (cachedTxId == null) {
+            if (!hasWitnesses() && cachedWTxId != null) {
+                cachedTxId = cachedWTxId;
+            } else {
+                ByteArrayOutputStream stream = new UnsafeByteArrayOutputStream(length < 32 ? 32 : length + 32);
+                try {
+                    bitcoinSerializeToStream(stream, false);
+                } catch (IOException e) {
+                    throw new RuntimeException(e); // cannot happen
+                }
+                cachedTxId = Sha256Hash.wrapReversed(Sha256Hash.hashTwice(stream.toByteArray()));
+            }
         }
-        return hash;
+        return cachedTxId;
     }
 
     /**
-     * Used by BitcoinSerializer.  The serializer has to calculate a hash for checksumming so to
-     * avoid wasting the considerable effort a set method is provided so the serializer can set it.
-     *
-     * No verification is performed on this hash.
+     * Returns the witness transaction id (aka witness id) as per BIP144. For transactions without witness, this is the
+     * same as {@link #getTxId()}.
      */
-    void setHash(Sha256Hash hash) {
-        this.hash = hash;
+    public Sha256Hash getWTxId() {
+        if (cachedWTxId == null) {
+            if (!hasWitnesses() && cachedTxId != null) {
+                cachedWTxId = cachedTxId;
+            } else {
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                try {
+                    bitcoinSerializeToStream(baos, hasWitnesses());
+                } catch (IOException e) {
+                    throw new RuntimeException(e); // cannot happen
+                }
+                cachedWTxId = Sha256Hash.wrapReversed(Sha256Hash.hashTwice(baos.toByteArray()));
+            }
+        }
+        return cachedWTxId;
+    }
+
+    /** Gets the transaction weight as defined in BIP141. */
+    public int getWeight() {
+        if (!hasWitnesses())
+            return getMessageSize() * 4;
+        try (final ByteArrayOutputStream stream = new UnsafeByteArrayOutputStream(length)) {
+            bitcoinSerializeToStream(stream, false);
+            final int baseSize = stream.size();
+            stream.reset();
+            bitcoinSerializeToStream(stream, true);
+            final int totalSize = stream.size();
+            return baseSize * 3 + totalSize;
+        } catch (IOException e) {
+            throw new RuntimeException(e); // cannot happen
+        }
     }
 
-    public String getHashAsString() {
-        return getHash().toString();
+    /** Gets the virtual transaction size as defined in BIP141. */
+    public int getVsize() {
+        if (!hasWitnesses())
+            return getMessageSize();
+        return (getWeight() + 3) / 4; // round up
     }
 
     /**
@@ -315,9 +392,10 @@ public boolean isPending() {
      * is the best chain. The best chain block is guaranteed to be called last. So this must be idempotent.</p>
      *
      * <p>Sets updatedAt to be the earliest valid block time where this tx was seen.</p>
+     * <p>Sets includedInBestChainAt to be the block time of the best chain block where this tx is included.</p>
      *
      * @param block     The {@link StoredBlock} in which the transaction has appeared.
-     * @param bestChain whether to set the updatedAt timestamp from the block header (only if not already set)
+     * @param bestChain whether the supplied block is part of the best chain.
      * @param relativityOffset A number that disambiguates the order of transactions within a block.
      */
     public void setBlockAppearance(StoredBlock block, boolean bestChain, int relativityOffset) {
@@ -325,6 +403,9 @@ public void setBlockAppearance(StoredBlock block, boolean bestChain, int relativ
         if (bestChain && (updatedAt == null || updatedAt.getTime() == 0 || updatedAt.getTime() > blockTime)) {
             updatedAt = new Date(blockTime);
         }
+        if (bestChain) {
+            includedInBestChainAt = new Date(blockTime);
+        }
 
         addBlockAppearance(block.getHeader().getHash(), relativityOffset);
 
@@ -338,7 +419,7 @@ public void setBlockAppearance(StoredBlock block, boolean bestChain, int relativ
     public void addBlockAppearance(final Sha256Hash blockHash, int relativityOffset) {
         if (appearsInHashes == null) {
             // TODO: This could be a lot more memory efficient as we'll typically only store one element.
-            appearsInHashes = new TreeMap<Sha256Hash, Integer>();
+            appearsInHashes = new TreeMap<>();
         }
         appearsInHashes.put(blockHash, relativityOffset);
     }
@@ -413,6 +494,8 @@ public Coin getValue(TransactionBag wallet) throws ScriptException {
      */
     public Coin getFee() {
         Coin fee = Coin.ZERO;
+        if (inputs.isEmpty() || outputs.isEmpty()) // Incomplete transaction
+            return null;
         for (TransactionInput input : inputs) {
             if (input.getValue() == null)
                 return null;
@@ -463,6 +546,15 @@ public void setUpdateTime(Date updatedAt) {
         this.updatedAt = updatedAt;
     }
 
+    @Nullable
+    public Date getIncludedInBestChainAt() {
+        return includedInBestChainAt;
+    }
+
+    public void setIncludedInBestChainAt(Date includedInBestChainAt) {
+        this.includedInBestChainAt = includedInBestChainAt;
+    }
+
     /**
      * These constants are a part of a scriptSig signature on the inputs. They define the details of how a
      * transaction can be redeemed, specifically, they control how the hash of the transaction is calculated.
@@ -502,7 +594,9 @@ public byte byteValue() {
     @Override
     protected void unCache() {
         super.unCache();
-        hash = null;
+        cachedTxId = null;
+        cachedWTxId = null;
+        confidence = null;
     }
 
     protected static int calcLength(byte[] buf, int offset) {
@@ -541,17 +635,44 @@ protected static int calcLength(byte[] buf, int offset) {
         return cursor - offset + 4;
     }
 
+    /**
+     * Deserialize according to <a href="https://github.com/bitcoin/bips/blob/master/bip-0144.mediawiki">BIP144</a> or
+     * the <a href="https://en.bitcoin.it/wiki/Protocol_documentation#tx">classic format</a>, depending on if the
+     * transaction is segwit or not.
+     */
     @Override
     protected void parse() throws ProtocolException {
         cursor = offset;
+        optimalEncodingMessageSize = 4;
 
+        // version
         version = readUint32();
-        optimalEncodingMessageSize = 4;
+        // peek at marker
+        byte marker = payload[cursor];
+        boolean useSegwit = marker == 0;
+        // marker, flag
+        if (useSegwit) {
+            readBytes(2);
+            optimalEncodingMessageSize += 2;
+        }
+        // txin_count, txins
+        parseInputs();
+        // txout_count, txouts
+        parseOutputs();
+        // script_witnesses
+        if (useSegwit)
+            parseWitnesses();
+        // lock_time
+        lockTime = readUint32();
+        optimalEncodingMessageSize += 4;
 
-        // First come the inputs.
+        length = cursor - offset;
+    }
+
+    private void parseInputs() {
         long numInputs = readVarInt();
         optimalEncodingMessageSize += VarInt.sizeOf(numInputs);
-        inputs = new ArrayList<TransactionInput>((int) numInputs);
+        inputs = new ArrayList<>(Math.min((int) numInputs, Utils.MAX_INITIAL_ARRAY_LENGTH));
         for (long i = 0; i < numInputs; i++) {
             TransactionInput input = new TransactionInput(params, this, payload, cursor, serializer);
             inputs.add(input);
@@ -559,10 +680,12 @@ protected void parse() throws ProtocolException {
             optimalEncodingMessageSize += TransactionOutPoint.MESSAGE_LENGTH + VarInt.sizeOf(scriptLen) + scriptLen + 4;
             cursor += scriptLen + 4;
         }
-        // Now the outputs
+    }
+
+    private void parseOutputs() {
         long numOutputs = readVarInt();
         optimalEncodingMessageSize += VarInt.sizeOf(numOutputs);
-        outputs = new ArrayList<TransactionOutput>((int) numOutputs);
+        outputs = new ArrayList<>(Math.min((int) numOutputs, Utils.MAX_INITIAL_ARRAY_LENGTH));
         for (long i = 0; i < numOutputs; i++) {
             TransactionOutput output = new TransactionOutput(params, this, payload, cursor, serializer);
             outputs.add(output);
@@ -570,9 +693,30 @@ protected void parse() throws ProtocolException {
             optimalEncodingMessageSize += 8 + VarInt.sizeOf(scriptLen) + scriptLen;
             cursor += scriptLen;
         }
-        lockTime = readUint32();
-        optimalEncodingMessageSize += 4;
-        length = cursor - offset;
+    }
+
+    private void parseWitnesses() {
+        int numWitnesses = inputs.size();
+        for (int i = 0; i < numWitnesses; i++) {
+            long pushCount = readVarInt();
+            TransactionWitness witness = new TransactionWitness((int) pushCount);
+            getInput(i).setWitness(witness);
+            optimalEncodingMessageSize += VarInt.sizeOf(pushCount);
+            for (int y = 0; y < pushCount; y++) {
+                long pushSize = readVarInt();
+                optimalEncodingMessageSize += VarInt.sizeOf(pushSize) + pushSize;
+                byte[] push = readBytes((int) pushSize);
+                witness.setPush(y, push);
+            }
+        }
+    }
+
+    /** @return true of the transaction has any witnesses in any of its inputs */
+    public boolean hasWitnesses() {
+        for (TransactionInput in : inputs)
+            if (in.hasWitness())
+                return true;
+        return false;
     }
 
     public int getOptimalEncodingMessageSize() {
@@ -624,20 +768,40 @@ public boolean isMature() {
 
     @Override
     public String toString() {
-        return toString(null);
+        MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(this);
+        helper.addValue(toString(null, null));
+        return helper.toString();
     }
 
     /**
      * A human readable version of the transaction useful for debugging. The format is not guaranteed to be stable.
      * @param chain If provided, will be used to estimate lock times (if set). Can be null.
      */
-    public String toString(@Nullable AbstractBlockChain chain) {
+    public String toString(@Nullable AbstractBlockChain chain, @Nullable CharSequence indent) {
+        if (indent == null)
+            indent = "";
         StringBuilder s = new StringBuilder();
-        s.append("  ").append(getHashAsString()).append('\n');
-        if (hasConfidence())
-            s.append("  confidence: ").append(getConfidence()).append('\n');
+        Sha256Hash txId = getTxId(), wTxId = getWTxId();
+        s.append(indent).append(txId);
+        if (!wTxId.equals(txId))
+            s.append(", wtxid ").append(wTxId);
+        s.append('\n');
+        int weight = getWeight();
+        int size = unsafeBitcoinSerialize().length;
+        int vsize = getVsize();
+        s.append(indent).append("weight: ").append(weight).append(" wu, ");
+        if (size != vsize)
+            s.append(vsize).append(" virtual bytes, ");
+        s.append(size).append(" bytes\n");
+        if (updatedAt != null)
+            s.append(indent).append("updated: ").append(Utils.dateTimeFormat(updatedAt)).append('\n');
+        if (includedInBestChainAt != null)
+            s.append(indent).append("included in best chain at: ").append(Utils.dateTimeFormat(includedInBestChainAt)).append('\n');
+        if (version != 1)
+            s.append(indent).append("version ").append(version).append('\n');
+
         if (isTimeLocked()) {
-            s.append("  time locked until ");
+            s.append(indent).append("time locked until ");
             if (lockTime < LOCKTIME_THRESHOLD) {
                 s.append("block ").append(lockTime);
                 if (chain != null) {
@@ -649,13 +813,14 @@ public String toString(@Nullable AbstractBlockChain chain) {
             }
             s.append('\n');
         }
-        if (isOptInFullRBF()) {
-            s.append("  opts into full replace-by-fee\n");
+        if (hasRelativeLockTime()) {
+            s.append(indent).append("has relative lock time\n");
         }
-        if (inputs.size() == 0) {
-            s.append("  INCOMPLETE: No inputs!\n");
-            return s.toString();
+        if (isOptInFullRBF()) {
+            s.append(indent).append("opts into full replace-by-fee\n");
         }
+        if (purpose != null)
+            s.append(indent).append("purpose: ").append(purpose).append('\n');
         if (isCoinBase()) {
             String script;
             String script2;
@@ -666,69 +831,97 @@ public String toString(@Nullable AbstractBlockChain chain) {
                 script = "???";
                 script2 = "???";
             }
-            s.append("     == COINBASE TXN (scriptSig ").append(script)
-                .append(")  (scriptPubKey ").append(script2).append(")\n");
+            s.append(indent).append("   == COINBASE TXN (scriptSig ").append(script).append(")  (scriptPubKey ").append(script2)
+                    .append(")\n");
             return s.toString();
         }
-        for (TransactionInput in : inputs) {
-            s.append("     ");
-            s.append("in   ");
-
-            try {
-                Script scriptSig = in.getScriptSig();
-                s.append(scriptSig);
-                if (in.getValue() != null)
-                    s.append(" ").append(in.getValue().toFriendlyString());
-                s.append("\n          ");
-                s.append("outpoint:");
-                final TransactionOutPoint outpoint = in.getOutpoint();
-                s.append(outpoint.toString());
-                final TransactionOutput connectedOutput = outpoint.getConnectedOutput();
-                if (connectedOutput != null) {
-                    Script scriptPubKey = connectedOutput.getScriptPubKey();
-                    if (scriptPubKey.isSentToAddress() || scriptPubKey.isPayToScriptHash()) {
-                        s.append(" hash160:");
-                        s.append(Utils.HEX.encode(scriptPubKey.getPubKeyHash()));
+        if (!inputs.isEmpty()) {
+            int i = 0;
+            for (TransactionInput in : inputs) {
+                s.append(indent).append("   ");
+                s.append("in   ");
+
+                try {
+                    s.append(in.getScriptSig());
+                    final Coin value = in.getValue();
+                    if (value != null)
+                        s.append("  ").append(value.toFriendlyString()).append(" (").append(value).append(")");
+                    s.append('\n');
+                    if (in.hasWitness()) {
+                        s.append(indent).append("        witness:");
+                        s.append(in.getWitness());
+                        s.append('\n');
                     }
+                    final TransactionOutPoint outpoint = in.getOutpoint();
+                    final TransactionOutput connectedOutput = outpoint.getConnectedOutput();
+                    s.append(indent).append("        ");
+                    if (connectedOutput != null) {
+                        Script scriptPubKey = connectedOutput.getScriptPubKey();
+                        ScriptType scriptType = scriptPubKey.getScriptType();
+                        if (scriptType != null)
+                            s.append(scriptType).append(" addr:").append(scriptPubKey.getToAddress(params));
+                        else
+                            s.append("unknown script type");
+                    } else {
+                        s.append("unconnected");
+                    }
+                    s.append("  outpoint:").append(outpoint).append('\n');
+                    if (in.hasSequence()) {
+                        s.append(indent).append("        sequence:").append(Long.toHexString(in.getSequenceNumber()));
+                        if (in.isOptInFullRBF())
+                            s.append(", opts into full RBF");
+                        if (version >= 2 && in.hasRelativeLockTime())
+                            s.append(", has RLT");
+                        s.append('\n');
+                    }
+                } catch (Exception e) {
+                    s.append("[exception: ").append(e.getMessage()).append("]\n");
                 }
-                if (in.hasSequence()) {
-                    s.append("\n          sequence:").append(Long.toHexString(in.getSequenceNumber()));
-                    if (in.isOptInFullRBF())
-                        s.append(", opts into full RBF");
-                }
-            } catch (Exception e) {
-                s.append("[exception: ").append(e.getMessage()).append("]");
+                i++;
             }
-            s.append('\n');
+        } else {
+            s.append(indent).append("   ");
+            s.append("INCOMPLETE: No inputs!\n");
         }
         for (TransactionOutput out : outputs) {
-            s.append("     ");
+            s.append(indent).append("   ");
             s.append("out  ");
             try {
                 Script scriptPubKey = out.getScriptPubKey();
-                s.append(scriptPubKey);
-                s.append(" ");
-                s.append(out.getValue().toFriendlyString());
+                s.append(scriptPubKey.getChunks().size() > 0 ? scriptPubKey.toString() : "<no scriptPubKey>");
+                s.append(" (").append(HEX.encode(scriptPubKey.getProgram())).append(")");
+                s.append("  ");
+                s.append(out.getValue().toFriendlyString()).append(" (").append(out.getValue()).append(")");
+                s.append('\n');
+                s.append(indent).append("        ");
+                ScriptType scriptType = scriptPubKey.getScriptType();
+                if (scriptType != null)
+                    s.append(scriptType).append(" addr:").append(scriptPubKey.getToAddress(params));
+                else
+                    s.append("unknown script type");
                 if (!out.isAvailableForSpending()) {
-                    s.append(" Spent");
-                }
-                if (out.getSpentBy() != null) {
-                    s.append(" by ");
-                    s.append(out.getSpentBy().getParentTransaction().getHashAsString());
+                    s.append("  spent");
+                    final TransactionInput spentBy = out.getSpentBy();
+                    if (spentBy != null) {
+                        s.append(" by:");
+                        s.append(spentBy.getParentTransaction().getTxId()).append(':')
+                                .append(spentBy.getIndex());
+                    }
                 }
+                s.append('\n');
             } catch (Exception e) {
-                s.append("[exception: ").append(e.getMessage()).append("]");
+                s.append("[exception: ").append(e.getMessage()).append("]\n");
             }
-            s.append('\n');
         }
         final Coin fee = getFee();
         if (fee != null) {
-            final int size = unsafeBitcoinSerialize().length;
-            s.append("     fee  ").append(fee.multiply(1000).divide(size).toFriendlyString()).append("/kB, ")
-                    .append(fee.toFriendlyString()).append(" for ").append(size).append(" bytes\n");
+            s.append(indent).append("   fee  ");
+            s.append(fee.multiply(1000).divide(weight).toFriendlyString()).append("/wu, ");
+            if (size != vsize)
+                s.append(fee.multiply(1000).divide(vsize).toFriendlyString()).append("/vkB, ");
+            s.append(fee.multiply(1000).divide(size).toFriendlyString()).append("/kB  ");
+            s.append(fee.toFriendlyString()).append('\n');
         }
-        if (purpose != null)
-            s.append("     prps ").append(purpose).append('\n');
         return s.toString();
     }
 
@@ -747,16 +940,20 @@ public void clearInputs() {
     }
 
     /**
-     * Adds an input to this transaction that imports value from the given output. Note that this input is NOT
-     * complete and after every input is added with addInput() and every output is added with addOutput(),
-     * signInputs() must be called to finalize the transaction and finish the inputs off. Otherwise it won't be
-     * accepted by the network. Returns the newly created input.
+     * Adds an input to this transaction that imports value from the given output. Note that this input is <i>not</i>
+     * complete and after every input is added with {@link #addInput(TransactionInput)} and every output is added with
+     * {@link #addOutput(TransactionOutput)}, a {@link TransactionSigner} must be used to finalize the transaction and finish the inputs
+     * off. Otherwise it won't be accepted by the network.
+     * @return the newly created input.
      */
     public TransactionInput addInput(TransactionOutput from) {
         return addInput(new TransactionInput(params, this, from));
     }
 
-    /** Adds an input directly, with no checking that it's valid. Returns the new input. */
+    /**
+     * Adds an input directly, with no checking that it's valid.
+     * @return the new input.
+     */
     public TransactionInput addInput(TransactionInput input) {
         unCache();
         input.setParent(this);
@@ -765,7 +962,10 @@ public TransactionInput addInput(TransactionInput input) {
         return input;
     }
 
-    /** Adds an input directly, with no checking that it's valid. Returns the new input. */
+    /**
+     * Creates and adds an input to this transaction, with no checking that it's valid.
+     * @return the newly created input.
+     */
     public TransactionInput addInput(Sha256Hash spendTxHash, long outputIndex, Script script) {
         return addInput(new TransactionInput(params, this, script.getProgram(), new TransactionOutPoint(params, outputIndex, spendTxHash)));
     }
@@ -776,28 +976,39 @@ public TransactionInput addInput(Sha256Hash spendTxHash, long outputIndex, Scrip
      * to understand the values of sigHash and anyoneCanPay: otherwise you can use the other form of this method
      * that sets them to typical defaults.
      *
-     * @throws ScriptException if the scriptPubKey is not a pay to address or pay to pubkey script.
+     * @throws ScriptException if the scriptPubKey is not a pay to address or P2PK script.
      */
     public TransactionInput addSignedInput(TransactionOutPoint prevOut, Script scriptPubKey, ECKey sigKey,
                                            SigHash sigHash, boolean anyoneCanPay) throws ScriptException {
         // Verify the API user didn't try to do operations out of order.
         checkState(!outputs.isEmpty(), "Attempting to sign tx without outputs.");
-        TransactionInput input = new TransactionInput(params, this, new byte[]{}, prevOut);
+        TransactionInput input = new TransactionInput(params, this, new byte[] {}, prevOut);
         addInput(input);
-        Sha256Hash hash = hashForSignature(inputs.size() - 1, scriptPubKey, sigHash, anyoneCanPay);
-        ECKey.ECDSASignature ecSig = sigKey.sign(hash);
-        TransactionSignature txSig = new TransactionSignature(ecSig, sigHash, anyoneCanPay);
-        if (scriptPubKey.isSentToRawPubKey())
-            input.setScriptSig(ScriptBuilder.createInputScript(txSig));
-        else if (scriptPubKey.isSentToAddress())
-            input.setScriptSig(ScriptBuilder.createInputScript(txSig, sigKey));
-        else
-            throw new ScriptException("Don't know how to sign for this kind of scriptPubKey: " + scriptPubKey);
+        int inputIndex = inputs.size() - 1;
+        if (ScriptPattern.isP2PK(scriptPubKey)) {
+            TransactionSignature signature = calculateSignature(inputIndex, sigKey, scriptPubKey, sigHash,
+                    anyoneCanPay);
+            input.setScriptSig(ScriptBuilder.createInputScript(signature));
+            input.setWitness(null);
+        } else if (ScriptPattern.isP2PKH(scriptPubKey)) {
+            TransactionSignature signature = calculateSignature(inputIndex, sigKey, scriptPubKey, sigHash,
+                    anyoneCanPay);
+            input.setScriptSig(ScriptBuilder.createInputScript(signature, sigKey));
+            input.setWitness(null);
+        } else if (ScriptPattern.isP2WPKH(scriptPubKey)) {
+            Script scriptCode = ScriptBuilder.createP2PKHOutputScript(sigKey);
+            TransactionSignature signature = calculateWitnessSignature(inputIndex, sigKey, scriptCode, input.getValue(),
+                    sigHash, anyoneCanPay);
+            input.setScriptSig(ScriptBuilder.createEmpty());
+            input.setWitness(TransactionWitness.redeemP2WPKH(signature, sigKey));
+        } else {
+            throw new ScriptException(ScriptError.SCRIPT_ERR_UNKNOWN_ERROR, "Don't know how to sign for this kind of scriptPubKey: " + scriptPubKey);
+        }
         return input;
     }
 
     /**
-     * Same as {@link #addSignedInput(TransactionOutPoint, org.bitcoinj.script.Script, ECKey, org.bitcoinj.core.Transaction.SigHash, boolean)}
+     * Same as {@link #addSignedInput(TransactionOutPoint, Script, ECKey, Transaction.SigHash, boolean)}
      * but defaults to {@link SigHash#ALL} and "false" for the anyoneCanPay flag. This is normally what you want.
      */
     public TransactionInput addSignedInput(TransactionOutPoint prevOut, Script scriptPubKey, ECKey sigKey) throws ScriptException {
@@ -871,13 +1082,13 @@ public TransactionOutput addOutput(Coin value, Script script) {
 
     /**
      * Calculates a signature that is valid for being inserted into the input at the given position. This is simply
-     * a wrapper around calling {@link Transaction#hashForSignature(int, byte[], org.bitcoinj.core.Transaction.SigHash, boolean)}
+     * a wrapper around calling {@link Transaction#hashForSignature(int, byte[], Transaction.SigHash, boolean)}
      * followed by {@link ECKey#sign(Sha256Hash)} and then returning a new {@link TransactionSignature}. The key
      * must be usable for signing as-is: if the key is encrypted it must be decrypted first external to this method.
      *
      * @param inputIndex Which input to calculate the signature for, as an index.
      * @param key The private key used to calculate the signature.
-     * @param redeemScript Byte-exact contents of the scriptPubKey that is being satisified, or the P2SH redeem script.
+     * @param redeemScript Byte-exact contents of the scriptPubKey that is being satisfied, or the P2SH redeem script.
      * @param hashType Signing mode, see the enum for documentation.
      * @param anyoneCanPay Signing mode, see the SigHash enum for documentation.
      * @return A newly calculated signature object that wraps the r, s and sighash components.
@@ -891,12 +1102,12 @@ public TransactionSignature calculateSignature(int inputIndex, ECKey key,
 
     /**
      * Calculates a signature that is valid for being inserted into the input at the given position. This is simply
-     * a wrapper around calling {@link Transaction#hashForSignature(int, byte[], org.bitcoinj.core.Transaction.SigHash, boolean)}
+     * a wrapper around calling {@link Transaction#hashForSignature(int, byte[], Transaction.SigHash, boolean)}
      * followed by {@link ECKey#sign(Sha256Hash)} and then returning a new {@link TransactionSignature}.
      *
      * @param inputIndex Which input to calculate the signature for, as an index.
      * @param key The private key used to calculate the signature.
-     * @param redeemScript The scriptPubKey that is being satisified, or the P2SH redeem script.
+     * @param redeemScript The scriptPubKey that is being satisfied, or the P2SH redeem script.
      * @param hashType Signing mode, see the enum for documentation.
      * @param anyoneCanPay Signing mode, see the SigHash enum for documentation.
      * @return A newly calculated signature object that wraps the r, s and sighash components.
@@ -908,6 +1119,49 @@ public TransactionSignature calculateSignature(int inputIndex, ECKey key,
         return new TransactionSignature(key.sign(hash), hashType, anyoneCanPay);
     }
 
+    /**
+     * Calculates a signature that is valid for being inserted into the input at the given position. This is simply
+     * a wrapper around calling {@link Transaction#hashForSignature(int, byte[], Transaction.SigHash, boolean)}
+     * followed by {@link ECKey#sign(Sha256Hash)} and then returning a new {@link TransactionSignature}. The key
+     * must be usable for signing as-is: if the key is encrypted it must be decrypted first external to this method.
+     *
+     * @param inputIndex Which input to calculate the signature for, as an index.
+     * @param key The private key used to calculate the signature.
+     * @param aesKey The AES key to use for decryption of the private key. If null then no decryption is required.
+     * @param redeemScript Byte-exact contents of the scriptPubKey that is being satisfied, or the P2SH redeem script.
+     * @param hashType Signing mode, see the enum for documentation.
+     * @param anyoneCanPay Signing mode, see the SigHash enum for documentation.
+     * @return A newly calculated signature object that wraps the r, s and sighash components.
+     */
+    public TransactionSignature calculateSignature(int inputIndex, ECKey key,
+                                                   @Nullable KeyParameter aesKey,
+                                                   byte[] redeemScript,
+                                                   SigHash hashType, boolean anyoneCanPay) {
+        Sha256Hash hash = hashForSignature(inputIndex, redeemScript, hashType, anyoneCanPay);
+        return new TransactionSignature(key.sign(hash, aesKey), hashType, anyoneCanPay);
+    }
+
+    /**
+     * Calculates a signature that is valid for being inserted into the input at the given position. This is simply
+     * a wrapper around calling {@link Transaction#hashForSignature(int, byte[], Transaction.SigHash, boolean)}
+     * followed by {@link ECKey#sign(Sha256Hash)} and then returning a new {@link TransactionSignature}.
+     *
+     * @param inputIndex Which input to calculate the signature for, as an index.
+     * @param key The private key used to calculate the signature.
+     * @param aesKey The AES key to use for decryption of the private key. If null then no decryption is required.
+     * @param redeemScript The scriptPubKey that is being satisfied, or the P2SH redeem script.
+     * @param hashType Signing mode, see the enum for documentation.
+     * @param anyoneCanPay Signing mode, see the SigHash enum for documentation.
+     * @return A newly calculated signature object that wraps the r, s and sighash components.
+     */
+    public TransactionSignature calculateSignature(int inputIndex, ECKey key,
+                                                   @Nullable KeyParameter aesKey,
+                                                   Script redeemScript,
+                                                   SigHash hashType, boolean anyoneCanPay) {
+        Sha256Hash hash = hashForSignature(inputIndex, redeemScript.getProgram(), hashType, anyoneCanPay);
+        return new TransactionSignature(key.sign(hash, aesKey), hashType, anyoneCanPay);
+    }
+
     /**
      * <p>Calculates a signature hash, that is, a hash of a simplified form of the transaction. How exactly the transaction
      * is simplified is specified by the type and anyoneCanPay parameters.</p>
@@ -967,7 +1221,9 @@ public Sha256Hash hashForSignature(int inputIndex, byte[] connectedScript, byte
             // transaction that step isn't very helpful, but it doesn't add much cost relative to the actual
             // EC math so we'll do it anyway.
             for (int i = 0; i < tx.inputs.size(); i++) {
-                tx.inputs.get(i).clearScriptBytes();
+                TransactionInput input = tx.inputs.get(i);
+                input.clearScriptBytes();
+                input.setWitness(null);
             }
 
             // This step has no purpose beyond being synchronized with Bitcoin Core's bugs. OP_CODESEPARATOR
@@ -976,7 +1232,7 @@ public Sha256Hash hashForSignature(int inputIndex, byte[] connectedScript, byte
             // the design we use today where scripts are executed independently but share a stack. This left the
             // OP_CODESEPARATOR instruction having no purpose as it was only meant to be used internally, not actually
             // ever put into scripts. Deleting OP_CODESEPARATOR is a step that should never be required but if we don't
-            // do it, we could split off the main chain.
+            // do it, we could split off the best chain.
             connectedScript = Script.removeAllInstancesOfOp(connectedScript, ScriptOpCodes.OP_CODESEPARATOR);
 
             // Set the input to the script of its output. Bitcoin Core does this but the step has no obvious purpose as
@@ -987,7 +1243,7 @@ public Sha256Hash hashForSignature(int inputIndex, byte[] connectedScript, byte
 
             if ((sigHashType & 0x1f) == SigHash.NONE.value) {
                 // SIGHASH_NONE means no outputs are signed at all - the signature is effectively for a "blank cheque".
-                tx.outputs = new ArrayList<TransactionOutput>(0);
+                tx.outputs = new ArrayList<>(0);
                 // The signature isn't broken by new versions of the transaction issued by other parties.
                 for (int i = 0; i < tx.inputs.size(); i++)
                     if (i != inputIndex)
@@ -1007,7 +1263,7 @@ public Sha256Hash hashForSignature(int inputIndex, byte[] connectedScript, byte
                 }
                 // In SIGHASH_SINGLE the outputs after the matching input index are deleted, and the outputs before
                 // that position are "nulled out". Unintuitively, the value in a "null" transaction is set to -1.
-                tx.outputs = new ArrayList<TransactionOutput>(tx.outputs.subList(0, inputIndex + 1));
+                tx.outputs = new ArrayList<>(tx.outputs.subList(0, inputIndex + 1));
                 for (int i = 0; i < inputIndex; i++)
                     tx.outputs.set(i, new TransactionOutput(tx.params, tx, Coin.NEGATIVE_SATOSHI, new byte[] {}));
                 // The signature isn't broken by new versions of the transaction issued by other parties.
@@ -1019,12 +1275,12 @@ public Sha256Hash hashForSignature(int inputIndex, byte[] connectedScript, byte
             if ((sigHashType & SigHash.ANYONECANPAY.value) == SigHash.ANYONECANPAY.value) {
                 // SIGHASH_ANYONECANPAY means the signature in the input is not broken by changes/additions/removals
                 // of other inputs. For example, this is useful for building assurance contracts.
-                tx.inputs = new ArrayList<TransactionInput>();
+                tx.inputs = new ArrayList<>();
                 tx.inputs.add(input);
             }
 
-            ByteArrayOutputStream bos = new UnsafeByteArrayOutputStream(tx.length == UNKNOWN_LENGTH ? 256 : tx.length + 4);
-            tx.bitcoinSerialize(bos);
+            ByteArrayOutputStream bos = new ByteArrayOutputStream(tx.length);
+            tx.bitcoinSerializeToStream(bos, false);
             // We also have to write a hash type (sigHashType is actually an unsigned char)
             uint32ToByteStreamLE(0x000000ff & sigHashType, bos);
             // Note that this is NOT reversed to ensure it will be signed correctly. If it were to be printed out
@@ -1038,19 +1294,204 @@ public Sha256Hash hashForSignature(int inputIndex, byte[] connectedScript, byte
         }
     }
 
+    public TransactionSignature calculateWitnessSignature(
+            int inputIndex,
+            ECKey key,
+            byte[] scriptCode,
+            Coin value,
+            SigHash hashType,
+            boolean anyoneCanPay) {
+        Sha256Hash hash = hashForWitnessSignature(inputIndex, scriptCode, value, hashType, anyoneCanPay);
+        return new TransactionSignature(key.sign(hash), hashType, anyoneCanPay);
+    }
+
+    public TransactionSignature calculateWitnessSignature(
+            int inputIndex,
+            ECKey key,
+            Script scriptCode,
+            Coin value,
+            SigHash hashType,
+            boolean anyoneCanPay) {
+        return calculateWitnessSignature(inputIndex, key, scriptCode.getProgram(), value, hashType, anyoneCanPay);
+    }
+
+    public TransactionSignature calculateWitnessSignature(
+            int inputIndex,
+            ECKey key,
+            @Nullable KeyParameter aesKey,
+            byte[] scriptCode,
+            Coin value,
+            SigHash hashType,
+            boolean anyoneCanPay) {
+        Sha256Hash hash = hashForWitnessSignature(inputIndex, scriptCode, value, hashType, anyoneCanPay);
+        return new TransactionSignature(key.sign(hash, aesKey), hashType, anyoneCanPay);
+    }
+
+    public TransactionSignature calculateWitnessSignature(
+            int inputIndex,
+            ECKey key,
+            @Nullable KeyParameter aesKey,
+            Script scriptCode,
+            Coin value,
+            SigHash hashType,
+            boolean anyoneCanPay) {
+        return calculateWitnessSignature(inputIndex, key, aesKey, scriptCode.getProgram(), value, hashType, anyoneCanPay);
+    }
+
+    public synchronized Sha256Hash hashForWitnessSignature(
+            int inputIndex,
+            byte[] scriptCode,
+            Coin prevValue,
+            SigHash type,
+            boolean anyoneCanPay) {
+        int sigHash = TransactionSignature.calcSigHashValue(type, anyoneCanPay);
+        return hashForWitnessSignature(inputIndex, scriptCode, prevValue, (byte) sigHash);
+    }
+
+    /**
+     * <p>Calculates a signature hash, that is, a hash of a simplified form of the transaction. How exactly the transaction
+     * is simplified is specified by the type and anyoneCanPay parameters.</p>
+     *
+     * <p>This is a low level API and when using the regular {@link Wallet} class you don't have to call this yourself.
+     * When working with more complex transaction types and contracts, it can be necessary. When signing a Witness output
+     * the scriptCode should be the script encoded into the scriptSig field, for normal transactions, it's the
+     * scriptPubKey of the output you're signing for. (See BIP143: https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki)</p>
+     *
+     * @param inputIndex   input the signature is being calculated for. Tx signatures are always relative to an input.
+     * @param scriptCode   the script that should be in the given input during signing.
+     * @param prevValue    the value of the coin being spent
+     * @param type         Should be SigHash.ALL
+     * @param anyoneCanPay should be false.
+     */
+    public synchronized Sha256Hash hashForWitnessSignature(
+            int inputIndex,
+            Script scriptCode,
+            Coin prevValue,
+            SigHash type,
+            boolean anyoneCanPay) {
+        return hashForWitnessSignature(inputIndex, scriptCode.getProgram(), prevValue, type, anyoneCanPay);
+    }
+
+    public synchronized Sha256Hash hashForWitnessSignature(
+            int inputIndex,
+            byte[] scriptCode,
+            Coin prevValue,
+            byte sigHashType){
+        ByteArrayOutputStream bos = new UnsafeByteArrayOutputStream(length == UNKNOWN_LENGTH ? 256 : length + 4);
+        try {
+            byte[] hashPrevouts = new byte[32];
+            byte[] hashSequence = new byte[32];
+            byte[] hashOutputs = new byte[32];
+            int basicSigHashType = sigHashType & 0x1f;
+            boolean anyoneCanPay = (sigHashType & SigHash.ANYONECANPAY.value) == SigHash.ANYONECANPAY.value;
+            boolean signAll = (basicSigHashType != SigHash.SINGLE.value) && (basicSigHashType != SigHash.NONE.value);
+
+            if (!anyoneCanPay) {
+                ByteArrayOutputStream bosHashPrevouts = new UnsafeByteArrayOutputStream(256);
+                for (int i = 0; i < this.inputs.size(); ++i) {
+                    bosHashPrevouts.write(this.inputs.get(i).getOutpoint().getHash().getReversedBytes());
+                    uint32ToByteStreamLE(this.inputs.get(i).getOutpoint().getIndex(), bosHashPrevouts);
+                }
+                hashPrevouts = Sha256Hash.hashTwice(bosHashPrevouts.toByteArray());
+            }
+
+            if (!anyoneCanPay && signAll) {
+                ByteArrayOutputStream bosSequence = new UnsafeByteArrayOutputStream(256);
+                for (int i = 0; i < this.inputs.size(); ++i) {
+                    uint32ToByteStreamLE(this.inputs.get(i).getSequenceNumber(), bosSequence);
+                }
+                hashSequence = Sha256Hash.hashTwice(bosSequence.toByteArray());
+            }
+
+            if (signAll) {
+                ByteArrayOutputStream bosHashOutputs = new UnsafeByteArrayOutputStream(256);
+                for (int i = 0; i < this.outputs.size(); ++i) {
+                    uint64ToByteStreamLE(
+                            BigInteger.valueOf(this.outputs.get(i).getValue().getValue()),
+                            bosHashOutputs
+                    );
+                    bosHashOutputs.write(new VarInt(this.outputs.get(i).getScriptBytes().length).encode());
+                    bosHashOutputs.write(this.outputs.get(i).getScriptBytes());
+                }
+                hashOutputs = Sha256Hash.hashTwice(bosHashOutputs.toByteArray());
+            } else if (basicSigHashType == SigHash.SINGLE.value && inputIndex < outputs.size()) {
+                ByteArrayOutputStream bosHashOutputs = new UnsafeByteArrayOutputStream(256);
+                uint64ToByteStreamLE(
+                        BigInteger.valueOf(this.outputs.get(inputIndex).getValue().getValue()),
+                        bosHashOutputs
+                );
+                bosHashOutputs.write(new VarInt(this.outputs.get(inputIndex).getScriptBytes().length).encode());
+                bosHashOutputs.write(this.outputs.get(inputIndex).getScriptBytes());
+                hashOutputs = Sha256Hash.hashTwice(bosHashOutputs.toByteArray());
+            }
+            uint32ToByteStreamLE(version, bos);
+            bos.write(hashPrevouts);
+            bos.write(hashSequence);
+            bos.write(inputs.get(inputIndex).getOutpoint().getHash().getReversedBytes());
+            uint32ToByteStreamLE(inputs.get(inputIndex).getOutpoint().getIndex(), bos);
+            bos.write(new VarInt(scriptCode.length).encode());
+            bos.write(scriptCode);
+            uint64ToByteStreamLE(BigInteger.valueOf(prevValue.getValue()), bos);
+            uint32ToByteStreamLE(inputs.get(inputIndex).getSequenceNumber(), bos);
+            bos.write(hashOutputs);
+            uint32ToByteStreamLE(this.lockTime, bos);
+            uint32ToByteStreamLE(0x000000ff & sigHashType, bos);
+        } catch (IOException e) {
+            throw new RuntimeException(e);  // Cannot happen.
+        }
+
+        return Sha256Hash.twiceOf(bos.toByteArray());
+    }
+
+    public byte[] bitcoinSerialize(boolean segwit) {
+        ByteArrayOutputStream stream = new ByteArrayOutputStream();
+        try {
+            bitcoinSerializeToStream(stream, segwit);
+        } catch (IOException e) {
+            // Cannot happen, we are serializing to a memory stream.
+        }
+        return stream.toByteArray();
+    }
+
+
     @Override
     protected void bitcoinSerializeToStream(OutputStream stream) throws IOException {
+        boolean useSegwit = hasWitnesses()
+                && protocolVersion >= NetworkParameters.ProtocolVersion.WITNESS_VERSION.getBitcoinProtocolVersion();
+        bitcoinSerializeToStream(stream, useSegwit);
+    }
+
+    /**
+     * Serialize according to <a href="https://github.com/bitcoin/bips/blob/master/bip-0144.mediawiki">BIP144</a> or the
+     * <a href="https://en.bitcoin.it/wiki/Protocol_documentation#tx">classic format</a>, depending on if segwit is
+     * desired.
+     */
+    protected void bitcoinSerializeToStream(OutputStream stream, boolean useSegwit) throws IOException {
+        // version
         uint32ToByteStreamLE(version, stream);
+        // marker, flag
+        if (useSegwit) {
+            stream.write(0);
+            stream.write(1);
+        }
+        // txin_count, txins
         stream.write(new VarInt(inputs.size()).encode());
         for (TransactionInput in : inputs)
             in.bitcoinSerialize(stream);
+        // txout_count, txouts
         stream.write(new VarInt(outputs.size()).encode());
         for (TransactionOutput out : outputs)
             out.bitcoinSerialize(stream);
+        // script_witnisses
+        if (useSegwit) {
+            for (TransactionInput in : inputs) {
+                in.getWitness().bitcoinSerializeToStream(stream);
+            }
+        }
+        // lock_time
         uint32ToByteStreamLE(lockTime, stream);
     }
 
-
     /**
      * Transactions can have an associated lock time, specified either as a block height or in seconds since the
      * UNIX epoch. A transaction is not allowed to be confirmed by miners until the lock time is reached, and
@@ -1084,13 +1525,15 @@ public void setLockTime(long lockTime) {
         this.lockTime = lockTime;
     }
 
-    /**
-     * @return the version
-     */
     public long getVersion() {
         return version;
     }
 
+    public void setVersion(int version) {
+        this.version = version;
+        unCache();
+    }
+
     /** Returns an unmodifiable view of all inputs. */
     public List<TransactionInput> getInputs() {
         return Collections.unmodifiableList(inputs);
@@ -1110,7 +1553,7 @@ public List<TransactionOutput> getOutputs() {
      * @return linked list of outputs relevant to the wallet in this transaction
      */
     public List<TransactionOutput> getWalletOutputs(TransactionBag transactionBag){
-        List<TransactionOutput> walletOutputs = new LinkedList<TransactionOutput>();
+        List<TransactionOutput> walletOutputs = new LinkedList<>();
         for (TransactionOutput o : outputs) {
             if (!o.isMineOrWatched(transactionBag)) continue;
             walletOutputs.add(o);
@@ -1135,7 +1578,7 @@ public TransactionOutput getOutput(long index) {
     }
 
     /**
-     * Returns the confidence object for this transaction from the {@link org.bitcoinj.core.TxConfidenceTable}
+     * Returns the confidence object for this transaction from the {@link TxConfidenceTable}
      * referenced by the implicit {@link Context}.
      */
     public TransactionConfidence getConfidence() {
@@ -1143,7 +1586,7 @@ public TransactionConfidence getConfidence() {
     }
 
     /**
-     * Returns the confidence object for this transaction from the {@link org.bitcoinj.core.TxConfidenceTable}
+     * Returns the confidence object for this transaction from the {@link TxConfidenceTable}
      * referenced by the given {@link Context}.
      */
     public TransactionConfidence getConfidence(Context context) {
@@ -1151,11 +1594,11 @@ public TransactionConfidence getConfidence(Context context) {
     }
 
     /**
-     * Returns the confidence object for this transaction from the {@link org.bitcoinj.core.TxConfidenceTable}
+     * Returns the confidence object for this transaction from the {@link TxConfidenceTable}
      */
     public TransactionConfidence getConfidence(TxConfidenceTable table) {
         if (confidence == null)
-            confidence = table.getOrCreate(getHash()) ;
+            confidence = table.getOrCreate(getTxId()) ;
         return confidence;
     }
 
@@ -1168,12 +1611,12 @@ public boolean hasConfidence() {
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        return getHash().equals(((Transaction)o).getHash());
+        return getTxId().equals(((Transaction)o).getTxId());
     }
 
     @Override
     public int hashCode() {
-        return getHash().hashCode();
+        return getTxId().hashCode();
     }
 
     /**
@@ -1213,6 +1656,17 @@ public void checkCoinBaseHeight(final int height)
         }
     }
 
+    /** Loops the outputs of a coinbase transaction to locate the witness commitment. */
+    public Sha256Hash findWitnessCommitment() {
+        checkState(isCoinBase());
+        for (TransactionOutput out : Lists.reverse(outputs)) {
+            Script scriptPubKey = out.getScriptPubKey();
+            if (ScriptPattern.isWitnessCommitment(scriptPubKey))
+                return ScriptPattern.extractWitnessCommitmentHash(scriptPubKey);
+        }
+        return null;
+    }
+
     /**
      * <p>Checks the transaction contents for sanity, in ways that can be done in a standalone manner.
      * Does <b>not</b> perform all checks on a transaction such as whether the inputs are already spent.
@@ -1236,7 +1690,7 @@ public void verify() throws VerificationException {
             throw new VerificationException.LargerThanMaxBlockSize();
 
         Coin valueOut = Coin.ZERO;
-        HashSet<TransactionOutPoint> outpoints = new HashSet<TransactionOutPoint>();
+        HashSet<TransactionOutPoint> outpoints = new HashSet<>();
         for (TransactionInput input : inputs) {
             if (outpoints.contains(input.getOutpoint()))
                 throw new VerificationException.DuplicatedOutPoint();
@@ -1267,7 +1721,8 @@ public void verify() throws VerificationException {
     }
 
     /**
-     * <p>A transaction is time locked if at least one of its inputs is non-final and it has a lock time</p>
+     * <p>A transaction is time-locked if at least one of its inputs is non-final and it has a lock time. A transaction can
+     * also have a relative lock time which this method doesn't tell. Use {@link #hasRelativeLockTime()} to find out.</p>
      *
      * <p>To check if this transaction is final at a given height and time, see {@link Transaction#isFinal(int, long)}
      * </p>
@@ -1281,6 +1736,20 @@ public boolean isTimeLocked() {
         return false;
     }
 
+    /**
+     * A transaction has a relative lock time
+     * (<a href="https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki">BIP 68</a>) if it is version 2 or
+     * higher and at least one of its inputs has its {@link TransactionInput#SEQUENCE_LOCKTIME_DISABLE_FLAG} cleared.
+     */
+    public boolean hasRelativeLockTime() {
+        if (version < 2)
+            return false;
+        for (TransactionInput input : getInputs())
+            if (input.hasRelativeLockTime())
+                return true;
+        return false;
+    }
+
     /**
      * Returns whether this transaction will opt into the
      * <a href="https://github.com/bitcoin/bips/blob/master/bip-0125.mediawiki">full replace-by-fee </a> semantics.
@@ -1351,6 +1820,7 @@ public void setExchangeRate(ExchangeRate exchangeRate) {
     /**
      * Returns the transaction {@link #memo}.
      */
+    @Nullable
     public String getMemo() {
         return memo;
     }
diff --git a/core/src/main/java/org/bitcoinj/core/TransactionBag.java b/core/src/main/java/org/bitcoinj/core/TransactionBag.java
index e391adca273..87a4a292a0c 100644
--- a/core/src/main/java/org/bitcoinj/core/TransactionBag.java
+++ b/core/src/main/java/org/bitcoinj/core/TransactionBag.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014 Giannis Dzegoutanis
+ * Copyright 2019 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,23 +17,31 @@
 
 package org.bitcoinj.core;
 
+import javax.annotation.Nullable;
+
 import org.bitcoinj.script.Script;
+import org.bitcoinj.wallet.Wallet;
 import org.bitcoinj.wallet.WalletTransaction;
 
 import java.util.Map;
 
 /**
- * This interface is used to abstract the {@link org.bitcoinj.wallet.Wallet} and the {@link org.bitcoinj.core.Transaction}
+ * This interface is used to abstract the {@link Wallet} and the {@link Transaction}
  */
 public interface TransactionBag {
-    /** Returns true if this wallet contains a public key which hashes to the given hash. */
-    boolean isPubKeyHashMine(byte[] pubkeyHash);
+    /**
+     * Look for a public key which hashes to the given hash and (optionally) is used for a specific script type.
+     * @param pubKeyHash hash of the public key to look for
+     * @param scriptType only look for given usage (currently {@link Script.ScriptType#P2PKH} or {@link Script.ScriptType#P2WPKH}) or {@code null} if we don't care
+     * @return true if hash was found
+     */
+    boolean isPubKeyHashMine(byte[] pubKeyHash, @Nullable Script.ScriptType scriptType);
 
     /** Returns true if this wallet is watching transactions for outputs with the script. */
     boolean isWatchedScript(Script script);
 
     /** Returns true if this wallet contains a keypair with the given public key. */
-    boolean isPubKeyMine(byte[] pubkey);
+    boolean isPubKeyMine(byte[] pubKey);
 
     /** Returns true if this wallet knows the script corresponding to the given hash. */
     boolean isPayToScriptHashMine(byte[] payToScriptHash);
diff --git a/core/src/main/java/org/bitcoinj/core/TransactionBroadcast.java b/core/src/main/java/org/bitcoinj/core/TransactionBroadcast.java
index a68c555d31d..5660eddd3c5 100644
--- a/core/src/main/java/org/bitcoinj/core/TransactionBroadcast.java
+++ b/core/src/main/java/org/bitcoinj/core/TransactionBroadcast.java
@@ -44,6 +44,7 @@ public class TransactionBroadcast {
     private final PeerGroup peerGroup;
     private final Transaction tx;
     private int minConnections;
+    private boolean dropPeersAfterBroadcast = false;
     private int numWaitingFor;
 
     /** Used for shuffling the peers before broadcast: unit tests can replace this to make themselves deterministic. */
@@ -88,12 +89,16 @@ public void setMinConnections(int minConnections) {
         this.minConnections = minConnections;
     }
 
+    public void setDropPeersAfterBroadcast(boolean dropPeersAfterBroadcast) {
+        this.dropPeersAfterBroadcast = dropPeersAfterBroadcast;
+    }
+
     private PreMessageReceivedEventListener rejectionListener = new PreMessageReceivedEventListener() {
         @Override
         public Message onPreMessageReceived(Peer peer, Message m) {
             if (m instanceof RejectMessage) {
                 RejectMessage rejectMessage = (RejectMessage)m;
-                if (tx.getHash().equals(rejectMessage.getRejectedObjectHash())) {
+                if (tx.getTxId().equals(rejectMessage.getRejectedObjectHash())) {
                     rejects.put(peer, rejectMessage);
                     int size = rejects.size();
                     long threshold = Math.round(numWaitingFor / 2.0);
@@ -116,8 +121,15 @@ public ListenableFuture<Transaction> broadcast() {
     }
 
     private class EnoughAvailablePeers implements Runnable {
+        private Context context;
+
+        public EnoughAvailablePeers() {
+            this.context = Context.get();
+        }
+
         @Override
         public void run() {
+            Context.propagate(context);
             // We now have enough connected peers to send the transaction.
             // This can be called immediately if we already have enough. Otherwise it'll be called from a peer
             // thread.
@@ -145,11 +157,28 @@ public void run() {
             numWaitingFor = (int) Math.ceil((peers.size() - numToBroadcastTo) / 2.0);
             Collections.shuffle(peers, random);
             peers = peers.subList(0, numToBroadcastTo);
-            log.info("broadcastTransaction: We have {} peers, adding {} to the memory pool", numConnected, tx.getHashAsString());
+            log.info("broadcastTransaction: We have {} peers, adding {} to the memory pool", numConnected, tx.getTxId());
             log.info("Sending to {} peers, will wait for {}, sending to: {}", numToBroadcastTo, numWaitingFor, Joiner.on(",").join(peers));
-            for (Peer peer : peers) {
+            for (final Peer peer : peers) {
                 try {
-                    peer.sendMessage(tx);
+                    ListenableFuture future = peer.sendMessage(tx);
+                    // Peer drop after broadcast feature disabled until we better understand why this feature was
+                    // implemented.
+                    // If several txs are broadcasted in a short period of time, we may disconnect many peers
+                    // quickly, then making the connection to the bitcoin network unstable and have a risk a
+                    // tx is not broadcasted at all.
+                    dropPeersAfterBroadcast = false;
+                    if (dropPeersAfterBroadcast) {
+                        // We drop the peer shortly after the transaction has been sent, because this peer will not
+                        // send us back useful broadcast confirmations.
+                        future.addListener(new Runnable() {
+                            @Override
+                            public void run() {
+                                Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
+                                peer.close();
+                            }
+                        }, Threading.THREAD_POOL);
+                    }
                     // We don't record the peer as having seen the tx in the memory pool because we want to track only
                     // how many peers announced to us.
                 } catch (Exception e) {
@@ -176,7 +205,7 @@ public void onConfidenceChanged(TransactionConfidence conf, ChangeReason reason)
             // The number of peers that announced this tx has gone up.
             int numSeenPeers = conf.numBroadcastPeers() + rejects.size();
             boolean mined = tx.getAppearsInHashes() != null;
-            log.info("broadcastTransaction: {}:  TX {} seen by {} peers{}", reason, tx.getHashAsString(),
+            log.info("broadcastTransaction: {}:  TX {} seen by {} peers{}", reason, tx.getTxId(),
                     numSeenPeers, mined ? " and mined" : "");
 
             // Progress callback on the requested thread.
@@ -196,7 +225,7 @@ public void onConfidenceChanged(TransactionConfidence conf, ChangeReason reason)
                 //
                 // We're done! It's important that the PeerGroup lock is not held (by this thread) at this
                 // point to avoid triggering inversions when the Future completes.
-                log.info("broadcastTransaction: {} complete", tx.getHash());
+                log.info("broadcastTransaction: {} complete", tx.getTxId());
                 peerGroup.removePreMessageReceivedEventListener(rejectionListener);
                 conf.removeEventListener(this);
                 future.set(tx);  // RE-ENTRANCY POINT
@@ -256,7 +285,7 @@ public interface ProgressCallback {
 
     /**
      * Sets the given callback for receiving progress values, which will run on the user thread. See
-     * {@link org.bitcoinj.utils.Threading} for details.  If the broadcast has already started then the callback will
+     * {@link Threading} for details.  If the broadcast has already started then the callback will
      * be invoked immediately with the current progress.
      */
     public void setProgressCallback(ProgressCallback callback) {
diff --git a/core/src/main/java/org/bitcoinj/core/TransactionBroadcaster.java b/core/src/main/java/org/bitcoinj/core/TransactionBroadcaster.java
index da6c1877fed..87b295d6447 100644
--- a/core/src/main/java/org/bitcoinj/core/TransactionBroadcaster.java
+++ b/core/src/main/java/org/bitcoinj/core/TransactionBroadcaster.java
@@ -18,7 +18,7 @@
 
 /**
  * A general interface which declares the ability to broadcast transactions. This is implemented
- * by {@link org.bitcoinj.core.PeerGroup}.
+ * by {@link PeerGroup}.
  */
 public interface TransactionBroadcaster {
     /** Broadcast the given transaction on the network */
diff --git a/core/src/main/java/org/bitcoinj/core/TransactionConfidence.java b/core/src/main/java/org/bitcoinj/core/TransactionConfidence.java
index 3e0d59b8be8..8d104197a6b 100644
--- a/core/src/main/java/org/bitcoinj/core/TransactionConfidence.java
+++ b/core/src/main/java/org/bitcoinj/core/TransactionConfidence.java
@@ -19,7 +19,9 @@
 
 import com.google.common.collect.*;
 import com.google.common.util.concurrent.*;
+
 import org.bitcoinj.utils.*;
+import org.bitcoinj.wallet.CoinSelector;
 import org.bitcoinj.wallet.Wallet;
 
 import javax.annotation.*;
@@ -46,7 +48,7 @@
  * <li>Receiving it from multiple peers on the network. If your network connection is not being intercepted,
  *     hearing about a transaction from multiple peers indicates the network has accepted the transaction and
  *     thus miners likely have too (miners have the final say in whether a transaction becomes valid or not).</li>
- * <li>Seeing the transaction appear appear in a block on the main chain. Your confidence increases as the transaction
+ * <li>Seeing the transaction appear in a block on the best chain. Your confidence increases as the transaction
  *     becomes further buried under work. Work can be measured either in blocks (roughly, units of time), or
  *     amount of work done.</li>
  * </ul>
@@ -54,11 +56,16 @@
  * <p>Alternatively, you may know that the transaction is "dead", that is, one or more of its inputs have
  * been double spent and will never confirm unless there is another re-org.</p>
  *
- * <p>TransactionConfidence is updated via the {@link org.bitcoinj.core.TransactionConfidence#incrementDepthInBlocks()}
+ * <p>TransactionConfidence is updated via the {@link TransactionConfidence#incrementDepthInBlocks(int height)}
  * method to ensure the block depth is up to date.</p>
- * To make a copy that won't be changed, use {@link org.bitcoinj.core.TransactionConfidence#duplicate()}.
+ * To make a copy that won't be changed, use {@link TransactionConfidence#duplicate()}.
  */
 public class TransactionConfidence {
+    public static class Factory {
+        public TransactionConfidence createConfidence(Sha256Hash hash) {
+            return new TransactionConfidence(hash);
+        }
+    }
 
     /**
      * The peers that have announced the transaction to us. Network nodes don't have stable identities, so we use
@@ -86,7 +93,7 @@ public enum ConfidenceType {
          * announced and is considered valid by the network. A pending transaction will be announced if the containing
          * wallet has been attached to a live {@link PeerGroup} using {@link PeerGroup#addWallet(Wallet)}.
          * You can estimate how likely the transaction is to be included by connecting to a bunch of nodes then measuring
-         * how many announce it, using {@link org.bitcoinj.core.TransactionConfidence#numBroadcastPeers()}.
+         * how many announce it, using {@link TransactionConfidence#numBroadcastPeers()}.
          * Or if you saw it from a trusted peer, you can assume it's valid and will get mined sooner or later as well.
          */
         PENDING(2),
@@ -145,8 +152,8 @@ public enum Source {
 
     public TransactionConfidence(Sha256Hash hash) {
         // Assume a default number of peers for our set.
-        broadcastBy = new CopyOnWriteArrayList<PeerAddress>();
-        listeners = new CopyOnWriteArrayList<ListenerRegistration<Listener>>();
+        broadcastBy = new CopyOnWriteArrayList<>();
+        listeners = new CopyOnWriteArrayList<>();
         this.hash = hash;
     }
 
@@ -163,7 +170,7 @@ public interface Listener {
         /** An enum that describes why a transaction confidence listener is being invoked (i.e. the class of change). */
         enum ChangeReason {
             /**
-             * Occurs when the type returned by {@link org.bitcoinj.core.TransactionConfidence#getConfidenceType()}
+             * Occurs when the type returned by {@link TransactionConfidence#getConfidenceType()}
              * has changed. For example, if a PENDING transaction changes to BUILDING or DEAD, then this reason will
              * be given. It's a high level summary.
              */
@@ -206,7 +213,7 @@ enum ChangeReason {
      */
     public void addEventListener(Executor executor, Listener listener) {
         checkNotNull(listener);
-        listeners.addIfAbsent(new ListenerRegistration<Listener>(listener, executor));
+        listeners.addIfAbsent(new ListenerRegistration<>(listener, executor));
         pinnedConfidenceObjects.add(this);
     }
 
@@ -216,9 +223,9 @@ public void addEventListener(Executor executor, Listener listener) {
      *
      * <p>Note that this is NOT called when every block arrives. Instead it is called when the transaction
      * transitions between confidence states, ie, from not being seen in the chain to being seen (not necessarily in
-     * the best chain). If you want to know when the transaction gets buried under another block, implement a
-     * {@link BlockChainListener}, attach it to a {@link BlockChain} and then use the getters on the
-     * confidence object to determine the new depth.</p>
+     * the best chain). If you want to know when the transaction gets buried under another block, implement
+     * {@link org.bitcoinj.core.listeners.NewBestBlockListener} and related listeners, attach them to a
+     * {@link BlockChain} and then use the getters on the confidence object to determine the new depth.</p>
      */
     public void addEventListener(Listener listener) {
         addEventListener(Threading.USER_THREAD, listener);
@@ -334,7 +341,10 @@ public synchronized String toString() {
         StringBuilder builder = new StringBuilder();
         int peers = numBroadcastPeers();
         if (peers > 0) {
-            builder.append("Seen by ").append(peers).append(peers > 1 ? " peers. " : " peer. ");
+            builder.append("Seen by ").append(peers).append(peers > 1 ? " peers" : " peer");
+            if (lastBroadcastedAt != null)
+                builder.append(" (most recently: ").append(Utils.dateTimeFormat(lastBroadcastedAt)).append(")");
+            builder.append(". ");
         }
         switch (getConfidenceType()) {
             case UNKNOWN:
@@ -354,6 +364,8 @@ public synchronized String toString() {
                         getAppearedAtChainHeight(), getDepthInBlocks()));
                 break;
         }
+        if (source != Source.UNKNOWN)
+            builder.append(" Source: ").append(source);
         return builder.toString();
     }
 
@@ -363,8 +375,11 @@ public synchronized String toString() {
      *
      * @return the new depth
      */
-    public synchronized int incrementDepthInBlocks() {
-        return ++this.depth;
+    public synchronized int incrementDepthInBlocks(int height) {
+        if (getAppearedAtChainHeight() != -1)
+            this.depth = height - getAppearedAtChainHeight() + 1;
+
+        return this.depth;
     }
 
     /**
@@ -457,7 +472,7 @@ public void run() {
     /**
      * The source of a transaction tries to identify where it came from originally. For instance, did we download it
      * from the peer to peer network, or make it ourselves, or receive it via Bluetooth, or import it from another app,
-     * and so on. This information is useful for {@link org.bitcoinj.wallet.CoinSelector} implementations to risk analyze
+     * and so on. This information is useful for {@link CoinSelector} implementations to risk analyze
      * transactions and decide when to spend them.
      */
     public synchronized Source getSource() {
@@ -467,7 +482,7 @@ public synchronized Source getSource() {
     /**
      * The source of a transaction tries to identify where it came from originally. For instance, did we download it
      * from the peer to peer network, or make it ourselves, or receive it via Bluetooth, or import it from another app,
-     * and so on. This information is useful for {@link org.bitcoinj.wallet.CoinSelector} implementations to risk analyze
+     * and so on. This information is useful for {@link CoinSelector} implementations to risk analyze
      * transactions and decide when to spend them.
      */
     public synchronized void setSource(Source source) {
diff --git a/core/src/main/java/org/bitcoinj/core/TransactionInput.java b/core/src/main/java/org/bitcoinj/core/TransactionInput.java
index 4b38e3c8238..d8c56742bb9 100644
--- a/core/src/main/java/org/bitcoinj/core/TransactionInput.java
+++ b/core/src/main/java/org/bitcoinj/core/TransactionInput.java
@@ -18,6 +18,7 @@
 package org.bitcoinj.core;
 
 import org.bitcoinj.script.Script;
+import org.bitcoinj.script.ScriptException;
 import org.bitcoinj.wallet.DefaultRiskAnalysis;
 import org.bitcoinj.wallet.KeyBag;
 import org.bitcoinj.wallet.RedeemData;
@@ -46,6 +47,21 @@
 public class TransactionInput extends ChildMessage {
     /** Magic sequence number that indicates there is no sequence number. */
     public static final long NO_SEQUENCE = 0xFFFFFFFFL;
+    /**
+     * BIP68: If this flag set, sequence is NOT interpreted as a relative lock-time.
+     */
+    public static final long SEQUENCE_LOCKTIME_DISABLE_FLAG = 1L << 31;
+    /**
+     * BIP68: If sequence encodes a relative lock-time and this flag is set, the relative lock-time has units of 512
+     * seconds, otherwise it specifies blocks with a granularity of 1.
+     */
+    public static final long SEQUENCE_LOCKTIME_TYPE_FLAG = 1L << 22;
+    /**
+     * BIP68: If sequence encodes a relative lock-time, this mask is applied to extract that lock-time from the sequence
+     * field.
+     */
+    public static final long SEQUENCE_LOCKTIME_MASK = 0x0000ffff;
+
     private static final byte[] EMPTY_ARRAY = new byte[0];
     // Magic outpoint index that indicates the input is in fact unconnected.
     private static final long UNCONNECTED = 0xFFFFFFFFL;
@@ -65,6 +81,8 @@ public class TransactionInput extends ChildMessage {
     @Nullable
     private Coin value;
 
+    private TransactionWitness witness;
+
     /**
      * Creates an input that connects to nothing - used only in creation of coinbase transactions.
      */
@@ -129,6 +147,17 @@ public TransactionInput(NetworkParameters params, Transaction parentTransaction,
         this.value = null;
     }
 
+    /**
+     * Gets the index of this input in the parent transaction, or throws if this input is free standing. Iterates
+     * over the parents list to discover this.
+     */
+    public int getIndex() {
+        final int myIndex = getParentTransaction().getInputs().indexOf(this);
+        if (myIndex < 0)
+            throw new IllegalStateException("Input linked to wrong parent transaction?");
+        return myIndex;
+    }
+
     @Override
     protected void parse() throws ProtocolException {
         outpoint = new TransactionOutPoint(params, payload, cursor, this, serializer);
@@ -165,32 +194,18 @@ public Script getScriptSig() throws ScriptException {
         Script script = scriptSig == null ? null : scriptSig.get();
         if (script == null) {
             script = new Script(scriptBytes);
-            scriptSig = new WeakReference<Script>(script);
+            scriptSig = new WeakReference<>(script);
         }
         return script;
     }
 
     /** Set the given program as the scriptSig that is supposed to satisfy the connected output script. */
     public void setScriptSig(Script scriptSig) {
-        this.scriptSig = new WeakReference<Script>(checkNotNull(scriptSig));
+        this.scriptSig = new WeakReference<>(checkNotNull(scriptSig));
         // TODO: This should all be cleaned up so we have a consistent internal representation.
         setScriptBytes(scriptSig.getProgram());
     }
 
-    /**
-     * Convenience method that returns the from address of this input by parsing the scriptSig. The concept of a
-     * "from address" is not well defined in Bitcoin and you should not assume that senders of a transaction can
-     * actually receive coins on the same address they used to sign (e.g. this is not true for shared wallets).
-     */
-    @Deprecated
-    public Address getFromAddress() throws ScriptException {
-        if (isCoinBase()) {
-            throw new ScriptException(
-                    "This is a coinbase transaction which generates new coins. It does not have a from address.");
-        }
-        return getScriptSig().getFromAddress(params);
-    }
-
     /**
      * Sequence numbers allow participants in a multi-party transaction signing protocol to create new versions of the
      * transaction independently of each other. Newer versions of a transaction can replace an existing version that's
@@ -263,6 +278,31 @@ public Coin getValue() {
         return value;
     }
 
+    /**
+     * Get the transaction witness of this input.
+     * 
+     * @return the witness of the input
+     */
+    public TransactionWitness getWitness() {
+        return witness != null ? witness : TransactionWitness.EMPTY;
+    }
+
+    /**
+     * Set the transaction witness of an input.
+     */
+    public void setWitness(TransactionWitness witness) {
+        this.witness = witness;
+    }
+
+    /**
+     * Determine if the transaction has witnesses.
+     * 
+     * @return true if the transaction has witnesses
+     */
+    public boolean hasWitness() {
+        return witness != null && witness.getPushCount() != 0;
+    }
+
     public enum ConnectionResult {
         NO_SUCH_TX,
         ALREADY_SPENT,
@@ -286,7 +326,7 @@ TransactionOutput getConnectedOutput(Map<Sha256Hash, Transaction> transactions)
 
     /**
      * Alias for getOutpoint().getConnectedRedeemData(keyBag)
-     * @see TransactionOutPoint#getConnectedRedeemData(org.bitcoinj.wallet.KeyBag)
+     * @see TransactionOutPoint#getConnectedRedeemData(KeyBag)
      */
     @Nullable
     public RedeemData getConnectedRedeemData(KeyBag keyBag) throws ScriptException {
@@ -304,7 +344,7 @@ public enum ConnectMode {
      * Connecting means updating the internal pointers and spent flags. If the mode is to ABORT_ON_CONFLICT then
      * the spent output won't be changed, but the outpoint.fromTx pointer will still be updated.
      *
-     * @param transactions Map of txhash->transaction.
+     * @param transactions Map of txhash to transaction.
      * @param mode   Whether to abort if there's a pre-existing connection or not.
      * @return NO_SUCH_TX if the prevtx wasn't found, ALREADY_SPENT if there was a conflict, SUCCESS if not.
      */
@@ -326,7 +366,7 @@ public ConnectionResult connect(Map<Sha256Hash, Transaction> transactions, Conne
      * @return NO_SUCH_TX if transaction is not the prevtx, ALREADY_SPENT if there was a conflict, SUCCESS if not.
      */
     public ConnectionResult connect(Transaction transaction, ConnectMode mode) {
-        if (!transaction.getHash().equals(outpoint.getHash()))
+        if (!transaction.getTxId().equals(outpoint.getHash()))
             return ConnectionResult.NO_SUCH_TX;
         checkElementIndex((int) outpoint.getIndex(), transaction.getOutputs().size(), "Corrupt transaction");
         TransactionOutput out = transaction.getOutput((int) outpoint.getIndex());
@@ -359,11 +399,23 @@ public void connect(TransactionOutput out) {
      * @return true if the disconnection took place, false if it was not connected.
      */
     public boolean disconnect() {
-        if (outpoint.fromTx == null) return false;
-        TransactionOutput output = outpoint.fromTx.getOutput((int) outpoint.getIndex());
-        if (output.getSpentBy() == this) {
-            output.markAsUnspent();
+        TransactionOutput connectedOutput;
+        if (outpoint.fromTx != null) {
+            // The outpoint is connected using a "standard" wallet, disconnect it.
+            connectedOutput = outpoint.fromTx.getOutput((int) outpoint.getIndex());
             outpoint.fromTx = null;
+        } else if (outpoint.connectedOutput != null) {
+            // The outpoint is connected using a UTXO based wallet, disconnect it.
+            connectedOutput = outpoint.connectedOutput;
+            outpoint.connectedOutput = null;
+        } else {
+            // The outpoint is not connected, do nothing.
+            return false;
+        }
+
+        if (connectedOutput != null && connectedOutput.getSpentBy() == this) {
+            // The outpoint was connected to an output, disconnect the output.
+            connectedOutput.markAsUnspent();
             return true;
         } else {
             return false;
@@ -385,6 +437,14 @@ public boolean isOptInFullRBF() {
         return sequence < NO_SEQUENCE - 1;
     }
 
+    /**
+     * Returns whether this input, if it belongs to a version 2 (or higher) transaction, has
+     * <a href="https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki">relative lock-time</a> enabled.
+     */
+    public boolean hasRelativeLockTime() {
+        return (sequence & SEQUENCE_LOCKTIME_DISABLE_FLAG) == 0;
+    }
+
     /**
      * For a connected transaction, runs the script against the connected pubkey and verifies they are correct.
      * @throws ScriptException if the script did not verify.
@@ -408,14 +468,14 @@ public void verify() throws VerificationException {
      */
     public void verify(TransactionOutput output) throws VerificationException {
         if (output.parent != null) {
-            if (!getOutpoint().getHash().equals(output.getParentTransaction().getHash()))
+            if (!getOutpoint().getHash().equals(output.getParentTransaction().getTxId()))
                 throw new VerificationException("This input does not refer to the tx containing the output.");
             if (getOutpoint().getIndex() != output.getIndex())
                 throw new VerificationException("This input refers to a different output on the given tx.");
         }
         Script pubKey = output.getScriptPubKey();
-        int myIndex = getParentTransaction().getInputs().indexOf(this);
-        getScriptSig().correctlySpends(getParentTransaction(), myIndex, pubKey);
+        getScriptSig().correctlySpends(getParentTransaction(), getIndex(), getWitness(), getValue(), pubKey,
+                Script.ALL_VERIFY_FLAGS);
     }
 
     /**
@@ -448,7 +508,7 @@ public TransactionInput duplicateDetached() {
      * The "IsStandard" rules control whether the default Bitcoin Core client blocks relay of a tx / refuses to mine it,
      * however, non-standard transactions can still be included in blocks and will be accepted as valid if so.</p>
      *
-     * <p>This method simply calls <tt>DefaultRiskAnalysis.isInputStandard(this)</tt>.</p>
+     * <p>This method simply calls {@code DefaultRiskAnalysis.isInputStandard(this)}.</p>
      */
     public DefaultRiskAnalysis.RuleViolation isStandard() {
         return DefaultRiskAnalysis.isInputStandard(this);
@@ -479,7 +539,7 @@ public String toString() {
                 s.append(": COINBASE");
             } else {
                 s.append(" for [").append(outpoint).append("]: ").append(getScriptSig());
-                String flags = Joiner.on(", ").skipNulls().join(
+                String flags = Joiner.on(", ").skipNulls().join(hasWitness() ? "witness" : null,
                         hasSequence() ? "sequence: " + Long.toHexString(sequence) : null,
                         isOptInFullRBF() ? "opts into full RBF" : null);
                 if (!flags.isEmpty())
diff --git a/core/src/main/java/org/bitcoinj/core/TransactionOutPoint.java b/core/src/main/java/org/bitcoinj/core/TransactionOutPoint.java
index 2ddfe5f13bf..7f3239bc4e0 100644
--- a/core/src/main/java/org/bitcoinj/core/TransactionOutPoint.java
+++ b/core/src/main/java/org/bitcoinj/core/TransactionOutPoint.java
@@ -44,13 +44,13 @@ public class TransactionOutPoint extends ChildMessage {
     Transaction fromTx;
 
     // The connected output.
-    private TransactionOutput connectedOutput;
+    TransactionOutput connectedOutput;
 
     public TransactionOutPoint(NetworkParameters params, long index, @Nullable Transaction fromTx) {
         super(params);
         this.index = index;
         if (fromTx != null) {
-            this.hash = fromTx.getHash();
+            this.hash = fromTx.getTxId();
             this.fromTx = fromTx;
         } else {
             // This happens when constructing the genesis block.
@@ -129,8 +129,8 @@ public byte[] getConnectedPubKeyScript() {
     }
 
     /**
-     * Returns the ECKey identified in the connected output, for either pay-to-address scripts or pay-to-key scripts.
-     * For P2SH scripts you can use {@link #getConnectedRedeemData(org.bitcoinj.wallet.KeyBag)} and then get the
+     * Returns the ECKey identified in the connected output, for either P2PKH, P2WPKH or P2PK scripts.
+     * For P2SH scripts you can use {@link #getConnectedRedeemData(KeyBag)} and then get the
      * key from RedeemData.
      * If the script form cannot be understood, throws ScriptException.
      *
@@ -141,19 +141,22 @@ public ECKey getConnectedKey(KeyBag keyBag) throws ScriptException {
         TransactionOutput connectedOutput = getConnectedOutput();
         checkNotNull(connectedOutput, "Input is not connected so cannot retrieve key");
         Script connectedScript = connectedOutput.getScriptPubKey();
-        if (connectedScript.isSentToAddress()) {
-            byte[] addressBytes = connectedScript.getPubKeyHash();
-            return keyBag.findKeyFromPubHash(addressBytes);
-        } else if (connectedScript.isSentToRawPubKey()) {
-            byte[] pubkeyBytes = connectedScript.getPubKey();
+        if (ScriptPattern.isP2PKH(connectedScript)) {
+            byte[] addressBytes = ScriptPattern.extractHashFromP2PKH(connectedScript);
+            return keyBag.findKeyFromPubKeyHash(addressBytes, Script.ScriptType.P2PKH);
+        } else if (ScriptPattern.isP2WPKH(connectedScript)) {
+            byte[] addressBytes = ScriptPattern.extractHashFromP2WH(connectedScript);
+            return keyBag.findKeyFromPubKeyHash(addressBytes, Script.ScriptType.P2WPKH);
+        } else if (ScriptPattern.isP2PK(connectedScript)) {
+            byte[] pubkeyBytes = ScriptPattern.extractKeyFromP2PK(connectedScript);
             return keyBag.findKeyFromPubKey(pubkeyBytes);
         } else {
-            throw new ScriptException("Could not understand form of connected output script: " + connectedScript);
+            throw new ScriptException(ScriptError.SCRIPT_ERR_UNKNOWN_ERROR, "Could not understand form of connected output script: " + connectedScript);
         }
     }
 
     /**
-     * Returns the RedeemData identified in the connected output, for either pay-to-address scripts, pay-to-key
+     * Returns the RedeemData identified in the connected output, for either P2PKH, P2WPKH, P2PK
      * or P2SH scripts.
      * If the script forms cannot be understood, throws ScriptException.
      *
@@ -164,17 +167,20 @@ public RedeemData getConnectedRedeemData(KeyBag keyBag) throws ScriptException {
         TransactionOutput connectedOutput = getConnectedOutput();
         checkNotNull(connectedOutput, "Input is not connected so cannot retrieve key");
         Script connectedScript = connectedOutput.getScriptPubKey();
-        if (connectedScript.isSentToAddress()) {
-            byte[] addressBytes = connectedScript.getPubKeyHash();
-            return RedeemData.of(keyBag.findKeyFromPubHash(addressBytes), connectedScript);
-        } else if (connectedScript.isSentToRawPubKey()) {
-            byte[] pubkeyBytes = connectedScript.getPubKey();
+        if (ScriptPattern.isP2PKH(connectedScript)) {
+            byte[] addressBytes = ScriptPattern.extractHashFromP2PKH(connectedScript);
+            return RedeemData.of(keyBag.findKeyFromPubKeyHash(addressBytes, Script.ScriptType.P2PKH), connectedScript);
+        } else if (ScriptPattern.isP2WPKH(connectedScript)) {
+            byte[] addressBytes = ScriptPattern.extractHashFromP2WH(connectedScript);
+            return RedeemData.of(keyBag.findKeyFromPubKeyHash(addressBytes, Script.ScriptType.P2WPKH), connectedScript);
+        } else if (ScriptPattern.isP2PK(connectedScript)) {
+            byte[] pubkeyBytes = ScriptPattern.extractKeyFromP2PK(connectedScript);
             return RedeemData.of(keyBag.findKeyFromPubKey(pubkeyBytes), connectedScript);
-        } else if (connectedScript.isPayToScriptHash()) {
-            byte[] scriptHash = connectedScript.getPubKeyHash();
+        } else if (ScriptPattern.isP2SH(connectedScript)) {
+            byte[] scriptHash = ScriptPattern.extractHashFromP2SH(connectedScript);
             return keyBag.findRedeemDataFromScriptHash(scriptHash);
         } else {
-            throw new ScriptException("Could not understand form of connected output script: " + connectedScript);
+            throw new ScriptException(ScriptError.SCRIPT_ERR_UNKNOWN_ERROR, "Could not understand form of connected output script: " + connectedScript);
         }
     }
 
diff --git a/core/src/main/java/org/bitcoinj/core/TransactionOutput.java b/core/src/main/java/org/bitcoinj/core/TransactionOutput.java
index 0a9facf0d1c..1a379047c86 100644
--- a/core/src/main/java/org/bitcoinj/core/TransactionOutput.java
+++ b/core/src/main/java/org/bitcoinj/core/TransactionOutput.java
@@ -24,7 +24,8 @@
 
 import javax.annotation.*;
 import java.io.*;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
 
 import static com.google.common.base.Preconditions.*;
 
@@ -95,7 +96,7 @@ public TransactionOutput(NetworkParameters params, @Nullable Transaction parent,
      * {@link Transaction#addOutput(Coin, ECKey)} instead of creating an output directly.
      */
     public TransactionOutput(NetworkParameters params, @Nullable Transaction parent, Coin value, ECKey to) {
-        this(params, parent, value, ScriptBuilder.createOutputScript(to).getProgram());
+        this(params, parent, value, ScriptBuilder.createP2PKOutputScript(to).getProgram());
     }
 
     public TransactionOutput(NetworkParameters params, @Nullable Transaction parent, Coin value, byte[] scriptBytes) {
@@ -118,40 +119,20 @@ public Script getScriptPubKey() throws ScriptException {
         return scriptPubKey;
     }
 
-    /**
-     * <p>If the output script pays to an address as in <a href="https://bitcoin.org/en/developer-guide#term-p2pkh">
-     * P2PKH</a>, return the address of the receiver, i.e., a base58 encoded hash of the public key in the script. </p>
-     *
-     * @param networkParameters needed to specify an address
-     * @return null, if the output script is not the form <i>OP_DUP OP_HASH160 <PubkeyHash> OP_EQUALVERIFY OP_CHECKSIG</i>,
-     * i.e., not P2PKH
-     * @return an address made out of the public key hash
-     */
     @Nullable
-    public Address getAddressFromP2PKHScript(NetworkParameters networkParameters) throws ScriptException{
-        if (getScriptPubKey().isSentToAddress())
-            return getScriptPubKey().getToAddress(networkParameters);
-
+    @Deprecated
+    public LegacyAddress getAddressFromP2PKHScript(NetworkParameters params) throws ScriptException {
+        if (ScriptPattern.isP2PKH(getScriptPubKey()))
+            return LegacyAddress.fromPubKeyHash(params,
+                    ScriptPattern.extractHashFromP2PKH(getScriptPubKey()));
         return null;
     }
 
-    /**
-     * <p>If the output script pays to a redeem script, return the address of the redeem script as described by,
-     * i.e., a base58 encoding of [one-byte version][20-byte hash][4-byte checksum], where the 20-byte hash refers to
-     * the redeem script.</p>
-     *
-     * <p>P2SH is described by <a href="https://github.com/bitcoin/bips/blob/master/bip-0016.mediawiki">BIP 16</a> and
-     * <a href="https://bitcoin.org/en/developer-guide#p2sh-scripts">documented in the Bitcoin Developer Guide</a>.</p>
-     *
-     * @param networkParameters needed to specify an address
-     * @return null if the output script does not pay to a script hash
-     * @return an address that belongs to the redeem script
-     */
     @Nullable
-    public Address getAddressFromP2SH(NetworkParameters networkParameters) throws ScriptException{
-        if (getScriptPubKey().isPayToScriptHash())
-            return getScriptPubKey().getToAddress(networkParameters);
-
+    @Deprecated
+    public LegacyAddress getAddressFromP2SH(NetworkParameters params) throws ScriptException {
+        if (ScriptPattern.isP2SH(getScriptPubKey()))
+            return LegacyAddress.fromScriptHash(params, ScriptPattern.extractHashFromP2SH(getScriptPubKey()));
         return null;
     }
 
@@ -211,7 +192,7 @@ public int getIndex() {
      */
     public boolean isDust() {
         // Transactions that are OP_RETURN can't be dust regardless of their value.
-        if (getScriptPubKey().isOpReturn())
+        if (ScriptPattern.isOpReturn(getScriptPubKey()))
             return false;
         return getValue().isLessThan(getMinNonDustValue());
     }
@@ -223,7 +204,7 @@ public boolean isDust() {
      * so we call them "dust outputs" and they're made non standard. The choice of one third is somewhat arbitrary and
      * may change in future.</p>
      *
-     * <p>You probably should use {@link org.bitcoinj.core.TransactionOutput#getMinNonDustValue()} which uses
+     * <p>You probably should use {@link TransactionOutput#getMinNonDustValue()} which uses
      * a safe fee-per-kb by default.</p>
      *
      * @param feePerKb The fee required per kilobyte. Note that this is the same as Bitcoin Core's -minrelaytxfee * 3
@@ -231,7 +212,7 @@ public boolean isDust() {
     public Coin getMinNonDustValue(Coin feePerKb) {
         // A typical output is 33 bytes (pubkey hash + opcodes) and requires an input of 148 bytes to spend so we add
         // that together to find out the total amount of data used to transfer this amount of value. Note that this
-        // formula is wrong for anything that's not a pay-to-address output, unfortunately, we must follow Bitcoin Core's
+        // formula is wrong for anything that's not a P2PKH output, unfortunately, we must follow Bitcoin Core's
         // wrongness in order to ensure we're considered standard. A better formula would either estimate the
         // size of data needed to satisfy all different script types, or just hard code 33 below.
         final long size = this.unsafeBitcoinSerialize().length + 148;
@@ -320,18 +301,22 @@ public boolean isWatched(TransactionBag transactionBag) {
     public boolean isMine(TransactionBag transactionBag) {
         try {
             Script script = getScriptPubKey();
-            if (script.isSentToRawPubKey()) {
-                byte[] pubkey = script.getPubKey();
-                return transactionBag.isPubKeyMine(pubkey);
-            } if (script.isPayToScriptHash()) {
-                return transactionBag.isPayToScriptHashMine(script.getPubKeyHash());
-            } else {
-                byte[] pubkeyHash = script.getPubKeyHash();
-                return transactionBag.isPubKeyHashMine(pubkeyHash);
-            }
+            if (ScriptPattern.isP2PK(script))
+                return transactionBag.isPubKeyMine(ScriptPattern.extractKeyFromP2PK(script));
+            else if (ScriptPattern.isP2SH(script))
+                return transactionBag.isPayToScriptHashMine(ScriptPattern.extractHashFromP2SH(script));
+            else if (ScriptPattern.isP2PKH(script))
+                return transactionBag.isPubKeyHashMine(ScriptPattern.extractHashFromP2PKH(script),
+                        Script.ScriptType.P2PKH);
+            else if (ScriptPattern.isP2WPKH(script))
+                return transactionBag.isPubKeyHashMine(ScriptPattern.extractHashFromP2WH(script),
+                        Script.ScriptType.P2WPKH);
+            else
+                return false;
         } catch (ScriptException e) {
             // Just means we didn't understand the output of this transaction: ignore it.
-            log.debug("Could not parse tx output script: {}", e.toString());
+            log.debug("Could not parse tx {} output script: {}",
+                    parent != null ? ((Transaction) parent).getTxId() : "(no parent)", e.toString());
             return false;
         }
     }
@@ -345,11 +330,12 @@ public String toString() {
             Script script = getScriptPubKey();
             StringBuilder buf = new StringBuilder("TxOut of ");
             buf.append(Coin.valueOf(value).toFriendlyString());
-            if (script.isSentToAddress() || script.isPayToScriptHash())
+            if (ScriptPattern.isP2PKH(script) || ScriptPattern.isP2WPKH(script)
+                    || ScriptPattern.isP2SH(script))
                 buf.append(" to ").append(script.getToAddress(params));
-            else if (script.isSentToRawPubKey())
-                buf.append(" to pubkey ").append(Utils.HEX.encode(script.getPubKey()));
-            else if (script.isSentToMultiSig())
+            else if (ScriptPattern.isP2PK(script))
+                buf.append(" to pubkey ").append(Utils.HEX.encode(ScriptPattern.extractKeyFromP2PK(script)));
+            else if (ScriptPattern.isSentToMultisig(script))
                 buf.append(" to multisig");
             else
                 buf.append(" (unknown type)");
@@ -381,7 +367,7 @@ public Transaction getParentTransaction() {
      */
     @Nullable
     public Sha256Hash getParentTransactionHash() {
-        return parent == null ? null : parent.getHash();
+        return parent == null ? null : ((Transaction) parent).getTxId();
     }
 
     /**
@@ -411,7 +397,7 @@ public TransactionOutPoint getOutPointFor() {
 
     /** Returns a copy of the output detached from its containing transaction, if need be. */
     public TransactionOutput duplicateDetached() {
-        return new TransactionOutput(params, null, Coin.valueOf(value), org.spongycastle.util.Arrays.clone(scriptBytes));
+        return new TransactionOutput(params, null, Coin.valueOf(value), Arrays.copyOf(scriptBytes, scriptBytes.length));
     }
 
     @Override
@@ -419,8 +405,8 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         TransactionOutput other = (TransactionOutput) o;
-        return value == other.value && (parent == null || parent == other.parent)
-            && Arrays.equals(scriptBytes, other.scriptBytes);
+        return value == other.value && (parent == null || (parent == other.parent && getIndex() == other.getIndex()))
+                && Arrays.equals(scriptBytes, other.scriptBytes);
     }
 
     @Override
diff --git a/core/src/main/java/org/bitcoinj/core/TransactionOutputChanges.java b/core/src/main/java/org/bitcoinj/core/TransactionOutputChanges.java
index d006795ed49..431dedcd570 100644
--- a/core/src/main/java/org/bitcoinj/core/TransactionOutputChanges.java
+++ b/core/src/main/java/org/bitcoinj/core/TransactionOutputChanges.java
@@ -38,38 +38,26 @@ public TransactionOutputChanges(List<UTXO> txOutsCreated, List<UTXO> txOutsSpent
     }
     
     public TransactionOutputChanges(InputStream in) throws IOException {
-        int numOutsCreated = (in.read() & 0xFF) |
-                             ((in.read() & 0xFF) << 8) |
-                             ((in.read() & 0xFF) << 16) |
-                             ((in.read() & 0xFF) << 24);
-        txOutsCreated = new LinkedList<UTXO>();
+        int numOutsCreated = (int) Utils.readUint32FromStream(in);
+        txOutsCreated = new LinkedList<>();
         for (int i = 0; i < numOutsCreated; i++)
             txOutsCreated.add(new UTXO(in));
         
-        int numOutsSpent = (in.read() & 0xFF) |
-                           ((in.read() & 0xFF) << 8) |
-                           ((in.read() & 0xFF) << 16) |
-                           ((in.read() & 0xFF) << 24);
-        txOutsSpent = new LinkedList<UTXO>();
+        int numOutsSpent = (int) Utils.readUint32FromStream(in);
+        txOutsSpent = new LinkedList<>();
         for (int i = 0; i < numOutsSpent; i++)
             txOutsSpent.add(new UTXO(in));
     }
 
     public void serializeToStream(OutputStream bos) throws IOException {
         int numOutsCreated = txOutsCreated.size();
-        bos.write(0xFF & numOutsCreated);
-        bos.write(0xFF & (numOutsCreated >> 8));
-        bos.write(0xFF & (numOutsCreated >> 16));
-        bos.write(0xFF & (numOutsCreated >> 24));
+        Utils.uint32ToByteStreamLE(numOutsCreated, bos);
         for (UTXO output : txOutsCreated) {
             output.serializeToStream(bos);
         }
         
         int numOutsSpent = txOutsSpent.size();
-        bos.write(0xFF & numOutsSpent);
-        bos.write(0xFF & (numOutsSpent >> 8));
-        bos.write(0xFF & (numOutsSpent >> 16));
-        bos.write(0xFF & (numOutsSpent >> 24));
+        Utils.uint32ToByteStreamLE(numOutsSpent, bos);
         for (UTXO output : txOutsSpent) {
             output.serializeToStream(bos);
         }
diff --git a/core/src/main/java/org/bitcoinj/core/TransactionWitness.java b/core/src/main/java/org/bitcoinj/core/TransactionWitness.java
new file mode 100644
index 00000000000..e9808397f7b
--- /dev/null
+++ b/core/src/main/java/org/bitcoinj/core/TransactionWitness.java
@@ -0,0 +1,125 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bitcoinj.core;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.bitcoinj.crypto.TransactionSignature;
+import org.bitcoinj.script.Script;
+
+public class TransactionWitness {
+    public static final TransactionWitness EMPTY = new TransactionWitness(0);
+
+    /**
+     * Creates the stack pushes necessary to redeem a P2WPKH output. If given signature is null, an empty push will be
+     * used as a placeholder.
+     */
+    public static TransactionWitness redeemP2WPKH(@Nullable TransactionSignature signature, ECKey pubKey) {
+        checkArgument(pubKey.isCompressed(), "only compressed keys allowed");
+        TransactionWitness witness = new TransactionWitness(2);
+        witness.setPush(0, signature != null ? signature.encodeToBitcoin() : new byte[0]); // signature
+        witness.setPush(1, pubKey.getPubKey()); // pubkey
+        return witness;
+    }
+
+    /**
+     * Creates the stack pushes necessary to redeem a P2WSH output.
+     */
+    public static TransactionWitness redeemP2WSH(Script witnessScript, TransactionSignature... signatures) {
+        TransactionWitness witness = new TransactionWitness(signatures.length + 2);
+        witness.setPush(0, new byte[]{});
+        int i;
+        for (i = 0; i < signatures.length; i++) {
+            witness.setPush(i + 1, signatures[i].encodeToBitcoin());
+        }
+        witness.setPush(i + 1, witnessScript.getProgram());
+        return witness;
+    }
+
+    private final List<byte[]> pushes;
+
+    public TransactionWitness(int pushCount) {
+        pushes = new ArrayList<>(Math.min(pushCount, Utils.MAX_INITIAL_ARRAY_LENGTH));
+    }
+
+    public byte[] getPush(int i) {
+        return pushes.get(i);
+    }
+
+    public int getPushCount() {
+        return pushes.size();
+    }
+
+    public void setPush(int i, byte[] value) {
+        while (i >= pushes.size()) {
+            pushes.add(new byte[]{});
+        }
+        pushes.set(i, value);
+    }
+
+    protected void bitcoinSerializeToStream(OutputStream stream) throws IOException {
+        stream.write(new VarInt(pushes.size()).encode());
+        for (int i = 0; i < pushes.size(); i++) {
+            byte[] push = pushes.get(i);
+            stream.write(new VarInt(push.length).encode());
+            stream.write(push);
+        }
+    }
+
+    @Override
+    public String toString() {
+        List<String> stringPushes = new ArrayList<>();
+        for (int j = 0; j < this.getPushCount(); j++) {
+            byte[] push = this.getPush(j);
+            if (push == null) {
+                stringPushes.add("NULL");
+            } else if (push.length == 0) {
+                stringPushes.add("EMPTY");
+            } else {
+                stringPushes.add(Utils.HEX.encode(push));
+            }
+        }
+        return Utils.SPACE_JOINER.join(stringPushes);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        TransactionWitness other = (TransactionWitness) o;
+        if (pushes.size() != other.pushes.size()) return false;
+        for (int i = 0; i < pushes.size(); i++) {
+            if (!Arrays.equals(pushes.get(i), other.pushes.get(i))) return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int hashCode = 1;
+        for (byte[] push : pushes) {
+            hashCode = 31 * hashCode + (push == null ? 0 : Arrays.hashCode(push));
+        }
+        return hashCode;
+    }
+}
diff --git a/core/src/main/java/org/bitcoinj/core/TxConfidenceTable.java b/core/src/main/java/org/bitcoinj/core/TxConfidenceTable.java
index cb2c4a3b362..f4748b4fad6 100644
--- a/core/src/main/java/org/bitcoinj/core/TxConfidenceTable.java
+++ b/core/src/main/java/org/bitcoinj/core/TxConfidenceTable.java
@@ -46,7 +46,8 @@ public WeakConfidenceReference(TransactionConfidence confidence, ReferenceQueue<
             hash = confidence.getTransactionHash();
         }
     }
-    private LinkedHashMap<Sha256Hash, WeakConfidenceReference> table;
+    private final Map<Sha256Hash, WeakConfidenceReference> table;
+    private final TransactionConfidence.Factory confidenceFactory;
 
     // This ReferenceQueue gets entries added to it when they are only weakly reachable, ie, the TxConfidenceTable is the
     // only thing that is tracking the confidence data anymore. We check it from time to time and delete table entries
@@ -64,6 +65,10 @@ public WeakConfidenceReference(TransactionConfidence confidence, ReferenceQueue<
      * @param size Max number of transactions to track. The table will fill up to this size then stop growing.
      */
     public TxConfidenceTable(final int size) {
+        this(size, new TransactionConfidence.Factory());
+    }
+
+    TxConfidenceTable(final int size, TransactionConfidence.Factory confidenceFactory){
         table = new LinkedHashMap<Sha256Hash, WeakConfidenceReference>() {
             @Override
             protected boolean removeEldestEntry(Map.Entry<Sha256Hash, WeakConfidenceReference> entry) {
@@ -72,7 +77,8 @@ protected boolean removeEldestEntry(Map.Entry<Sha256Hash, WeakConfidenceReferenc
                 return size() > size;
             }
         };
-        referenceQueue = new ReferenceQueue<TransactionConfidence>();
+        referenceQueue = new ReferenceQueue<>();
+        this.confidenceFactory = confidenceFactory;
     }
 
     /**
@@ -131,7 +137,7 @@ public int numBroadcastPeers(Sha256Hash txHash) {
 
     /**
      * Called by peers when they see a transaction advertised in an "inv" message. It passes the data on to the relevant
-     * {@link org.bitcoinj.core.TransactionConfidence} object, creating it if needed.
+     * {@link TransactionConfidence} object, creating it if needed.
      *
      * @return the number of peers that have now announced this hash (including the caller)
      */
@@ -139,12 +145,13 @@ public TransactionConfidence seen(Sha256Hash hash, PeerAddress byPeer) {
         TransactionConfidence confidence;
         boolean fresh = false;
         lock.lock();
-        {
+        try {
             cleanTable();
             confidence = getOrCreate(hash);
             fresh = confidence.markBroadcastBy(byPeer);
+        } finally {
+            lock.unlock();
         }
-        lock.unlock();
         if (fresh)
             confidence.queueListeners(TransactionConfidence.Listener.ChangeReason.SEEN_PEERS);
         return confidence;
@@ -164,7 +171,7 @@ public TransactionConfidence getOrCreate(Sha256Hash hash) {
                 if (confidence != null)
                     return confidence;
             }
-            TransactionConfidence newConfidence = new TransactionConfidence(hash);
+            TransactionConfidence newConfidence = confidenceFactory.createConfidence(hash);
             table.put(hash, new WeakConfidenceReference(newConfidence, referenceQueue));
             return newConfidence;
         } finally {
diff --git a/core/src/main/java/org/bitcoinj/core/UTXO.java b/core/src/main/java/org/bitcoinj/core/UTXO.java
index 5012bd00cac..292854d40e6 100644
--- a/core/src/main/java/org/bitcoinj/core/UTXO.java
+++ b/core/src/main/java/org/bitcoinj/core/UTXO.java
@@ -30,7 +30,9 @@
  * It avoids having to store the entire parentTransaction just to get the hash and index.
  * Useful when working with free standing outputs.
  */
-public class UTXO {
+public class UTXO implements Serializable {
+
+    private static final long serialVersionUID = 4736241649298988166L;
 
     private Coin value;
     private Script script;
@@ -86,38 +88,7 @@ public UTXO(Sha256Hash hash,
     }
 
     public UTXO(InputStream in) throws IOException {
-        byte[] valueBytes = new byte[8];
-        if (in.read(valueBytes, 0, 8) != 8)
-            throw new EOFException();
-        value = Coin.valueOf(Utils.readInt64(valueBytes, 0));
-
-        int scriptBytesLength = ((in.read() & 0xFF)) |
-                ((in.read() & 0xFF) << 8) |
-                ((in.read() & 0xFF) << 16) |
-                ((in.read() & 0xFF) << 24);
-        byte[] scriptBytes = new byte[scriptBytesLength];
-        if (in.read(scriptBytes) != scriptBytesLength)
-            throw new EOFException();
-        script = new Script(scriptBytes);
-
-        byte[] hashBytes = new byte[32];
-        if (in.read(hashBytes) != 32)
-            throw new EOFException();
-        hash = Sha256Hash.wrap(hashBytes);
-
-        byte[] indexBytes = new byte[4];
-        if (in.read(indexBytes) != 4)
-            throw new EOFException();
-        index = Utils.readUint32(indexBytes, 0);
-
-        height = ((in.read() & 0xFF)) |
-                ((in.read() & 0xFF) << 8) |
-                ((in.read() & 0xFF) << 16) |
-                ((in.read() & 0xFF) << 24);
-
-        byte[] coinbaseByte = new byte[1];
-        in.read(coinbaseByte);
-        coinbase = coinbaseByte[0] == 1;
+        deserializeFromStream(in);
     }
 
     /** The value which this Transaction output holds. */
@@ -175,22 +146,50 @@ public boolean equals(Object o) {
 
     public void serializeToStream(OutputStream bos) throws IOException {
         Utils.uint64ToByteStreamLE(BigInteger.valueOf(value.value), bos);
-
         byte[] scriptBytes = script.getProgram();
-        bos.write(0xFF & scriptBytes.length);
-        bos.write(0xFF & scriptBytes.length >> 8);
-        bos.write(0xFF & (scriptBytes.length >> 16));
-        bos.write(0xFF & (scriptBytes.length >> 24));
+        Utils.uint32ToByteStreamLE(scriptBytes.length, bos);
         bos.write(scriptBytes);
-
         bos.write(hash.getBytes());
         Utils.uint32ToByteStreamLE(index, bos);
+        Utils.uint32ToByteStreamLE(height, bos);
+        bos.write(new byte[] { (byte)(coinbase ? 1 : 0) });
+    }
 
-        bos.write(0xFF & (height));
-        bos.write(0xFF & (height >> 8));
-        bos.write(0xFF & (height >> 16));
-        bos.write(0xFF & (height >> 24));
+    public void deserializeFromStream(InputStream in) throws IOException {
+        byte[] valueBytes = new byte[8];
+        if (in.read(valueBytes, 0, 8) != 8)
+            throw new EOFException();
+        value = Coin.valueOf(Utils.readInt64(valueBytes, 0));
 
-        bos.write(new byte[] { (byte)(coinbase ? 1 : 0) });
+        int scriptBytesLength = (int) Utils.readUint32FromStream(in);
+        byte[] scriptBytes = new byte[scriptBytesLength];
+        if (in.read(scriptBytes) != scriptBytesLength)
+            throw new EOFException();
+        script = new Script(scriptBytes);
+
+        byte[] hashBytes = new byte[32];
+        if (in.read(hashBytes) != 32)
+            throw new EOFException();
+        hash = Sha256Hash.wrap(hashBytes);
+
+        byte[] indexBytes = new byte[4];
+        if (in.read(indexBytes) != 4)
+            throw new EOFException();
+        index = Utils.readUint32(indexBytes, 0);
+
+        height = (int) Utils.readUint32FromStream(in);
+
+        byte[] coinbaseByte = new byte[1];
+        in.read(coinbaseByte);
+        coinbase = coinbaseByte[0] == 1;
+    }
+    
+    
+    private void writeObject(ObjectOutputStream o) throws IOException {
+        serializeToStream(o);
     }
+          
+    private void readObject(ObjectInputStream o) throws IOException, ClassNotFoundException {
+        deserializeFromStream(o);
+    }        
 }
diff --git a/core/src/main/java/org/bitcoinj/core/UTXOProvider.java b/core/src/main/java/org/bitcoinj/core/UTXOProvider.java
index aa7fdbaaf2f..2bfb837ab3b 100644
--- a/core/src/main/java/org/bitcoinj/core/UTXOProvider.java
+++ b/core/src/main/java/org/bitcoinj/core/UTXOProvider.java
@@ -16,29 +16,29 @@
 
 package org.bitcoinj.core;
 
+import org.bitcoinj.store.FullPrunedBlockStore;
+
 import java.util.List;
 
 /**
  * A UTXOProvider encapsulates functionality for returning unspent transaction outputs,
  * for use by the wallet or other code that crafts spends.
  *
- * <p>A {@link org.bitcoinj.store.FullPrunedBlockStore} is an internal implementation within bitcoinj.</p>
+ * <p>A {@link FullPrunedBlockStore} is an internal implementation within bitcoinj.</p>
  */
 public interface UTXOProvider {
-
-    // TODO currently the access to outputs is by address. Change to ECKey
     /**
-     * Get the list of {@link UTXO}'s for a given address.
-     * @param addresses List of address.
+     * Get the list of {@link UTXO}'s for given keys.
+     * @param keys List of keys.
      * @return The list of transaction outputs.
      * @throws UTXOProviderException If there is an error.
      */
-    List<UTXO> getOpenTransactionOutputs(List<Address> addresses) throws UTXOProviderException;
+    List<UTXO> getOpenTransactionOutputs(List<ECKey> keys) throws UTXOProviderException;
 
     /**
      * Get the height of the chain head.
      * @return The chain head height.
-     * @throws UTXOProvider If there is an error.
+     * @throws UTXOProviderException If there is an error.
      */
     int getChainHeadHeight() throws UTXOProviderException;
 
diff --git a/core/src/main/java/org/bitcoinj/core/UTXOsMessage.java b/core/src/main/java/org/bitcoinj/core/UTXOsMessage.java
index 6b04c42f143..35a60965ae9 100644
--- a/core/src/main/java/org/bitcoinj/core/UTXOsMessage.java
+++ b/core/src/main/java/org/bitcoinj/core/UTXOsMessage.java
@@ -17,6 +17,8 @@
 package org.bitcoinj.core;
 
 import com.google.common.base.Objects;
+import org.bitcoinj.net.discovery.HttpDiscovery;
+
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
@@ -28,7 +30,7 @@
  * {@link GetUTXOsMessage} ("getutxos"). Note that both this message and the query that generates it are not
  * supported by Bitcoin Core. An implementation is available in <a href="https://github.com/bitcoinxt/bitcoinxt">Bitcoin XT</a>,
  * a patch set on top of Core. Thus if you want to use it, you must find some XT peers to connect to. This can be done
- * using a {@link org.bitcoinj.net.discovery.HttpDiscovery} class combined with an HTTP/Cartographer seed.</p>
+ * using a {@link HttpDiscovery} class combined with an HTTP/Cartographer seed.</p>
  *
  * <p>The getutxos/utxos protocol is defined in <a href="https://github.com/bitcoin/bips/blob/master/bip-0065.mediawiki">BIP 65</a>.
  * In that document you can find a discussion of the security of this protocol (briefly, there is none). Because the
@@ -67,7 +69,7 @@ public UTXOsMessage(NetworkParameters params, List<TransactionOutput> outputs, l
             if (outputs.get(i) != null)
                 Utils.setBitLE(hits, i);
         }
-        this.outputs = new ArrayList<TransactionOutput>(outputs.size());
+        this.outputs = new ArrayList<>(outputs.size());
         for (TransactionOutput output : outputs) {
             if (output != null) this.outputs.add(output);
         }
@@ -111,7 +113,7 @@ protected void parse() throws ProtocolException {
         int numOuts = (int) readVarInt();
         if (numOuts < 0 || numOuts > InventoryMessage.MAX_INVENTORY_ITEMS)
             throw new ProtocolException("numOuts out of range: " + numOuts);
-        outputs = new ArrayList<TransactionOutput>(numOuts);
+        outputs = new ArrayList<>(numOuts);
         heights = new long[numOuts];
         for (int i = 0; i < numOuts; i++) {
             long version = readUint32();
@@ -135,7 +137,7 @@ public byte[] getHitMap() {
 
     /** Returns the list of outputs that matched the query. */
     public List<TransactionOutput> getOutputs() {
-        return new ArrayList<TransactionOutput>(outputs);
+        return new ArrayList<>(outputs);
     }
 
     /** Returns the block heights of each output returned in getOutputs(), or MEMPOOL_HEIGHT if not confirmed yet. */
diff --git a/core/src/main/java/org/bitcoinj/core/UnsafeByteArrayOutputStream.java b/core/src/main/java/org/bitcoinj/core/UnsafeByteArrayOutputStream.java
index e6dd0214986..726300a84b2 100644
--- a/core/src/main/java/org/bitcoinj/core/UnsafeByteArrayOutputStream.java
+++ b/core/src/main/java/org/bitcoinj/core/UnsafeByteArrayOutputStream.java
@@ -21,12 +21,12 @@
 import java.io.OutputStream;
 
 /**
- * An unsynchronized implementation of ByteArrayOutputStream that will return the backing byte array if its length == size().
+ * <p>An unsynchronized implementation of ByteArrayOutputStream that will return the backing byte array if its length == size().
  * This avoids unneeded array copy where the BOS is simply being used to extract a byte array of known length from a
- * 'serialized to stream' method.
- * <p/>
- * Unless the final length can be accurately predicted the only performance this will yield is due to unsynchronized
- * methods.
+ * 'serialized to stream' method.</p>
+ *
+ * <p>Unless the final length can be accurately predicted the only performance this will yield is due to unsynchronized
+ * methods.</p>
  *
  * @author git
  */
@@ -49,15 +49,15 @@ public UnsafeByteArrayOutputStream(int size) {
     public void write(int b) {
         int newcount = count + 1;
         if (newcount > buf.length) {
-            buf = Utils.copyOf(buf, Math.max(buf.length << 1, newcount));
+            buf = copyOf(buf, Math.max(buf.length << 1, newcount));
         }
         buf[count] = (byte) b;
         count = newcount;
     }
 
     /**
-     * Writes <code>len</code> bytes from the specified byte array
-     * starting at offset <code>off</code> to this byte array output stream.
+     * Writes {@code len} bytes from the specified byte array
+     * starting at offset {@code off} to this byte array output stream.
      *
      * @param b   the data.
      * @param off the start offset in the data.
@@ -73,7 +73,7 @@ public void write(byte[] b, int off, int len) {
         }
         int newcount = count + len;
         if (newcount > buf.length) {
-            buf = Utils.copyOf(buf, Math.max(buf.length << 1, newcount));
+            buf = copyOf(buf, Math.max(buf.length << 1, newcount));
         }
         System.arraycopy(b, off, buf, count, len);
         count = newcount;
@@ -82,7 +82,7 @@ public void write(byte[] b, int off, int len) {
     /**
      * Writes the complete contents of this byte array output stream to
      * the specified output stream argument, as if by calling the output
-     * stream's write method using <code>out.write(buf, 0, count)</code>.
+     * stream's write method using {@code out.write(buf, 0, count)}.
      *
      * @param out the output stream to which to write the data.
      * @throws IOException if an I/O error occurs.
@@ -93,7 +93,7 @@ public void writeTo(OutputStream out) throws IOException {
     }
 
     /**
-     * Resets the <code>count</code> field of this byte array output
+     * Resets the {@code count} field of this byte array output
      * stream to zero, so that all currently accumulated output in the
      * output stream is discarded. The output stream can be used again,
      * reusing the already allocated buffer space.
@@ -115,13 +115,13 @@ public void reset() {
      */
     @Override
     public byte toByteArray()[] {
-        return count == buf.length ? buf : Utils.copyOf(buf, count);
+        return count == buf.length ? buf : copyOf(buf, count);
     }
 
     /**
      * Returns the current size of the buffer.
      *
-     * @return the value of the <code>count</code> field, which is the number
+     * @return the value of the {@code count} field, which is the number
      *         of valid bytes in this output stream.
      * @see java.io.ByteArrayOutputStream#count
      */
@@ -130,4 +130,9 @@ public int size() {
         return count;
     }
 
+    private static byte[] copyOf(byte[] in, int length) {
+        byte[] out = new byte[length];
+        System.arraycopy(in, 0, out, 0, Math.min(length, in.length));
+        return out;
+    }
 }
diff --git a/core/src/main/java/org/bitcoinj/core/Utils.java b/core/src/main/java/org/bitcoinj/core/Utils.java
index 80c2c735690..3a72c5b9681 100644
--- a/core/src/main/java/org/bitcoinj/core/Utils.java
+++ b/core/src/main/java/org/bitcoinj/core/Utils.java
@@ -17,29 +17,30 @@
 
 package org.bitcoinj.core;
 
-import com.google.common.base.Charsets;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Ordering;
-import com.google.common.io.BaseEncoding;
-import com.google.common.io.Resources;
-import com.google.common.primitives.Ints;
-import com.google.common.primitives.UnsignedLongs;
-import org.spongycastle.crypto.digests.RIPEMD160Digest;
-
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
-import java.net.URL;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.TimeZone;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
+
+import org.bouncycastle.crypto.digests.RIPEMD160Digest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Joiner;
+import com.google.common.base.Splitter;
+import com.google.common.io.BaseEncoding;
+import com.google.common.primitives.Ints;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
@@ -50,41 +51,62 @@
  */
 public class Utils {
 
-    /** The string that prefixes all text messages signed using Bitcoin keys. */
-    public static final String BITCOIN_SIGNED_MESSAGE_HEADER = "Bitcoin Signed Message:\n";
-    public static final byte[] BITCOIN_SIGNED_MESSAGE_HEADER_BYTES = BITCOIN_SIGNED_MESSAGE_HEADER.getBytes(Charsets.UTF_8);
+    /** Joiner for concatenating words with a space inbetween. */
+    public static final Joiner SPACE_JOINER = Joiner.on(" ");
+    /** Splitter for splitting words on whitespaces. */
+    public static final Splitter WHITESPACE_SPLITTER = Splitter.on(Pattern.compile("\\s+"));
+    /** Hex encoding used throughout the framework. Use with HEX.encode(byte[]) or HEX.decode(CharSequence). */
+    public static final BaseEncoding HEX = BaseEncoding.base16().lowerCase();
 
-    private static final Joiner SPACE_JOINER = Joiner.on(" ");
+    /**
+     * Max initial size of variable length arrays and ArrayLists that could be attacked.
+     * Avoids this attack: Attacker sends a msg indicating it will contain a huge number (eg 2 billion) elements (eg transaction inputs) and
+     * forces bitcoinj to try to allocate a huge piece of the memory resulting in OutOfMemoryError.
+    */
+    public static final int MAX_INITIAL_ARRAY_LENGTH = 20;
 
     private static BlockingQueue<Boolean> mockSleepQueue;
 
+    private static final Logger log = LoggerFactory.getLogger(Utils.class);
+
     /**
-     * The regular {@link java.math.BigInteger#toByteArray()} method isn't quite what we often need: it appends a
-     * leading zero to indicate that the number is positive and may need padding.
-     *
+     * <p>
+     * The regular {@link BigInteger#toByteArray()} includes the sign bit of the number and
+     * might result in an extra byte addition. This method removes this extra byte.
+     * </p>
+     * <p>
+     * Assuming only positive numbers, it's possible to discriminate if an extra byte
+     * is added by checking if the first element of the array is 0 (0000_0000).
+     * Due to the minimal representation provided by BigInteger, it means that the bit sign
+     * is the least significant bit 0000_000<b>0</b> .
+     * Otherwise the representation is not minimal.
+     * For example, if the sign bit is 0000_00<b>0</b>0, then the representation is not minimal due to the rightmost zero.
+     * </p>
      * @param b the integer to format into a byte array
      * @param numBytes the desired size of the resulting byte array
      * @return numBytes byte long array.
      */
     public static byte[] bigIntegerToBytes(BigInteger b, int numBytes) {
-        if (b == null) {
-            return null;
-        }
-        byte[] bytes = new byte[numBytes];
-        byte[] biBytes = b.toByteArray();
-        int start = (biBytes.length == numBytes + 1) ? 1 : 0;
-        int length = Math.min(biBytes.length, numBytes);
-        System.arraycopy(biBytes, start, bytes, numBytes - length, length);
-        return bytes;        
-    }
-
-    public static void uint32ToByteArrayBE(long val, byte[] out, int offset) {
-        out[offset] = (byte) (0xFF & (val >> 24));
-        out[offset + 1] = (byte) (0xFF & (val >> 16));
-        out[offset + 2] = (byte) (0xFF & (val >> 8));
-        out[offset + 3] = (byte) (0xFF & val);
+        checkArgument(b.signum() >= 0, "b must be positive or zero");
+        checkArgument(numBytes > 0, "numBytes must be positive");
+        byte[] src = b.toByteArray();
+        byte[] dest = new byte[numBytes];
+        boolean isFirstByteOnlyForSign = src[0] == 0;
+        int length = isFirstByteOnlyForSign ? src.length - 1 : src.length;
+        checkArgument(length <= numBytes, "The given number does not fit in " + numBytes);
+        int srcPos = isFirstByteOnlyForSign ? 1 : 0;
+        int destPos = numBytes - length;
+        System.arraycopy(src, srcPos, dest, destPos, length);
+        return dest;
+    }
+
+    /** Write 2 bytes to the byte array (starting at the offset) as unsigned 16-bit integer in little endian format. */
+    public static void uint16ToByteArrayLE(int val, byte[] out, int offset) {
+        out[offset] = (byte) (0xFF & val);
+        out[offset + 1] = (byte) (0xFF & (val >> 8));
     }
 
+    /** Write 4 bytes to the byte array (starting at the offset) as unsigned 32-bit integer in little endian format. */
     public static void uint32ToByteArrayLE(long val, byte[] out, int offset) {
         out[offset] = (byte) (0xFF & val);
         out[offset + 1] = (byte) (0xFF & (val >> 8));
@@ -92,7 +114,16 @@ public static void uint32ToByteArrayLE(long val, byte[] out, int offset) {
         out[offset + 3] = (byte) (0xFF & (val >> 24));
     }
 
-    public static void uint64ToByteArrayLE(long val, byte[] out, int offset) {
+    /** Write 4 bytes to the byte array (starting at the offset) as unsigned 32-bit integer in big endian format. */
+    public static void uint32ToByteArrayBE(long val, byte[] out, int offset) {
+        out[offset] = (byte) (0xFF & (val >> 24));
+        out[offset + 1] = (byte) (0xFF & (val >> 16));
+        out[offset + 2] = (byte) (0xFF & (val >> 8));
+        out[offset + 3] = (byte) (0xFF & val);
+    }
+
+    /** Write 8 bytes to the byte array (starting at the offset) as signed 64-bit integer in little endian format. */
+    public static void int64ToByteArrayLE(long val, byte[] out, int offset) {
         out[offset] = (byte) (0xFF & val);
         out[offset + 1] = (byte) (0xFF & (val >> 8));
         out[offset + 2] = (byte) (0xFF & (val >> 16));
@@ -103,13 +134,35 @@ public static void uint64ToByteArrayLE(long val, byte[] out, int offset) {
         out[offset + 7] = (byte) (0xFF & (val >> 56));
     }
 
+    /** Write 2 bytes to the output stream as unsigned 16-bit integer in little endian format. */
+    public static void uint16ToByteStreamLE(int val, OutputStream stream) throws IOException {
+        stream.write((int) (0xFF & val));
+        stream.write((int) (0xFF & (val >> 8)));
+    }
+
+    /** Write 2 bytes to the output stream as unsigned 16-bit integer in big endian format. */
+    public static void uint16ToByteStreamBE(int val, OutputStream stream) throws IOException {
+        stream.write((int) (0xFF & (val >> 8)));
+        stream.write((int) (0xFF & val));
+    }
+
+    /** Write 4 bytes to the output stream as unsigned 32-bit integer in little endian format. */
     public static void uint32ToByteStreamLE(long val, OutputStream stream) throws IOException {
         stream.write((int) (0xFF & val));
         stream.write((int) (0xFF & (val >> 8)));
         stream.write((int) (0xFF & (val >> 16)));
         stream.write((int) (0xFF & (val >> 24)));
     }
-    
+
+    /** Write 4 bytes to the output stream as unsigned 32-bit integer in big endian format. */
+    public static void uint32ToByteStreamBE(long val, OutputStream stream) throws IOException {
+        stream.write((int) (0xFF & (val >> 24)));
+        stream.write((int) (0xFF & (val >> 16)));
+        stream.write((int) (0xFF & (val >> 8)));
+        stream.write((int) (0xFF & val));
+    }
+
+    /** Write 8 bytes to the output stream as signed 64-bit integer in little endian format. */
     public static void int64ToByteStreamLE(long val, OutputStream stream) throws IOException {
         stream.write((int) (0xFF & val));
         stream.write((int) (0xFF & (val >> 8)));
@@ -121,6 +174,7 @@ public static void int64ToByteStreamLE(long val, OutputStream stream) throws IOE
         stream.write((int) (0xFF & (val >> 56)));
     }
 
+    /** Write 8 bytes to the output stream as unsigned 64-bit integer in little endian format. */
     public static void uint64ToByteStreamLE(BigInteger val, OutputStream stream) throws IOException {
         byte[] bytes = val.toByteArray();
         if (bytes.length > 8) {
@@ -134,56 +188,10 @@ public static void uint64ToByteStreamLE(BigInteger val, OutputStream stream) thr
         }
     }
 
-    /**
-     * Work around lack of unsigned types in Java.
-     */
-    public static boolean isLessThanUnsigned(long n1, long n2) {
-        return UnsignedLongs.compare(n1, n2) < 0;
-    }
-
-    /**
-     * Work around lack of unsigned types in Java.
-     */
-    public static boolean isLessThanOrEqualToUnsigned(long n1, long n2) {
-        return UnsignedLongs.compare(n1, n2) <= 0;
-    }
-
-    /**
-     * Hex encoding used throughout the framework. Use with HEX.encode(byte[]) or HEX.decode(CharSequence).
-     */
-    public static final BaseEncoding HEX = BaseEncoding.base16().lowerCase();
-
-    /**
-     * Returns a copy of the given byte array in reverse order.
-     */
-    public static byte[] reverseBytes(byte[] bytes) {
-        // We could use the XOR trick here but it's easier to understand if we don't. If we find this is really a
-        // performance issue the matter can be revisited.
-        byte[] buf = new byte[bytes.length];
-        for (int i = 0; i < bytes.length; i++)
-            buf[i] = bytes[bytes.length - 1 - i];
-        return buf;
-    }
-    
-    /**
-     * Returns a copy of the given byte array with the bytes of each double-word (4 bytes) reversed.
-     * 
-     * @param bytes length must be divisible by 4.
-     * @param trimLength trim output to this length.  If positive, must be divisible by 4.
-     */
-    public static byte[] reverseDwordBytes(byte[] bytes, int trimLength) {
-        checkArgument(bytes.length % 4 == 0);
-        checkArgument(trimLength < 0 || trimLength % 4 == 0);
-        
-        byte[] rev = new byte[trimLength >= 0 && bytes.length > trimLength ? trimLength : bytes.length];
-        
-        for (int i = 0; i < rev.length; i += 4) {
-            System.arraycopy(bytes, i, rev, i , 4);
-            for (int j = 0; j < 4; j++) {
-                rev[i + j] = bytes[i + 3 - j];
-            }
-        }
-        return rev;
+    /** Parse 2 bytes from the byte array (starting at the offset) as unsigned 16-bit integer in little endian format. */
+    public static int readUint16(byte[] bytes, int offset) {
+        return (bytes[offset] & 0xff) |
+                ((bytes[offset + 1] & 0xff) << 8);
     }
 
     /** Parse 4 bytes from the byte array (starting at the offset) as unsigned 32-bit integer in little endian format. */
@@ -220,6 +228,40 @@ public static int readUint16BE(byte[] bytes, int offset) {
                 (bytes[offset + 1] & 0xff);
     }
 
+    /** Parse 2 bytes from the stream as unsigned 16-bit integer in little endian format. */
+    public static int readUint16FromStream(InputStream is) {
+        try {
+            return (is.read() & 0xff) |
+                    ((is.read() & 0xff) << 8);
+        } catch (IOException x) {
+            throw new RuntimeException(x);
+        }
+    }
+
+    /** Parse 4 bytes from the stream as unsigned 32-bit integer in little endian format. */
+    public static long readUint32FromStream(InputStream is) {
+        try {
+            return (is.read() & 0xffl) |
+                    ((is.read() & 0xffl) << 8) |
+                    ((is.read() & 0xffl) << 16) |
+                    ((is.read() & 0xffl) << 24);
+        } catch (IOException x) {
+            throw new RuntimeException(x);
+        }
+    }
+
+    /**
+     * Returns a copy of the given byte array in reverse order.
+     */
+    public static byte[] reverseBytes(byte[] bytes) {
+        // We could use the XOR trick here but it's easier to understand if we don't. If we find this is really a
+        // performance issue the matter can be revisited.
+        byte[] buf = new byte[bytes.length];
+        for (int i = 0; i < bytes.length; i++)
+            buf[i] = bytes[bytes.length - 1 - i];
+        return buf;
+    }
+
     /**
      * Calculates RIPEMD160(SHA256(input)). This is used in Address calculations.
      */
@@ -342,7 +384,7 @@ public static long encodeCompactBits(BigInteger value) {
     /**
      * If non-null, overrides the return value of now().
      */
-    public static volatile Date mockTime;
+    private static volatile Date mockTime;
 
     /**
      * Advances (or rewinds) the mock clock by the given number of seconds.
@@ -414,112 +456,6 @@ public static String dateTimeFormat(long dateTime) {
         return iso8601.format(dateTime);
     }
 
-    /**
-     * Returns a string containing the string representation of the given items,
-     * delimited by a single space character.
-     *
-     * @param items the items to join
-     * @param <T> the item type
-     * @return the joined space-delimited string
-     */
-    public static <T> String join(Iterable<T> items) {
-        return SPACE_JOINER.join(items);
-    }
-
-    public static byte[] copyOf(byte[] in, int length) {
-        byte[] out = new byte[length];
-        System.arraycopy(in, 0, out, 0, Math.min(length, in.length));
-        return out;
-    }
-
-    /**
-     * Creates a copy of bytes and appends b to the end of it
-     */
-    public static byte[] appendByte(byte[] bytes, byte b) {
-        byte[] result = Arrays.copyOf(bytes, bytes.length + 1);
-        result[result.length - 1] = b;
-        return result;
-    }
-
-    /**
-     * Constructs a new String by decoding the given bytes using the specified charset.
-     * <p>
-     * This is a convenience method which wraps the checked exception with a RuntimeException.
-     * The exception can never occur given the charsets
-     * US-ASCII, ISO-8859-1, UTF-8, UTF-16, UTF-16LE or UTF-16BE.
-     *
-     * @param bytes the bytes to be decoded into characters
-     * @param charsetName the name of a supported {@linkplain java.nio.charset.Charset charset}
-     * @return the decoded String
-     */
-    public static String toString(byte[] bytes, String charsetName) {
-        try {
-            return new String(bytes, charsetName);
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * Encodes the given string into a sequence of bytes using the named charset.
-     * <p>
-     * This is a convenience method which wraps the checked exception with a RuntimeException.
-     * The exception can never occur given the charsets
-     * US-ASCII, ISO-8859-1, UTF-8, UTF-16, UTF-16LE or UTF-16BE.
-     *
-     * @param str the string to encode into bytes
-     * @param charsetName the name of a supported {@linkplain java.nio.charset.Charset charset}
-     * @return the encoded bytes
-     */
-    public static byte[] toBytes(CharSequence str, String charsetName) {
-        try {
-            return str.toString().getBytes(charsetName);
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * Attempts to parse the given string as arbitrary-length hex or base58 and then return the results, or null if
-     * neither parse was successful.
-     */
-    public static byte[] parseAsHexOrBase58(String data) {
-        try {
-            return HEX.decode(data);
-        } catch (Exception e) {
-            // Didn't decode as hex, try base58.
-            try {
-                return Base58.decodeChecked(data);
-            } catch (AddressFormatException e1) {
-                return null;
-            }
-        }
-    }
-
-    public static boolean isWindows() {
-        return System.getProperty("os.name").toLowerCase().contains("win");
-    }
-
-    /**
-     * <p>Given a textual message, returns a byte buffer formatted as follows:</p>
-     *
-     * <tt><p>[24] "Bitcoin Signed Message:\n" [message.length as a varint] message</p></tt>
-     */
-    public static byte[] formatMessageForSigning(String message) {
-        try {
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            bos.write(BITCOIN_SIGNED_MESSAGE_HEADER_BYTES.length);
-            bos.write(BITCOIN_SIGNED_MESSAGE_HEADER_BYTES);
-            byte[] messageBytes = message.getBytes(Charsets.UTF_8);
-            VarInt size = new VarInt(messageBytes.length);
-            bos.write(size.encode());
-            bos.write(messageBytes);
-            return bos.toByteArray();
-        } catch (IOException e) {
-            throw new RuntimeException(e);  // Cannot happen.
-        }
-    }
-    
     // 00000001, 00000010, 00000100, 00001000, ...
     private static final int[] bitMask = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
     
@@ -552,7 +488,7 @@ public static void sleep(long millis) {
     /** Enable or disable mock sleep.  If enabled, set mock time to current time. */
     public static void setMockSleep(boolean isEnable) {
         if (isEnable) {
-            mockSleepQueue = new ArrayBlockingQueue<Boolean>(1);
+            mockSleepQueue = new ArrayBlockingQueue<>(1);
             mockTime = new Date(System.currentTimeMillis());
         } else {
             mockSleepQueue = null;
@@ -571,79 +507,70 @@ public static void finishMockSleep() {
         }
     }
 
-    private static int isAndroid = -1;
+    private enum Runtime {
+        ANDROID, OPENJDK, ORACLE_JAVA
+    }
+
+    private enum OS {
+        LINUX, WINDOWS, MAC_OS
+    }
+
+    private static Runtime runtime = null;
+    private static OS os = null;
+    static {
+        String runtimeProp = System.getProperty("java.runtime.name", "").toLowerCase(Locale.US);
+        if (runtimeProp.equals(""))
+            runtime = null;
+        else if (runtimeProp.contains("android"))
+            runtime = Runtime.ANDROID;
+        else if (runtimeProp.contains("openjdk"))
+            runtime = Runtime.OPENJDK;
+        else if (runtimeProp.contains("java(tm) se"))
+            runtime = Runtime.ORACLE_JAVA;
+        else
+            log.info("Unknown java.runtime.name '{}'", runtimeProp);
+
+        String osProp = System.getProperty("os.name", "").toLowerCase(Locale.US);
+        if (osProp.equals(""))
+            os = null;
+        else if (osProp.contains("linux"))
+            os = OS.LINUX;
+        else if (osProp.contains("win"))
+            os = OS.WINDOWS;
+        else if (osProp.contains("mac"))
+            os = OS.MAC_OS;
+        else
+            log.info("Unknown os.name '{}'", runtimeProp);
+    }
+
     public static boolean isAndroidRuntime() {
-        if (isAndroid == -1) {
-            final String runtime = System.getProperty("java.runtime.name");
-            isAndroid = (runtime != null && runtime.equals("Android Runtime")) ? 1 : 0;
-        }
-        return isAndroid == 1;
-    }
-
-    private static class Pair implements Comparable<Pair> {
-        int item, count;
-        public Pair(int item, int count) { this.count = count; this.item = item; }
-        // note that in this implementation compareTo() is not consistent with equals()
-        @Override public int compareTo(Pair o) { return -Ints.compare(count, o.count); }
-    }
-
-    public static int maxOfMostFreq(int... items) {
-        // Java 6 sucks.
-        ArrayList<Integer> list = new ArrayList<Integer>(items.length);
-        for (int item : items) list.add(item);
-        return maxOfMostFreq(list);
-    }
-
-    public static int maxOfMostFreq(List<Integer> items) {
-        if (items.isEmpty())
-            return 0;
-        // This would be much easier in a functional language (or in Java 8).
-        items = Ordering.natural().reverse().sortedCopy(items);
-        LinkedList<Pair> pairs = Lists.newLinkedList();
-        pairs.add(new Pair(items.get(0), 0));
-        for (int item : items) {
-            Pair pair = pairs.getLast();
-            if (pair.item != item)
-                pairs.add((pair = new Pair(item, 0)));
-            pair.count++;
-        }
-        // pairs now contains a uniqified list of the sorted inputs, with counts for how often that item appeared.
-        // Now sort by how frequently they occur, and pick the max of the most frequent.
-        Collections.sort(pairs);
-        int maxCount = pairs.getFirst().count;
-        int maxItem = pairs.getFirst().item;
-        for (Pair pair : pairs) {
-            if (pair.count != maxCount)
-                break;
-            maxItem = Math.max(maxItem, pair.item);
-        }
-        return maxItem;
+        return runtime == Runtime.ANDROID;
     }
 
-    /**
-     * Reads and joins together with LF char (\n) all the lines from given file. It's assumed that file is in UTF-8.
-     */
-    public static String getResourceAsString(URL url) throws IOException {
-        List<String> lines = Resources.readLines(url, Charsets.UTF_8);
-        return Joiner.on('\n').join(lines);
+    public static boolean isOpenJDKRuntime() {
+        return runtime == Runtime.OPENJDK;
     }
 
-    // Can't use Closeable here because it's Java 7 only and Android devices only got that with KitKat.
-    public static InputStream closeUnchecked(InputStream stream) {
-        try {
-            stream.close();
-            return stream;
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+    public static boolean isOracleJavaRuntime() {
+        return runtime == Runtime.ORACLE_JAVA;
     }
 
-    public static OutputStream closeUnchecked(OutputStream stream) {
-        try {
-            stream.close();
-            return stream;
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+    public static boolean isLinux() {
+        return os == OS.LINUX;
+    }
+
+    public static boolean isWindows() {
+        return os == OS.WINDOWS;
+    }
+
+    public static boolean isMac() {
+        return os == OS.MAC_OS;
+    }
+
+    public static String toString(List<byte[]> stack) {
+        List<String> parts = new ArrayList<>(stack.size());
+        for (byte[] push : stack)
+            parts.add('[' + HEX.encode(push) + ']');
+        return SPACE_JOINER.join(parts);
     }
 }
diff --git a/core/src/main/java/org/bitcoinj/core/VarInt.java b/core/src/main/java/org/bitcoinj/core/VarInt.java
index 7969ffa29ad..05759267f04 100644
--- a/core/src/main/java/org/bitcoinj/core/VarInt.java
+++ b/core/src/main/java/org/bitcoinj/core/VarInt.java
@@ -45,7 +45,7 @@ public VarInt(byte[] buf, int offset) {
             value = first;
             originallyEncodedSize = 1; // 1 data byte (8 bits)
         } else if (first == 253) {
-            value = (0xFF & buf[offset + 1]) | ((0xFF & buf[offset + 2]) << 8);
+            value = Utils.readUint16(buf, offset + 1);
             originallyEncodedSize = 3; // 1 marker + 2 data bytes (16 bits)
         } else if (first == 254) {
             value = Utils.readUint32(buf, offset + 1);
@@ -96,7 +96,10 @@ public byte[] encode() {
             case 1:
                 return new byte[]{(byte) value};
             case 3:
-                return new byte[]{(byte) 253, (byte) (value), (byte) (value >> 8)};
+                bytes = new byte[3];
+                bytes[0] = (byte) 253;
+                Utils.uint16ToByteArrayLE((int) value, bytes, 1);
+                return bytes;
             case 5:
                 bytes = new byte[5];
                 bytes[0] = (byte) 254;
@@ -105,7 +108,7 @@ public byte[] encode() {
             default:
                 bytes = new byte[9];
                 bytes[0] = (byte) 255;
-                Utils.uint64ToByteArrayLE(value, bytes, 1);
+                Utils.int64ToByteArrayLE(value, bytes, 1);
                 return bytes;
         }
     }
diff --git a/core/src/main/java/org/bitcoinj/core/VersionMessage.java b/core/src/main/java/org/bitcoinj/core/VersionMessage.java
index d4fa4f37ffc..470504843d4 100644
--- a/core/src/main/java/org/bitcoinj/core/VersionMessage.java
+++ b/core/src/main/java/org/bitcoinj/core/VersionMessage.java
@@ -16,31 +16,50 @@
 
 package org.bitcoinj.core;
 
+import com.google.common.base.Joiner;
 import com.google.common.base.Objects;
+import com.google.common.net.InetAddresses;
+
 import javax.annotation.Nullable;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.math.BigInteger;
 import java.net.InetAddress;
-import java.net.UnknownHostException;
+import java.nio.charset.StandardCharsets;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Locale;
 
 /**
  * <p>A VersionMessage holds information exchanged during connection setup with another peer. Most of the fields are not
- * particularly interesting. The subVer field, since BIP 14, acts as a User-Agent string would. You can and should 
+ * particularly interesting. The subVer field, since BIP 14, acts as a User-Agent string would. You can and should
  * append to or change the subVer for your own software so other implementations can identify it, and you can look at
  * the subVer field received from other nodes to see what they are running.</p>
  *
  * <p>After creating yourself a VersionMessage, you can pass it to {@link PeerGroup#setVersionMessage(VersionMessage)}
  * to ensure it will be used for each new connection.</p>
- * 
+ *
  * <p>Instances of this class are not safe for use by multiple threads.</p>
  */
 public class VersionMessage extends Message {
 
-    /** A services flag that denotes whether the peer has a copy of the block chain or not. */
-    public static final int NODE_NETWORK = 1;
-    /** A flag that denotes whether the peer supports the getutxos message or not. */
-    public static final int NODE_GETUTXOS = 2;
+    /** The version of this library release, as a string. */
+    public static final String BITCOINJ_VERSION = "0.15.8.bisq.14";
+    /** The value that is prepended to the subVer field of this application. */
+    public static final String LIBRARY_SUBVER = "/bitcoinj:" + BITCOINJ_VERSION + "/";
+
+    /** A service bit that denotes whether the peer has a full copy of the block chain or not. */
+    public static final int NODE_NETWORK = 1 << 0;
+    /** A service bit that denotes whether the peer supports the getutxos message or not. */
+    public static final int NODE_GETUTXOS = 1 << 1;
+    /** A service bit that denotes whether the peer supports BIP37 bloom filters or not. The service bit is defined in BIP111. */
+    public static final int NODE_BLOOM = 1 << 2;
+    /** Indicates that a node can be asked for blocks and transactions including witness data. */
+    public static final int NODE_WITNESS = 1 << 3;
+    /** A service bit that denotes whether the peer has at least the last two days worth of blockchain (BIP159). */
+    public static final int NODE_NETWORK_LIMITED = 1 << 10;
+    /** A service bit used by Bitcoin-ABC to announce Bitcoin Cash nodes. */
+    public static final int NODE_BITCOIN_CASH = 1 << 5;
 
     /**
      * The version number of the protocol spoken.
@@ -55,13 +74,13 @@ public class VersionMessage extends Message {
      */
     public long time;
     /**
-     * What the other side believes the address of this program is. Not used.
+     * The network address of the node receiving this message.
      */
-    public PeerAddress myAddr;
+    public PeerAddress receivingAddr;
     /**
-     * What the other side believes their own address is. Not used.
+     * The network address of the node emitting this message. Not used.
      */
-    public PeerAddress theirAddr;
+    public PeerAddress fromAddr;
     /**
      * User-Agent as defined in <a href="https://github.com/bitcoin/bips/blob/master/bip-0014.mediawiki">BIP 14</a>.
      * Bitcoin Core sets it to something like "/Satoshi:0.9.1/".
@@ -77,11 +96,6 @@ public class VersionMessage extends Message {
      */
     public boolean relayTxesBeforeFilter;
 
-    /** The version of this library release, as a string. */
-    public static final String BITCOINJ_VERSION = "0.14-SNAPSHOT";
-    /** The value that is prepended to the subVer field of this application. */
-    public static final String LIBRARY_SUBVER = "/bitcoinj:" + BITCOINJ_VERSION + "/";
-
     public VersionMessage(NetworkParameters params, byte[] payload) throws ProtocolException {
         super(params, payload, 0);
     }
@@ -89,31 +103,25 @@ public VersionMessage(NetworkParameters params, byte[] payload) throws ProtocolE
     // It doesn't really make sense to ever lazily parse a version message or to retain the backing bytes.
     // If you're receiving this on the wire you need to check the protocol version and it will never need to be sent
     // back down the wire.
-    
+
     public VersionMessage(NetworkParameters params, int newBestHeight) {
         super(params);
         clientVersion = params.getProtocolVersionNum(NetworkParameters.ProtocolVersion.CURRENT);
         localServices = 0;
-        time = System.currentTimeMillis() / 1000;
+        time = Utils.currentTimeSeconds();
         // Note that the Bitcoin Core doesn't do anything with these, and finding out your own external IP address
         // is kind of tricky anyway, so we just put nonsense here for now.
-        try {
-            // We hard-code the IPv4 localhost address here rather than use InetAddress.getLocalHost() because some
-            // mobile phones have broken localhost DNS entries, also, this is faster.
-            final byte[] localhost = { 127, 0, 0, 1 };
-            myAddr = new PeerAddress(InetAddress.getByAddress(localhost), params.getPort(), 0);
-            theirAddr = new PeerAddress(InetAddress.getByAddress(localhost), params.getPort(), 0);
-        } catch (UnknownHostException e) {
-            throw new RuntimeException(e);  // Cannot happen (illegal IP length).
-        }
+        InetAddress localhost = InetAddresses.forString("127.0.0.1");
+        receivingAddr = new PeerAddress(params, localhost, params.getPort(), clientVersion, BigInteger.ZERO);
+        receivingAddr.setParent(this);
+        fromAddr = new PeerAddress(params, localhost, params.getPort(), clientVersion, BigInteger.ZERO);
+        fromAddr.setParent(this);
         subVer = LIBRARY_SUBVER;
         bestHeight = newBestHeight;
         relayTxesBeforeFilter = true;
 
-        length = 85;
-        if (protocolVersion > 31402)
-            length += 8;
-        length += VarInt.sizeOf(subVer.length()) + subVer.length();
+        length = 4 + 8 + 8 + receivingAddr.getMessageSize() + fromAddr.getMessageSize() + 8
+                + VarInt.sizeOf(subVer.length()) + subVer.length() + 4 + 1;
     }
 
     @Override
@@ -121,33 +129,33 @@ protected void parse() throws ProtocolException {
         clientVersion = (int) readUint32();
         localServices = readUint64().longValue();
         time = readUint64().longValue();
-        myAddr = new PeerAddress(params, payload, cursor, 0);
-        cursor += myAddr.getMessageSize();
-        theirAddr = new PeerAddress(params, payload, cursor, 0);
-        cursor += theirAddr.getMessageSize();
-        // uint64 localHostNonce  (random data)
-        // We don't care about the localhost nonce. It's used to detect connecting back to yourself in cases where
-        // there are NATs and proxies in the way. However we don't listen for inbound connections so it's irrelevant.
-        readUint64();
-        try {
-            // Initialize default values for flags which may not be sent by old nodes
+        receivingAddr = new PeerAddress(params, payload, cursor, 0, this, serializer);
+        cursor += receivingAddr.getMessageSize();
+        if (clientVersion >= 106) {
+            fromAddr = new PeerAddress(params, payload, cursor, 0, this, serializer);
+            cursor += fromAddr.getMessageSize();
+            // uint64 localHostNonce (random data)
+            // We don't care about the localhost nonce. It's used to detect connecting back to yourself in cases where
+            // there are NATs and proxies in the way. However we don't listen for inbound connections so it's
+            // irrelevant.
+            readUint64();
+            // string subVer (currently "")
+            subVer = readStr();
+            // int bestHeight (size of known block chain).
+            bestHeight = readUint32();
+            if (clientVersion >= params.getProtocolVersionNum(NetworkParameters.ProtocolVersion.BLOOM_FILTER)) {
+                relayTxesBeforeFilter = readBytes(1)[0] != 0;
+            } else {
+                relayTxesBeforeFilter = true;
+            }
+        } else {
+            // Default values for flags which may not be sent by old nodes
+            fromAddr = null;
             subVer = "";
             bestHeight = 0;
             relayTxesBeforeFilter = true;
-            if (!hasMoreBytes())
-                return;
-            //   string subVer  (currently "")
-            subVer = readStr();
-            if (!hasMoreBytes())
-                return;
-            //   int bestHeight (size of known block chain).
-            bestHeight = readUint32();
-            if (!hasMoreBytes())
-                return;
-            relayTxesBeforeFilter = readBytes(1)[0] != 0;
-        } finally {
-            length = cursor - offset;
         }
+        length = cursor - offset;
     }
 
     @Override
@@ -157,36 +165,24 @@ public void bitcoinSerializeToStream(OutputStream buf) throws IOException {
         Utils.uint32ToByteStreamLE(localServices >> 32, buf);
         Utils.uint32ToByteStreamLE(time, buf);
         Utils.uint32ToByteStreamLE(time >> 32, buf);
-        try {
-            // My address.
-            myAddr.bitcoinSerialize(buf);
-            // Their address.
-            theirAddr.bitcoinSerialize(buf);
-        } catch (UnknownHostException e) {
-            throw new RuntimeException(e);  // Can't happen.
-        } catch (IOException e) {
-            throw new RuntimeException(e);  // Can't happen.
+        receivingAddr.bitcoinSerializeToStream(buf);
+        if (clientVersion >= 106) {
+            fromAddr.bitcoinSerializeToStream(buf);
+            // Next up is the "local host nonce", this is to detect the case of connecting
+            // back to yourself. We don't care about this as we won't be accepting inbound
+            // connections.
+            Utils.uint32ToByteStreamLE(0, buf);
+            Utils.uint32ToByteStreamLE(0, buf);
+            // Now comes subVer.
+            byte[] subVerBytes = subVer.getBytes(StandardCharsets.UTF_8);
+            buf.write(new VarInt(subVerBytes.length).encode());
+            buf.write(subVerBytes);
+            // Size of known block chain.
+            Utils.uint32ToByteStreamLE(bestHeight, buf);
+            if (clientVersion >= params.getProtocolVersionNum(NetworkParameters.ProtocolVersion.BLOOM_FILTER)) {
+                buf.write(relayTxesBeforeFilter ? 1 : 0);
+            }
         }
-        // Next up is the "local host nonce", this is to detect the case of connecting
-        // back to yourself. We don't care about this as we won't be accepting inbound 
-        // connections.
-        Utils.uint32ToByteStreamLE(0, buf);
-        Utils.uint32ToByteStreamLE(0, buf);
-        // Now comes subVer.
-        byte[] subVerBytes = subVer.getBytes("UTF-8");
-        buf.write(new VarInt(subVerBytes.length).encode());
-        buf.write(subVerBytes);
-        // Size of known block chain.
-        Utils.uint32ToByteStreamLE(bestHeight, buf);
-        buf.write(relayTxesBeforeFilter ? 1 : 0);
-    }
-
-    /**
-     * Returns true if the version message indicates the sender has a full copy of the block chain,
-     * or if it's running in client mode (only has the headers).
-     */
-    public boolean hasBlockChain() {
-        return (localServices & NODE_NETWORK) == NODE_NETWORK;
     }
 
     @Override
@@ -199,30 +195,32 @@ public boolean equals(Object o) {
                 other.localServices == localServices &&
                 other.time == time &&
                 other.subVer.equals(subVer) &&
-                other.myAddr.equals(myAddr) &&
-                other.theirAddr.equals(theirAddr) &&
+                other.receivingAddr.equals(receivingAddr) &&
+                other.fromAddr.equals(fromAddr) &&
                 other.relayTxesBeforeFilter == relayTxesBeforeFilter;
     }
 
     @Override
     public int hashCode() {
         return Objects.hashCode(bestHeight, clientVersion, localServices,
-            time, subVer, myAddr, theirAddr, relayTxesBeforeFilter);
+            time, subVer, receivingAddr, fromAddr, relayTxesBeforeFilter);
     }
 
     @Override
     public String toString() {
-        StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append("\n");
-        stringBuilder.append("client version: ").append(clientVersion).append("\n");
-        stringBuilder.append("local services: ").append(localServices).append("\n");
-        stringBuilder.append("time:           ").append(time).append("\n");
-        stringBuilder.append("my addr:        ").append(myAddr).append("\n");
-        stringBuilder.append("their addr:     ").append(theirAddr).append("\n");
-        stringBuilder.append("sub version:    ").append(subVer).append("\n");
-        stringBuilder.append("best height:    ").append(bestHeight).append("\n");
-        stringBuilder.append("delay tx relay: ").append(!relayTxesBeforeFilter).append("\n");
-        return stringBuilder.toString();
+        StringBuilder builder = new StringBuilder("\n");
+        builder.append("client version: ").append(clientVersion).append("\n");
+        builder.append("local services: ").append(localServices);
+        if (localServices != 0)
+            builder.append(" (").append(toStringServices(localServices)).append(")");
+        builder.append("\n");
+        builder.append("time:           ").append(time).append("\n");
+        builder.append("receiving addr: ").append(receivingAddr).append("\n");
+        builder.append("from addr:      ").append(fromAddr).append("\n");
+        builder.append("sub version:    ").append(subVer).append("\n");
+        builder.append("best height:    ").append(bestHeight).append("\n");
+        builder.append("delay tx relay: ").append(!relayTxesBeforeFilter).append("\n");
+        return builder.toString();
     }
 
     public VersionMessage duplicate() {
@@ -230,29 +228,29 @@ public VersionMessage duplicate() {
         v.clientVersion = clientVersion;
         v.localServices = localServices;
         v.time = time;
-        v.myAddr = myAddr;
-        v.theirAddr = theirAddr;
+        v.receivingAddr = receivingAddr;
+        v.fromAddr = fromAddr;
         v.subVer = subVer;
         v.relayTxesBeforeFilter = relayTxesBeforeFilter;
         return v;
     }
 
     /**
-     * Appends the given user-agent information to the subVer field. The subVer is composed of a series of
+     * <p>Appends the given user-agent information to the subVer field. The subVer is composed of a series of
      * name:version pairs separated by slashes in the form of a path. For example a typical subVer field for bitcoinj
-     * users might look like "/bitcoinj:0.13/MultiBit:1.2/" where libraries come further to the left.<p>
+     * users might look like "/bitcoinj:0.13/MultiBit:1.2/" where libraries come further to the left.</p>
      *
-     * There can be as many components as you feel a need for, and the version string can be anything, but it is
+     * <p>There can be as many components as you feel a need for, and the version string can be anything, but it is
      * recommended to use A.B.C where A = major, B = minor and C = revision for software releases, and dates for
      * auto-generated source repository snapshots. A valid subVer begins and ends with a slash, therefore name
-     * and version are not allowed to contain such characters. <p>
+     * and version are not allowed to contain such characters.</p>
      *
-     * Anything put in the "comments" field will appear in brackets and may be used for platform info, or anything
-     * else. For example, calling <tt>appendToSubVer("MultiBit", "1.0", "Windows")</tt> will result in a subVer being
+     * <p>Anything put in the "comments" field will appear in brackets and may be used for platform info, or anything
+     * else. For example, calling {@code appendToSubVer("MultiBit", "1.0", "Windows")} will result in a subVer being
      * set of "/bitcoinj:1.0/MultiBit:1.0(Windows)/". Therefore the / ( and ) characters are reserved in all these
-     * components. If you don't want to add a comment (recommended), pass null.<p>
+     * components. If you don't want to add a comment (recommended), pass null.</p>
      *
-     * See <a href="https://github.com/bitcoin/bips/blob/master/bip-0014.mediawiki">BIP 14</a> for more information.
+     * <p>See <a href="https://github.com/bitcoin/bips/blob/master/bip-0014.mediawiki">BIP 14</a> for more information.</p>
      *
      * @param comments Optional (can be null) platform or other node specific information.
      * @throws IllegalArgumentException if name, version or comments contains invalid characters.
@@ -274,18 +272,23 @@ private static void checkSubVerComponent(String component) {
     }
 
     /**
-     * Returns true if the clientVersion field is >= Pong.MIN_PROTOCOL_VERSION. If it is then ping() is usable.
+     * Returns true if the clientVersion field is {@link NetworkParameters.ProtocolVersion#PONG} or higher.
+     * If it is then {@link Peer#ping()} is usable.
      */
     public boolean isPingPongSupported() {
         return clientVersion >= params.getProtocolVersionNum(NetworkParameters.ProtocolVersion.PONG);
     }
 
     /**
-     * Returns true if the clientVersion field is >= FilteredBlock.MIN_PROTOCOL_VERSION. If it is then Bloom filtering
-     * is available and the memory pool of the remote peer will be queried when the downloadData property is true.
+     * Returns true if the peer supports bloom filtering according to BIP37 and BIP111.
      */
     public boolean isBloomFilteringSupported() {
-        return clientVersion >= params.getProtocolVersionNum(NetworkParameters.ProtocolVersion.BLOOM_FILTER);
+        if (clientVersion >= params.getProtocolVersionNum(NetworkParameters.ProtocolVersion.BLOOM_FILTER)
+                && clientVersion < params.getProtocolVersionNum(NetworkParameters.ProtocolVersion.BLOOM_FILTER_BIP111))
+            return true;
+        if ((localServices & NODE_BLOOM) == NODE_BLOOM)
+            return true;
+        return false;
     }
 
     /** Returns true if the protocol version and service bits both indicate support for the getutxos message. */
@@ -293,4 +296,49 @@ public boolean isGetUTXOsSupported() {
         return clientVersion >= GetUTXOsMessage.MIN_PROTOCOL_VERSION &&
                 (localServices & NODE_GETUTXOS) == NODE_GETUTXOS;
     }
+
+    /** Returns true if a peer can be asked for blocks and transactions including witness data. */
+    public boolean isWitnessSupported() {
+        return (localServices & NODE_WITNESS) == NODE_WITNESS;
+    }
+
+    /**
+     * Returns true if the version message indicates the sender has a full copy of the block chain, or false if it's
+     * running in client mode (only has the headers).
+     */
+    public boolean hasBlockChain() {
+        return (localServices & NODE_NETWORK) == NODE_NETWORK;
+    }
+
+    /** Returns true if the peer has at least the last two days worth of blockchain (BIP159). */
+    public boolean hasLimitedBlockChain() {
+        return hasBlockChain() || (localServices & NODE_NETWORK_LIMITED) == NODE_NETWORK_LIMITED;
+    }
+
+    public static String toStringServices(long services) {
+        List<String> strings = new LinkedList<>();
+        if ((services & NODE_NETWORK) == NODE_NETWORK) {
+            strings.add("NETWORK");
+            services &= ~NODE_NETWORK;
+        }
+        if ((services & NODE_GETUTXOS) == NODE_GETUTXOS) {
+            strings.add("GETUTXOS");
+            services &= ~NODE_GETUTXOS;
+        }
+        if ((services & NODE_BLOOM) == NODE_BLOOM) {
+            strings.add("BLOOM");
+            services &= ~NODE_BLOOM;
+        }
+        if ((services & NODE_WITNESS) == NODE_WITNESS) {
+            strings.add("WITNESS");
+            services &= ~NODE_WITNESS;
+        }
+        if ((services & NODE_NETWORK_LIMITED) == NODE_NETWORK_LIMITED) {
+            strings.add("NETWORK_LIMITED");
+            services &= ~NODE_NETWORK_LIMITED;
+        }
+        if (services != 0)
+            strings.add("remaining: " + Long.toBinaryString(services));
+        return Joiner.on(", ").join(strings);
+    }
 }
diff --git a/core/src/main/java/org/bitcoinj/core/VersionedChecksummedBytes.java b/core/src/main/java/org/bitcoinj/core/VersionedChecksummedBytes.java
deleted file mode 100644
index 38141490624..00000000000
--- a/core/src/main/java/org/bitcoinj/core/VersionedChecksummedBytes.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.bitcoinj.core;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import java.io.Serializable;
-import java.util.Arrays;
-
-import com.google.common.base.Objects;
-import com.google.common.primitives.Ints;
-import com.google.common.primitives.UnsignedBytes;
-
-/**
- * <p>In Bitcoin the following format is often used to represent some type of key:</p>
- * <p/>
- * <pre>[one version byte] [data bytes] [4 checksum bytes]</pre>
- * <p/>
- * <p>and the result is then Base58 encoded. This format is used for addresses, and private keys exported using the
- * dumpprivkey command.</p>
- */
-public class VersionedChecksummedBytes implements Serializable, Cloneable, Comparable<VersionedChecksummedBytes> {
-    protected final int version;
-    protected byte[] bytes;
-
-    protected VersionedChecksummedBytes(String encoded) throws AddressFormatException {
-        byte[] versionAndDataBytes = Base58.decodeChecked(encoded);
-        byte versionByte = versionAndDataBytes[0];
-        version = versionByte & 0xFF;
-        bytes = new byte[versionAndDataBytes.length - 1];
-        System.arraycopy(versionAndDataBytes, 1, bytes, 0, versionAndDataBytes.length - 1);
-    }
-
-    protected VersionedChecksummedBytes(int version, byte[] bytes) {
-        checkArgument(version >= 0 && version < 256);
-        this.version = version;
-        this.bytes = bytes;
-    }
-
-    /**
-     * Returns the base-58 encoded String representation of this
-     * object, including version and checksum bytes.
-     */
-    public final String toBase58() {
-        // A stringified buffer is:
-        //   1 byte version + data bytes + 4 bytes check code (a truncated hash)
-        byte[] addressBytes = new byte[1 + bytes.length + 4];
-        addressBytes[0] = (byte) version;
-        System.arraycopy(bytes, 0, addressBytes, 1, bytes.length);
-        byte[] checksum = Sha256Hash.hashTwice(addressBytes, 0, bytes.length + 1);
-        System.arraycopy(checksum, 0, addressBytes, bytes.length + 1, 4);
-        return Base58.encode(addressBytes);
-    }
-
-    @Override
-    public String toString() {
-        return toBase58();
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(version, Arrays.hashCode(bytes));
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        VersionedChecksummedBytes other = (VersionedChecksummedBytes) o;
-        return this.version == other.version && Arrays.equals(this.bytes, other.bytes);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * This implementation narrows the return type to <code>VersionedChecksummedBytes</code>
-     * and allows subclasses to throw <code>CloneNotSupportedException</code> even though it
-     * is never thrown by this implementation.
-     */
-    @Override
-    public VersionedChecksummedBytes clone() throws CloneNotSupportedException {
-        return (VersionedChecksummedBytes) super.clone();
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * This implementation uses an optimized Google Guava method to compare <code>bytes</code>.
-     */
-    @Override
-    public int compareTo(VersionedChecksummedBytes o) {
-        int result = Ints.compare(this.version, o.version);
-        return result != 0 ? result : UnsignedBytes.lexicographicalComparator().compare(this.bytes, o.bytes);
-    }
-
-    /**
-     * Returns the "version" or "header" byte: the first byte of the data. This is used to disambiguate what the
-     * contents apply to, for example, which network the key or address is valid on.
-     *
-     * @return A positive number between 0 and 255.
-     */
-    public int getVersion() {
-        return version;
-    }
-}
diff --git a/core/src/main/java/org/bitcoinj/core/WrongNetworkException.java b/core/src/main/java/org/bitcoinj/core/WrongNetworkException.java
deleted file mode 100644
index e49dd284eb5..00000000000
--- a/core/src/main/java/org/bitcoinj/core/WrongNetworkException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.bitcoinj.core;
-
-import java.util.Arrays;
-
-/**
- * This exception is thrown by the Address class when you try and decode an address with a version code that isn't
- * used by that network. You shouldn't allow the user to proceed in this case as they are trying to send money across
- * different chains, an operation that is guaranteed to destroy the money.
- */
-public class WrongNetworkException extends AddressFormatException {
-    /** The version code that was provided in the address. */
-    public int verCode;
-    /** The list of acceptable versions that were expected given the addresses network parameters. */
-    public int[] acceptableVersions;
-    
-    public WrongNetworkException(int verCode, int[] acceptableVersions) {
-        super("Version code of address did not match acceptable versions for network: " + verCode + " not in " +
-          Arrays.toString(acceptableVersions));
-        this.verCode = verCode;
-        this.acceptableVersions = acceptableVersions;
-    }
-}
diff --git a/core/src/main/java/org/bitcoinj/core/listeners/AbstractBlockChainListener.java b/core/src/main/java/org/bitcoinj/core/listeners/AbstractBlockChainListener.java
deleted file mode 100644
index 391edba32e2..00000000000
--- a/core/src/main/java/org/bitcoinj/core/listeners/AbstractBlockChainListener.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.bitcoinj.core.listeners;
-
-import org.bitcoinj.core.*;
-
-import java.util.*;
-
-/**
- * For backwards compatibility only. Implements the block chain listener interfaces. Use the more specific interfaces
- * instead.
- */
-@Deprecated
-public class AbstractBlockChainListener implements BlockChainListener {
-    @Override
-    public void notifyNewBestBlock(StoredBlock block) throws VerificationException {
-    }
-
-    @Override
-    public void reorganize(StoredBlock splitPoint, List<StoredBlock> oldBlocks, List<StoredBlock> newBlocks) throws VerificationException {
-    }
-
-    @Override
-    public void receiveFromBlock(Transaction tx, StoredBlock block, BlockChain.NewBlockType blockType, int relativityOffset) throws VerificationException {
-    }
-
-    @Override
-    public boolean notifyTransactionIsInBlock(Sha256Hash txHash, StoredBlock block, BlockChain.NewBlockType blockType, int relativityOffset) throws VerificationException {
-        return false;
-    }
-}
diff --git a/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerConnectionEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerConnectionEventListener.java
deleted file mode 100644
index 6e5aa5ba9c4..00000000000
--- a/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerConnectionEventListener.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.bitcoinj.core.listeners;
-
-import org.bitcoinj.core.*;
-
-import java.util.*;
-
-/**
- * Deprecated: implement the more specific event listener interfaces instead to fill out only what you need
- */
-@Deprecated
-public abstract class AbstractPeerConnectionEventListener implements PeerConnectionEventListener {
-    @Override
-    public void onPeersDiscovered(Set<PeerAddress> peerAddresses) {
-        // Do nothing
-    }
-
-    @Override
-    public void onPeerConnected(Peer peer, int peerCount) {
-        // Do nothing
-    }
-
-    @Override
-    public void onPeerDisconnected(Peer peer, int peerCount) {
-        // Do nothing
-    }
-}
diff --git a/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerEventListener.java
deleted file mode 100644
index a8d9ee54aed..00000000000
--- a/core/src/main/java/org/bitcoinj/core/listeners/AbstractPeerEventListener.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.bitcoinj.core.listeners;
-
-import org.bitcoinj.core.Block;
-import org.bitcoinj.core.FilteredBlock;
-import org.bitcoinj.core.GetDataMessage;
-import org.bitcoinj.core.Message;
-import org.bitcoinj.core.PeerAddress;
-import org.bitcoinj.core.Peer;
-import org.bitcoinj.core.Transaction;
-import javax.annotation.*;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Deprecated: implement the more specific event listener interfaces instead to fill out only what you need
- */
-@Deprecated
-public abstract class AbstractPeerEventListener extends AbstractPeerDataEventListener implements PeerConnectionEventListener, OnTransactionBroadcastListener {
-    @Override
-    public void onBlocksDownloaded(Peer peer, Block block, @Nullable FilteredBlock filteredBlock, int blocksLeft) {
-    }
-
-    @Override
-    public void onChainDownloadStarted(Peer peer, int blocksLeft) {
-    }
-
-    @Override
-    public Message onPreMessageReceived(Peer peer, Message m) {
-        // Just pass the message right through for further processing.
-        return m;
-    }
-
-    @Override
-    public void onTransaction(Peer peer, Transaction t) {
-    }
-
-    @Override
-    public List<Message> getData(Peer peer, GetDataMessage m) {
-        return null;
-    }
-
-    @Override
-    public void onPeersDiscovered(Set<PeerAddress> peerAddresses) {
-    }
-
-    @Override
-    public void onPeerConnected(Peer peer, int peerCount) {
-    }
-
-    @Override
-    public void onPeerDisconnected(Peer peer, int peerCount) {
-    }
-}
diff --git a/core/src/main/java/org/bitcoinj/core/listeners/BlockChainListener.java b/core/src/main/java/org/bitcoinj/core/listeners/BlockChainListener.java
deleted file mode 100644
index a19a42b74fe..00000000000
--- a/core/src/main/java/org/bitcoinj/core/listeners/BlockChainListener.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.bitcoinj.core.listeners;
-
-/**
- * Old interface for backwards compatibility. Implement the more specific interfaces instead.
- */
-@Deprecated
-public interface BlockChainListener extends NewBestBlockListener, TransactionReceivedInBlockListener, ReorganizeListener {
-}
diff --git a/core/src/main/java/org/bitcoinj/core/listeners/BlocksDownloadedEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/BlocksDownloadedEventListener.java
index 6edb2282b11..5481726fc3c 100644
--- a/core/src/main/java/org/bitcoinj/core/listeners/BlocksDownloadedEventListener.java
+++ b/core/src/main/java/org/bitcoinj/core/listeners/BlocksDownloadedEventListener.java
@@ -22,7 +22,7 @@
 
 /**
  * <p>Implementors can listen to events like blocks being downloaded/transactions being broadcast/connect/disconnects,
- * they can pre-filter messages before they are procesesed by a {@link Peer} or {@link PeerGroup}, and they can
+ * they can pre-filter messages before they are processed by a {@link Peer} or {@link PeerGroup}, and they can
  * provide transactions to remote peers when they ask for them.</p>
  */
 public interface BlocksDownloadedEventListener {
diff --git a/core/src/main/java/org/bitcoinj/core/listeners/ChainDownloadStartedEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/ChainDownloadStartedEventListener.java
index 434b0843434..927847f46a7 100644
--- a/core/src/main/java/org/bitcoinj/core/listeners/ChainDownloadStartedEventListener.java
+++ b/core/src/main/java/org/bitcoinj/core/listeners/ChainDownloadStartedEventListener.java
@@ -20,7 +20,7 @@
 
 /**
  * <p>Implementors can listen to events like blocks being downloaded/transactions being broadcast/connect/disconnects,
- * they can pre-filter messages before they are procesesed by a {@link Peer} or {@link PeerGroup}, and they can
+ * they can pre-filter messages before they are processed by a {@link Peer} or {@link PeerGroup}, and they can
  * provide transactions to remote peers when they ask for them.</p>
  */
 public interface ChainDownloadStartedEventListener {
diff --git a/core/src/main/java/org/bitcoinj/core/listeners/DownloadProgressTracker.java b/core/src/main/java/org/bitcoinj/core/listeners/DownloadProgressTracker.java
index dfd8b1fd65b..088f220c2f2 100644
--- a/core/src/main/java/org/bitcoinj/core/listeners/DownloadProgressTracker.java
+++ b/core/src/main/java/org/bitcoinj/core/listeners/DownloadProgressTracker.java
@@ -66,8 +66,13 @@ public void onBlocksDownloaded(Peer peer, Block block, @Nullable FilteredBlock f
 
         if (blocksLeft == 0) {
             caughtUp = true;
+            if (lastPercent != 100) {
+                lastPercent = 100;
+                progress(lastPercent, blocksLeft, new Date(block.getTimeSeconds() * 1000));
+            }
             doneDownload();
             future.set(peer.getBestHeight());
+            return;
         }
 
         if (blocksLeft < 0 || originalBlocksLeft <= 0)
diff --git a/core/src/main/java/org/bitcoinj/core/listeners/GetDataEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/GetDataEventListener.java
index 2fbc1e0c11f..96bb254f057 100644
--- a/core/src/main/java/org/bitcoinj/core/listeners/GetDataEventListener.java
+++ b/core/src/main/java/org/bitcoinj/core/listeners/GetDataEventListener.java
@@ -17,13 +17,14 @@
 package org.bitcoinj.core.listeners;
 
 import org.bitcoinj.core.*;
+import org.bitcoinj.utils.Threading;
 
 import javax.annotation.*;
 import java.util.*;
 
 /**
  * <p>Implementors can listen to events like blocks being downloaded/transactions being broadcast/connect/disconnects,
- * they can pre-filter messages before they are procesesed by a {@link Peer} or {@link PeerGroup}, and they can
+ * they can pre-filter messages before they are processed by a {@link Peer} or {@link PeerGroup}, and they can
  * provide transactions to remote peers when they ask for them.</p>
  */
 public interface GetDataEventListener {
@@ -33,7 +34,7 @@ public interface GetDataEventListener {
      * items as possible which appear in the {@link GetDataMessage}, or null if you're not interested in responding.</p>
      *
      * <p>Note that this will never be called if registered with any executor other than
-     * {@link org.bitcoinj.utils.Threading#SAME_THREAD}</p>
+     * {@link Threading#SAME_THREAD}</p>
      */
     @Nullable
     List<Message> getData(Peer peer, GetDataMessage m);
diff --git a/core/src/main/java/org/bitcoinj/core/listeners/NewBestBlockListener.java b/core/src/main/java/org/bitcoinj/core/listeners/NewBestBlockListener.java
index 178b3470329..93eb04b2fb3 100644
--- a/core/src/main/java/org/bitcoinj/core/listeners/NewBestBlockListener.java
+++ b/core/src/main/java/org/bitcoinj/core/listeners/NewBestBlockListener.java
@@ -16,7 +16,10 @@
 
 package org.bitcoinj.core.listeners;
 
+import org.bitcoinj.core.AbstractBlockChain;
+import org.bitcoinj.core.Sha256Hash;
 import org.bitcoinj.core.StoredBlock;
+import org.bitcoinj.core.Transaction;
 import org.bitcoinj.core.VerificationException;
 
 /**
@@ -26,8 +29,8 @@ public interface NewBestBlockListener {
     /**
      * Called when a new block on the best chain is seen, after relevant
      * transactions are extracted and sent to us via either
-     * {@link TransactionReceivedInBlockListener#receiveFromBlock(org.bitcoinj.core.Transaction, org.bitcoinj.core.StoredBlock, org.bitcoinj.core.BlockChain.NewBlockType, int relativityOffset)}
-     * or {@link TransactionReceivedInBlockListener#notifyTransactionIsInBlock(org.bitcoinj.core.Sha256Hash, org.bitcoinj.core.StoredBlock, org.bitcoinj.core.BlockChain.NewBlockType, int)}.
+     * {@link TransactionReceivedInBlockListener#receiveFromBlock(Transaction, StoredBlock, AbstractBlockChain.NewBlockType, int)}
+     * or {@link TransactionReceivedInBlockListener#notifyTransactionIsInBlock(Sha256Hash, StoredBlock, AbstractBlockChain.NewBlockType, int)}.
      * If this block is causing a re-organise to a new chain, this method is NOT
      * called even though the block may be the new best block: your reorganize
      * implementation is expected to do whatever would normally be done do for a
diff --git a/core/src/main/java/org/bitcoinj/core/listeners/OnTransactionBroadcastListener.java b/core/src/main/java/org/bitcoinj/core/listeners/OnTransactionBroadcastListener.java
index 9ae94af20bd..58e6614c561 100644
--- a/core/src/main/java/org/bitcoinj/core/listeners/OnTransactionBroadcastListener.java
+++ b/core/src/main/java/org/bitcoinj/core/listeners/OnTransactionBroadcastListener.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/core/listeners/PeerConnectedEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/PeerConnectedEventListener.java
index c41722038ca..8af273896fd 100644
--- a/core/src/main/java/org/bitcoinj/core/listeners/PeerConnectedEventListener.java
+++ b/core/src/main/java/org/bitcoinj/core/listeners/PeerConnectedEventListener.java
@@ -17,6 +17,7 @@
 package org.bitcoinj.core.listeners;
 
 import org.bitcoinj.core.Peer;
+import org.bitcoinj.core.PeerGroup;
 
 /**
  * <p>Implementors can listen to events indicating a new peer connecting.</p>
diff --git a/core/src/main/java/org/bitcoinj/core/listeners/PeerConnectionEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/PeerConnectionEventListener.java
deleted file mode 100644
index ed5e9d9014c..00000000000
--- a/core/src/main/java/org/bitcoinj/core/listeners/PeerConnectionEventListener.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.bitcoinj.core.listeners;
-
-import org.bitcoinj.core.Peer;
-
-/**
- * <p>Implementors can listen to events like peer discovery, connect or disconnects.</p>
- *
- * @deprecated Use the single event interfaces instead
- */
-@Deprecated
-public interface PeerConnectionEventListener extends PeerConnectedEventListener,
-        PeerDiscoveredEventListener, PeerDisconnectedEventListener {
-
-    /**
-     * Called when a peer is disconnected. Note that this won't be called if the listener is registered on a
-     * {@link PeerGroup} and the group is in the process of shutting down. If this listener is registered to a
-     * {@link Peer} instead of a {@link PeerGroup}, peerCount will always be 0. This handler can be called without
-     * a corresponding invocation of onPeerConnected if the initial connection is never successful.
-     *
-     * @param peer
-     * @param peerCount the total number of connected peers
-     */
-    void onPeerDisconnected(Peer peer, int peerCount);
-}
diff --git a/core/src/main/java/org/bitcoinj/core/listeners/PeerDisconnectedEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/PeerDisconnectedEventListener.java
index 7565b2c8c23..709fcd86ad8 100644
--- a/core/src/main/java/org/bitcoinj/core/listeners/PeerDisconnectedEventListener.java
+++ b/core/src/main/java/org/bitcoinj/core/listeners/PeerDisconnectedEventListener.java
@@ -17,6 +17,7 @@
 package org.bitcoinj.core.listeners;
 
 import org.bitcoinj.core.Peer;
+import org.bitcoinj.core.PeerGroup;
 
 /**
  * <p>Implementors can listen to events indicating a peer disconnecting.</p>
diff --git a/core/src/main/java/org/bitcoinj/core/listeners/PeerDiscoveredEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/PeerDiscoveredEventListener.java
index 45d6f24737b..7de58abcf88 100644
--- a/core/src/main/java/org/bitcoinj/core/listeners/PeerDiscoveredEventListener.java
+++ b/core/src/main/java/org/bitcoinj/core/listeners/PeerDiscoveredEventListener.java
@@ -18,6 +18,8 @@
 
 import org.bitcoinj.core.Peer;
 import org.bitcoinj.core.PeerAddress;
+import org.bitcoinj.core.PeerGroup;
+
 import java.util.Set;
 
 /**
diff --git a/core/src/main/java/org/bitcoinj/core/listeners/PreMessageReceivedEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/PreMessageReceivedEventListener.java
index ff1256430b4..35248625353 100644
--- a/core/src/main/java/org/bitcoinj/core/listeners/PreMessageReceivedEventListener.java
+++ b/core/src/main/java/org/bitcoinj/core/listeners/PreMessageReceivedEventListener.java
@@ -17,10 +17,11 @@
 package org.bitcoinj.core.listeners;
 
 import org.bitcoinj.core.*;
+import org.bitcoinj.utils.Threading;
 
 /**
  * <p>Implementors can listen to events like blocks being downloaded/transactions being broadcast/connect/disconnects,
- * they can pre-filter messages before they are procesesed by a {@link Peer} or {@link PeerGroup}, and they can
+ * they can pre-filter messages before they are processed by a {@link Peer} or {@link PeerGroup}, and they can
  * provide transactions to remote peers when they ask for them.</p>
  */
 public interface PreMessageReceivedEventListener {
@@ -32,7 +33,7 @@ public interface PreMessageReceivedEventListener {
      * callback is passed as "m" to the next, forming a chain.</p>
      *
      * <p>Note that this will never be called if registered with any executor other than
-     * {@link org.bitcoinj.utils.Threading#SAME_THREAD}</p>
+     * {@link Threading#SAME_THREAD}</p>
      */
     Message onPreMessageReceived(Peer peer, Message m);
 }
diff --git a/core/src/main/java/org/bitcoinj/core/listeners/ReorganizeListener.java b/core/src/main/java/org/bitcoinj/core/listeners/ReorganizeListener.java
index 67c59bd36fc..25580cce4e3 100644
--- a/core/src/main/java/org/bitcoinj/core/listeners/ReorganizeListener.java
+++ b/core/src/main/java/org/bitcoinj/core/listeners/ReorganizeListener.java
@@ -17,6 +17,8 @@
 package org.bitcoinj.core.listeners;
 
 import java.util.List;
+
+import org.bitcoinj.core.BlockChain;
 import org.bitcoinj.core.StoredBlock;
 import org.bitcoinj.core.VerificationException;
 
@@ -26,7 +28,7 @@
 public interface ReorganizeListener {
 
     /**
-     * Called by the {@link org.bitcoinj.core.BlockChain} when the best chain
+     * Called by the {@link BlockChain} when the best chain
      * (representing total work done) has changed. In this case,
      * we need to go through our transactions and find out if any have become invalid. It's possible for our balance
      * to go down in this case: money we thought we had can suddenly vanish if the rest of the network agrees it
diff --git a/core/src/main/java/org/bitcoinj/core/listeners/TransactionConfidenceEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/TransactionConfidenceEventListener.java
index 542bd017a14..4366f6cc397 100644
--- a/core/src/main/java/org/bitcoinj/core/listeners/TransactionConfidenceEventListener.java
+++ b/core/src/main/java/org/bitcoinj/core/listeners/TransactionConfidenceEventListener.java
@@ -38,9 +38,8 @@ public interface TransactionConfidenceEventListener {
      *     will then re-use the same outputs when creating the next spend.</li>
      * </ol><p>
      *
-     * <p>To find if the transaction is dead, you can use <tt>tx.getConfidence().getConfidenceType() ==
-     * TransactionConfidence.ConfidenceType.DEAD</tt>. If it is, you should notify the user
-     * in some way so they know the thing they bought may not arrive/the thing they sold should not be dispatched.</p>
+     * <p>To find if the transaction is dead, you can use {@code tx.getConfidence().getConfidenceType() == TransactionConfidence.ConfidenceType.DEAD}.
+     * If it is, you should notify the user in some way so they know the thing they bought may not arrive/the thing they sold should not be dispatched.</p>
      *
      * <p>Note that this callback will be invoked for every transaction in the wallet, for every new block that is
      * received (because the depth has changed). <b>If you want to update a UI view from the contents of the wallet
diff --git a/core/src/main/java/org/bitcoinj/core/listeners/TransactionReceivedInBlockListener.java b/core/src/main/java/org/bitcoinj/core/listeners/TransactionReceivedInBlockListener.java
index c1b1865c7b3..3254f60272f 100644
--- a/core/src/main/java/org/bitcoinj/core/listeners/TransactionReceivedInBlockListener.java
+++ b/core/src/main/java/org/bitcoinj/core/listeners/TransactionReceivedInBlockListener.java
@@ -17,6 +17,7 @@
 package org.bitcoinj.core.listeners;
 
 import org.bitcoinj.core.BlockChain;
+import org.bitcoinj.core.FilteredBlock;
 import org.bitcoinj.core.Sha256Hash;
 import org.bitcoinj.core.StoredBlock;
 import org.bitcoinj.core.Transaction;
diff --git a/core/src/main/java/org/bitcoinj/core/listeners/VersionMessageReceivedEventListener.java b/core/src/main/java/org/bitcoinj/core/listeners/VersionMessageReceivedEventListener.java
new file mode 100644
index 00000000000..cf6e2b0afcb
--- /dev/null
+++ b/core/src/main/java/org/bitcoinj/core/listeners/VersionMessageReceivedEventListener.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bitcoinj.core.listeners;
+
+import org.bitcoinj.core.Peer;
+import org.bitcoinj.core.VersionMessage;
+
+/**
+ * <p>Implementors can listen to events indicating a peer's VersionMessage receival during handshake.</p>
+ */
+public interface VersionMessageReceivedEventListener {
+
+    /**
+     * Called when a peer's VersionMessage is received during handshake. Peer's VersionMessage
+     * may be accessed through the Peer object; however, it is null until it is received. Here
+     * the VersionMessage is passed explicitly to be unambigious about its availability.
+     *
+     * @param peer the peer receiving the VersionMessage
+     * @param versionMessage the received VersionMessage
+     */
+    void onVersionMessageReceived(Peer peer, VersionMessage versionMessage);
+}
diff --git a/core/src/main/java/org/bitcoinj/core/package-info.java b/core/src/main/java/org/bitcoinj/core/package-info.java
index 0b075687027..cdd34874309 100644
--- a/core/src/main/java/org/bitcoinj/core/package-info.java
+++ b/core/src/main/java/org/bitcoinj/core/package-info.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/crypto/BIP38PrivateKey.java b/core/src/main/java/org/bitcoinj/crypto/BIP38PrivateKey.java
index 23520d3bb26..45fcee64f65 100644
--- a/core/src/main/java/org/bitcoinj/crypto/BIP38PrivateKey.java
+++ b/core/src/main/java/org/bitcoinj/crypto/BIP38PrivateKey.java
@@ -17,32 +17,26 @@
 package org.bitcoinj.crypto;
 
 import org.bitcoinj.core.*;
-import com.google.common.base.Charsets;
-import com.google.common.base.Objects;
+import org.bouncycastle.crypto.generators.SCrypt;
+
 import com.google.common.primitives.Bytes;
-import com.lambdaworks.crypto.SCrypt;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.SecretKeySpec;
 
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
 import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.text.Normalizer;
 import java.util.Arrays;
 
-import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 
 /**
  * Implementation of <a href="https://github.com/bitcoin/bips/blob/master/bip-0038.mediawiki">BIP 38</a>
  * passphrase-protected private keys. Currently, only decryption is supported.
  */
-public class BIP38PrivateKey extends VersionedChecksummedBytes {
-
-    public transient NetworkParameters params;
+public class BIP38PrivateKey extends PrefixedChecksummedBytes {
     public final boolean ecMultiply;
     public final boolean compressed;
     public final boolean hasLotAndSequence;
@@ -62,20 +56,16 @@ public static final class BadPassphraseException extends Exception {
      *             if the given base58 doesn't parse or the checksum is invalid
      */
     public static BIP38PrivateKey fromBase58(NetworkParameters params, String base58) throws AddressFormatException {
-        return new BIP38PrivateKey(params, base58);
-    }
+        byte[] versionAndDataBytes = Base58.decodeChecked(base58);
+        int version = versionAndDataBytes[0] & 0xFF;
+        byte[] bytes = Arrays.copyOfRange(versionAndDataBytes, 1, versionAndDataBytes.length);
 
-    /** @deprecated Use {@link #fromBase58(NetworkParameters, String)} */
-    @Deprecated
-    public BIP38PrivateKey(NetworkParameters params, String encoded) throws AddressFormatException {
-        super(encoded);
-        this.params = checkNotNull(params);
         if (version != 0x01)
-            throw new AddressFormatException("Mismatched version number: " + version);
+            throw new AddressFormatException.InvalidPrefix("Mismatched version number: " + version);
         if (bytes.length != 38)
-            throw new AddressFormatException("Wrong number of bytes, excluding version byte: " + bytes.length);
-        hasLotAndSequence = (bytes[1] & 0x04) != 0; // bit 2
-        compressed = (bytes[1] & 0x20) != 0; // bit 5
+            throw new AddressFormatException.InvalidDataLength("Wrong number of bytes: " + bytes.length);
+        boolean hasLotAndSequence = (bytes[1] & 0x04) != 0; // bit 2
+        boolean compressed = (bytes[1] & 0x20) != 0; // bit 5
         if ((bytes[1] & 0x01) != 0) // bit 0
             throw new AddressFormatException("Bit 0x01 reserved for future use.");
         if ((bytes[1] & 0x02) != 0) // bit 1
@@ -85,6 +75,7 @@ public BIP38PrivateKey(NetworkParameters params, String encoded) throws AddressF
         if ((bytes[1] & 0x10) != 0) // bit 4
             throw new AddressFormatException("Bit 0x10 reserved for future use.");
         final int byte0 = bytes[0] & 0xff;
+        final boolean ecMultiply;
         if (byte0 == 0x42) {
             // Non-EC-multiplied key
             if ((bytes[1] & 0xc0) != 0xc0) // bits 6+7
@@ -100,14 +91,34 @@ public BIP38PrivateKey(NetworkParameters params, String encoded) throws AddressF
         } else {
             throw new AddressFormatException("Second byte must by 0x42 or 0x43.");
         }
-        addressHash = Arrays.copyOfRange(bytes, 2, 6);
-        content = Arrays.copyOfRange(bytes, 6, 38);
+        byte[] addressHash = Arrays.copyOfRange(bytes, 2, 6);
+        byte[] content = Arrays.copyOfRange(bytes, 6, 38);
+        return new BIP38PrivateKey(params, bytes, ecMultiply, compressed, hasLotAndSequence, addressHash, content);
+    }
+
+    private BIP38PrivateKey(NetworkParameters params, byte[] bytes, boolean ecMultiply, boolean compressed,
+            boolean hasLotAndSequence, byte[] addressHash, byte[] content) throws AddressFormatException {
+        super(params, bytes);
+        this.ecMultiply = ecMultiply;
+        this.compressed = compressed;
+        this.hasLotAndSequence = hasLotAndSequence;
+        this.addressHash = addressHash;
+        this.content = content;
+    }
+
+    /**
+     * Returns the base58-encoded textual form, including version and checksum bytes.
+     * 
+     * @return textual form
+     */
+    public String toBase58() {
+        return Base58.encodeChecked(1, bytes);
     }
 
     public ECKey decrypt(String passphrase) throws BadPassphraseException {
         String normalizedPassphrase = Normalizer.normalize(passphrase, Normalizer.Form.NFC);
         ECKey key = ecMultiply ? decryptEC(normalizedPassphrase) : decryptNoEC(normalizedPassphrase);
-        Sha256Hash hash = Sha256Hash.twiceOf(key.toAddress(params).toString().getBytes(Charsets.US_ASCII));
+        Sha256Hash hash = Sha256Hash.twiceOf(LegacyAddress.fromKey(params, key).toString().getBytes(StandardCharsets.US_ASCII));
         byte[] actualAddressHash = Arrays.copyOfRange(hash.getBytes(), 0, 4);
         if (!Arrays.equals(actualAddressHash, addressHash))
             throw new BadPassphraseException();
@@ -116,7 +127,7 @@ public ECKey decrypt(String passphrase) throws BadPassphraseException {
 
     private ECKey decryptNoEC(String normalizedPassphrase) {
         try {
-            byte[] derived = SCrypt.scrypt(normalizedPassphrase.getBytes(Charsets.UTF_8), addressHash, 16384, 8, 8, 64);
+            byte[] derived = SCrypt.generate(normalizedPassphrase.getBytes(StandardCharsets.UTF_8), addressHash, 16384, 8, 8, 64);
             byte[] key = Arrays.copyOfRange(derived, 32, 64);
             SecretKeySpec keyspec = new SecretKeySpec(key, "AES");
 
@@ -138,7 +149,7 @@ private ECKey decryptEC(String normalizedPassphrase) {
             byte[] ownerEntropy = Arrays.copyOfRange(content, 0, 8);
             byte[] ownerSalt = hasLotAndSequence ? Arrays.copyOfRange(ownerEntropy, 0, 4) : ownerEntropy;
 
-            byte[] passFactorBytes = SCrypt.scrypt(normalizedPassphrase.getBytes(Charsets.UTF_8), ownerSalt, 16384, 8, 8, 32);
+            byte[] passFactorBytes = SCrypt.generate(normalizedPassphrase.getBytes(StandardCharsets.UTF_8), ownerSalt, 16384, 8, 8, 32);
             if (hasLotAndSequence) {
                 byte[] hashBytes = Bytes.concat(passFactorBytes, ownerEntropy);
                 checkState(hashBytes.length == 40);
@@ -149,7 +160,7 @@ private ECKey decryptEC(String normalizedPassphrase) {
 
             byte[] salt = Bytes.concat(addressHash, ownerEntropy);
             checkState(salt.length == 12);
-            byte[] derived = SCrypt.scrypt(k.getPubKey(), salt, 1024, 1, 1, 64);
+            byte[] derived = SCrypt.generate(k.getPubKey(), salt, 1024, 1, 1, 64);
             byte[] aeskey = Arrays.copyOfRange(derived, 32, 64);
 
             SecretKeySpec keyspec = new SecretKeySpec(aeskey, "AES");
@@ -182,27 +193,7 @@ private ECKey decryptEC(String normalizedPassphrase) {
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        BIP38PrivateKey other = (BIP38PrivateKey) o;
-        return super.equals(other) && Objects.equal(this.params, other.params);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(super.hashCode(), params);
-    }
-
-    // Java serialization
-
-    private void writeObject(ObjectOutputStream out) throws IOException {
-        out.defaultWriteObject();
-        out.writeUTF(params.getId());
-    }
-
-    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
-        in.defaultReadObject();
-        params = checkNotNull(NetworkParameters.fromID(in.readUTF()));
+    public String toString() {
+        return toBase58();
     }
 }
diff --git a/core/src/main/java/org/bitcoinj/crypto/ChildNumber.java b/core/src/main/java/org/bitcoinj/crypto/ChildNumber.java
index 1952036bab7..068145a1e54 100644
--- a/core/src/main/java/org/bitcoinj/crypto/ChildNumber.java
+++ b/core/src/main/java/org/bitcoinj/crypto/ChildNumber.java
@@ -16,13 +16,14 @@
 
 package org.bitcoinj.crypto;
 
+import java.util.List;
 import java.util.Locale;
 
 import com.google.common.primitives.Ints;
 
 /**
  * <p>This is just a wrapper for the i (child number) as per BIP 32 with a boolean getter for the most significant bit
- * and a getter for the actual 0-based child number. A {@link java.util.List} of these forms a <i>path</i> through a
+ * and a getter for the actual 0-based child number. A {@link List} of these forms a <i>path</i> through a
  * {@link DeterministicHierarchy}. This class is immutable.
  */
 public class ChildNumber implements Comparable<ChildNumber> {
@@ -36,8 +37,9 @@ public class ChildNumber implements Comparable<ChildNumber> {
     public static final int HARDENED_BIT = 0x80000000;
 
     public static final ChildNumber ZERO = new ChildNumber(0);
-    public static final ChildNumber ONE = new ChildNumber(1);
     public static final ChildNumber ZERO_HARDENED = new ChildNumber(0, true);
+    public static final ChildNumber ONE = new ChildNumber(1);
+    public static final ChildNumber ONE_HARDENED = new ChildNumber(1, true);
 
     /** Integer i as per BIP 32 spec, including the MSB denoting derivation type (0 = public, 1 = private) **/
     private final int i;
diff --git a/core/src/main/java/org/bitcoinj/crypto/DRMWorkaround.java b/core/src/main/java/org/bitcoinj/crypto/DRMWorkaround.java
index 7f8320e40dd..35e2ae618ac 100644
--- a/core/src/main/java/org/bitcoinj/crypto/DRMWorkaround.java
+++ b/core/src/main/java/org/bitcoinj/crypto/DRMWorkaround.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -21,6 +23,7 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 
 public class DRMWorkaround {
     private static Logger log = LoggerFactory.getLogger(DRMWorkaround.class);
@@ -36,11 +39,14 @@ public static void maybeDisableExportControls() {
         if (done) return;
         done = true;
 
-        if (Utils.isAndroidRuntime())
+        if (Utils.isAndroidRuntime() || Utils.isOpenJDKRuntime())
             return;
         try {
             Field gate = Class.forName("javax.crypto.JceSecurity").getDeclaredField("isRestricted");
             gate.setAccessible(true);
+            Field modifiersField = Field.class.getDeclaredField("modifiers");
+            modifiersField.setAccessible(true);
+            modifiersField.setInt(gate, gate.getModifiers() & ~Modifier.FINAL);
             gate.setBoolean(null, false);
             final Field allPerm = Class.forName("javax.crypto.CryptoAllPermission").getDeclaredField("INSTANCE");
             allPerm.setAccessible(true);
diff --git a/core/src/main/java/org/bitcoinj/crypto/DeterministicHierarchy.java b/core/src/main/java/org/bitcoinj/crypto/DeterministicHierarchy.java
index eba119fd7bd..ac90cf69865 100644
--- a/core/src/main/java/org/bitcoinj/crypto/DeterministicHierarchy.java
+++ b/core/src/main/java/org/bitcoinj/crypto/DeterministicHierarchy.java
@@ -58,7 +58,7 @@ public DeterministicHierarchy(DeterministicKey rootKey) {
     }
 
     /**
-     * Inserts a key into the heirarchy. Used during deserialization: you normally don't need this. Keys must be
+     * Inserts a key into the hierarchy. Used during deserialization: you normally don't need this. Keys must be
      * inserted in order.
      */
     public final void putKey(DeterministicKey key) {
diff --git a/core/src/main/java/org/bitcoinj/crypto/DeterministicKey.java b/core/src/main/java/org/bitcoinj/crypto/DeterministicKey.java
index b91438cda1f..fb059e05d06 100644
--- a/core/src/main/java/org/bitcoinj/crypto/DeterministicKey.java
+++ b/core/src/main/java/org/bitcoinj/crypto/DeterministicKey.java
@@ -18,12 +18,13 @@
 package org.bitcoinj.crypto;
 
 import org.bitcoinj.core.*;
+import org.bitcoinj.script.Script;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableList;
-import org.spongycastle.crypto.params.KeyParameter;
-import org.spongycastle.math.ec.ECPoint;
+import org.bouncycastle.crypto.params.KeyParameter;
+import org.bouncycastle.math.ec.ECPoint;
 
 import javax.annotation.Nullable;
 import java.math.BigInteger;
@@ -130,7 +131,7 @@ private int ascertainParentFingerprint(DeterministicKey parentKey, int parentFin
      * information about its parent key.  Invoked when deserializing, but otherwise not something that
      * you normally should use.
      */
-    private DeterministicKey(ImmutableList<ChildNumber> childNumberPath,
+    public DeterministicKey(ImmutableList<ChildNumber> childNumberPath,
                             byte[] chainCode,
                             LazyECPoint publicAsPoint,
                             @Nullable DeterministicKey parent,
@@ -150,7 +151,7 @@ private DeterministicKey(ImmutableList<ChildNumber> childNumberPath,
      * information about its parent key.  Invoked when deserializing, but otherwise not something that
      * you normally should use.
      */
-    private DeterministicKey(ImmutableList<ChildNumber> childNumberPath,
+    public DeterministicKey(ImmutableList<ChildNumber> childNumberPath,
                             byte[] chainCode,
                             BigInteger priv,
                             @Nullable DeterministicKey parent,
@@ -179,7 +180,7 @@ public DeterministicKey(DeterministicKey keyToClone, DeterministicKey newParent)
 
     /**
      * Returns the path through some {@link DeterministicHierarchy} which reaches this keys position in the tree.
-     * A path can be written as 1/2/1 which means the first child of the root, the second child of that node, then
+     * A path can be written as 0/1/0 which means the first child of the root, the second child of that node, then
      * the first child of that node.
      */
     public ImmutableList<ChildNumber> getPath() {
@@ -316,7 +317,6 @@ public boolean isPubKeyOnly() {
         return super.isPubKeyOnly() && (parent == null || parent.isPubKeyOnly());
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean hasPrivKey() {
         return findParentWithPrivKey() != null;
@@ -339,7 +339,7 @@ public boolean isEncrypted() {
     }
 
     /**
-     * Returns this keys {@link org.bitcoinj.crypto.KeyCrypter} <b>or</b> the keycrypter of its parent key.
+     * Returns this keys {@link KeyCrypter} <b>or</b> the keycrypter of its parent key.
      */
     @Override @Nullable
     public KeyCrypter getKeyCrypter() {
@@ -355,13 +355,13 @@ else if (parent != null)
     public ECDSASignature sign(Sha256Hash input, @Nullable KeyParameter aesKey) throws KeyCrypterException {
         if (isEncrypted()) {
             // If the key is encrypted, ECKey.sign will decrypt it first before rerunning sign. Decryption walks the
-            // key heirarchy to find the private key (see below), so, we can just run the inherited method.
+            // key hierarchy to find the private key (see below), so, we can just run the inherited method.
             return super.sign(input, aesKey);
         } else {
             // If it's not encrypted, derive the private via the parents.
             final BigInteger privateKey = findOrDerivePrivateKey();
             if (privateKey == null) {
-                // This key is a part of a public-key only heirarchy and cannot be used for signing
+                // This key is a part of a public-key only hierarchy and cannot be used for signing
                 throw new MissingPrivateKeyException();
             }
             return super.doSign(input, privateKey);
@@ -377,7 +377,7 @@ public DeterministicKey decrypt(KeyCrypter keyCrypter, KeyParameter aesKey) thro
         BigInteger privKey = findOrDeriveEncryptedPrivateKey(keyCrypter, aesKey);
         DeterministicKey key = new DeterministicKey(childNumberPath, chainCode, privKey, parent);
         if (!Arrays.equals(key.getPubKey(), getPubKey()))
-            throw new KeyCrypterException("Provided AES key is wrong");
+            throw new KeyCrypterException.PublicPrivateMismatch("Provided AES key is wrong");
         if (parent == null)
             key.setCreationTimeSeconds(getCreationTimeSeconds());
         return key;
@@ -391,8 +391,13 @@ public DeterministicKey decrypt(KeyParameter aesKey) throws KeyCrypterException
     // For when a key is encrypted, either decrypt our encrypted private key bytes, or work up the tree asking parents
     // to decrypt and re-derive.
     private BigInteger findOrDeriveEncryptedPrivateKey(KeyCrypter keyCrypter, KeyParameter aesKey) {
-        if (encryptedPrivateKey != null)
-            return new BigInteger(1, keyCrypter.decrypt(encryptedPrivateKey, aesKey));
+        if (encryptedPrivateKey != null) {
+            byte[] decryptedKey = keyCrypter.decrypt(encryptedPrivateKey, aesKey);
+            if (decryptedKey.length != 32)
+                throw new KeyCrypterException.InvalidCipherText(
+                        "Decrypted key must be 32 bytes long, but is " + decryptedKey.length);
+            return new BigInteger(1, decryptedKey);
+        }
         // Otherwise we don't have it, but maybe we can figure it out from our parents. Walk up the tree looking for
         // the first key that has some encrypted private key data.
         DeterministicKey cursor = parent;
@@ -403,6 +408,9 @@ private BigInteger findOrDeriveEncryptedPrivateKey(KeyCrypter keyCrypter, KeyPar
         if (cursor == null)
             throw new KeyCrypterException("Neither this key nor its parents have an encrypted private key");
         byte[] parentalPrivateKeyBytes = keyCrypter.decrypt(cursor.encryptedPrivateKey, aesKey);
+        if (parentalPrivateKeyBytes.length != 32)
+            throw new KeyCrypterException.InvalidCipherText(
+                    "Decrypted key must be 32 bytes long, but is " + parentalPrivateKeyBytes.length);
         return derivePrivateKeyDownwards(cursor, parentalPrivateKeyBytes);
     }
 
@@ -436,14 +444,14 @@ private BigInteger derivePrivateKeyDownwards(DeterministicKey cursor, byte[] par
         // If it's not, it means we tried decrypting with an invalid password and earlier checks e.g. for padding didn't
         // catch it.
         if (!downCursor.pub.equals(pub))
-            throw new KeyCrypterException("Could not decrypt bytes");
+            throw new KeyCrypterException.PublicPrivateMismatch("Could not decrypt bytes");
         return checkNotNull(downCursor.priv);
     }
 
     /**
-     * Derives a child at the given index using hardened derivation.  Note: <code>index</code> is
+     * Derives a child at the given index using hardened derivation.  Note: {@code index} is
      * not the "i" value.  If you want the softened derivation, then use instead
-     * <code>HDKeyDerivation.deriveChildKey(this, new ChildNumber(child, false))</code>.
+     * {@code HDKeyDerivation.deriveChildKey(this, new ChildNumber(child, false))}.
      */
     public DeterministicKey derive(int child) {
         return HDKeyDerivation.deriveChildKey(this, new ChildNumber(child, true));
@@ -461,17 +469,24 @@ public BigInteger getPrivKey() {
         return key;
     }
 
+    @Deprecated
     public byte[] serializePublic(NetworkParameters params) {
-        return serialize(params, true);
+        return serialize(params, true, Script.ScriptType.P2PKH);
     }
 
+    @Deprecated
     public byte[] serializePrivate(NetworkParameters params) {
-        return serialize(params, false);
+        return serialize(params, false, Script.ScriptType.P2PKH);
     }
 
-    private byte[] serialize(NetworkParameters params, boolean pub) {
+    private byte[] serialize(NetworkParameters params, boolean pub, Script.ScriptType outputScriptType) {
         ByteBuffer ser = ByteBuffer.allocate(78);
-        ser.putInt(pub ? params.getBip32HeaderPub() : params.getBip32HeaderPriv());
+        if (outputScriptType == Script.ScriptType.P2PKH)
+            ser.putInt(pub ? params.getBip32HeaderP2PKHpub() : params.getBip32HeaderP2PKHpriv());
+        else if (outputScriptType == Script.ScriptType.P2WPKH)
+            ser.putInt(pub ? params.getBip32HeaderP2WPKHpub() : params.getBip32HeaderP2WPKHpriv());
+        else
+            throw new IllegalStateException(outputScriptType.toString());
         ser.put((byte) getDepth());
         ser.putInt(getParentFingerprint());
         ser.putInt(getChildNumber().i());
@@ -481,12 +496,20 @@ private byte[] serialize(NetworkParameters params, boolean pub) {
         return ser.array();
     }
 
+    public String serializePubB58(NetworkParameters params, Script.ScriptType outputScriptType) {
+        return toBase58(serialize(params, true, outputScriptType));
+    }
+
+    public String serializePrivB58(NetworkParameters params, Script.ScriptType outputScriptType) {
+        return toBase58(serialize(params, false, outputScriptType));
+    }
+
     public String serializePubB58(NetworkParameters params) {
-        return toBase58(serialize(params, true));
+        return serializePubB58(params, Script.ScriptType.P2PKH);
     }
 
     public String serializePrivB58(NetworkParameters params) {
-        return toBase58(serialize(params, false));
+        return serializePrivB58(params, Script.ScriptType.P2PKH);
     }
 
     static String toBase58(byte[] ser) {
@@ -521,9 +544,10 @@ public static DeterministicKey deserialize(NetworkParameters params, byte[] seri
     public static DeterministicKey deserialize(NetworkParameters params, byte[] serializedKey, @Nullable DeterministicKey parent) {
         ByteBuffer buffer = ByteBuffer.wrap(serializedKey);
         int header = buffer.getInt();
-        if (header != params.getBip32HeaderPriv() && header != params.getBip32HeaderPub())
+        final boolean pub = header == params.getBip32HeaderP2PKHpub() || header == params.getBip32HeaderP2WPKHpub();
+        final boolean priv = header == params.getBip32HeaderP2PKHpriv() || header == params.getBip32HeaderP2WPKHpriv();
+        if (!(pub || priv))
             throw new IllegalArgumentException("Unknown header bytes: " + toBase58(serializedKey).substring(0, 4));
-        boolean pub = header == params.getBip32HeaderPub();
         int depth = buffer.get() & 0xFF; // convert signed byte to positive int since depth cannot be negative
         final int parentFingerprint = buffer.getInt();
         final int i = buffer.getInt();
@@ -560,7 +584,7 @@ public static DeterministicKey deserialize(NetworkParameters params, byte[] seri
 
     /**
      * The creation time of a deterministic key is equal to that of its parent, unless this key is the root of a tree
-     * in which case the time is stored alongside the key as per normal, see {@link org.bitcoinj.core.ECKey#getCreationTimeSeconds()}.
+     * in which case the time is stored alongside the key as per normal, see {@link ECKey#getCreationTimeSeconds()}.
      */
     @Override
     public long getCreationTimeSeconds() {
@@ -583,7 +607,7 @@ public void setCreationTimeSeconds(long newCreationTimeSeconds) {
     }
 
     /**
-     * Verifies equality of all fields but NOT the parent pointer (thus the same key derived in two separate heirarchy
+     * Verifies equality of all fields but NOT the parent pointer (thus the same key derived in two separate hierarchy
      * objects will equal each other.
      */
     @Override
@@ -615,13 +639,16 @@ public String toString() {
     }
 
     @Override
-    public void formatKeyWithAddress(boolean includePrivateKeys, StringBuilder builder, NetworkParameters params) {
-        final Address address = toAddress(params);
-        builder.append("  addr:").append(address);
+    public void formatKeyWithAddress(boolean includePrivateKeys, @Nullable KeyParameter aesKey, StringBuilder builder,
+            NetworkParameters params, Script.ScriptType outputScriptType, @Nullable String comment) {
+        builder.append("  addr:").append(Address.fromKey(params, this, outputScriptType).toString());
         builder.append("  hash160:").append(Utils.HEX.encode(getPubKeyHash()));
-        builder.append("  (").append(getPathAsString()).append(")\n");
+        builder.append("  (").append(getPathAsString());
+        if (comment != null)
+            builder.append(", ").append(comment);
+        builder.append(")\n");
         if (includePrivateKeys) {
-            builder.append("  ").append(toStringWithPrivate(params)).append("\n");
+            builder.append("  ").append(toStringWithPrivate(aesKey, params)).append("\n");
         }
     }
 }
diff --git a/core/src/main/java/org/bitcoinj/crypto/EncryptableItem.java b/core/src/main/java/org/bitcoinj/crypto/EncryptableItem.java
index 22c1fec3f7b..3c9fce1886d 100644
--- a/core/src/main/java/org/bitcoinj/crypto/EncryptableItem.java
+++ b/core/src/main/java/org/bitcoinj/crypto/EncryptableItem.java
@@ -22,7 +22,7 @@
 
 /**
  * Provides a uniform way to access something that can be optionally encrypted with a
- * {@link org.bitcoinj.crypto.KeyCrypter}, yielding an {@link org.bitcoinj.crypto.EncryptedData}, and
+ * {@link KeyCrypter}, yielding an {@link EncryptedData}, and
  * which can have a creation time associated with it.
  */
 public interface EncryptableItem {
diff --git a/core/src/main/java/org/bitcoinj/crypto/HDKeyDerivation.java b/core/src/main/java/org/bitcoinj/crypto/HDKeyDerivation.java
index 8640617cf75..55d96a3e7a9 100644
--- a/core/src/main/java/org/bitcoinj/crypto/HDKeyDerivation.java
+++ b/core/src/main/java/org/bitcoinj/crypto/HDKeyDerivation.java
@@ -18,7 +18,7 @@
 
 import com.google.common.collect.*;
 import org.bitcoinj.core.*;
-import org.spongycastle.math.ec.*;
+import org.bouncycastle.math.ec.*;
 
 import java.math.*;
 import java.nio.*;
@@ -57,8 +57,8 @@ private HDKeyDerivation() { }
      * broken by attackers (this is not theoretical, people have had money stolen that way). This method checks
      * that the given seed is at least 64 bits long.
      *
-     * @throws HDDerivationException if generated master key is invalid (private key 0 or >= n).
-     * @throws IllegalArgumentException if the seed is less than 8 bytes and could be brute forced.
+     * @throws HDDerivationException if generated master key is invalid (private key not between 0 and n inclusive)
+     * @throws IllegalArgumentException if the seed is less than 8 bytes and could be brute forced
      */
     public static DeterministicKey createMasterPrivateKey(byte[] seed) throws HDDerivationException {
         checkArgument(seed.length > 8, "Seed is too short and could be brute forced");
@@ -79,13 +79,23 @@ public static DeterministicKey createMasterPrivateKey(byte[] seed) throws HDDeri
     }
 
     /**
-     * @throws HDDerivationException if privKeyBytes is invalid (0 or >= n).
+     * @throws HDDerivationException if privKeyBytes is invalid (not between 0 and n inclusive).
      */
-    public static DeterministicKey createMasterPrivKeyFromBytes(byte[] privKeyBytes, byte[] chainCode) throws HDDerivationException {
+    public static DeterministicKey createMasterPrivKeyFromBytes(byte[] privKeyBytes, byte[] chainCode)
+            throws HDDerivationException {
+        // childNumberPath is an empty list because we are creating the root key.
+        return createMasterPrivKeyFromBytes(privKeyBytes, chainCode, ImmutableList.<ChildNumber> of());
+    }
+
+    /**
+     * @throws HDDerivationException if privKeyBytes is invalid (not between 0 and n inclusive).
+     */
+    public static DeterministicKey createMasterPrivKeyFromBytes(byte[] privKeyBytes, byte[] chainCode,
+            ImmutableList<ChildNumber> childNumberPath) throws HDDerivationException {
         BigInteger priv = new BigInteger(1, privKeyBytes);
         assertNonZero(priv, "Generated master key is invalid.");
         assertLessThanN(priv, "Generated master key is invalid.");
-        return new DeterministicKey(ImmutableList.<ChildNumber>of(), chainCode, priv, null);
+        return new DeterministicKey(childNumberPath, chainCode, priv, null);
     }
 
     public static DeterministicKey createMasterPubKeyFromBytes(byte[] pubKeyBytes, byte[] chainCode) {
@@ -94,11 +104,11 @@ public static DeterministicKey createMasterPubKeyFromBytes(byte[] pubKeyBytes, b
 
     /**
      * Derives a key given the "extended" child number, ie. the 0x80000000 bit of the value that you
-     * pass for <code>childNumber</code> will determine whether to use hardened derivation or not.
+     * pass for {@code childNumber} will determine whether to use hardened derivation or not.
      * Consider whether your code would benefit from the clarity of the equivalent, but explicit, form
-     * of this method that takes a <code>ChildNumber</code> rather than an <code>int</code>, for example:
-     * <code>deriveChildKey(parent, new ChildNumber(childNumber, true))</code>
-     * where the value of the hardened bit of <code>childNumber</code> is zero.
+     * of this method that takes a {@code ChildNumber} rather than an {@code int}, for example:
+     * {@code deriveChildKey(parent, new ChildNumber(childNumber, true))}
+     * where the value of the hardened bit of {@code childNumber} is zero.
      */
     public static DeterministicKey deriveChildKey(DeterministicKey parent, int childNumber) {
         return deriveChildKey(parent, new ChildNumber(childNumber));
@@ -176,7 +186,7 @@ public enum PublicDeriveMode {
     }
 
     public static RawKeyBytes deriveChildKeyBytesFromPublic(DeterministicKey parent, ChildNumber childNumber, PublicDeriveMode mode) throws HDDerivationException {
-        checkArgument(!childNumber.isHardened(), "Can't use private derivation with public keys only.");
+        checkArgument(!childNumber.isHardened(), "Hardened derivation is unsupported (%s).", childNumber);
         byte[] parentPublicKey = parent.getPubKeyPoint().getEncoded(true);
         checkState(parentPublicKey.length == 33, "Parent pubkey must be 33 bytes, but is " + parentPublicKey.length);
         ByteBuffer data = ByteBuffer.allocate(37);
diff --git a/core/src/main/java/org/bitcoinj/crypto/HDUtils.java b/core/src/main/java/org/bitcoinj/crypto/HDUtils.java
index fb9581c9fa5..ca34a3916c3 100644
--- a/core/src/main/java/org/bitcoinj/crypto/HDUtils.java
+++ b/core/src/main/java/org/bitcoinj/crypto/HDUtils.java
@@ -21,9 +21,9 @@
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
-import org.spongycastle.crypto.digests.SHA512Digest;
-import org.spongycastle.crypto.macs.HMac;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.digests.SHA512Digest;
+import org.bouncycastle.crypto.macs.HMac;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import javax.annotation.Nonnull;
 import java.nio.ByteBuffer;
@@ -91,7 +91,7 @@ public static String formatPath(List<ChildNumber> path) {
      */
     public static List<ChildNumber> parsePath(@Nonnull String path) {
         String[] parsedNodes = path.replace("M", "").split("/");
-        List<ChildNumber> nodes = new ArrayList<ChildNumber>();
+        List<ChildNumber> nodes = new ArrayList<>();
 
         for (String n : parsedNodes) {
             n = n.replaceAll(" ", "");
diff --git a/core/src/main/java/org/bitcoinj/crypto/KeyCrypter.java b/core/src/main/java/org/bitcoinj/crypto/KeyCrypter.java
index 2089e675a43..afa8c3d9c85 100644
--- a/core/src/main/java/org/bitcoinj/crypto/KeyCrypter.java
+++ b/core/src/main/java/org/bitcoinj/crypto/KeyCrypter.java
@@ -17,7 +17,7 @@
 package org.bitcoinj.crypto;
 
 import org.bitcoinj.wallet.Protos.Wallet.EncryptionType;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import java.io.Serializable;
 
diff --git a/core/src/main/java/org/bitcoinj/crypto/KeyCrypterException.java b/core/src/main/java/org/bitcoinj/crypto/KeyCrypterException.java
index e65a1deddce..c38b5f29fde 100644
--- a/core/src/main/java/org/bitcoinj/crypto/KeyCrypterException.java
+++ b/core/src/main/java/org/bitcoinj/crypto/KeyCrypterException.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -26,11 +28,39 @@
 public class KeyCrypterException extends RuntimeException {
     private static final long serialVersionUID = -4441989608332681377L;
 
-    public KeyCrypterException(String s) {
-        super(s);
+    public KeyCrypterException(String message) {
+        super(message);
     }
 
-    public KeyCrypterException(String s, Throwable throwable) {
-        super(s, throwable);
+    public KeyCrypterException(String message, Throwable throwable) {
+        super(message, throwable);
+    }
+
+    /**
+     * This exception is thrown when a private key or seed is decrypted, it doesn't match its public key any
+     * more. This likely means the wrong decryption key has been used.
+     */
+    public static class PublicPrivateMismatch extends KeyCrypterException {
+        public PublicPrivateMismatch(String message) {
+            super(message);
+        }
+
+        public PublicPrivateMismatch(String message, Throwable throwable) {
+            super(message, throwable);
+        }
+    }
+
+    /**
+     * This exception is thrown when a private key or seed is decrypted, the decrypted message is damaged
+     * (e.g. the padding is damaged). This likely means the wrong decryption key has been used.
+     */
+    public static class InvalidCipherText extends KeyCrypterException {
+        public InvalidCipherText(String message) {
+            super(message);
+        }
+
+        public InvalidCipherText(String message, Throwable throwable) {
+            super(message, throwable);
+        }
     }
 }
diff --git a/core/src/main/java/org/bitcoinj/crypto/KeyCrypterScrypt.java b/core/src/main/java/org/bitcoinj/crypto/KeyCrypterScrypt.java
index 6d4f72110e8..ed236750b7d 100644
--- a/core/src/main/java/org/bitcoinj/crypto/KeyCrypterScrypt.java
+++ b/core/src/main/java/org/bitcoinj/crypto/KeyCrypterScrypt.java
@@ -18,20 +18,22 @@
 package org.bitcoinj.crypto;
 
 import com.google.common.base.Objects;
+import com.google.common.base.Stopwatch;
 import com.google.protobuf.ByteString;
-import com.lambdaworks.crypto.SCrypt;
 import org.bitcoinj.core.Utils;
 import org.bitcoinj.wallet.Protos;
 import org.bitcoinj.wallet.Protos.ScryptParameters;
 import org.bitcoinj.wallet.Protos.Wallet.EncryptionType;
+import org.bouncycastle.crypto.engines.AESEngine;
+import org.bouncycastle.crypto.generators.SCrypt;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.spongycastle.crypto.BufferedBlockCipher;
-import org.spongycastle.crypto.engines.AESFastEngine;
-import org.spongycastle.crypto.modes.CBCBlockCipher;
-import org.spongycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.spongycastle.crypto.params.KeyParameter;
-import org.spongycastle.crypto.params.ParametersWithIV;
+import org.bouncycastle.crypto.BufferedBlockCipher;
+import org.bouncycastle.crypto.InvalidCipherTextException;
+import org.bouncycastle.crypto.modes.CBCBlockCipher;
+import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
+import org.bouncycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.ParametersWithIV;
 
 import java.security.SecureRandom;
 import java.util.Arrays;
@@ -102,8 +104,8 @@ public KeyCrypterScrypt() {
     }
 
     /**
-     * Encryption/Decryption using custom number of iterations parameters and a random salt. A useful value for mobile
-     * devices is 512 (~500 ms).
+     * Encryption/Decryption using custom number of iterations parameters and a random salt.
+     * As of August 2016, a useful value for mobile devices is 4096 (derivation takes about 1 second).
      *
      * @param iterations
      *            number of scrypt iterations
@@ -154,7 +156,10 @@ public KeyParameter deriveKey(CharSequence password) throws KeyCrypterException
                 log.warn("You are using a ScryptParameters with no salt. Your encryption may be vulnerable to a dictionary attack.");
             }
 
-            byte[] keyBytes = SCrypt.scrypt(passwordBytes, salt, (int) scryptParameters.getN(), scryptParameters.getR(), scryptParameters.getP(), KEY_LENGTH);
+            final Stopwatch watch = Stopwatch.createStarted();
+            byte[] keyBytes = SCrypt.generate(passwordBytes, salt, (int) scryptParameters.getN(), scryptParameters.getR(), scryptParameters.getP(), KEY_LENGTH);
+            watch.stop();
+            log.info("Deriving key took {} for {}.", watch, scryptParametersString());
             return new KeyParameter(keyBytes);
         } catch (Exception e) {
             throw new KeyCrypterException("Could not generate key from password and salt.", e);
@@ -182,7 +187,7 @@ public EncryptedData encrypt(byte[] plainBytes, KeyParameter aesKey) throws KeyC
             ParametersWithIV keyWithIv = new ParametersWithIV(aesKey, iv);
 
             // Encrypt using AES.
-            BufferedBlockCipher cipher = new PaddedBufferedBlockCipher(new CBCBlockCipher(new AESFastEngine()));
+            BufferedBlockCipher cipher = new PaddedBufferedBlockCipher(new CBCBlockCipher(new AESEngine()));
             cipher.init(true, keyWithIv);
             byte[] encryptedBytes = new byte[cipher.getOutputSize(plainBytes.length)];
             final int length1 = cipher.processBytes(plainBytes, 0, plainBytes.length, encryptedBytes, 0);
@@ -211,7 +216,7 @@ public byte[] decrypt(EncryptedData dataToDecrypt, KeyParameter aesKey) throws K
             ParametersWithIV keyWithIv = new ParametersWithIV(new KeyParameter(aesKey.getKey()), dataToDecrypt.initialisationVector);
 
             // Decrypt the message.
-            BufferedBlockCipher cipher = new PaddedBufferedBlockCipher(new CBCBlockCipher(new AESFastEngine()));
+            BufferedBlockCipher cipher = new PaddedBufferedBlockCipher(new CBCBlockCipher(new AESEngine()));
             cipher.init(false, keyWithIv);
 
             byte[] cipherBytes = dataToDecrypt.encryptedBytes;
@@ -220,7 +225,9 @@ public byte[] decrypt(EncryptedData dataToDecrypt, KeyParameter aesKey) throws K
             final int length2 = cipher.doFinal(decryptedBytes, length1);
 
             return Arrays.copyOf(decryptedBytes, length1 + length2);
-        } catch (Exception e) {
+        } catch (InvalidCipherTextException e) {
+            throw new KeyCrypterException.InvalidCipherText("Could not decrypt bytes", e);
+        } catch (RuntimeException e) {
             throw new KeyCrypterException("Could not decrypt bytes", e);
         }
     }
@@ -257,7 +264,11 @@ public EncryptionType getUnderstoodEncryptionType() {
 
     @Override
     public String toString() {
-        return "Scrypt/AES";
+        return "AES-" + KEY_LENGTH * 8 + "-CBC, Scrypt (" + scryptParametersString() + ")";
+    }
+
+    private String scryptParametersString() {
+        return "N=" + scryptParameters.getN() + ", r=" + scryptParameters.getR() + ", p=" + scryptParameters.getP();
     }
 
     @Override
diff --git a/core/src/main/java/org/bitcoinj/crypto/LazyECPoint.java b/core/src/main/java/org/bitcoinj/crypto/LazyECPoint.java
index 8d2e9cce378..8a04b84ed67 100644
--- a/core/src/main/java/org/bitcoinj/crypto/LazyECPoint.java
+++ b/core/src/main/java/org/bitcoinj/crypto/LazyECPoint.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -14,9 +16,9 @@
 
 package org.bitcoinj.crypto;
 
-import org.spongycastle.math.ec.ECCurve;
-import org.spongycastle.math.ec.ECFieldElement;
-import org.spongycastle.math.ec.ECPoint;
+import org.bouncycastle.math.ec.ECCurve;
+import org.bouncycastle.math.ec.ECFieldElement;
+import org.bouncycastle.math.ec.ECPoint;
 
 import javax.annotation.Nullable;
 import java.math.BigInteger;
diff --git a/core/src/main/java/org/bitcoinj/crypto/MnemonicCode.java b/core/src/main/java/org/bitcoinj/crypto/MnemonicCode.java
index 8955517da35..53b62e108e6 100644
--- a/core/src/main/java/org/bitcoinj/crypto/MnemonicCode.java
+++ b/core/src/main/java/org/bitcoinj/crypto/MnemonicCode.java
@@ -29,11 +29,13 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import static com.google.common.base.Preconditions.checkNotNull;
 import static org.bitcoinj.core.Utils.HEX;
 
 /**
@@ -86,8 +88,8 @@ private static InputStream openDefaultWords() throws IOException {
      * is supplied the digest of the words will be checked.
      */
     public MnemonicCode(InputStream wordstream, String wordListDigest) throws IOException, IllegalArgumentException {
-        BufferedReader br = new BufferedReader(new InputStreamReader(wordstream, "UTF-8"));
-        this.wordList = new ArrayList<String>(2048);
+        BufferedReader br = new BufferedReader(new InputStreamReader(wordstream, StandardCharsets.UTF_8));
+        this.wordList = new ArrayList<>(2048);
         MessageDigest md = Sha256Hash.newDigest();
         String word;
         while ((word = br.readLine()) != null) {
@@ -119,6 +121,7 @@ public List<String> getWordList() {
      * Convert mnemonic word list to seed.
      */
     public static byte[] toSeed(List<String> words, String passphrase) {
+        checkNotNull(passphrase, "A null passphrase is not allowed.");
 
         // To create binary seed from mnemonic, we use PBKDF2 function
         // with mnemonic sentence (in UTF-8) used as a password and
@@ -127,7 +130,7 @@ public static byte[] toSeed(List<String> words, String passphrase) {
         // used as a pseudo-random function. Desired length of the
         // derived key is 512 bits (= 64 bytes).
         //
-        String pass = Utils.join(words);
+        String pass = Utils.SPACE_JOINER.join(words);
         String salt = "mnemonic" + passphrase;
 
         final Stopwatch watch = Stopwatch.createStarted();
@@ -216,7 +219,7 @@ public List<String> toMnemonic(byte[] entropy) throws MnemonicException.Mnemonic
         // which is a position in a wordlist.  We convert numbers into
         // words and use joined words as mnemonic sentence.
 
-        ArrayList<String> words = new ArrayList<String>();
+        ArrayList<String> words = new ArrayList<>();
         int nwords = concatBits.length / 11;
         for (int i = 0; i < nwords; ++i) {
             int index = 0;
diff --git a/core/src/main/java/org/bitcoinj/crypto/PBKDF2SHA512.java b/core/src/main/java/org/bitcoinj/crypto/PBKDF2SHA512.java
index 03cfa419849..010b88ed84d 100644
--- a/core/src/main/java/org/bitcoinj/crypto/PBKDF2SHA512.java
+++ b/core/src/main/java/org/bitcoinj/crypto/PBKDF2SHA512.java
@@ -25,9 +25,11 @@
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
+
 import java.io.ByteArrayOutputStream;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
 
 /**
  * <p>This is a clean-room implementation of PBKDF2 using RFC 2898 as a reference.</p>
@@ -71,13 +73,13 @@ private static byte[] F(String P, String S, int c, int i) throws Exception {
         byte[] U_LAST = null;
         byte[] U_XOR = null;
 
-        SecretKeySpec key = new SecretKeySpec(P.getBytes("UTF-8"), "HmacSHA512");
+        SecretKeySpec key = new SecretKeySpec(P.getBytes(StandardCharsets.UTF_8), "HmacSHA512");
         Mac mac = Mac.getInstance(key.getAlgorithm());
         mac.init(key);
 
         for (int j = 0; j < c; j++) {
             if (j == 0) {
-                byte[] baS = S.getBytes("UTF-8");
+                byte[] baS = S.getBytes(StandardCharsets.UTF_8);
                 byte[] baI = INT(i);
                 byte[] baU = new byte[baS.length + baI.length];
 
diff --git a/core/src/main/java/org/bitcoinj/crypto/TransactionSignature.java b/core/src/main/java/org/bitcoinj/crypto/TransactionSignature.java
index 545804a1b0e..dfae9057937 100644
--- a/core/src/main/java/org/bitcoinj/crypto/TransactionSignature.java
+++ b/core/src/main/java/org/bitcoinj/crypto/TransactionSignature.java
@@ -16,6 +16,7 @@
 
 package org.bitcoinj.crypto;
 
+import org.bitcoinj.core.SignatureDecodeException;
 import org.bitcoinj.core.ECKey;
 import org.bitcoinj.core.Transaction;
 import org.bitcoinj.core.VerificationException;
@@ -26,7 +27,7 @@
 import java.math.BigInteger;
 
 /**
- * A TransactionSignature wraps an {@link org.bitcoinj.core.ECKey.ECDSASignature} and adds methods for handling
+ * A TransactionSignature wraps an {@link ECKey.ECDSASignature} and adds methods for handling
  * the additional SIGHASH mode byte that is used.
  */
 public class TransactionSignature extends ECKey.ECDSASignature {
@@ -156,20 +157,6 @@ public ECKey.ECDSASignature toCanonicalised() {
         return new TransactionSignature(super.toCanonicalised(), sigHashMode(), anyoneCanPay());
     }
 
-    /**
-     * Returns a decoded signature.
-     *
-     * @param requireCanonicalEncoding if the encoding of the signature must
-     * be canonical.
-     * @throws RuntimeException if the signature is invalid or unparseable in some way.
-     * @deprecated use {@link #decodeFromBitcoin(byte[], boolean, boolean} instead}.
-     */
-    @Deprecated
-    public static TransactionSignature decodeFromBitcoin(byte[] bytes,
-                                                         boolean requireCanonicalEncoding) throws VerificationException {
-        return decodeFromBitcoin(bytes, requireCanonicalEncoding, false);
-    }
-
     /**
      * Returns a decoded signature.
      *
@@ -177,20 +164,15 @@ public static TransactionSignature decodeFromBitcoin(byte[] bytes,
      * be canonical.
      * @param requireCanonicalSValue if the S-value must be canonical (below half
      * the order of the curve).
-     * @throws RuntimeException if the signature is invalid or unparseable in some way.
+     * @throws SignatureDecodeException if the signature is unparseable in some way.
+     * @throws VerificationException if the signature is invalid.
      */
-    public static TransactionSignature decodeFromBitcoin(byte[] bytes,
-                                                         boolean requireCanonicalEncoding,
-                                                         boolean requireCanonicalSValue) throws VerificationException {
+    public static TransactionSignature decodeFromBitcoin(byte[] bytes, boolean requireCanonicalEncoding,
+            boolean requireCanonicalSValue) throws SignatureDecodeException, VerificationException {
         // Bitcoin encoding is DER signature + sighash byte.
         if (requireCanonicalEncoding && !isEncodingCanonical(bytes))
             throw new VerificationException("Signature encoding is not canonical.");
-        ECKey.ECDSASignature sig;
-        try {
-            sig = ECKey.ECDSASignature.decodeFromDER(bytes);
-        } catch (IllegalArgumentException e) {
-            throw new VerificationException("Could not decode DER", e);
-        }
+        ECKey.ECDSASignature sig = ECKey.ECDSASignature.decodeFromDER(bytes);
         if (requireCanonicalSValue && !sig.isCanonical())
             throw new VerificationException("S-value is not canonical.");
 
diff --git a/core/src/main/java/org/bitcoinj/crypto/TrustStoreLoader.java b/core/src/main/java/org/bitcoinj/crypto/TrustStoreLoader.java
index a3542e8b043..9098799969f 100644
--- a/core/src/main/java/org/bitcoinj/crypto/TrustStoreLoader.java
+++ b/core/src/main/java/org/bitcoinj/crypto/TrustStoreLoader.java
@@ -27,7 +27,7 @@
 
 /**
  * An implementation of TrustStoreLoader handles fetching a KeyStore from the operating system, a file, etc. It's
- * necessary because the Java {@link java.security.KeyStore} abstraction is not completely seamless and for example
+ * necessary because the Java {@link KeyStore} abstraction is not completely seamless and for example
  * we sometimes need slightly different techniques to load the key store on different versions of Android, MacOS,
  * Windows, etc.
  */
diff --git a/core/src/main/java/org/bitcoinj/crypto/X509Utils.java b/core/src/main/java/org/bitcoinj/crypto/X509Utils.java
index 074468f7ba2..3f1ae0e7dec 100644
--- a/core/src/main/java/org/bitcoinj/crypto/X509Utils.java
+++ b/core/src/main/java/org/bitcoinj/crypto/X509Utils.java
@@ -17,12 +17,13 @@
 package org.bitcoinj.crypto;
 
 import com.google.common.base.Joiner;
-import org.spongycastle.asn1.ASN1ObjectIdentifier;
-import org.spongycastle.asn1.ASN1String;
-import org.spongycastle.asn1.x500.AttributeTypeAndValue;
-import org.spongycastle.asn1.x500.RDN;
-import org.spongycastle.asn1.x500.X500Name;
-import org.spongycastle.asn1.x500.style.RFC4519Style;
+import org.bitcoinj.protocols.payments.PaymentSession;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
+import org.bouncycastle.asn1.ASN1String;
+import org.bouncycastle.asn1.x500.AttributeTypeAndValue;
+import org.bouncycastle.asn1.x500.RDN;
+import org.bouncycastle.asn1.x500.X500Name;
+import org.bouncycastle.asn1.x500.style.RFC4519Style;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -38,7 +39,7 @@
 
 /**
  * X509Utils provides tools for working with X.509 certificates and keystores, as used in the BIP 70 payment protocol.
- * For more details on this, see {@link org.bitcoinj.protocols.payments.PaymentSession}, the article "Working with
+ * For more details on this, see {@link PaymentSession}, the article "Working with
  * the payment protocol" on the bitcoinj website, or the Bitcoin developer guide.
  */
 public class X509Utils {
diff --git a/core/src/main/java/org/bitcoinj/crypto/package-info.java b/core/src/main/java/org/bitcoinj/crypto/package-info.java
index f3b1447daae..59619c25440 100644
--- a/core/src/main/java/org/bitcoinj/crypto/package-info.java
+++ b/core/src/main/java/org/bitcoinj/crypto/package-info.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/jni/NativePaymentChannelHandlerFactory.java b/core/src/main/java/org/bitcoinj/jni/NativePaymentChannelHandlerFactory.java
index afee9c32c55..ec833c5ec62 100644
--- a/core/src/main/java/org/bitcoinj/jni/NativePaymentChannelHandlerFactory.java
+++ b/core/src/main/java/org/bitcoinj/jni/NativePaymentChannelHandlerFactory.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/jni/NativePaymentChannelServerConnectionEventHandler.java b/core/src/main/java/org/bitcoinj/jni/NativePaymentChannelServerConnectionEventHandler.java
index a706cc5ac64..6226bfb3c7a 100644
--- a/core/src/main/java/org/bitcoinj/jni/NativePaymentChannelServerConnectionEventHandler.java
+++ b/core/src/main/java/org/bitcoinj/jni/NativePaymentChannelServerConnectionEventHandler.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/jni/NativePeerEventListener.java b/core/src/main/java/org/bitcoinj/jni/NativePeerEventListener.java
deleted file mode 100644
index f9b160b8310..00000000000
--- a/core/src/main/java/org/bitcoinj/jni/NativePeerEventListener.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.bitcoinj.jni;
-
-import org.bitcoinj.core.listeners.*;
-import org.bitcoinj.core.*;
-
-import javax.annotation.*;
-import java.util.List;
-import java.util.Set;
-
-/**
- * An event listener that relays events to a native C++ object. A pointer to that object is stored in
- * this class using JNI on the native side, thus several instances of this can point to different actual
- * native implementations.
- */
-public class NativePeerEventListener implements PeerConnectionEventListener, PeerDataEventListener, OnTransactionBroadcastListener {
-    public long ptr;
-
-    @Override
-    public native void onPeersDiscovered(Set<PeerAddress> peerAddresses);
-
-    @Override
-    public native void onBlocksDownloaded(Peer peer, Block block, @Nullable FilteredBlock filteredBlock, int blocksLeft);
-
-    @Override
-    public native void onChainDownloadStarted(Peer peer, int blocksLeft);
-
-    @Override
-    public native void onPeerConnected(Peer peer, int peerCount);
-
-    @Override
-    public native void onPeerDisconnected(Peer peer, int peerCount);
-
-    @Override
-    public native Message onPreMessageReceived(Peer peer, Message m);
-
-    @Override
-    public native void onTransaction(Peer peer, Transaction t);
-
-    @Override
-    public native List<Message> getData(Peer peer, GetDataMessage m);
-}
diff --git a/core/src/main/java/org/bitcoinj/jni/NativeWalletEventListener.java b/core/src/main/java/org/bitcoinj/jni/NativeWalletEventListener.java
deleted file mode 100644
index cddd86d9711..00000000000
--- a/core/src/main/java/org/bitcoinj/jni/NativeWalletEventListener.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.bitcoinj.jni;
-
-import org.bitcoinj.core.Coin;
-import org.bitcoinj.core.ECKey;
-import org.bitcoinj.core.Transaction;
-import org.bitcoinj.script.Script;
-import org.bitcoinj.wallet.Wallet;
-import org.bitcoinj.wallet.listeners.WalletEventListener;
-
-import java.util.List;
-
-/**
- * An event listener that relays events to a native C++ object. A pointer to that object is stored in
- * this class using JNI on the native side, thus several instances of this can point to different actual
- * native implementations.
- */
-public class NativeWalletEventListener implements WalletEventListener {
-    public long ptr;
-
-    @Override
-    public native void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coin newBalance);
-
-    @Override
-    public native void onCoinsSent(Wallet wallet, Transaction tx, Coin prevBalance, Coin newBalance);
-
-    @Override
-    public native void onReorganize(Wallet wallet);
-
-    @Override
-    public native void onTransactionConfidenceChanged(Wallet wallet, Transaction tx);
-
-    @Override
-    public native void onWalletChanged(Wallet wallet);
-
-    @Override
-    public native void onKeysAdded(List<ECKey> keys);
-
-    @Override
-    public native void onScriptsChanged(Wallet wallet, List<Script> scripts, boolean isAddingScripts);
-}
diff --git a/core/src/main/java/org/bitcoinj/kits/WalletAppKit.java b/core/src/main/java/org/bitcoinj/kits/WalletAppKit.java
index a05767a4526..a87208c87d9 100644
--- a/core/src/main/java/org/bitcoinj/kits/WalletAppKit.java
+++ b/core/src/main/java/org/bitcoinj/kits/WalletAppKit.java
@@ -18,12 +18,14 @@
 package org.bitcoinj.kits;
 
 import com.google.common.collect.*;
+import com.google.common.io.Closeables;
 import com.google.common.util.concurrent.*;
-import com.subgraph.orchid.*;
 import org.bitcoinj.core.listeners.*;
 import org.bitcoinj.core.*;
+import org.bitcoinj.crypto.DeterministicKey;
 import org.bitcoinj.net.discovery.*;
 import org.bitcoinj.protocols.channels.*;
+import org.bitcoinj.script.Script;
 import org.bitcoinj.store.*;
 import org.bitcoinj.wallet.*;
 import org.slf4j.*;
@@ -55,17 +57,19 @@
  * means doing potentially blocking file IO, generating keys and other potentially intensive operations. By running it
  * on a background thread, there's no risk of accidentally causing UI lag.</p>
  *
- * <p>Note that {@link #awaitRunning()} can throw an unchecked {@link java.lang.IllegalStateException}
+ * <p>Note that {@link #awaitRunning()} can throw an unchecked {@link IllegalStateException}
  * if anything goes wrong during startup - you should probably handle it and use {@link Exception#getCause()} to figure
  * out what went wrong more precisely. Same thing if you just use the {@link #startAsync()} method.</p>
  */
 public class WalletAppKit extends AbstractIdleService {
     protected static final Logger log = LoggerFactory.getLogger(WalletAppKit.class);
 
-    protected final String filePrefix;
     protected final NetworkParameters params;
+    protected final Script.ScriptType preferredOutputScriptType;
+    protected final KeyChainGroupStructure structure;
+    protected final String filePrefix;
     protected volatile BlockChain vChain;
-    protected volatile BlockStore vStore;
+    protected volatile SPVBlockStore vStore;
     protected volatile Wallet vWallet;
     protected volatile PeerGroup vPeerGroup;
 
@@ -78,10 +82,10 @@ public class WalletAppKit extends AbstractIdleService {
     protected boolean autoStop = true;
     protected InputStream checkpoints;
     protected boolean blockingStartup = true;
-    protected boolean useTor = false;   // Perhaps in future we can change this to true.
     protected String userAgent, version;
     protected WalletProtobufSerializer.WalletFactory walletFactory;
     @Nullable protected DeterministicSeed restoreFromSeed;
+    @Nullable protected DeterministicKey restoreFromKey;
     @Nullable protected PeerDiscovery discovery;
 
     protected volatile Context context;
@@ -90,15 +94,26 @@ public class WalletAppKit extends AbstractIdleService {
      * Creates a new WalletAppKit, with a newly created {@link Context}. Files will be stored in the given directory.
      */
     public WalletAppKit(NetworkParameters params, File directory, String filePrefix) {
-        this(new Context(params), directory, filePrefix);
+        this(new Context(params), Script.ScriptType.P2PKH, null, directory, filePrefix);
+    }
+
+    /**
+     * Creates a new WalletAppKit, with a newly created {@link Context}. Files will be stored in the given directory.
+     */
+    public WalletAppKit(NetworkParameters params, Script.ScriptType preferredOutputScriptType,
+            @Nullable KeyChainGroupStructure structure, File directory, String filePrefix) {
+        this(new Context(params), preferredOutputScriptType, structure, directory, filePrefix);
     }
 
     /**
      * Creates a new WalletAppKit, with the given {@link Context}. Files will be stored in the given directory.
      */
-    public WalletAppKit(Context context, File directory, String filePrefix) {
+    public WalletAppKit(Context context, Script.ScriptType preferredOutputScriptType,
+            @Nullable KeyChainGroupStructure structure, File directory, String filePrefix) {
         this.context = context;
         this.params = checkNotNull(context.getParams());
+        this.preferredOutputScriptType = checkNotNull(preferredOutputScriptType);
+        this.structure = structure != null ? structure : KeyChainGroupStructure.DEFAULT;
         this.directory = checkNotNull(directory);
         this.filePrefix = checkNotNull(filePrefix);
     }
@@ -130,7 +145,7 @@ public WalletAppKit setAutoSave(boolean value) {
 
     /**
      * If you want to learn about the sync process, you can provide a listener here. For instance, a
-     * {@link org.bitcoinj.core.DownloadProgressTracker} is a good choice. This has no effect unless setBlockingStartup(false) has been called
+     * {@link DownloadProgressTracker} is a good choice. This has no effect unless setBlockingStartup(false) has been called
      * too, due to some missing implementation code.
      */
     public WalletAppKit setDownloadListener(DownloadProgressTracker listener) {
@@ -146,11 +161,12 @@ public WalletAppKit setAutoStop(boolean autoStop) {
 
     /**
      * If set, the file is expected to contain a checkpoints file calculated with BuildCheckpoints. It makes initial
-     * block sync faster for new users - please refer to the documentation on the bitcoinj website for further details.
+     * block sync faster for new users - please refer to the documentation on the bitcoinj website
+     * (https://bitcoinj.github.io/speeding-up-chain-sync) for further details.
      */
     public WalletAppKit setCheckpoints(InputStream checkpoints) {
         if (this.checkpoints != null)
-            Utils.closeUnchecked(this.checkpoints);
+            Closeables.closeQuietly(checkpoints);
         this.checkpoints = checkNotNull(checkpoints);
         return this;
     }
@@ -178,11 +194,10 @@ public WalletAppKit setUserAgent(String userAgent, String version) {
     }
 
     /**
-     * If called, then an embedded Tor client library will be used to connect to the P2P network. The user does not need
-     * any additional software for this: it's all pure Java. As of April 2014 <b>this mode is experimental</b>.
+     * Sets a wallet factory which will be used when the kit creates a new wallet.
      */
-    public WalletAppKit useTor() {
-        this.useTor = true;
+    public WalletAppKit setWalletFactory(WalletProtobufSerializer.WalletFactory walletFactory) {
+        this.walletFactory = walletFactory;
         return this;
     }
 
@@ -199,6 +214,19 @@ public WalletAppKit restoreWalletFromSeed(DeterministicSeed seed) {
         return this;
     }
 
+    /**
+     * If an account key is set here then any existing wallet that matches the file name will be renamed to a backup name,
+     * the chain file will be deleted, and the wallet object will be instantiated with the given key instead of
+     * a fresh seed being created. This is intended for restoring a wallet from an account key. To implement restore
+     * you would shut down the existing appkit, if any, then recreate it with the key given by the user, then start
+     * up the new kit. The next time your app starts it should work as normal (that is, don't keep calling this each
+     * time).
+     */
+    public WalletAppKit restoreWalletFromKey(DeterministicKey accountKey) {
+        this.restoreFromKey = accountKey;
+        return this;
+    }
+
     /**
      * Sets the peer discovery class to use. If none is provided then DNS is used, which is a reasonable default.
      */
@@ -217,13 +245,6 @@ protected List<WalletExtension> provideWalletExtensions() throws Exception {
         return ImmutableList.of();
     }
 
-    /**
-     * Override this to use a {@link BlockStore} that isn't the default of {@link SPVBlockStore}.
-     */
-    protected BlockStore provideBlockStore(File file) throws BlockStoreException {
-        return new SPVBlockStore(params, file);
-    }
-
     /**
      * This method is invoked on a background thread after all objects are initialised, but before the peer group
      * or block chain download is started. You can tweak the objects configuration here.
@@ -269,12 +290,12 @@ protected void startUp() throws Exception {
             File chainFile = new File(directory, filePrefix + ".spvchain");
             boolean chainFileExists = chainFile.exists();
             vWalletFile = new File(directory, filePrefix + ".wallet");
-            boolean shouldReplayWallet = (vWalletFile.exists() && !chainFileExists) || restoreFromSeed != null;
+            boolean shouldReplayWallet = (vWalletFile.exists() && !chainFileExists) || restoreFromSeed != null || restoreFromKey != null;
             vWallet = createOrLoadWallet(shouldReplayWallet);
 
             // Initiate Bitcoin network objects (block store, blockchain and peer group)
-            vStore = provideBlockStore(chainFile);
-            if (!chainFileExists || restoreFromSeed != null) {
+            vStore = new SPVBlockStore(params, chainFile);
+            if (!chainFileExists || restoreFromSeed != null || restoreFromKey != null) {
                 if (checkpoints == null && !Utils.isAndroidRuntime()) {
                     checkpoints = CheckpointManager.openStream(params);
                 }
@@ -285,13 +306,18 @@ protected void startUp() throws Exception {
                     if (restoreFromSeed != null) {
                         time = restoreFromSeed.getCreationTimeSeconds();
                         if (chainFileExists) {
-                            log.info("Deleting the chain file in preparation from restore.");
-                            vStore.close();
-                            if (!chainFile.delete())
-                                throw new IOException("Failed to delete chain file in preparation for restore.");
-                            vStore = new SPVBlockStore(params, chainFile);
+                            log.info("Clearing the chain file in preparation for restore.");
+                            vStore.clear();
                         }
-                    } else {
+                    } else if (restoreFromKey != null) {
+                        time = restoreFromKey.getCreationTimeSeconds();
+                        if (chainFileExists) {
+                            log.info("Clearing the chain file in preparation for restore.");
+                            vStore.clear();
+                        }
+                    }
+                    else
+                    {
                         time = vWallet.getEarliestKeyCreationTime();
                     }
                     if (time > 0)
@@ -299,11 +325,8 @@ protected void startUp() throws Exception {
                     else
                         log.warn("Creating a new uncheckpointed block store due to a wallet with a creation time of zero: this will result in a very slow chain sync");
                 } else if (chainFileExists) {
-                    log.info("Deleting the chain file in preparation from restore.");
-                    vStore.close();
-                    if (!chainFile.delete())
-                        throw new IOException("Failed to delete chain file in preparation for restore.");
-                    vStore = new SPVBlockStore(params, chainFile);
+                    log.info("Clearing the chain file in preparation for restore.");
+                    vStore.clear();
                 }
             }
             vChain = new BlockChain(params, vStore);
@@ -317,7 +340,7 @@ protected void startUp() throws Exception {
                 for (PeerAddress addr : peerAddresses) vPeerGroup.addAddress(addr);
                 vPeerGroup.setMaxConnections(peerAddresses.length);
                 peerAddresses = null;
-            } else if (!params.getId().equals(NetworkParameters.ID_REGTEST) && !useTor) {
+            } else if (!params.getId().equals(NetworkParameters.ID_REGTEST)) {
                 vPeerGroup.addPeerDiscovery(discovery != null ? discovery : new DnsDiscovery(params));
             }
             vChain.addWallet(vWallet);
@@ -348,7 +371,7 @@ public void onFailure(Throwable t) {
                         throw new RuntimeException(t);
 
                     }
-                });
+                }, MoreExecutors.directExecutor());
             }
         } catch (BlockStoreException e) {
             throw new IOException(e);
@@ -409,20 +432,22 @@ private Wallet loadWallet(boolean shouldReplayWallet) throws Exception {
     }
 
     protected Wallet createWallet() {
-        KeyChainGroup kcg;
+        KeyChainGroup.Builder kcg = KeyChainGroup.builder(params, structure);
         if (restoreFromSeed != null)
-            kcg = new KeyChainGroup(params, restoreFromSeed);
+            kcg.fromSeed(restoreFromSeed, preferredOutputScriptType);
+        else if (restoreFromKey != null)
+            kcg.fromKey(restoreFromKey, preferredOutputScriptType).build();
         else
-            kcg = new KeyChainGroup(params);
+            kcg.fromRandom(preferredOutputScriptType);
         if (walletFactory != null) {
-            return walletFactory.create(params, kcg);
+            return walletFactory.create(params, kcg.build());
         } else {
-            return new Wallet(params, kcg);  // default
+            return new Wallet(params, kcg.build()); // default
         }
     }
 
     private void maybeMoveOldWalletOutOfTheWay() {
-        if (restoreFromSeed == null) return;
+        if (restoreFromSeed == null && restoreFromKey == null) return;
         if (!vWalletFile.exists()) return;
         int counter = 1;
         File newName;
@@ -456,13 +481,7 @@ private void completeExtensionInitiations(TransactionBroadcaster transactionBroa
 
 
     protected PeerGroup createPeerGroup() throws TimeoutException {
-        if (useTor) {
-            TorClient torClient = new TorClient();
-            torClient.getConfig().setDataDirectory(directory);
-            return PeerGroup.newWithTor(params, vChain, torClient);
-        }
-        else
-            return new PeerGroup(params, vChain);
+        return new PeerGroup(params, vChain);
     }
 
     private void installShutdownHook() {
diff --git a/core/src/main/java/org/bitcoinj/kits/package-info.java b/core/src/main/java/org/bitcoinj/kits/package-info.java
index efb678dd491..77bdfff03f1 100644
--- a/core/src/main/java/org/bitcoinj/kits/package-info.java
+++ b/core/src/main/java/org/bitcoinj/kits/package-info.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/net/BlockingClient.java b/core/src/main/java/org/bitcoinj/net/BlockingClient.java
index a6762b269a2..b22194e257c 100644
--- a/core/src/main/java/org/bitcoinj/net/BlockingClient.java
+++ b/core/src/main/java/org/bitcoinj/net/BlockingClient.java
@@ -63,7 +63,7 @@ public BlockingClient(final SocketAddress serverAddress, final StreamConnection
                           @Nullable final Set<BlockingClient> clientSet) throws IOException {
         connectFuture = SettableFuture.create();
         // Try to fit at least one message in the network buffer, but place an upper and lower limit on its size to make
-        // sure it doesnt get too large or have to call read too often.
+        // sure it doesn't get too large or have to call read too often.
         connection.setWriteTarget(this);
         socket = socketFactory.createSocket();
         final Context context = Context.get();
@@ -143,11 +143,16 @@ public void closeConnection() {
     }
 
     @Override
-    public synchronized void writeBytes(byte[] message) throws IOException {
+    public synchronized ListenableFuture writeBytes(byte[] message) throws IOException {
         try {
-            OutputStream stream = socket.getOutputStream();
-            stream.write(message);
-            stream.flush();
+            if(!socket.isClosed()) {
+                OutputStream stream = socket.getOutputStream();
+                stream.write(message);
+                stream.flush();
+            } else {
+                log.warn("Attempted to write to a closed socket.");
+            }
+            return Futures.immediateFuture(null);
         } catch (IOException e) {
             log.error("Error writing message to connection, closing connection", e);
             closeConnection();
diff --git a/core/src/main/java/org/bitcoinj/net/ClientConnectionManager.java b/core/src/main/java/org/bitcoinj/net/ClientConnectionManager.java
index 23d493436d9..7ed88de9cad 100644
--- a/core/src/main/java/org/bitcoinj/net/ClientConnectionManager.java
+++ b/core/src/main/java/org/bitcoinj/net/ClientConnectionManager.java
@@ -25,7 +25,7 @@
  * <p>A generic interface for an object which keeps track of a set of open client connections, creates new ones and
  * ensures they are serviced properly.</p>
  *
- * <p>When the service is {@link com.google.common.util.concurrent.Service#stop()}ed, all connections will be closed and
+ * <p>When the service is stopped via {@link com.google.common.util.concurrent.Service#stopAsync()}, all connections will be closed and
  * the appropriate connectionClosed() calls must be made.</p>
  */
 public interface ClientConnectionManager extends Service {
diff --git a/core/src/main/java/org/bitcoinj/net/ConnectionHandler.java b/core/src/main/java/org/bitcoinj/net/ConnectionHandler.java
index 8f2bfe6cdd0..b5c29663c33 100644
--- a/core/src/main/java/org/bitcoinj/net/ConnectionHandler.java
+++ b/core/src/main/java/org/bitcoinj/net/ConnectionHandler.java
@@ -16,9 +16,11 @@
 
 package org.bitcoinj.net;
 
+import com.google.common.base.Throwables;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
 import org.bitcoinj.core.Message;
 import org.bitcoinj.utils.Threading;
-import com.google.common.base.Throwables;
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nullable;
@@ -61,7 +63,17 @@ class ConnectionHandler implements MessageWriteTarget {
     @GuardedBy("lock") private boolean closeCalled = false;
 
     @GuardedBy("lock") private long bytesToWriteRemaining = 0;
-    @GuardedBy("lock") private final LinkedList<ByteBuffer> bytesToWrite = new LinkedList<ByteBuffer>();
+    @GuardedBy("lock") private final LinkedList<BytesAndFuture> bytesToWrite = new LinkedList<>();
+
+    private static class BytesAndFuture {
+        public final ByteBuffer bytes;
+        public final SettableFuture future;
+
+        public BytesAndFuture(ByteBuffer bytes, SettableFuture future) {
+            this.bytes = bytes;
+            this.future = future;
+        }
+    }
 
     private Set<ConnectionHandler> connectedHandlers;
 
@@ -113,13 +125,14 @@ private void tryWriteBytes() throws IOException {
         lock.lock();
         try {
             // Iterate through the outbound ByteBuff queue, pushing as much as possible into the OS' network buffer.
-            Iterator<ByteBuffer> bytesIterator = bytesToWrite.iterator();
-            while (bytesIterator.hasNext()) {
-                ByteBuffer buff = bytesIterator.next();
-                bytesToWriteRemaining -= channel.write(buff);
-                if (!buff.hasRemaining())
-                    bytesIterator.remove();
-                else {
+            Iterator<BytesAndFuture> iterator = bytesToWrite.iterator();
+            while (iterator.hasNext()) {
+                BytesAndFuture bytesAndFuture = iterator.next();
+                bytesToWriteRemaining -= channel.write(bytesAndFuture.bytes);
+                if (!bytesAndFuture.bytes.hasRemaining()) {
+                    iterator.remove();
+                    bytesAndFuture.future.set(null);
+                } else {
                     setWriteOps();
                     break;
                 }
@@ -134,7 +147,7 @@ private void tryWriteBytes() throws IOException {
     }
 
     @Override
-    public void writeBytes(byte[] message) throws IOException {
+    public ListenableFuture writeBytes(byte[] message) throws IOException {
         boolean andUnlock = true;
         lock.lock();
         try {
@@ -147,9 +160,11 @@ public void writeBytes(byte[] message) throws IOException {
                 throw new IOException("Outbound buffer overflowed");
             // Just dump the message onto the write buffer and call tryWriteBytes
             // TODO: Kill the needless message duplication when the write completes right away
-            bytesToWrite.offer(ByteBuffer.wrap(Arrays.copyOf(message, message.length)));
+            final SettableFuture<Object> future = SettableFuture.create();
+            bytesToWrite.offer(new BytesAndFuture(ByteBuffer.wrap(Arrays.copyOf(message, message.length)), future));
             bytesToWriteRemaining += message.length;
             setWriteOps();
+            return future;
         } catch (IOException e) {
             lock.unlock();
             andUnlock = false;
@@ -232,7 +247,7 @@ else if (read == -1) { // Socket was closed
             // This can happen eg if the channel closes while the thread is about to get killed
             // (ClosedByInterruptException), or if handler.connection.receiveBytes throws something
             Throwable t = Throwables.getRootCause(e);
-            log.warn("Error handling SelectionKey: {}", t.getMessage() != null ? t.getMessage() : t.getClass().getName());
+            log.warn("Error handling SelectionKey: {} {}", t.getClass().getName(), t.getMessage() != null ? t.getMessage() : "", e);
             handler.closeConnection();
         }
     }
diff --git a/core/src/main/java/org/bitcoinj/net/FilterMerger.java b/core/src/main/java/org/bitcoinj/net/FilterMerger.java
index 53a718b3cd9..b3425c2a77c 100644
--- a/core/src/main/java/org/bitcoinj/net/FilterMerger.java
+++ b/core/src/main/java/org/bitcoinj/net/FilterMerger.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -18,15 +20,16 @@
 import org.bitcoinj.core.BloomFilter;
 import org.bitcoinj.core.PeerFilterProvider;
 import com.google.common.collect.ImmutableList;
+import org.bitcoinj.core.PeerGroup;
 
 import java.util.LinkedList;
 
 // This code is unit tested by the PeerGroup tests.
 
 /**
- * <p>A reusable object that will calculate, given a list of {@link org.bitcoinj.core.PeerFilterProvider}s, a merged
- * {@link org.bitcoinj.core.BloomFilter} and earliest key time for all of them.
- * Used by the {@link org.bitcoinj.core.PeerGroup} class internally.</p>
+ * <p>A reusable object that will calculate, given a list of {@link PeerFilterProvider}s, a merged
+ * {@link BloomFilter} and earliest key time for all of them.
+ * Used by the {@link PeerGroup} class internally.</p>
  *
  * <p>Thread safety: threading here can be complicated. Each filter provider is given a begin event, which may acquire
  * a lock (and is guaranteed to receive an end event). This class is mostly thread unsafe and is meant to be used from a
diff --git a/core/src/main/java/org/bitcoinj/net/MessageWriteTarget.java b/core/src/main/java/org/bitcoinj/net/MessageWriteTarget.java
index 7679b7304ad..a16a5c407ee 100644
--- a/core/src/main/java/org/bitcoinj/net/MessageWriteTarget.java
+++ b/core/src/main/java/org/bitcoinj/net/MessageWriteTarget.java
@@ -16,6 +16,8 @@
 
 package org.bitcoinj.net;
 
+import com.google.common.util.concurrent.ListenableFuture;
+
 import java.io.IOException;
 
 /**
@@ -23,9 +25,10 @@
  */
 public interface MessageWriteTarget {
     /**
-     * Writes the given bytes to the remote server.
+     * Writes the given bytes to the remote server. The returned future will complete when all bytes
+     * have been written to the OS network buffer.
      */
-    void writeBytes(byte[] message) throws IOException;
+    ListenableFuture writeBytes(byte[] message) throws IOException;
     /**
      * Closes the connection to the server, triggering the {@link StreamConnection#connectionClosed()}
      * event on the network-handling thread where all callbacks occur.
diff --git a/core/src/main/java/org/bitcoinj/net/NioClient.java b/core/src/main/java/org/bitcoinj/net/NioClient.java
index df8f9688241..6c4698854a0 100644
--- a/core/src/main/java/org/bitcoinj/net/NioClient.java
+++ b/core/src/main/java/org/bitcoinj/net/NioClient.java
@@ -111,7 +111,7 @@ public void onSuccess(SocketAddress result) {
             public void onFailure(Throwable t) {
                 log.error("Connect to {} failed: {}", serverAddress, Throwables.getRootCause(t));
             }
-        });
+        }, MoreExecutors.directExecutor());
     }
 
     @Override
@@ -120,7 +120,7 @@ public void closeConnection() {
     }
 
     @Override
-    public synchronized void writeBytes(byte[] message) throws IOException {
-        handler.writeTarget.writeBytes(message);
+    public synchronized ListenableFuture writeBytes(byte[] message) throws IOException {
+        return handler.writeTarget.writeBytes(message);
     }
 }
diff --git a/core/src/main/java/org/bitcoinj/net/NioClientManager.java b/core/src/main/java/org/bitcoinj/net/NioClientManager.java
index a79c5f336f0..fe585430e30 100644
--- a/core/src/main/java/org/bitcoinj/net/NioClientManager.java
+++ b/core/src/main/java/org/bitcoinj/net/NioClientManager.java
@@ -46,7 +46,7 @@ class PendingConnect {
 
         PendingConnect(SocketChannel sc, StreamConnection connection, SocketAddress address) { this.sc = sc; this.connection = connection; this.address = address; }
     }
-    final Queue<PendingConnect> newConnectionChannels = new LinkedBlockingQueue<PendingConnect>();
+    final Queue<PendingConnect> newConnectionChannels = new LinkedBlockingQueue<>();
 
     // Added to/removed from by the individual ConnectionHandler's, thus must by synchronized on its own.
     private final Set<ConnectionHandler> connectedHandlers = Collections.synchronizedSet(new HashSet<ConnectionHandler>());
@@ -77,7 +77,7 @@ private void handleKey(SelectionKey key) throws IOException {
                 // may cause this. Otherwise it may be any arbitrary kind of connection failure.
                 // Calling sc.socket().getRemoteSocketAddress() here throws an exception, so we can only log the error itself
                 Throwable cause = Throwables.getRootCause(e);
-                log.warn("Failed to connect with exception: {}: {}", cause.getClass().getName(), cause.getMessage());
+                log.warn("Failed to connect with exception: {}: {}", cause.getClass().getName(), cause.getMessage(), e);
                 handler.closeConnection();
                 data.future.setException(cause);
                 data.future = null;
diff --git a/core/src/main/java/org/bitcoinj/net/NioServer.java b/core/src/main/java/org/bitcoinj/net/NioServer.java
index cfe025186ed..b73765d486f 100644
--- a/core/src/main/java/org/bitcoinj/net/NioServer.java
+++ b/core/src/main/java/org/bitcoinj/net/NioServer.java
@@ -123,7 +123,7 @@ protected void run() throws Exception {
     /**
      * Invoked by the Execution service when it's time to stop.
      * Calling this method directly will NOT stop the service, call
-     * {@link com.google.common.util.concurrent.AbstractExecutionThreadService#stop()} instead.
+     * {@link com.google.common.util.concurrent.AbstractExecutionThreadService#stopAsync()} instead.
      */
     @Override
     public void triggerShutdown() {
diff --git a/core/src/main/java/org/bitcoinj/net/OnionCatAddressChecker.java b/core/src/main/java/org/bitcoinj/net/OnionCatAddressChecker.java
new file mode 100644
index 00000000000..706650e4be4
--- /dev/null
+++ b/core/src/main/java/org/bitcoinj/net/OnionCatAddressChecker.java
@@ -0,0 +1,40 @@
+package org.bitcoinj.net;
+
+import org.bitcoinj.utils.CIDRUtils;
+
+import java.net.InetAddress;
+
+/**
+ * Checks an IPv6 InetAddress represents a valid OnionCat address
+ * @author danda
+ * @author Oscar Guindzberg
+ */
+public class OnionCatAddressChecker {
+
+    // Note:  this is borrowed/ported from btcd (written in go).
+
+    // btcd has many more rules that are probably important and should be
+    // implemented in this class, but for now we only care about onion
+    // addresses for onioncat (ipv6) encoding/decoding.
+
+    // onionCatNet defines the IPv6 address block used to support Tor.
+    // bitcoind encodes a .onion address as a 16 byte number by decoding the
+    // address prior to the .onion (i.e. the key hash) base32 into a ten
+    // byte number. It then stores the first 6 bytes of the address as
+    // 0xfd, 0x87, 0xd8, 0x7e, 0xeb, 0x43.
+    //
+    // This is the same range used by OnionCat, which is part part of the
+    // RFC4193 unique local IPv6 range.
+    //
+    // In summary the format is:
+    // { magic 6 bytes, 10 bytes base32 decode of key hash }
+    private static CIDRUtils onionCatNet = new CIDRUtils("fd87:d87e:eb43::", 48);
+
+    // isOnionCatTor returns whether or not the passed address is in the IPv6 range
+    // used by bitcoin to support Tor (fd87:d87e:eb43::/48).  Note that this range
+    // is the same range used by OnionCat, which is part of the RFC4193 unique local
+    // IPv6 range.
+    public static boolean isOnionCatTor(InetAddress addr) {
+        return onionCatNet.isInRange(addr);
+    }
+}
diff --git a/core/src/main/java/org/bitcoinj/net/OnionCatConverter.java b/core/src/main/java/org/bitcoinj/net/OnionCatConverter.java
new file mode 100644
index 00000000000..3f0faaa81eb
--- /dev/null
+++ b/core/src/main/java/org/bitcoinj/net/OnionCatConverter.java
@@ -0,0 +1,61 @@
+package org.bitcoinj.net;
+
+import org.bitcoinj.core.Utils;
+import org.bitcoinj.utils.Base32;
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
+import java.util.Arrays;
+
+
+/**
+ * Converts .onion addresses to IPv6 format and viceversa.
+ * @author danda
+ * @author Oscar Guindzberg
+ */
+public class OnionCatConverter {
+
+    /** Converts a .onion address to onioncat format
+     *
+     * @param hostname e.g. explorernuoc63nb.onion
+     * @return e.g. fd87:d87e:eb43:25de:b744:916d:1c2f:6da1
+     */
+    public static byte[] onionHostToIPV6Bytes(String hostname) {
+        String needle = ".onion";
+        if(hostname.endsWith(needle)) {
+            if (hostname.length() != 22) {
+                throw new IllegalArgumentException("Invalid hostname: " + hostname);
+            }
+            hostname = hostname.substring(0, hostname.length() - needle.length());
+        } else {
+            if (hostname.length() != 16) {
+                throw new IllegalArgumentException("Invalid hostname: " + hostname);
+            }
+        }
+        byte[] prefix = new byte[] {(byte)0xfd, (byte)0x87, (byte)0xd8, (byte)0x7e, (byte)0xeb, (byte)0x43};
+        byte[] onionaddr = Base32.base32Decode(hostname);
+        byte[] ipBytes = new byte[prefix.length + onionaddr.length];
+        System.arraycopy(prefix, 0, ipBytes, 0, prefix.length);
+        System.arraycopy(onionaddr, 0, ipBytes, prefix.length, onionaddr.length);
+
+        return ipBytes;
+    }
+
+    public static InetAddress onionHostToInetAddress(String hostname) throws UnknownHostException {
+        return InetAddress.getByAddress(onionHostToIPV6Bytes(hostname));
+    }
+
+
+    /** Converts an IPV6 onioncat encoded address to a .onion address
+     * @param bytes e.g. fd87:d87e:eb43:25de:b744:916d:1c2f:6da1
+     * @return e.g. explorernuoc63nb.onion
+     */
+    public static String IPV6BytesToOnionHost(byte[] bytes) {
+        if (bytes.length != 16) {
+            throw new IllegalArgumentException("Invalid IPv6 address: " + Utils.HEX.encode(bytes));
+        }
+        String base32 = Base32.base32Encode( Arrays.copyOfRange(bytes, 6, 16) );
+        return base32.toLowerCase() + ".onion";
+    }
+}
diff --git a/core/src/main/java/org/bitcoinj/net/ProtobufConnection.java b/core/src/main/java/org/bitcoinj/net/ProtobufConnection.java
index dec49870eda..e798444adb9 100644
--- a/core/src/main/java/org/bitcoinj/net/ProtobufConnection.java
+++ b/core/src/main/java/org/bitcoinj/net/ProtobufConnection.java
@@ -77,14 +77,14 @@ public interface Listener<MessageType extends MessageLite> {
     @GuardedBy("lock") private byte[] messageBytes;
     private final ReentrantLock lock = Threading.lock("ProtobufConnection");
 
-    @VisibleForTesting final AtomicReference<MessageWriteTarget> writeTarget = new AtomicReference<MessageWriteTarget>();
+    @VisibleForTesting final AtomicReference<MessageWriteTarget> writeTarget = new AtomicReference<>();
 
     /**
      * Creates a new protobuf handler.
      *
      * @param handler The callback listener
      * @param prototype The default instance of the message type used in both directions of this channel.
-     *                  This should be the return value from {@link MessageType#getDefaultInstanceForType()}
+     *                  This should be the return value from {@link MessageLite#getDefaultInstanceForType()}
      * @param maxMessageSize The maximum message size (not including the 4-byte length prefix).
      *                       Note that this has an upper bound of {@link Integer#MAX_VALUE} - 4
      * @param timeoutMillis The timeout between messages before the connection is automatically closed. Only enabled
diff --git a/core/src/main/java/org/bitcoinj/net/StreamConnection.java b/core/src/main/java/org/bitcoinj/net/StreamConnection.java
index 40b4caf11fb..f46822aa845 100644
--- a/core/src/main/java/org/bitcoinj/net/StreamConnection.java
+++ b/core/src/main/java/org/bitcoinj/net/StreamConnection.java
@@ -22,7 +22,7 @@
  * A generic handler which is used in {@link NioServer}, {@link NioClient} and {@link BlockingClient} to handle incoming
  * data streams.
  *
- * Used to be callet StreamParser.
+ * Used to be called StreamParser.
  */
 public interface StreamConnection {
     /** Called when the connection socket is closed */
@@ -41,7 +41,7 @@ public interface StreamConnection {
      *     will start reading at (always 0)</li>
      * <li>May read more than one message (recursively) if there are enough bytes available</li>
      * <li>Uses some internal buffering to store message which are larger (incl their length prefix) than buff's
-     *     capacity(), ie it is up to this method to ensure we dont run out of buffer space to decode the next message.
+     *     capacity(), ie it is up to this method to ensure we don't run out of buffer space to decode the next message.
      *     </li>
      * <li>buff will end with its limit the same as it was previously, and its position set to the position up to which
      *     bytes have been read (the same as its return value)</li>
diff --git a/core/src/main/java/org/bitcoinj/net/discovery/DnsDiscovery.java b/core/src/main/java/org/bitcoinj/net/discovery/DnsDiscovery.java
index 1d05a8379bb..e12faff8ff8 100644
--- a/core/src/main/java/org/bitcoinj/net/discovery/DnsDiscovery.java
+++ b/core/src/main/java/org/bitcoinj/net/discovery/DnsDiscovery.java
@@ -19,6 +19,8 @@
 
 import org.bitcoinj.core.*;
 import org.bitcoinj.utils.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.net.*;
 import java.util.*;
@@ -31,11 +33,13 @@
  * However, if all hosts passed fail to resolve a PeerDiscoveryException will be thrown during getPeers().
  * </p>
  *
- * <p>DNS seeds do not attempt to enumerate every peer on the network. {@link DnsDiscovery#getPeers(long, java.util.concurrent.TimeUnit)}
+ * <p>DNS seeds do not attempt to enumerate every peer on the network. {@link DnsDiscovery#getPeers(long, long, TimeUnit)}
  * will return up to 30 random peers from the set of those returned within the timeout period. If you want more peers
  * to connect to, you need to discover them via other means (like addr broadcasts).</p>
  */
 public class DnsDiscovery extends MultiplexingDiscovery {
+    private static final Logger log = LoggerFactory.getLogger(DnsDiscovery.class);
+
     /**
      * Supports finding peers through DNS A records. Community run DNS entry points will be used.
      *
@@ -56,7 +60,7 @@ public DnsDiscovery(String[] dnsSeeds, NetworkParameters params) {
     }
 
     private static List<PeerDiscovery> buildDiscoveries(NetworkParameters params, String[] seeds) {
-        List<PeerDiscovery> discoveries = new ArrayList<PeerDiscovery>();
+        List<PeerDiscovery> discoveries = new ArrayList<>();
         if (seeds != null)
             for (String seed : seeds)
                 discoveries.add(new DnsSeedDiscovery(params, seed));
@@ -67,7 +71,7 @@ private static List<PeerDiscovery> buildDiscoveries(NetworkParameters params, St
     protected ExecutorService createExecutor() {
         // Attempted workaround for reported bugs on Linux in which gethostbyname does not appear to be properly
         // thread safe and can cause segfaults on some libc versions.
-        if (System.getProperty("os.name").toLowerCase().contains("linux"))
+        if (Utils.isLinux())
             return Executors.newSingleThreadExecutor(new ContextPropagatingThreadFactory("DNS seed lookups"));
         else
             return Executors.newFixedThreadPool(seeds.size(), new DaemonThreadFactory("DNS seed lookups"));
@@ -85,17 +89,32 @@ public DnsSeedDiscovery(NetworkParameters params, String hostname) {
 
         @Override
         public InetSocketAddress[] getPeers(long services, long timeoutValue, TimeUnit timeoutUnit) throws PeerDiscoveryException {
-            if (services != 0)
-                throw new PeerDiscoveryException("DNS seeds cannot filter by services: " + services);
-            try {
-                InetAddress[] response = InetAddress.getAllByName(hostname);
-                InetSocketAddress[] result = new InetSocketAddress[response.length];
-                for (int i = 0; i < response.length; i++)
-                    result[i] = new InetSocketAddress(response[i], params.getPort());
-                return result;
-            } catch (UnknownHostException e) {
-                throw new PeerDiscoveryException(e);
+            InetAddress[] response = null;
+            if (services != 0) {
+                String hostnameWithServices = "x" + Long.toHexString(services) + "." + hostname;
+                log.info("Requesting {} peers from {}", VersionMessage.toStringServices(services),
+                        hostnameWithServices);
+                try {
+                    response = InetAddress.getAllByName(hostnameWithServices);
+                    log.info("Got {} peers from {}", response.length, hostnameWithServices);
+                } catch (UnknownHostException e) {
+                    log.info("Seed {} doesn't appear to support service bit filtering: {}", hostname, e.getMessage());
+                }
+            }
+            if (response == null || response.length == 0) {
+                log.info("Requesting all peers from {}", hostname);
+                try {
+                    response = InetAddress.getAllByName(hostname);
+                    log.info("Got {} peers from {}", response.length, hostname);
+                } catch (UnknownHostException e) {
+                    throw new PeerDiscoveryException(e);
+                }
             }
+
+            InetSocketAddress[] result = new InetSocketAddress[response.length];
+            for (int i = 0; i < response.length; i++)
+                result[i] = new InetSocketAddress(response[i], params.getPort());
+            return result;
         }
 
         @Override
diff --git a/core/src/main/java/org/bitcoinj/net/discovery/HttpDiscovery.java b/core/src/main/java/org/bitcoinj/net/discovery/HttpDiscovery.java
index f46b07113ba..53f54c9c6e4 100644
--- a/core/src/main/java/org/bitcoinj/net/discovery/HttpDiscovery.java
+++ b/core/src/main/java/org/bitcoinj/net/discovery/HttpDiscovery.java
@@ -19,7 +19,6 @@
 
 import com.google.common.annotations.*;
 import com.google.protobuf.*;
-import com.squareup.okhttp.*;
 import org.bitcoin.crawler.*;
 import org.bitcoinj.core.*;
 import org.slf4j.*;
@@ -32,6 +31,11 @@
 import java.util.concurrent.*;
 import java.util.zip.*;
 
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
 import static com.google.common.base.Preconditions.*;
 
 /**
@@ -88,15 +92,23 @@ public InetSocketAddress[] getPeers(long services, long timeoutValue, TimeUnit t
             Request.Builder request = new Request.Builder();
             request.url(url.build());
             request.addHeader("User-Agent", VersionMessage.LIBRARY_SUBVER); // TODO Add main version.
-            log.info("Requesting seeds from {}", url);
+            log.info("Requesting {} peers from {}", services != 0 ? VersionMessage.toStringServices(services) :
+                    "all", url);
             Response response = client.newCall(request.build()).execute();
             if (!response.isSuccessful())
                 throw new PeerDiscoveryException("HTTP request failed: " + response.code() + " " + response.message());
             InputStream stream = response.body().byteStream();
             GZIPInputStream zip = new GZIPInputStream(stream);
-            PeerSeedProtos.SignedPeerSeeds proto = PeerSeedProtos.SignedPeerSeeds.parseDelimitedFrom(zip);
-            stream.close();
-            return protoToAddrs(proto);
+            PeerSeedProtos.SignedPeerSeeds proto;
+            try {
+                proto = PeerSeedProtos.SignedPeerSeeds.parseDelimitedFrom(zip);
+            } finally {
+                zip.close(); // will close InputStream as well
+            }
+
+            final InetSocketAddress[] peers = protoToAddrs(proto);
+            log.info("Got {} peers from {}", peers.length, url);
+            return peers;
         } catch (PeerDiscoveryException e1) {
             throw e1;
         } catch (Exception e) {
@@ -105,7 +117,8 @@ public InetSocketAddress[] getPeers(long services, long timeoutValue, TimeUnit t
     }
 
     @VisibleForTesting
-    public InetSocketAddress[] protoToAddrs(PeerSeedProtos.SignedPeerSeeds proto) throws PeerDiscoveryException, InvalidProtocolBufferException, SignatureException {
+    public InetSocketAddress[] protoToAddrs(PeerSeedProtos.SignedPeerSeeds proto) throws PeerDiscoveryException,
+            InvalidProtocolBufferException, SignatureDecodeException, SignatureException {
         if (details.pubkey != null) {
             if (!Arrays.equals(proto.getPubkey().toByteArray(), details.pubkey.getPubKey()))
                 throw new PeerDiscoveryException("Public key mismatch");
diff --git a/core/src/main/java/org/bitcoinj/net/discovery/MultiplexingDiscovery.java b/core/src/main/java/org/bitcoinj/net/discovery/MultiplexingDiscovery.java
index fbd003954b5..3cc41200461 100644
--- a/core/src/main/java/org/bitcoinj/net/discovery/MultiplexingDiscovery.java
+++ b/core/src/main/java/org/bitcoinj/net/discovery/MultiplexingDiscovery.java
@@ -18,7 +18,6 @@
 package org.bitcoinj.net.discovery;
 
 import com.google.common.collect.Lists;
-import com.squareup.okhttp.OkHttpClient;
 
 import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.core.VersionMessage;
@@ -34,6 +33,8 @@
 import java.util.List;
 import java.util.concurrent.*;
 
+import okhttp3.OkHttpClient;
+
 import static com.google.common.base.Preconditions.checkArgument;
 
 /**
@@ -54,21 +55,18 @@ public class MultiplexingDiscovery implements PeerDiscovery {
      * @param params Network to use.
      * @param services Required services as a bitmask, e.g. {@link VersionMessage#NODE_NETWORK}.
      */
-    public static MultiplexingDiscovery forServices(NetworkParameters params, long services) {
+    public static MultiplexingDiscovery forServices(NetworkParameters params, long services, boolean ignoreHttpSeeds) {
         List<PeerDiscovery> discoveries = Lists.newArrayList();
         HttpDiscovery.Details[] httpSeeds = params.getHttpSeeds();
-        if (httpSeeds != null) {
+        if (!ignoreHttpSeeds && httpSeeds != null) {
             OkHttpClient httpClient = new OkHttpClient();
             for (HttpDiscovery.Details httpSeed : httpSeeds)
                 discoveries.add(new HttpDiscovery(params, httpSeed, httpClient));
         }
-        // Also use DNS seeds if there is no specific service requirement
-        if (services == 0) {
-            String[] dnsSeeds = params.getDnsSeeds();
-            if (dnsSeeds != null)
-                for (String dnsSeed : dnsSeeds)
-                    discoveries.add(new DnsSeedDiscovery(params, dnsSeed));
-        }
+        String[] dnsSeeds = params.getDnsSeeds();
+        if (dnsSeeds != null)
+            for (String dnsSeed : dnsSeeds)
+                discoveries.add(new DnsSeedDiscovery(params, dnsSeed));
         return new MultiplexingDiscovery(params, discoveries);
     }
 
diff --git a/core/src/main/java/org/bitcoinj/net/discovery/PeerDiscovery.java b/core/src/main/java/org/bitcoinj/net/discovery/PeerDiscovery.java
index 72452c25d01..0b66e361aa1 100644
--- a/core/src/main/java/org/bitcoinj/net/discovery/PeerDiscovery.java
+++ b/core/src/main/java/org/bitcoinj/net/discovery/PeerDiscovery.java
@@ -20,6 +20,8 @@
 import java.net.InetSocketAddress;
 import java.util.concurrent.TimeUnit;
 
+import org.bitcoinj.core.VersionMessage;
+
 /**
  * A PeerDiscovery object is responsible for finding addresses of other nodes in the Bitcoin P2P network. Note that
  * the addresses returned may or may not be accepting connections.
diff --git a/core/src/main/java/org/bitcoinj/net/discovery/SeedPeers.java b/core/src/main/java/org/bitcoinj/net/discovery/SeedPeers.java
index b44b4ee7e29..a0b903fe52b 100644
--- a/core/src/main/java/org/bitcoinj/net/discovery/SeedPeers.java
+++ b/core/src/main/java/org/bitcoinj/net/discovery/SeedPeers.java
@@ -17,6 +17,7 @@
 package org.bitcoinj.net.discovery;
 
 import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.core.Utils;
 
 import javax.annotation.Nullable;
 import java.net.InetAddress;
@@ -104,10 +105,7 @@ private InetSocketAddress[] allPeers() throws UnknownHostException {
 
     private InetAddress convertAddress(int seed) throws UnknownHostException {
         byte[] v4addr = new byte[4];
-        v4addr[0] = (byte) (0xFF & (seed));
-        v4addr[1] = (byte) (0xFF & (seed >> 8));
-        v4addr[2] = (byte) (0xFF & (seed >> 16));
-        v4addr[3] = (byte) (0xFF & (seed >> 24));
+        Utils.uint32ToByteArrayLE(seed, v4addr, 0);
         return InetAddress.getByAddress(v4addr);
     }
 
diff --git a/core/src/main/java/org/bitcoinj/net/discovery/TorDiscovery.java b/core/src/main/java/org/bitcoinj/net/discovery/TorDiscovery.java
deleted file mode 100644
index e17100a688c..00000000000
--- a/core/src/main/java/org/bitcoinj/net/discovery/TorDiscovery.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Copyright 2014 Miron Cuperman
- * Copyright 2015 Andreas Schildbach
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.bitcoinj.net.discovery;
-
-import com.google.common.collect.*;
-import com.google.common.util.concurrent.*;
-import com.subgraph.orchid.*;
-import com.subgraph.orchid.circuits.path.*;
-import com.subgraph.orchid.data.*;
-import com.subgraph.orchid.data.exitpolicy.*;
-import org.bitcoinj.core.*;
-import org.bitcoinj.utils.*;
-import org.slf4j.*;
-
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static com.google.common.base.Preconditions.*;
-import static java.util.Collections.*;
-
-/**
- * <p>Supports peer discovery through Tor.</p>
- *
- * <p>Failure to obtain at least four different peers through different exit nodes will cause
- * a PeerDiscoveryException will be thrown during getPeers().
- * </p>
- *
- * <p>DNS seeds do not attempt to enumerate every peer on the network. If you want more peers
- * to connect to, you need to discover them via other means (like addr broadcasts).</p>
- */
-public class TorDiscovery implements PeerDiscovery {
-    private static final Logger log = LoggerFactory.getLogger(TorDiscovery.class);
-    public static final int MINIMUM_ROUTER_COUNT = 4;
-    public static final int ROUTER_LOOKUP_COUNT = 10;
-    public static final int MINIMUM_ROUTER_LOOKUP_COUNT = 6;
-    public static final int RECEIVE_RETRIES = 3;
-    public static final int RESOLVE_STREAM_ID = 0x1000; // An arbitrary stream ID
-    public static final int RESOLVE_CNAME = 0x00;
-    public static final int RESOLVE_ERROR = 0xf0;
-    public static final int RESOLVE_IPV4 = 0x04;
-    public static final int RESOLVE_IPV6 = 0x06;
-
-    private final String[] hostNames;
-    private final NetworkParameters netParams;
-    private final CircuitPathChooser pathChooser;
-    private final TorClient torClient;
-    private ListeningExecutorService threadPool;
-
-    /**
-     * Supports finding peers through Tor. Community run DNS entry points will be used.
-     *
-     * @param netParams Network parameters to be used for port information.
-     */
-    public TorDiscovery(NetworkParameters netParams, TorClient torClient) {
-        this(netParams.getDnsSeeds(), netParams, torClient);
-    }
-
-    /**
-     * Supports finding peers through Tor.
-     *
-     * @param hostNames Host names to be examined for seed addresses.
-     * @param netParams Network parameters to be used for port information.
-     * @param torClient an already-started Tor client.
-     */
-    public TorDiscovery(String[] hostNames, NetworkParameters netParams, TorClient torClient) {
-        this.hostNames = hostNames;
-        this.netParams = netParams;
-
-        this.torClient = torClient;
-        this.pathChooser = CircuitPathChooser.create(torClient.getConfig(), torClient.getDirectory());
-    }
-
-    private static class Lookup {
-        final Router router;
-        final InetAddress address;
-
-        Lookup(Router router, InetAddress address) {
-            this.router = router;
-            this.address = address;
-        }
-    }
-
-    @Override
-    public InetSocketAddress[] getPeers(long services, long timeoutValue, TimeUnit timeoutUnit) throws PeerDiscoveryException {
-        if (hostNames == null)
-            throw new PeerDiscoveryException("Unable to find any peers via DNS");
-        if (services != 0)
-            throw new PeerDiscoveryException("DNS seeds cannot filter by services: " + services);
-
-        Set<Router> routers = Sets.newHashSet();
-        ArrayList<ExitTarget> dummyTargets = Lists.newArrayList();
-
-        // Collect exit nodes until we have enough
-        while (routers.size() < ROUTER_LOOKUP_COUNT) {
-            Router router = pathChooser.chooseExitNodeForTargets(dummyTargets);
-            routers.add(router);
-        }
-
-        try {
-            List<Circuit> circuits =
-                getCircuits(torClient.getConfig().getCircuitBuildTimeout(), TimeUnit.MILLISECONDS, routers);
-            if (circuits.isEmpty())
-                throw new PeerDiscoveryException("Failed to open any circuit within " +
-                                                 String.valueOf(timeoutValue) + " " + timeoutUnit);
-
-            Collection<InetSocketAddress> addresses = lookupAddresses(timeoutValue, timeoutUnit, circuits);
-
-            if (addresses.size() < MINIMUM_ROUTER_COUNT)
-                throw new PeerDiscoveryException("Unable to find enough peers via Tor - got " + addresses.size());
-            ArrayList<InetSocketAddress> addressList = Lists.newArrayList();
-            addressList.addAll(addresses);
-            Collections.shuffle(addressList);
-            return addressList.toArray(new InetSocketAddress[addressList.size()]);
-        } catch (InterruptedException e) {
-            throw new PeerDiscoveryException(e);
-        }
-    }
-
-    private List<Circuit> getCircuits(long timeoutValue, TimeUnit timeoutUnit, Set<Router> routers) throws InterruptedException {
-        checkArgument(routers.size() >= MINIMUM_ROUTER_LOOKUP_COUNT, "Set of {} routers is smaller than required minimum {}",
-                      routers.size(), MINIMUM_ROUTER_LOOKUP_COUNT);
-        createThreadPool(routers.size());
-
-        try {
-            List<ListenableFuture<Circuit>> circuitFutures = Lists.newArrayList();
-            final CountDownLatch doneSignal = new CountDownLatch(MINIMUM_ROUTER_LOOKUP_COUNT);
-            for (final Router router : routers) {
-                ListenableFuture<Circuit> openCircuit = threadPool.submit(new Callable<Circuit>() {
-                    @Override
-                    public Circuit call() throws Exception {
-                        return torClient.getCircuitManager().openInternalCircuitTo(Lists.newArrayList(router));
-                    }
-                });
-                Futures.addCallback(openCircuit, new FutureCallback<Circuit>() {
-                    @Override
-                    public void onSuccess(Circuit circuit) {
-                        doneSignal.countDown();
-                    }
-                    @Override
-                    public void onFailure(Throwable thrown) {
-                        doneSignal.countDown();
-                    }
-                });
-                circuitFutures.add(openCircuit);
-            }
-
-            boolean countedDown = doneSignal.await(timeoutValue, timeoutUnit);
-
-            try {
-                List<Circuit> circuits = new ArrayList<Circuit>(Futures.successfulAsList(circuitFutures).get());
-                // Any failures will result in null entries.  Remove them.
-                circuits.removeAll(singleton(null));
-                int failures = routers.size() - circuits.size();
-                if (failures > 0) log.warn("{} failures " + (countedDown ? "" : "(including timeout) ") +
-                                           "opening DNS lookup circuits", failures);
-                return circuits;
-            } catch (ExecutionException e) {
-                // Cannot happen, successfulAsList accepts failures
-                throw new RuntimeException(e);
-            }
-        } finally {
-            shutdownThreadPool();
-        }
-    }
-
-    private Collection<InetSocketAddress> lookupAddresses(long timeoutValue, TimeUnit timeoutUnit, List<Circuit> circuits) throws InterruptedException {
-        createThreadPool(circuits.size() * hostNames.length);
-
-        try {
-            List<ListenableFuture<Lookup>> lookupFutures = Lists.newArrayList();
-            for (final Circuit circuit : circuits) {
-                for (final String seed : hostNames) {
-                    lookupFutures.add(threadPool.submit(new Callable<Lookup>() {
-                        @Override
-                        public Lookup call() throws Exception {
-                            return new Lookup(circuit.getFinalCircuitNode().getRouter(), lookup(circuit, seed));
-                        }
-                    }));
-                }
-            }
-
-            threadPool.awaitTermination(timeoutValue, timeoutUnit);
-            int timeouts = 0;
-            for (ListenableFuture<Lookup> future : lookupFutures) {
-                if (!future.isDone()) {
-                    timeouts++;
-                    future.cancel(true);
-                }
-            }
-            if (timeouts > 0)
-                log.warn("{} DNS lookups timed out", timeouts);
-
-            try {
-                List<Lookup> lookups = new ArrayList<Lookup>(Futures.successfulAsList(lookupFutures).get());
-                // Any failures will result in null entries.  Remove them.
-                lookups.removeAll(singleton(null));
-
-                // Use a map to enforce one result per exit node
-                // TODO: randomize result selection better
-                Map<HexDigest, InetSocketAddress> lookupMap = Maps.newHashMap();
-
-                for (Lookup lookup : lookups) {
-                    InetSocketAddress address = new InetSocketAddress(lookup.address, netParams.getPort());
-                    lookupMap.put(lookup.router.getIdentityHash(), address);
-                }
-
-                return lookupMap.values();
-            } catch (ExecutionException e) {
-                // Cannot happen, successfulAsList accepts failures
-                throw new RuntimeException(e);
-            }
-        } finally {
-            shutdownThreadPool();
-        }
-    }
-
-    private synchronized void shutdownThreadPool() {
-        threadPool.shutdownNow();
-        threadPool = null;
-    }
-
-    private synchronized void createThreadPool(int size) {
-        threadPool = MoreExecutors.listeningDecorator(
-                Executors.newFixedThreadPool(size, new ContextPropagatingThreadFactory("Tor DNS discovery")));
-    }
-
-    private InetAddress lookup(Circuit circuit, String seed) throws UnknownHostException {
-        // Send a resolve cell to the exit node
-        RelayCell cell = circuit.createRelayCell(RelayCell.RELAY_RESOLVE, RESOLVE_STREAM_ID, circuit.getFinalCircuitNode());
-        cell.putString(seed);
-        circuit.sendRelayCell(cell);
-
-        // Wait a few cell timeout periods (3 * 20 sec) for replies, in case the path is slow
-        for (int i = 0 ; i < RECEIVE_RETRIES; i++) {
-            RelayCell res = circuit.receiveRelayCell();
-            if (res != null) {
-                while (res.cellBytesRemaining() > 0) {
-                    int type = res.getByte();
-                    int len = res.getByte();
-                    byte[] value = new byte[len];
-                    res.getByteArray(value);
-                    int ttl = res.getInt();
-
-                    if (type == RESOLVE_CNAME || type >= RESOLVE_ERROR) {
-                        // TODO handle .onion CNAME replies
-                        throw new RuntimeException(new String(value));
-                    } else if (type == RESOLVE_IPV4 || type == RESOLVE_IPV6) {
-                        return InetAddress.getByAddress(value);
-                    }
-                }
-                break;
-            }
-        }
-        throw new RuntimeException("Could not look up " + seed);
-    }
-
-    @Override
-    public synchronized void shutdown() {
-        if (threadPool != null) {
-            shutdownThreadPool();
-        }
-    }
-}
diff --git a/core/src/main/java/org/bitcoinj/net/discovery/package-info.java b/core/src/main/java/org/bitcoinj/net/discovery/package-info.java
index d54d6e3e5bb..37043ba4733 100644
--- a/core/src/main/java/org/bitcoinj/net/discovery/package-info.java
+++ b/core/src/main/java/org/bitcoinj/net/discovery/package-info.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -13,6 +15,6 @@
  */
 
 /**
- * Classes that know how to discover peers in the P2P network using DNS, IRC or DNS via Tor (orchid).
+ * Classes that know how to discover peers in the P2P network using DNS or HTTP.
  */
 package org.bitcoinj.net.discovery;
\ No newline at end of file
diff --git a/core/src/main/java/org/bitcoinj/net/package-info.java b/core/src/main/java/org/bitcoinj/net/package-info.java
index 48249a61180..e63a2ecdbf8 100644
--- a/core/src/main/java/org/bitcoinj/net/package-info.java
+++ b/core/src/main/java/org/bitcoinj/net/package-info.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/params/AbstractBitcoinNetParams.java b/core/src/main/java/org/bitcoinj/params/AbstractBitcoinNetParams.java
index ed1ccd25ad3..7a51eccadd0 100644
--- a/core/src/main/java/org/bitcoinj/params/AbstractBitcoinNetParams.java
+++ b/core/src/main/java/org/bitcoinj/params/AbstractBitcoinNetParams.java
@@ -17,12 +17,15 @@
 
 package org.bitcoinj.params;
 
+import static com.google.common.base.Preconditions.checkState;
+
 import java.math.BigInteger;
 import java.util.concurrent.TimeUnit;
 
 import org.bitcoinj.core.Block;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.core.Sha256Hash;
 import org.bitcoinj.core.StoredBlock;
 import org.bitcoinj.core.Transaction;
 import org.bitcoinj.core.Utils;
@@ -41,10 +44,12 @@
  * Parameters for Bitcoin-like networks.
  */
 public abstract class AbstractBitcoinNetParams extends NetworkParameters {
+
     /**
      * Scheme part for Bitcoin URIs.
      */
     public static final String BITCOIN_SCHEME = "bitcoin";
+    public static final int REWARD_HALVING_INTERVAL = 210000;
 
     private static final Logger log = LoggerFactory.getLogger(AbstractBitcoinNetParams.class);
 
@@ -52,22 +57,31 @@ public AbstractBitcoinNetParams() {
         super();
     }
 
-    /**

-     * Checks if we are at a difficulty transition point.

-     * @param storedPrev The previous stored block

-     * @return If this is a difficulty transition point

+    /**
+     * Checks if we are at a reward halving point.
+     * @param height The height of the previous stored block
+     * @return If this is a reward halving point
+     */
+    public final boolean isRewardHalvingPoint(final int height) {
+        return ((height + 1) % REWARD_HALVING_INTERVAL) == 0;
+    }
+
+    /**
+     * Checks if we are at a difficulty transition point.
+     * @param height The height of the previous stored block
+     * @return If this is a difficulty transition point
      */
-    protected boolean isDifficultyTransitionPoint(StoredBlock storedPrev) {
-        return ((storedPrev.getHeight() + 1) % this.getInterval()) == 0;
+    public final boolean isDifficultyTransitionPoint(final int height) {
+        return ((height + 1) % this.getInterval()) == 0;
     }
 
     @Override
     public void checkDifficultyTransitions(final StoredBlock storedPrev, final Block nextBlock,
-    	final BlockStore blockStore) throws VerificationException, BlockStoreException {
-        Block prev = storedPrev.getHeader();
+        final BlockStore blockStore) throws VerificationException, BlockStoreException {
+        final Block prev = storedPrev.getHeader();
 
         // Is this supposed to be a difficulty transition point?
-        if (!isDifficultyTransitionPoint(storedPrev)) {
+        if (!isDifficultyTransitionPoint(storedPrev.getHeight())) {
 
             // No ... so check the difficulty didn't actually change.
             if (nextBlock.getDifficultyTarget() != prev.getDifficultyTarget())
@@ -80,15 +94,20 @@ public void checkDifficultyTransitions(final StoredBlock storedPrev, final Block
         // We need to find a block far back in the chain. It's OK that this is expensive because it only occurs every
         // two weeks after the initial block chain download.
         final Stopwatch watch = Stopwatch.createStarted();
-        StoredBlock cursor = blockStore.get(prev.getHash());
-        for (int i = 0; i < this.getInterval() - 1; i++) {
+        Sha256Hash hash = prev.getHash();
+        StoredBlock cursor = null;
+        final int interval = this.getInterval();
+        for (int i = 0; i < interval; i++) {
+            cursor = blockStore.get(hash);
             if (cursor == null) {
                 // This should never happen. If it does, it means we are following an incorrect or busted chain.
                 throw new VerificationException(
-                        "Difficulty transition point but we did not find a way back to the genesis block.");
+                        "Difficulty transition point but we did not find a way back to the last transition point. Not found: " + hash);
             }
-            cursor = blockStore.get(cursor.getHeader().getPrevBlockHash());
+            hash = cursor.getHeader().getPrevBlockHash();
         }
+        checkState(cursor != null && isDifficultyTransitionPoint(cursor.getHeight() - 1),
+                "Didn't arrive at a transition point.");
         watch.stop();
         if (watch.elapsed(TimeUnit.MILLISECONDS) > 50)
             log.info("Difficulty transition traversal took {}", watch);
@@ -136,7 +155,7 @@ public Coin getMinNonDustOutput() {
 
     @Override
     public MonetaryFormat getMonetaryFormat() {
-        return new MonetaryFormat();
+        return MonetaryFormat.BTC;
     }
 
     @Override
diff --git a/core/src/main/java/org/bitcoinj/params/MainNetParams.java b/core/src/main/java/org/bitcoinj/params/MainNetParams.java
index e42393d7562..283d13cd492 100644
--- a/core/src/main/java/org/bitcoinj/params/MainNetParams.java
+++ b/core/src/main/java/org/bitcoinj/params/MainNetParams.java
@@ -40,11 +40,13 @@ public MainNetParams() {
         dumpedPrivateKeyHeader = 128;
         addressHeader = 0;
         p2shHeader = 5;
-        acceptableAddressCodes = new int[] { addressHeader, p2shHeader };
+        segwitAddressHrp = "bc";
         port = 8333;
         packetMagic = 0xf9beb4d9L;
-        bip32HeaderPub = 0x0488B21E; //The 4 byte header that serializes in base58 to "xpub".
-        bip32HeaderPriv = 0x0488ADE4; //The 4 byte header that serializes in base58 to "xprv"
+        bip32HeaderP2PKHpub = 0x0488b21e; // The 4 byte header that serializes in base58 to "xpub".
+        bip32HeaderP2PKHpriv = 0x0488ade4; // The 4 byte header that serializes in base58 to "xprv"
+        bip32HeaderP2WPKHpub = 0x04b24746; // The 4 byte header that serializes in base58 to "zpub".
+        bip32HeaderP2WPKHpriv = 0x04b2430c; // The 4 byte header that serializes in base58 to "zprv"
 
         majorityEnforceBlockUpgrade = MAINNET_MAJORITY_ENFORCE_BLOCK_UPGRADE;
         majorityRejectBlockOutdated = MAINNET_MAJORITY_REJECT_BLOCK_OUTDATED;
@@ -71,66 +73,77 @@ public MainNetParams() {
         checkpoints.put(200000, Sha256Hash.wrap("000000000000034a7dedef4a161fa058a2d67a173a90155f3a2fe6fc132e0ebf"));
 
         dnsSeeds = new String[] {
-                "seed.bitcoin.sipa.be",        // Pieter Wuille
-                "dnsseed.bluematt.me",         // Matt Corallo
-                "dnsseed.bitcoin.dashjr.org",  // Luke Dashjr
-                "seed.bitcoinstats.com",       // Chris Decker
-                "seed.bitnodes.io",            // Addy Yeow
+                "seed.bitcoin.sipa.be",         // Pieter Wuille
+                "dnsseed.bluematt.me",          // Matt Corallo
+                "dnsseed.bitcoin.dashjr.org",   // Luke Dashjr
+                "seed.bitcoinstats.com",        // Chris Decker
+                "seed.bitcoin.jonasschnelli.ch",// Jonas Schnelli
+                "seed.btc.petertodd.org",       // Peter Todd
+                "seed.bitcoin.sprovoost.nl",    // Sjors Provoost
+                "dnsseed.emzy.de",              // Stephan Oeste
         };
         httpSeeds = new HttpDiscovery.Details[] {
-                // Mike Hearn
-                new HttpDiscovery.Details(
-                        ECKey.fromPublicOnly(Utils.HEX.decode("027a79143a4de36341494d21b6593015af6b2500e720ad2eda1c0b78165f4f38c4")),
-                        URI.create("http://main.seed.vinumeris.com/peers")
-                ),
                 // Andreas Schildbach
                 new HttpDiscovery.Details(
                         ECKey.fromPublicOnly(Utils.HEX.decode("0238746c59d46d5408bf8b1d0af5740fe1a6e1703fcb56b2953f0b965c740d256f")),
                         URI.create("http://httpseed.bitcoin.schildbach.de/peers")
+                ),
+                // Anton Kumaigorodski
+                new HttpDiscovery.Details(
+                        ECKey.fromPublicOnly(Utils.HEX.decode("02c682e83db4efac3c841d6fa544211fb1e4a55061060019b3682fc306f228c558")),
+                        URI.create("http://lightning-wallet.com:8081/peers")
                 )
         };
 
+        // note: These are in big-endian format, which is what the SeedPeers code expects.
+        // These values should be kept up-to-date as much as possible.
+        //
+        // these values were created using this tool:
+        //  https://github.com/dan-da/names2ips
+        //
+        // with this exact command:
+        //  $ ./names2ips.php --hostnames=seed.bitcoin.sipa.be,dnsseed.bluematt.me,dnsseed.bitcoin.dashjr.org,seed.bitcoinstats.com,seed.bitcoin.jonasschnelli.ch,seed.btc.petertodd.org,seed.bitcoin.sprovoost.nl,dnsseed.emzy.de --format=code --ipformat=hex --endian=big
+
+        // TODO better would be that use same as deliver to Bitcoin Core: https://github.com/bitcoin/bitcoin/tree/master/contrib/seeds
+        // Prefer to not use the list from BitoinJ
+
+        // Updated Apr. 11th 2019
         addrSeeds = new int[] {
-                0x1ddb1032, 0x6242ce40, 0x52d6a445, 0x2dd7a445, 0x8a53cd47, 0x73263750, 0xda23c257, 0xecd4ed57,
-                0x0a40ec59, 0x75dce160, 0x7df76791, 0x89370bad, 0xa4f214ad, 0x767700ae, 0x638b0418, 0x868a1018,
-                0xcd9f332e, 0x0129653e, 0xcc92dc3e, 0x96671640, 0x56487e40, 0x5b66f440, 0xb1d01f41, 0xf1dc6041,
-                0xc1d12b42, 0x86ba1243, 0x6be4df43, 0x6d4cef43, 0xd18e0644, 0x1ab0b344, 0x6584a345, 0xe7c1a445,
-                0x58cea445, 0xc5daa445, 0x21dda445, 0x3d3b5346, 0x13e55347, 0x1080d24a, 0x8e611e4b, 0x81518e4b,
-                0x6c839e4b, 0xe2ad0a4c, 0xfbbc0a4c, 0x7f5b6e4c, 0x7244224e, 0x1300554e, 0x20690652, 0x5a48b652,
-                0x75c5c752, 0x4335cc54, 0x340fd154, 0x87c07455, 0x087b2b56, 0x8a133a57, 0xac23c257, 0x70374959,
-                0xfb63d45b, 0xb9a1685c, 0x180d765c, 0x674f645d, 0x04d3495e, 0x1de44b5e, 0x4ee8a362, 0x0ded1b63,
-                0xc1b04b6d, 0x8d921581, 0x97b7ea82, 0x1cf83a8e, 0x91490bad, 0x09dc75ae, 0x9a6d79ae, 0xa26d79ae,
-                0x0fd08fae, 0x0f3e3fb2, 0x4f944fb2, 0xcca448b8, 0x3ecd6ab8, 0xa9d5a5bc, 0x8d0119c1, 0x045997d5,
-                0xca019dd9, 0x0d526c4d, 0xabf1ba44, 0x66b1ab55, 0x1165f462, 0x3ed7cbad, 0xa38fae6e, 0x3bd2cbad,
-                0xd36f0547, 0x20df7840, 0x7a337742, 0x549f8e4b, 0x9062365c, 0xd399f562, 0x2b5274a1, 0x8edfa153,
-                0x3bffb347, 0x7074bf58, 0xb74fcbad, 0x5b5a795b, 0x02fa29ce, 0x5a6738d4, 0xe8a1d23e, 0xef98c445,
-                0x4b0f494c, 0xa2bc1e56, 0x7694ad63, 0xa4a800c3, 0x05fda6cd, 0x9f22175e, 0x364a795b, 0x536285d5,
-                0xac44c9d4, 0x0b06254d, 0x150c2fd4, 0x32a50dcc, 0xfd79ce48, 0xf15cfa53, 0x66c01e60, 0x6bc26661,
-                0xc03b47ae, 0x4dda1b81, 0x3285a4c1, 0x883ca96d, 0x35d60a4c, 0xdae09744, 0x2e314d61, 0x84e247cf,
-                0x6c814552, 0x3a1cc658, 0x98d8f382, 0xe584cb5b, 0x15e86057, 0x7b01504e, 0xd852dd48, 0x56382f56,
-                0x0a5df454, 0xa0d18d18, 0x2e89b148, 0xa79c114c, 0xcbdcd054, 0x5523bc43, 0xa9832640, 0x8a066144,
-                0x3894c3bc, 0xab76bf58, 0x6a018ac1, 0xfebf4f43, 0x2f26c658, 0x31102f4e, 0x85e929d5, 0x2a1c175e,
-                0xfc6c2cd1, 0x27b04b6d, 0xdf024650, 0x161748b8, 0x28be6580, 0x57be6580, 0x1cee677a, 0xaa6bb742,
-                0x9a53964b, 0x0a5a2d4d, 0x2434c658, 0x9a494f57, 0x1ebb0e48, 0xf610b85d, 0x077ecf44, 0x085128bc,
-                0x5ba17a18, 0x27ca1b42, 0xf8a00b56, 0xfcd4c257, 0xcf2fc15e, 0xd897e052, 0x4cada04f, 0x2f35f6d5,
-                0x382ce8c9, 0xe523984b, 0x3f946846, 0x60c8be43, 0x41da6257, 0xde0be142, 0xae8a544b, 0xeff0c254,
-                0x1e0f795b, 0xaeb28890, 0xca16acd9, 0x1e47ddd8, 0x8c8c4829, 0xd27dc747, 0xd53b1663, 0x4096b163,
-                0x9c8dd958, 0xcb12f860, 0x9e79305c, 0x40c1a445, 0x4a90c2bc, 0x2c3a464d, 0x2727f23c, 0x30b04b6d,
-                0x59024cb8, 0xa091e6ad, 0x31b04b6d, 0xc29d46a6, 0x63934fb2, 0xd9224dbe, 0x9f5910d8, 0x7f530a6b,
-                0x752e9c95, 0x65453548, 0xa484be46, 0xce5a1b59, 0x710e0718, 0x46a13d18, 0xdaaf5318, 0xc4a8ff53,
-                0x87abaa52, 0xb764cf51, 0xb2025d4a, 0x6d351e41, 0xc035c33e, 0xa432c162, 0x61ef34ae, 0xd16fddbc,
-                0x0870e8c1, 0x3070e8c1, 0x9c71e8c1, 0xa4992363, 0x85a1f663, 0x4184e559, 0x18d96ed8, 0x17b8dbd5,
-                0x60e7cd18, 0xe5ee104c, 0xab17ac62, 0x1e786e1b, 0x5d23b762, 0xf2388fae, 0x88270360, 0x9e5b3d80,
-                0x7da518b2, 0xb5613b45, 0x1ad41f3e, 0xd550854a, 0x8617e9a9, 0x925b229c, 0xf2e92542, 0x47af0544,
-                0x73b5a843, 0xb9b7a0ad, 0x03a748d0, 0x0a6ff862, 0x6694df62, 0x3bfac948, 0x8e098f4f, 0x746916c3,
-                0x02f38e4f, 0x40bb1243, 0x6a54d162, 0x6008414b, 0xa513794c, 0x514aa343, 0x63781747, 0xdbb6795b,
-                0xed065058, 0x42d24b46, 0x1518794c, 0x9b271681, 0x73e4ffad, 0x0654784f, 0x438dc945, 0x641846a6,
-                0x2d1b0944, 0x94b59148, 0x8d369558, 0xa5a97662, 0x8b705b42, 0xce9204ae, 0x8d584450, 0x2df61555,
-                0xeebff943, 0x2e75fb4d, 0x3ef8fc57, 0x9921135e, 0x8e31042e, 0xb5afad43, 0x89ecedd1, 0x9cfcc047,
-                0x8fcd0f4c, 0xbe49f5ad, 0x146a8d45, 0x98669ab8, 0x98d9175e, 0xd1a8e46d, 0x839a3ab8, 0x40a0016c,
-                0x6d27c257, 0x977fffad, 0x7baa5d5d, 0x1213be43, 0xb167e5a9, 0x640fe8ca, 0xbc9ea655, 0x0f820a4c,
-                0x0f097059, 0x69ac957c, 0x366d8453, 0xb1ba2844, 0x8857f081, 0x70b5be63, 0xc545454b, 0xaf36ded1,
-                0xb5a4b052, 0x21f062d1, 0x72ab89b2, 0x74a45318, 0x8312e6bc, 0xb916965f, 0x8aa7c858, 0xfe7effad,
+                // seed.bitcoin.sipa.be
+                0x117c7e18, 0x12641955, 0x1870652e, 0x1dfec3b9, 0x4a330834, 0x5b53382d, 0x77abaca3, 0x09e3d36c,
+                0xa0a4e1d4, 0xa275d9c7, 0xa280bc4b, 0xa50d1b76, 0x0a5f84cb, 0xa86cd5bd, 0xb3f427ba, 0xc6fc4cd0,
+                0xc73c19b9, 0xd905d85f, 0xd919f9ad, 0xda3fc312, 0xdc4ca5b9, 0xe38ef05b, 0xedce8e57, 0xf68ad23e,
+                0xfb3b9c59,
+                // dnsseed.bluematt.me
+                0x1061d85f, 0x2d5325b0, 0x3505ef91, 0x4c42b14c, 0x623cce72, 0x067e4428, 0x6b47e32e, 0x6e47e32e,
+                0x87aed35f, 0x96fe3234, 0xac81419f, 0xb6f9bb25, 0xc9ddb4b9, 0xcbd8aca3, 0xd55c09b0, 0xd5640618,
+                0xdaa9144e, 0xdfb99088, 0xe0339650, 0xeb8221af, 0xfcbfd75b,
+                // dnsseed.bitcoin.dashjr.org
+                0x028ea62e, 0x2cf968be, 0x2d9cf023, 0x3bedb812, 0x40373745, 0x40aa9850, 0x42504a28, 0x50b8f655,
+                0x5a86e548, 0x6d79f459, 0x70681b41, 0x74a8cf1f, 0x779233d4, 0x8b2380b2, 0x9dcc342f, 0xa331b5ad,
+                0xa95b4c90, 0xb05ff750, 0x0bfde3d4, 0x0c15c136, 0xd3912552, 0xd56ce69d, 0xd8af5454, 0xfce48068,
+                // seed.bitcoinstats.com
+                0x10c23a35, 0x1168b223, 0x11ae871f, 0x14ddce34, 0x018ce3d5, 0x1b242934, 0x20bcf754, 0x33954d33,
+                0x355609b0, 0x39fd202f, 0x4df35e2f, 0x4f23f22b, 0x5707f862, 0x8602bdce, 0x8e09703e, 0x90009ede,
+                0x9ffb125b, 0xa33c4c90, 0xa9c4ec57, 0xaa2d5097, 0xae52fb94, 0x00ed2636, 0xedf5649f, 0x0f41a6bc,
+                0xfe03cf22,
+                // seed.bitcoin.jonasschnelli.ch
+                0x23159dd8, 0x368fea55, 0x50bd4031, 0x5395de6c, 0x05c6902f, 0x60c09350, 0x66d6d168, 0x70d90337,
+                0x7a549ac3, 0x9012d552, 0x94a60f33, 0xa490ff36, 0xb030d552, 0xb0729450, 0xb12b4c4a, 0x0b7e7e60,
+                0xc4f84b2f, 0xc533f42f, 0xc8f60ec2, 0xc9d1bab9, 0xd329cb74, 0xe4b26ab4, 0xe70e5db0, 0xec072034,
+                // seed.btc.petertodd.org
+                0x10ac1242, 0x131c4a79, 0x1477da47, 0x2899ec63, 0x45660451, 0x4b1b0050, 0x6931d0c2, 0x070ed85f,
+                0x806a9950, 0x80b0d522, 0x810d2bc1, 0x829d3b8b, 0x848bdfb0, 0x87a5e52e, 0x9664bb25, 0xa021a6df,
+                0x0a5f8548, 0x0a66c752, 0xaaf5b64f, 0xabba464a, 0xc5df4165, 0xe8c5efd5, 0xfa08d01f,
+                // seed.bitcoin.sprovoost.nl
+                0x14420418, 0x1efdd990, 0x32ded23a, 0x364e1e54, 0x3981d262, 0x39ae6ed3, 0x5143a699, 0x68f861cb,
+                0x6f229e23, 0x6fe45d8e, 0x77db09b0, 0x7a1cd85f, 0x8dd03b8b, 0x92aec9c3, 0xa2debb23, 0xa47dee50,
+                0xb3566bb4, 0xcb1845b9, 0xcd51c253, 0xd541574d, 0xe0cba936, 0xfb2c26d0,
+                // dnsseed.emzy.de
+                0x16e0d7b9, 0x1719c2b9, 0x1edfd04a, 0x287eff2d, 0x28f54e3e, 0x3574c1bc, 0x36f1b4cf, 0x3932571b,
+                0x3d6f9bbc, 0x4458aa3a, 0x4dd2cf52, 0x05483e97, 0x559caed5, 0x59496251, 0x66d432c6, 0x7501f7c7,
+                0x7775599f, 0x8e0ea28b, 0x8f3d0d9d, 0x902695de, 0xa6ada27b, 0xbb00875b, 0xbc26c979, 0xd1a2c58a,
+                0xf6d33b8b, 0xf9d95947,
         };
     }
 
diff --git a/core/src/main/java/org/bitcoinj/params/Networks.java b/core/src/main/java/org/bitcoinj/params/Networks.java
index 03082ad06a2..011be87f440 100644
--- a/core/src/main/java/org/bitcoinj/params/Networks.java
+++ b/core/src/main/java/org/bitcoinj/params/Networks.java
@@ -24,8 +24,8 @@
 import java.util.Set;
 
 /**
- * Utility class that holds all the registered NetworkParameters types used for Address auto discovery.
- * By default only MainNetParams and TestNet3Params are used. If you want to use TestNet2, RegTestParams or
+ * Utility class that holds all the registered NetworkParameters types used for address auto discovery.
+ * By default only MainNetParams and TestNet3Params are used. If you want to use RegTestParams or
  * UnitTestParams use the register and unregister the TestNet3Params as they don't have their own address
  * version/type code.
  */
diff --git a/core/src/main/java/org/bitcoinj/params/RegTestParams.java b/core/src/main/java/org/bitcoinj/params/RegTestParams.java
index d426b0af621..962916b9bff 100644
--- a/core/src/main/java/org/bitcoinj/params/RegTestParams.java
+++ b/core/src/main/java/org/bitcoinj/params/RegTestParams.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2013 Google Inc.
+ * Copyright 2018 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,12 +26,34 @@
 /**
  * Network parameters for the regression test mode of bitcoind in which all blocks are trivially solvable.
  */
-public class RegTestParams extends TestNet2Params {
-    private static final BigInteger MAX_TARGET = new BigInteger("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16);
+public class RegTestParams extends AbstractBitcoinNetParams {
+    private static final BigInteger MAX_TARGET = new BigInteger("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16);
 
     public RegTestParams() {
         super();
-        interval = 10000;
+        packetMagic = 0xfabfb5daL;
+        addressHeader = 111;
+        p2shHeader = 196;
+        targetTimespan = TARGET_TIMESPAN;
+        dumpedPrivateKeyHeader = 239;
+        segwitAddressHrp = "bcrt";
+        genesisBlock.setTime(1296688602L);
+        genesisBlock.setDifficultyTarget(0x1d07fff8L);
+        genesisBlock.setNonce(384568319);
+        spendableCoinbaseDepth = 100;
+        String genesisHash = genesisBlock.getHashAsString();
+        checkState(genesisHash.equals("00000007199508e34a9ff81e6ec0c477a4cccff2a4767a8eee39c11db367b008"));
+        dnsSeeds = null;
+        addrSeeds = null;
+        bip32HeaderP2PKHpub = 0x043587cf; // The 4 byte header that serializes in base58 to "tpub".
+        bip32HeaderP2PKHpriv = 0x04358394; // The 4 byte header that serializes in base58 to "tprv"
+        bip32HeaderP2WPKHpub = 0x045f1cf6; // The 4 byte header that serializes in base58 to "vpub".
+        bip32HeaderP2WPKHpriv = 0x045f18bc; // The 4 byte header that serializes in base58 to "vprv"
+
+        // Difficulty adjustments are disabled for regtest.
+        // By setting the block interval for difficulty adjustments to Integer.MAX_VALUE we make sure difficulty never
+        // changes.
+        interval = Integer.MAX_VALUE;
         maxTarget = MAX_TARGET;
         subsidyDecreaseBlockCount = 150;
         port = 18444;
diff --git a/core/src/main/java/org/bitcoinj/params/TestNet2Params.java b/core/src/main/java/org/bitcoinj/params/TestNet2Params.java
deleted file mode 100644
index d2e01589ec2..00000000000
--- a/core/src/main/java/org/bitcoinj/params/TestNet2Params.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.bitcoinj.params;
-
-import org.bitcoinj.core.Utils;
-
-import static com.google.common.base.Preconditions.checkState;
-
-/**
- * Parameters for the old version 2 testnet. This is not useful to you - it exists only because some unit tests are
- * based on it.
- */
-public class TestNet2Params extends AbstractBitcoinNetParams {
-    public static final int TESTNET_MAJORITY_WINDOW = 100;
-    public static final int TESTNET_MAJORITY_REJECT_BLOCK_OUTDATED = 75;
-    public static final int TESTNET_MAJORITY_ENFORCE_BLOCK_UPGRADE = 51;
-
-    public TestNet2Params() {
-        super();
-        id = ID_TESTNET;
-        packetMagic = 0xfabfb5daL;
-        port = 18333;
-        addressHeader = 111;
-        p2shHeader = 196;
-        acceptableAddressCodes = new int[] { addressHeader, p2shHeader };
-        interval = INTERVAL;
-        targetTimespan = TARGET_TIMESPAN;
-        maxTarget = Utils.decodeCompactBits(0x1d0fffffL);
-        dumpedPrivateKeyHeader = 239;
-        genesisBlock.setTime(1296688602L);
-        genesisBlock.setDifficultyTarget(0x1d07fff8L);
-        genesisBlock.setNonce(384568319);
-        spendableCoinbaseDepth = 100;
-        subsidyDecreaseBlockCount = 210000;
-        String genesisHash = genesisBlock.getHashAsString();
-        checkState(genesisHash.equals("00000007199508e34a9ff81e6ec0c477a4cccff2a4767a8eee39c11db367b008"));
-        dnsSeeds = null;
-        addrSeeds = null;
-        bip32HeaderPub = 0x043587CF;
-        bip32HeaderPriv = 0x04358394;
-
-        majorityEnforceBlockUpgrade = TESTNET_MAJORITY_ENFORCE_BLOCK_UPGRADE;
-        majorityRejectBlockOutdated = TESTNET_MAJORITY_REJECT_BLOCK_OUTDATED;
-        majorityWindow = TESTNET_MAJORITY_WINDOW;
-    }
-
-    private static TestNet2Params instance;
-    public static synchronized TestNet2Params get() {
-        if (instance == null) {
-            instance = new TestNet2Params();
-        }
-        return instance;
-    }
-
-    @Override
-    public String getPaymentProtocolId() {
-        return null;
-    }
-}
diff --git a/core/src/main/java/org/bitcoinj/params/TestNet3Params.java b/core/src/main/java/org/bitcoinj/params/TestNet3Params.java
index 02ccbe16025..3bf4f96520a 100644
--- a/core/src/main/java/org/bitcoinj/params/TestNet3Params.java
+++ b/core/src/main/java/org/bitcoinj/params/TestNet3Params.java
@@ -18,13 +18,16 @@
 package org.bitcoinj.params;
 
 import java.math.BigInteger;
+import java.net.URI;
 import java.util.Date;
 
 import org.bitcoinj.core.Block;
+import org.bitcoinj.core.ECKey;
 import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.core.StoredBlock;
 import org.bitcoinj.core.Utils;
 import org.bitcoinj.core.VerificationException;
+import org.bitcoinj.net.discovery.HttpDiscovery;
 import org.bitcoinj.store.BlockStore;
 import org.bitcoinj.store.BlockStoreException;
 
@@ -35,10 +38,13 @@
  * and testing of applications and new Bitcoin versions.
  */
 public class TestNet3Params extends AbstractBitcoinNetParams {
+    public static final int TESTNET_MAJORITY_WINDOW = 100;
+    public static final int TESTNET_MAJORITY_REJECT_BLOCK_OUTDATED = 75;
+    public static final int TESTNET_MAJORITY_ENFORCE_BLOCK_UPGRADE = 51;
+
     public TestNet3Params() {
         super();
         id = ID_TESTNET;
-        // Genesis hash is 000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943
         packetMagic = 0x0b110907;
         interval = INTERVAL;
         targetTimespan = TARGET_TIMESPAN;
@@ -46,8 +52,8 @@ public TestNet3Params() {
         port = 18333;
         addressHeader = 111;
         p2shHeader = 196;
-        acceptableAddressCodes = new int[] { addressHeader, p2shHeader };
         dumpedPrivateKeyHeader = 239;
+        segwitAddressHrp = "tb";
         genesisBlock.setTime(1296688602L);
         genesisBlock.setDifficultyTarget(0x1d00ffffL);
         genesisBlock.setNonce(414098458);
@@ -58,16 +64,28 @@ public TestNet3Params() {
         alertSigningKey = Utils.HEX.decode("04302390343f91cc401d56d68b123028bf52e5fca1939df127f63c6467cdf9c8e2c14b61104cf817d0b780da337893ecc4aaff1309e536162dabbdb45200ca2b0a");
 
         dnsSeeds = new String[] {
-                "testnet-seed.bitcoin.schildbach.de", // Andreas Schildbach
-                "testnet-seed.bitcoin.petertodd.org"  // Peter Todd
+                "testnet-seed.bitcoin.jonasschnelli.ch", // Jonas Schnelli
+                "seed.tbtc.petertodd.org",               // Peter Todd
+                "seed.testnet.bitcoin.sprovoost.nl",     // Sjors Provoost
+                "testnet-seed.bluematt.me",              // Matt Corallo
+        };
+        httpSeeds = new HttpDiscovery.Details[] {
+                // Andreas Schildbach
+                new HttpDiscovery.Details(
+                        ECKey.fromPublicOnly(Utils.HEX.decode(
+                                "0238746c59d46d5408bf8b1d0af5740fe1a6e1703fcb56b2953f0b965c740d256f")),
+                        URI.create("http://testnet.httpseed.bitcoin.schildbach.de/peers")
+                )
         };
         addrSeeds = null;
-        bip32HeaderPub = 0x043587CF;
-        bip32HeaderPriv = 0x04358394;
+        bip32HeaderP2PKHpub = 0x043587cf; // The 4 byte header that serializes in base58 to "tpub".
+        bip32HeaderP2PKHpriv = 0x04358394; // The 4 byte header that serializes in base58 to "tprv"
+        bip32HeaderP2WPKHpub = 0x045f1cf6; // The 4 byte header that serializes in base58 to "vpub".
+        bip32HeaderP2WPKHpriv = 0x045f18bc; // The 4 byte header that serializes in base58 to "vprv"
 
-        majorityEnforceBlockUpgrade = TestNet2Params.TESTNET_MAJORITY_ENFORCE_BLOCK_UPGRADE;
-        majorityRejectBlockOutdated = TestNet2Params.TESTNET_MAJORITY_REJECT_BLOCK_OUTDATED;
-        majorityWindow = TestNet2Params.TESTNET_MAJORITY_WINDOW;
+        majorityEnforceBlockUpgrade = TESTNET_MAJORITY_ENFORCE_BLOCK_UPGRADE;
+        majorityRejectBlockOutdated = TESTNET_MAJORITY_REJECT_BLOCK_OUTDATED;
+        majorityWindow = TESTNET_MAJORITY_WINDOW;
     }
 
     private static TestNet3Params instance;
@@ -89,7 +107,7 @@ public String getPaymentProtocolId() {
     @Override
     public void checkDifficultyTransitions(final StoredBlock storedPrev, final Block nextBlock,
         final BlockStore blockStore) throws VerificationException, BlockStoreException {
-        if (!isDifficultyTransitionPoint(storedPrev) && nextBlock.getTime().after(testnetDiffDate)) {
+        if (!isDifficultyTransitionPoint(storedPrev.getHeight()) && nextBlock.getTime().after(testnetDiffDate)) {
             Block prev = storedPrev.getHeader();
 
             // After 15th February 2012 the rules on the testnet change to avoid people running up the difficulty
@@ -99,19 +117,19 @@ public void checkDifficultyTransitions(final StoredBlock storedPrev, final Block
             // There is an integer underflow bug in bitcoin-qt that means mindiff blocks are accepted when time
             // goes backwards.
             if (timeDelta >= 0 && timeDelta <= NetworkParameters.TARGET_SPACING * 2) {
-        	// Walk backwards until we find a block that doesn't have the easiest proof of work, then check
-        	// that difficulty is equal to that one.
-        	StoredBlock cursor = storedPrev;
-        	while (!cursor.getHeader().equals(getGenesisBlock()) &&
-                       cursor.getHeight() % getInterval() != 0 &&
-                       cursor.getHeader().getDifficultyTargetAsInteger().equals(getMaxTarget()))
-                    cursor = cursor.getPrev(blockStore);
-        	BigInteger cursorTarget = cursor.getHeader().getDifficultyTargetAsInteger();
-        	BigInteger newTarget = nextBlock.getDifficultyTargetAsInteger();
-        	if (!cursorTarget.equals(newTarget))
-                    throw new VerificationException("Testnet block transition that is not allowed: " +
-                	Long.toHexString(cursor.getHeader().getDifficultyTarget()) + " vs " +
-                	Long.toHexString(nextBlock.getDifficultyTarget()));
+                // Walk backwards until we find a block that doesn't have the easiest proof of work, then check
+                // that difficulty is equal to that one.
+                StoredBlock cursor = storedPrev;
+                while (!cursor.getHeader().equals(getGenesisBlock()) &&
+                           cursor.getHeight() % getInterval() != 0 &&
+                           cursor.getHeader().getDifficultyTargetAsInteger().equals(getMaxTarget()))
+                        cursor = cursor.getPrev(blockStore);
+                BigInteger cursorTarget = cursor.getHeader().getDifficultyTargetAsInteger();
+                BigInteger newTarget = nextBlock.getDifficultyTargetAsInteger();
+                if (!cursorTarget.equals(newTarget))
+                        throw new VerificationException("Testnet block transition that is not allowed: " +
+                        Long.toHexString(cursor.getHeader().getDifficultyTarget()) + " vs " +
+                        Long.toHexString(nextBlock.getDifficultyTarget()));
             }
         } else {
             super.checkDifficultyTransitions(storedPrev, nextBlock, blockStore);
diff --git a/core/src/main/java/org/bitcoinj/params/UnitTestParams.java b/core/src/main/java/org/bitcoinj/params/UnitTestParams.java
index 0a7fea1459c..65a409ededb 100644
--- a/core/src/main/java/org/bitcoinj/params/UnitTestParams.java
+++ b/core/src/main/java/org/bitcoinj/params/UnitTestParams.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2013 Google Inc.
+ * Copyright 2019 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +23,7 @@
 
 /**
  * Network parameters used by the bitcoinj unit tests (and potentially your own). This lets you solve a block using
- * {@link org.bitcoinj.core.Block#solve()} by setting difficulty to the easiest possible.
+ * {@link Block#solve()} by setting difficulty to the easiest possible.
  */
 public class UnitTestParams extends AbstractBitcoinNetParams {
     public static final int UNITNET_MAJORITY_WINDOW = 8;
@@ -35,21 +36,23 @@ public UnitTestParams() {
         packetMagic = 0x0b110907;
         addressHeader = 111;
         p2shHeader = 196;
-        acceptableAddressCodes = new int[] { addressHeader, p2shHeader };
         maxTarget = new BigInteger("00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16);
-        genesisBlock.setTime(System.currentTimeMillis() / 1000);
+        genesisBlock.setTime(Utils.currentTimeSeconds());
         genesisBlock.setDifficultyTarget(Block.EASIEST_DIFFICULTY_TARGET);
         genesisBlock.solve();
         port = 18333;
         interval = 10;
         dumpedPrivateKeyHeader = 239;
+        segwitAddressHrp = "tb";
         targetTimespan = 200000000;  // 6 years. Just a very big number.
         spendableCoinbaseDepth = 5;
         subsidyDecreaseBlockCount = 100;
         dnsSeeds = null;
         addrSeeds = null;
-        bip32HeaderPub = 0x043587CF;
-        bip32HeaderPriv = 0x04358394;
+        bip32HeaderP2PKHpub = 0x043587cf; // The 4 byte header that serializes in base58 to "tpub".
+        bip32HeaderP2PKHpriv = 0x04358394; // The 4 byte header that serializes in base58 to "tprv"
+        bip32HeaderP2WPKHpub = 0x045f1cf6; // The 4 byte header that serializes in base58 to "vpub".
+        bip32HeaderP2WPKHpriv = 0x045f18bc; // The 4 byte header that serializes in base58 to "vprv"
 
         majorityEnforceBlockUpgrade = 3;
         majorityRejectBlockOutdated = 4;
diff --git a/core/src/main/java/org/bitcoinj/params/package-info.java b/core/src/main/java/org/bitcoinj/params/package-info.java
index a0e1697c549..57d7e64289a 100644
--- a/core/src/main/java/org/bitcoinj/params/package-info.java
+++ b/core/src/main/java/org/bitcoinj/params/package-info.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/ClientState.java b/core/src/main/java/org/bitcoinj/protocols/channels/ClientState.java
index a3e0db62c69..82634427fa8 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/ClientState.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/ClientState.java
@@ -5,8 +5,14 @@
 
 public final class ClientState {
   private ClientState() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   public interface StoredClientPaymentChannelsOrBuilder extends
       // @@protoc_insertion_point(interface_extends:paymentchannels.StoredClientPaymentChannels)
@@ -37,43 +43,38 @@ org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannelOrBuilder
         int index);
   }
   /**
-   * Protobuf type {@code paymentchannels.StoredClientPaymentChannels}
-   *
    * <pre>
    * A set of StoredPaymentChannel's
    * </pre>
+   *
+   * Protobuf type {@code paymentchannels.StoredClientPaymentChannels}
    */
-  public static final class StoredClientPaymentChannels extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class StoredClientPaymentChannels extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:paymentchannels.StoredClientPaymentChannels)
       StoredClientPaymentChannelsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use StoredClientPaymentChannels.newBuilder() to construct.
-    private StoredClientPaymentChannels(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private StoredClientPaymentChannels(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private StoredClientPaymentChannels(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final StoredClientPaymentChannels defaultInstance;
-    public static StoredClientPaymentChannels getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public StoredClientPaymentChannels getDefaultInstanceForType() {
-      return defaultInstance;
+    private StoredClientPaymentChannels() {
+      channels_ = java.util.Collections.emptyList();
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private StoredClientPaymentChannels(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -85,19 +86,20 @@ private StoredClientPaymentChannels(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                 channels_ = new java.util.ArrayList<org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel>();
                 mutable_bitField0_ |= 0x00000001;
               }
-              channels_.add(input.readMessage(org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.PARSER, extensionRegistry));
+              channels_.add(
+                  input.readMessage(org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.PARSER, extensionRegistry));
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
               break;
             }
           }
@@ -106,7 +108,7 @@ private StoredClientPaymentChannels(
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
           channels_ = java.util.Collections.unmodifiableList(channels_);
@@ -120,28 +122,14 @@ private StoredClientPaymentChannels(
       return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels.class, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<StoredClientPaymentChannels> PARSER =
-        new com.google.protobuf.AbstractParser<StoredClientPaymentChannels>() {
-      public StoredClientPaymentChannels parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new StoredClientPaymentChannels(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<StoredClientPaymentChannels> getParserForType() {
-      return PARSER;
-    }
-
     public static final int CHANNELS_FIELD_NUMBER = 1;
     private java.util.List<org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel> channels_;
     /**
@@ -177,10 +165,8 @@ public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannelOrB
       return channels_.get(index);
     }
 
-    private void initFields() {
-      channels_ = java.util.Collections.emptyList();
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -196,18 +182,18 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       for (int i = 0; i < channels_.size(); i++) {
         output.writeMessage(1, channels_.get(i));
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -215,18 +201,55 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(1, channels_.get(i));
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels)) {
+        return super.equals(obj);
+      }
+      org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels other = (org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels) obj;
+
+      boolean result = true;
+      result = result && getChannelsList()
+          .equals(other.getChannelsList());
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (getChannelsCount() > 0) {
+        hash = (37 * hash) + CHANNELS_FIELD_NUMBER;
+        hash = (53 * hash) + getChannelsList().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -250,58 +273,71 @@ public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentCha
     }
     public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code paymentchannels.StoredClientPaymentChannels}
-     *
      * <pre>
      * A set of StoredPaymentChannel's
      * </pre>
+     *
+     * Protobuf type {@code paymentchannels.StoredClientPaymentChannels}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:paymentchannels.StoredClientPaymentChannels)
         org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannelsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -309,7 +345,8 @@ public static final class Builder extends
         return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -322,19 +359,17 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
           getChannelsFieldBuilder();
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (channelsBuilder_ == null) {
@@ -346,19 +381,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannels_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels getDefaultInstanceForType() {
         return org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels build() {
         org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels result = buildPartial();
         if (!result.isInitialized()) {
@@ -367,6 +401,7 @@ public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels b
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels buildPartial() {
         org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels result = new org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels(this);
         int from_bitField0_ = bitField0_;
@@ -383,6 +418,39 @@ public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels b
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels) {
           return mergeFrom((org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels)other);
@@ -413,27 +481,29 @@ public Builder mergeFrom(org.bitcoinj.protocols.channels.ClientState.StoredClien
               channels_ = other.channels_;
               bitField0_ = (bitField0_ & ~0x00000001);
               channelsBuilder_ = 
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getChannelsFieldBuilder() : null;
             } else {
               channelsBuilder_.addAllMessages(other.channels_);
             }
           }
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         for (int i = 0; i < getChannelsCount(); i++) {
           if (!getChannels(i).isInitialized()) {
-            
             return false;
           }
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -443,7 +513,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -462,7 +532,7 @@ private void ensureChannelsIsMutable() {
          }
       }
 
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannelOrBuilder> channelsBuilder_;
 
       /**
@@ -678,11 +748,11 @@ public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.Bu
            getChannelsBuilderList() {
         return getChannelsFieldBuilder().getBuilderList();
       }
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannelOrBuilder> 
           getChannelsFieldBuilder() {
         if (channelsBuilder_ == null) {
-          channelsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+          channelsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannelOrBuilder>(
                   channels_,
                   ((bitField0_ & 0x00000001) == 0x00000001),
@@ -692,16 +762,57 @@ public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.Bu
         }
         return channelsBuilder_;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:paymentchannels.StoredClientPaymentChannels)
     }
 
+    // @@protoc_insertion_point(class_scope:paymentchannels.StoredClientPaymentChannels)
+    private static final org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels DEFAULT_INSTANCE;
     static {
-      defaultInstance = new StoredClientPaymentChannels(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels();
+    }
+
+    public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<StoredClientPaymentChannels>
+        PARSER = new com.google.protobuf.AbstractParser<StoredClientPaymentChannels>() {
+      @java.lang.Override
+      public StoredClientPaymentChannels parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new StoredClientPaymentChannels(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<StoredClientPaymentChannels> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<StoredClientPaymentChannels> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannels getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:paymentchannels.StoredClientPaymentChannels)
   }
 
   public interface StoredClientPaymentChannelOrBuilder extends
@@ -745,19 +856,19 @@ public interface StoredClientPaymentChannelOrBuilder extends
     com.google.protobuf.ByteString getMyPublicKey();
 
     /**
-     * <code>required bytes myKey = 4;</code>
-     *
      * <pre>
      * Deprecated, key is already stored in the wallet, and found using myPublicKey;
      * </pre>
+     *
+     * <code>required bytes myKey = 4;</code>
      */
     boolean hasMyKey();
     /**
-     * <code>required bytes myKey = 4;</code>
-     *
      * <pre>
      * Deprecated, key is already stored in the wallet, and found using myPublicKey;
      * </pre>
+     *
+     * <code>required bytes myKey = 4;</code>
      */
     com.google.protobuf.ByteString getMyKey();
 
@@ -771,40 +882,40 @@ public interface StoredClientPaymentChannelOrBuilder extends
     long getValueToMe();
 
     /**
-     * <code>required uint64 refundFees = 6;</code>
-     *
      * <pre>
      * Fees required to refund the transaction.
      * </pre>
+     *
+     * <code>required uint64 refundFees = 6;</code>
      */
     boolean hasRefundFees();
     /**
-     * <code>required uint64 refundFees = 6;</code>
-     *
      * <pre>
      * Fees required to refund the transaction.
      * </pre>
+     *
+     * <code>required uint64 refundFees = 6;</code>
      */
     long getRefundFees();
 
     /**
-     * <code>optional bytes closeTransactionHash = 7;</code>
-     *
      * <pre>
      * When set, the hash of the transaction that was presented by the server for closure of the channel.
      * It spends the contractTransaction and is expected to be broadcast to the network by the server.
      * It's supposed to be in the wallet already.
      * </pre>
+     *
+     * <code>optional bytes closeTransactionHash = 7;</code>
      */
     boolean hasCloseTransactionHash();
     /**
-     * <code>optional bytes closeTransactionHash = 7;</code>
-     *
      * <pre>
      * When set, the hash of the transaction that was presented by the server for closure of the channel.
      * It spends the contractTransaction and is expected to be broadcast to the network by the server.
      * It's supposed to be in the wallet already.
      * </pre>
+     *
+     * <code>optional bytes closeTransactionHash = 7;</code>
      */
     com.google.protobuf.ByteString getCloseTransactionHash();
 
@@ -818,78 +929,83 @@ public interface StoredClientPaymentChannelOrBuilder extends
     int getMajorVersion();
 
     /**
-     * <code>optional uint64 expiryTime = 10;</code>
-     *
      * <pre>
      * The expiry time of the CLTV lock. Only used in protocol v2.
      * </pre>
+     *
+     * <code>optional uint64 expiryTime = 10;</code>
      */
     boolean hasExpiryTime();
     /**
-     * <code>optional uint64 expiryTime = 10;</code>
-     *
      * <pre>
      * The expiry time of the CLTV lock. Only used in protocol v2.
      * </pre>
+     *
+     * <code>optional uint64 expiryTime = 10;</code>
      */
     long getExpiryTime();
 
     /**
-     * <code>optional bytes serverKey = 11;</code>
-     *
      * <pre>
      * The server's public key. Only used in protocol v2.
      * </pre>
+     *
+     * <code>optional bytes serverKey = 11;</code>
      */
     boolean hasServerKey();
     /**
-     * <code>optional bytes serverKey = 11;</code>
-     *
      * <pre>
      * The server's public key. Only used in protocol v2.
      * </pre>
+     *
+     * <code>optional bytes serverKey = 11;</code>
      */
     com.google.protobuf.ByteString getServerKey();
   }
   /**
-   * Protobuf type {@code paymentchannels.StoredClientPaymentChannel}
-   *
    * <pre>
    * A client-side payment channel in serialized form, which can be reloaded later if the client restarts and wants to
    * reopen an existing channel
    * </pre>
+   *
+   * Protobuf type {@code paymentchannels.StoredClientPaymentChannel}
    */
-  public static final class StoredClientPaymentChannel extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class StoredClientPaymentChannel extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:paymentchannels.StoredClientPaymentChannel)
       StoredClientPaymentChannelOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use StoredClientPaymentChannel.newBuilder() to construct.
-    private StoredClientPaymentChannel(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private StoredClientPaymentChannel(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private StoredClientPaymentChannel(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final StoredClientPaymentChannel defaultInstance;
-    public static StoredClientPaymentChannel getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public StoredClientPaymentChannel getDefaultInstanceForType() {
-      return defaultInstance;
+    private StoredClientPaymentChannel() {
+      id_ = com.google.protobuf.ByteString.EMPTY;
+      contractTransaction_ = com.google.protobuf.ByteString.EMPTY;
+      refundTransaction_ = com.google.protobuf.ByteString.EMPTY;
+      myPublicKey_ = com.google.protobuf.ByteString.EMPTY;
+      myKey_ = com.google.protobuf.ByteString.EMPTY;
+      valueToMe_ = 0L;
+      refundFees_ = 0L;
+      closeTransactionHash_ = com.google.protobuf.ByteString.EMPTY;
+      majorVersion_ = 1;
+      expiryTime_ = 0L;
+      serverKey_ = com.google.protobuf.ByteString.EMPTY;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private StoredClientPaymentChannel(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -901,13 +1017,6 @@ private StoredClientPaymentChannel(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               bitField0_ |= 0x00000001;
               id_ = input.readBytes();
@@ -963,13 +1072,20 @@ private StoredClientPaymentChannel(
               serverKey_ = input.readBytes();
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -980,28 +1096,14 @@ private StoredClientPaymentChannel(
       return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.class, org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<StoredClientPaymentChannel> PARSER =
-        new com.google.protobuf.AbstractParser<StoredClientPaymentChannel>() {
-      public StoredClientPaymentChannel parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new StoredClientPaymentChannel(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<StoredClientPaymentChannel> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int ID_FIELD_NUMBER = 1;
     private com.google.protobuf.ByteString id_;
@@ -1066,21 +1168,21 @@ public com.google.protobuf.ByteString getMyPublicKey() {
     public static final int MYKEY_FIELD_NUMBER = 4;
     private com.google.protobuf.ByteString myKey_;
     /**
-     * <code>required bytes myKey = 4;</code>
-     *
      * <pre>
      * Deprecated, key is already stored in the wallet, and found using myPublicKey;
      * </pre>
+     *
+     * <code>required bytes myKey = 4;</code>
      */
     public boolean hasMyKey() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * <code>required bytes myKey = 4;</code>
-     *
      * <pre>
      * Deprecated, key is already stored in the wallet, and found using myPublicKey;
      * </pre>
+     *
+     * <code>required bytes myKey = 4;</code>
      */
     public com.google.protobuf.ByteString getMyKey() {
       return myKey_;
@@ -1104,21 +1206,21 @@ public long getValueToMe() {
     public static final int REFUNDFEES_FIELD_NUMBER = 6;
     private long refundFees_;
     /**
-     * <code>required uint64 refundFees = 6;</code>
-     *
      * <pre>
      * Fees required to refund the transaction.
      * </pre>
+     *
+     * <code>required uint64 refundFees = 6;</code>
      */
     public boolean hasRefundFees() {
       return ((bitField0_ & 0x00000040) == 0x00000040);
     }
     /**
-     * <code>required uint64 refundFees = 6;</code>
-     *
      * <pre>
      * Fees required to refund the transaction.
      * </pre>
+     *
+     * <code>required uint64 refundFees = 6;</code>
      */
     public long getRefundFees() {
       return refundFees_;
@@ -1127,25 +1229,25 @@ public long getRefundFees() {
     public static final int CLOSETRANSACTIONHASH_FIELD_NUMBER = 7;
     private com.google.protobuf.ByteString closeTransactionHash_;
     /**
-     * <code>optional bytes closeTransactionHash = 7;</code>
-     *
      * <pre>
      * When set, the hash of the transaction that was presented by the server for closure of the channel.
      * It spends the contractTransaction and is expected to be broadcast to the network by the server.
      * It's supposed to be in the wallet already.
      * </pre>
+     *
+     * <code>optional bytes closeTransactionHash = 7;</code>
      */
     public boolean hasCloseTransactionHash() {
       return ((bitField0_ & 0x00000080) == 0x00000080);
     }
     /**
-     * <code>optional bytes closeTransactionHash = 7;</code>
-     *
      * <pre>
      * When set, the hash of the transaction that was presented by the server for closure of the channel.
      * It spends the contractTransaction and is expected to be broadcast to the network by the server.
      * It's supposed to be in the wallet already.
      * </pre>
+     *
+     * <code>optional bytes closeTransactionHash = 7;</code>
      */
     public com.google.protobuf.ByteString getCloseTransactionHash() {
       return closeTransactionHash_;
@@ -1169,21 +1271,21 @@ public int getMajorVersion() {
     public static final int EXPIRYTIME_FIELD_NUMBER = 10;
     private long expiryTime_;
     /**
-     * <code>optional uint64 expiryTime = 10;</code>
-     *
      * <pre>
      * The expiry time of the CLTV lock. Only used in protocol v2.
      * </pre>
+     *
+     * <code>optional uint64 expiryTime = 10;</code>
      */
     public boolean hasExpiryTime() {
       return ((bitField0_ & 0x00000200) == 0x00000200);
     }
     /**
-     * <code>optional uint64 expiryTime = 10;</code>
-     *
      * <pre>
      * The expiry time of the CLTV lock. Only used in protocol v2.
      * </pre>
+     *
+     * <code>optional uint64 expiryTime = 10;</code>
      */
     public long getExpiryTime() {
       return expiryTime_;
@@ -1192,40 +1294,28 @@ public long getExpiryTime() {
     public static final int SERVERKEY_FIELD_NUMBER = 11;
     private com.google.protobuf.ByteString serverKey_;
     /**
-     * <code>optional bytes serverKey = 11;</code>
-     *
      * <pre>
      * The server's public key. Only used in protocol v2.
      * </pre>
+     *
+     * <code>optional bytes serverKey = 11;</code>
      */
     public boolean hasServerKey() {
       return ((bitField0_ & 0x00000400) == 0x00000400);
     }
     /**
-     * <code>optional bytes serverKey = 11;</code>
-     *
      * <pre>
      * The server's public key. Only used in protocol v2.
      * </pre>
+     *
+     * <code>optional bytes serverKey = 11;</code>
      */
     public com.google.protobuf.ByteString getServerKey() {
       return serverKey_;
     }
 
-    private void initFields() {
-      id_ = com.google.protobuf.ByteString.EMPTY;
-      contractTransaction_ = com.google.protobuf.ByteString.EMPTY;
-      refundTransaction_ = com.google.protobuf.ByteString.EMPTY;
-      myPublicKey_ = com.google.protobuf.ByteString.EMPTY;
-      myKey_ = com.google.protobuf.ByteString.EMPTY;
-      valueToMe_ = 0L;
-      refundFees_ = 0L;
-      closeTransactionHash_ = com.google.protobuf.ByteString.EMPTY;
-      majorVersion_ = 1;
-      expiryTime_ = 0L;
-      serverKey_ = com.google.protobuf.ByteString.EMPTY;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1263,9 +1353,9 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeBytes(1, id_);
       }
@@ -1299,12 +1389,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000400) == 0x00000400)) {
         output.writeBytes(11, serverKey_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -1352,18 +1442,151 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(11, serverKey_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel)) {
+        return super.equals(obj);
+      }
+      org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel other = (org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel) obj;
+
+      boolean result = true;
+      result = result && (hasId() == other.hasId());
+      if (hasId()) {
+        result = result && getId()
+            .equals(other.getId());
+      }
+      result = result && (hasContractTransaction() == other.hasContractTransaction());
+      if (hasContractTransaction()) {
+        result = result && getContractTransaction()
+            .equals(other.getContractTransaction());
+      }
+      result = result && (hasRefundTransaction() == other.hasRefundTransaction());
+      if (hasRefundTransaction()) {
+        result = result && getRefundTransaction()
+            .equals(other.getRefundTransaction());
+      }
+      result = result && (hasMyPublicKey() == other.hasMyPublicKey());
+      if (hasMyPublicKey()) {
+        result = result && getMyPublicKey()
+            .equals(other.getMyPublicKey());
+      }
+      result = result && (hasMyKey() == other.hasMyKey());
+      if (hasMyKey()) {
+        result = result && getMyKey()
+            .equals(other.getMyKey());
+      }
+      result = result && (hasValueToMe() == other.hasValueToMe());
+      if (hasValueToMe()) {
+        result = result && (getValueToMe()
+            == other.getValueToMe());
+      }
+      result = result && (hasRefundFees() == other.hasRefundFees());
+      if (hasRefundFees()) {
+        result = result && (getRefundFees()
+            == other.getRefundFees());
+      }
+      result = result && (hasCloseTransactionHash() == other.hasCloseTransactionHash());
+      if (hasCloseTransactionHash()) {
+        result = result && getCloseTransactionHash()
+            .equals(other.getCloseTransactionHash());
+      }
+      result = result && (hasMajorVersion() == other.hasMajorVersion());
+      if (hasMajorVersion()) {
+        result = result && (getMajorVersion()
+            == other.getMajorVersion());
+      }
+      result = result && (hasExpiryTime() == other.hasExpiryTime());
+      if (hasExpiryTime()) {
+        result = result && (getExpiryTime()
+            == other.getExpiryTime());
+      }
+      result = result && (hasServerKey() == other.hasServerKey());
+      if (hasServerKey()) {
+        result = result && getServerKey()
+            .equals(other.getServerKey());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasId()) {
+        hash = (37 * hash) + ID_FIELD_NUMBER;
+        hash = (53 * hash) + getId().hashCode();
+      }
+      if (hasContractTransaction()) {
+        hash = (37 * hash) + CONTRACTTRANSACTION_FIELD_NUMBER;
+        hash = (53 * hash) + getContractTransaction().hashCode();
+      }
+      if (hasRefundTransaction()) {
+        hash = (37 * hash) + REFUNDTRANSACTION_FIELD_NUMBER;
+        hash = (53 * hash) + getRefundTransaction().hashCode();
+      }
+      if (hasMyPublicKey()) {
+        hash = (37 * hash) + MYPUBLICKEY_FIELD_NUMBER;
+        hash = (53 * hash) + getMyPublicKey().hashCode();
+      }
+      if (hasMyKey()) {
+        hash = (37 * hash) + MYKEY_FIELD_NUMBER;
+        hash = (53 * hash) + getMyKey().hashCode();
+      }
+      if (hasValueToMe()) {
+        hash = (37 * hash) + VALUETOME_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getValueToMe());
+      }
+      if (hasRefundFees()) {
+        hash = (37 * hash) + REFUNDFEES_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getRefundFees());
+      }
+      if (hasCloseTransactionHash()) {
+        hash = (37 * hash) + CLOSETRANSACTIONHASH_FIELD_NUMBER;
+        hash = (53 * hash) + getCloseTransactionHash().hashCode();
+      }
+      if (hasMajorVersion()) {
+        hash = (37 * hash) + MAJORVERSION_FIELD_NUMBER;
+        hash = (53 * hash) + getMajorVersion();
+      }
+      if (hasExpiryTime()) {
+        hash = (37 * hash) + EXPIRYTIME_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getExpiryTime());
+      }
+      if (hasServerKey()) {
+        hash = (37 * hash) + SERVERKEY_FIELD_NUMBER;
+        hash = (53 * hash) + getServerKey().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -1387,59 +1610,72 @@ public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentCha
     }
     public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code paymentchannels.StoredClientPaymentChannel}
-     *
      * <pre>
      * A client-side payment channel in serialized form, which can be reloaded later if the client restarts and wants to
      * reopen an existing channel
      * </pre>
+     *
+     * Protobuf type {@code paymentchannels.StoredClientPaymentChannel}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:paymentchannels.StoredClientPaymentChannel)
         org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannelOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -1447,7 +1683,8 @@ public static final class Builder extends
         return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -1460,18 +1697,16 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         id_ = com.google.protobuf.ByteString.EMPTY;
@@ -1499,19 +1734,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoinj.protocols.channels.ClientState.internal_static_paymentchannels_StoredClientPaymentChannel_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel getDefaultInstanceForType() {
         return org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel build() {
         org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel result = buildPartial();
         if (!result.isInitialized()) {
@@ -1520,6 +1754,7 @@ public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel bu
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel buildPartial() {
         org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel result = new org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel(this);
         int from_bitField0_ = bitField0_;
@@ -1573,6 +1808,39 @@ public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel bu
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel) {
           return mergeFrom((org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel)other);
@@ -1617,42 +1885,38 @@ public Builder mergeFrom(org.bitcoinj.protocols.channels.ClientState.StoredClien
         if (other.hasServerKey()) {
           setServerKey(other.getServerKey());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasId()) {
-          
           return false;
         }
         if (!hasContractTransaction()) {
-          
           return false;
         }
         if (!hasRefundTransaction()) {
-          
           return false;
         }
         if (!hasMyPublicKey()) {
-          
           return false;
         }
         if (!hasMyKey()) {
-          
           return false;
         }
         if (!hasValueToMe()) {
-          
           return false;
         }
         if (!hasRefundFees()) {
-          
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1662,7 +1926,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -1814,31 +2078,31 @@ public Builder clearMyPublicKey() {
 
       private com.google.protobuf.ByteString myKey_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>required bytes myKey = 4;</code>
-       *
        * <pre>
        * Deprecated, key is already stored in the wallet, and found using myPublicKey;
        * </pre>
+       *
+       * <code>required bytes myKey = 4;</code>
        */
       public boolean hasMyKey() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * <code>required bytes myKey = 4;</code>
-       *
        * <pre>
        * Deprecated, key is already stored in the wallet, and found using myPublicKey;
        * </pre>
+       *
+       * <code>required bytes myKey = 4;</code>
        */
       public com.google.protobuf.ByteString getMyKey() {
         return myKey_;
       }
       /**
-       * <code>required bytes myKey = 4;</code>
-       *
        * <pre>
        * Deprecated, key is already stored in the wallet, and found using myPublicKey;
        * </pre>
+       *
+       * <code>required bytes myKey = 4;</code>
        */
       public Builder setMyKey(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -1850,11 +2114,11 @@ public Builder setMyKey(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>required bytes myKey = 4;</code>
-       *
        * <pre>
        * Deprecated, key is already stored in the wallet, and found using myPublicKey;
        * </pre>
+       *
+       * <code>required bytes myKey = 4;</code>
        */
       public Builder clearMyKey() {
         bitField0_ = (bitField0_ & ~0x00000010);
@@ -1897,31 +2161,31 @@ public Builder clearValueToMe() {
 
       private long refundFees_ ;
       /**
-       * <code>required uint64 refundFees = 6;</code>
-       *
        * <pre>
        * Fees required to refund the transaction.
        * </pre>
+       *
+       * <code>required uint64 refundFees = 6;</code>
        */
       public boolean hasRefundFees() {
         return ((bitField0_ & 0x00000040) == 0x00000040);
       }
       /**
-       * <code>required uint64 refundFees = 6;</code>
-       *
        * <pre>
        * Fees required to refund the transaction.
        * </pre>
+       *
+       * <code>required uint64 refundFees = 6;</code>
        */
       public long getRefundFees() {
         return refundFees_;
       }
       /**
-       * <code>required uint64 refundFees = 6;</code>
-       *
        * <pre>
        * Fees required to refund the transaction.
        * </pre>
+       *
+       * <code>required uint64 refundFees = 6;</code>
        */
       public Builder setRefundFees(long value) {
         bitField0_ |= 0x00000040;
@@ -1930,11 +2194,11 @@ public Builder setRefundFees(long value) {
         return this;
       }
       /**
-       * <code>required uint64 refundFees = 6;</code>
-       *
        * <pre>
        * Fees required to refund the transaction.
        * </pre>
+       *
+       * <code>required uint64 refundFees = 6;</code>
        */
       public Builder clearRefundFees() {
         bitField0_ = (bitField0_ & ~0x00000040);
@@ -1945,37 +2209,37 @@ public Builder clearRefundFees() {
 
       private com.google.protobuf.ByteString closeTransactionHash_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>optional bytes closeTransactionHash = 7;</code>
-       *
        * <pre>
        * When set, the hash of the transaction that was presented by the server for closure of the channel.
        * It spends the contractTransaction and is expected to be broadcast to the network by the server.
        * It's supposed to be in the wallet already.
        * </pre>
+       *
+       * <code>optional bytes closeTransactionHash = 7;</code>
        */
       public boolean hasCloseTransactionHash() {
         return ((bitField0_ & 0x00000080) == 0x00000080);
       }
       /**
-       * <code>optional bytes closeTransactionHash = 7;</code>
-       *
        * <pre>
        * When set, the hash of the transaction that was presented by the server for closure of the channel.
        * It spends the contractTransaction and is expected to be broadcast to the network by the server.
        * It's supposed to be in the wallet already.
        * </pre>
+       *
+       * <code>optional bytes closeTransactionHash = 7;</code>
        */
       public com.google.protobuf.ByteString getCloseTransactionHash() {
         return closeTransactionHash_;
       }
       /**
-       * <code>optional bytes closeTransactionHash = 7;</code>
-       *
        * <pre>
        * When set, the hash of the transaction that was presented by the server for closure of the channel.
        * It spends the contractTransaction and is expected to be broadcast to the network by the server.
        * It's supposed to be in the wallet already.
        * </pre>
+       *
+       * <code>optional bytes closeTransactionHash = 7;</code>
        */
       public Builder setCloseTransactionHash(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -1987,13 +2251,13 @@ public Builder setCloseTransactionHash(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>optional bytes closeTransactionHash = 7;</code>
-       *
        * <pre>
        * When set, the hash of the transaction that was presented by the server for closure of the channel.
        * It spends the contractTransaction and is expected to be broadcast to the network by the server.
        * It's supposed to be in the wallet already.
        * </pre>
+       *
+       * <code>optional bytes closeTransactionHash = 7;</code>
        */
       public Builder clearCloseTransactionHash() {
         bitField0_ = (bitField0_ & ~0x00000080);
@@ -2036,31 +2300,31 @@ public Builder clearMajorVersion() {
 
       private long expiryTime_ ;
       /**
-       * <code>optional uint64 expiryTime = 10;</code>
-       *
        * <pre>
        * The expiry time of the CLTV lock. Only used in protocol v2.
        * </pre>
+       *
+       * <code>optional uint64 expiryTime = 10;</code>
        */
       public boolean hasExpiryTime() {
         return ((bitField0_ & 0x00000200) == 0x00000200);
       }
       /**
-       * <code>optional uint64 expiryTime = 10;</code>
-       *
        * <pre>
        * The expiry time of the CLTV lock. Only used in protocol v2.
        * </pre>
+       *
+       * <code>optional uint64 expiryTime = 10;</code>
        */
       public long getExpiryTime() {
         return expiryTime_;
       }
       /**
-       * <code>optional uint64 expiryTime = 10;</code>
-       *
        * <pre>
        * The expiry time of the CLTV lock. Only used in protocol v2.
        * </pre>
+       *
+       * <code>optional uint64 expiryTime = 10;</code>
        */
       public Builder setExpiryTime(long value) {
         bitField0_ |= 0x00000200;
@@ -2069,11 +2333,11 @@ public Builder setExpiryTime(long value) {
         return this;
       }
       /**
-       * <code>optional uint64 expiryTime = 10;</code>
-       *
        * <pre>
        * The expiry time of the CLTV lock. Only used in protocol v2.
        * </pre>
+       *
+       * <code>optional uint64 expiryTime = 10;</code>
        */
       public Builder clearExpiryTime() {
         bitField0_ = (bitField0_ & ~0x00000200);
@@ -2084,31 +2348,31 @@ public Builder clearExpiryTime() {
 
       private com.google.protobuf.ByteString serverKey_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>optional bytes serverKey = 11;</code>
-       *
        * <pre>
        * The server's public key. Only used in protocol v2.
        * </pre>
+       *
+       * <code>optional bytes serverKey = 11;</code>
        */
       public boolean hasServerKey() {
         return ((bitField0_ & 0x00000400) == 0x00000400);
       }
       /**
-       * <code>optional bytes serverKey = 11;</code>
-       *
        * <pre>
        * The server's public key. Only used in protocol v2.
        * </pre>
+       *
+       * <code>optional bytes serverKey = 11;</code>
        */
       public com.google.protobuf.ByteString getServerKey() {
         return serverKey_;
       }
       /**
-       * <code>optional bytes serverKey = 11;</code>
-       *
        * <pre>
        * The server's public key. Only used in protocol v2.
        * </pre>
+       *
+       * <code>optional bytes serverKey = 11;</code>
        */
       public Builder setServerKey(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -2120,11 +2384,11 @@ public Builder setServerKey(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>optional bytes serverKey = 11;</code>
-       *
        * <pre>
        * The server's public key. Only used in protocol v2.
        * </pre>
+       *
+       * <code>optional bytes serverKey = 11;</code>
        */
       public Builder clearServerKey() {
         bitField0_ = (bitField0_ & ~0x00000400);
@@ -2132,34 +2396,75 @@ public Builder clearServerKey() {
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:paymentchannels.StoredClientPaymentChannel)
     }
 
+    // @@protoc_insertion_point(class_scope:paymentchannels.StoredClientPaymentChannel)
+    private static final org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel DEFAULT_INSTANCE;
     static {
-      defaultInstance = new StoredClientPaymentChannel(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel();
+    }
+
+    public static org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<StoredClientPaymentChannel>
+        PARSER = new com.google.protobuf.AbstractParser<StoredClientPaymentChannel>() {
+      @java.lang.Override
+      public StoredClientPaymentChannel parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new StoredClientPaymentChannel(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<StoredClientPaymentChannel> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<StoredClientPaymentChannel> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoinj.protocols.channels.ClientState.StoredClientPaymentChannel getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:paymentchannels.StoredClientPaymentChannel)
   }
 
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_paymentchannels_StoredClientPaymentChannels_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_paymentchannels_StoredClientPaymentChannels_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_paymentchannels_StoredClientPaymentChannel_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_paymentchannels_StoredClientPaymentChannel_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
   }
-  private static com.google.protobuf.Descriptors.FileDescriptor
+  private static  com.google.protobuf.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
@@ -2172,7 +2477,7 @@ public Builder clearServerKey() {
       " \002(\014\022\023\n\013myPublicKey\030\010 \002(\014\022\r\n\005myKey\030\004 \002(\014" +
       "\022\021\n\tvalueToMe\030\005 \002(\004\022\022\n\nrefundFees\030\006 \002(\004\022" +
       "\034\n\024closeTransactionHash\030\007 \001(\014\022\027\n\014majorVe" +
-      "rsion\030\t \001(\r:\0011\022\022\n\nexpiryTime\030\n \001(\004\022\021\n\tse",
+      "rsion\030\t \001(\r:\0011\022\022\n\nexpiryTime\030\n \001(\004\022\021\n\tse" +
       "rverKey\030\013 \001(\014B.\n\037org.bitcoinj.protocols." +
       "channelsB\013ClientState"
     };
@@ -2191,13 +2496,13 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     internal_static_paymentchannels_StoredClientPaymentChannels_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_paymentchannels_StoredClientPaymentChannels_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_paymentchannels_StoredClientPaymentChannels_descriptor,
         new java.lang.String[] { "Channels", });
     internal_static_paymentchannels_StoredClientPaymentChannel_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_paymentchannels_StoredClientPaymentChannel_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_paymentchannels_StoredClientPaymentChannel_descriptor,
         new java.lang.String[] { "Id", "ContractTransaction", "RefundTransaction", "MyPublicKey", "MyKey", "ValueToMe", "RefundFees", "CloseTransactionHash", "MajorVersion", "ExpiryTime", "ServerKey", });
   }
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/IPaymentChannelClient.java b/core/src/main/java/org/bitcoinj/protocols/channels/IPaymentChannelClient.java
index 398cf2cefc2..bcf58d483f4 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/IPaymentChannelClient.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/IPaymentChannelClient.java
@@ -23,7 +23,8 @@
 
 import com.google.protobuf.ByteString;
 import org.bitcoin.paymentchannel.Protos;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bitcoinj.wallet.SendRequest;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import javax.annotation.Nullable;
 
@@ -46,7 +47,7 @@ public interface IPaymentChannelClient {
      * intending to reopen the channel later. There is likely little reason to use this in a stateless protocol.</p>
      *
      * <p>Note that this <b>MUST</b> still be called even after either
-     * {@link PaymentChannelClient.ClientConnection#destroyConnection(org.bitcoinj.protocols.channels.PaymentChannelCloseException.CloseReason)} or
+     * {@link IPaymentChannelClient.ClientConnection#destroyConnection(PaymentChannelCloseException.CloseReason)} or
      * {@link IPaymentChannelClient#settle()} is called, to actually handle the connection close logic.</p>
      */
     void connectionClosed();
@@ -55,7 +56,7 @@ public interface IPaymentChannelClient {
      * <p>Settles the channel, notifying the server it can broadcast the most recent payment transaction.</p>
      *
      * <p>Note that this only generates a CLOSE message for the server and calls
-     * {@link PaymentChannelClient.ClientConnection#destroyConnection(org.bitcoinj.protocols.channels.PaymentChannelCloseException.CloseReason)}
+     * {@link IPaymentChannelClient.ClientConnection#destroyConnection(PaymentChannelCloseException.CloseReason)}
      * to settle the connection, it does not actually handle connection close logic, and
      * {@link PaymentChannelClient#connectionClosed()} must still be called after the connection fully settles.</p>
      *
@@ -102,44 +103,44 @@ interface ClientConnection {
          * however the order of messages must be preserved.</p>
          *
          * <p>If the send fails, no exception should be thrown, however
-         * {@link org.bitcoinj.protocols.channels.PaymentChannelClient#connectionClosed()} should be called immediately. In the case of messages which
+         * {@link PaymentChannelClient#connectionClosed()} should be called immediately. In the case of messages which
          * are a part of initialization, initialization will simply fail and the refund transaction will be broadcasted
          * when it unlocks (if necessary).  In the case of a payment message, the payment will be lost however if the
          * channel is resumed it will begin again from the channel value <i>after</i> the failed payment.</p>
          *
-         * <p>Called while holding a lock on the {@link org.bitcoinj.protocols.channels.PaymentChannelClient} object - be careful about reentrancy</p>
+         * <p>Called while holding a lock on the {@link PaymentChannelClient} object - be careful about reentrancy</p>
          */
         void sendToServer(Protos.TwoWayChannelMessage msg);
 
         /**
          * <p>Requests that the connection to the server be closed. For stateless protocols, note that after this call,
          * no more messages should be received from the server and this object is no longer usable. A
-         * {@link org.bitcoinj.protocols.channels.PaymentChannelClient#connectionClosed()} event should be generated immediately after this call.</p>
+         * {@link PaymentChannelClient#connectionClosed()} event should be generated immediately after this call.</p>
          *
-         * <p>Called while holding a lock on the {@link org.bitcoinj.protocols.channels.PaymentChannelClient} object - be careful about reentrancy</p>
+         * <p>Called while holding a lock on the {@link PaymentChannelClient} object - be careful about reentrancy</p>
          *
          * @param reason The reason for the closure, see the individual values for more details.
          *               It is usually safe to ignore this and treat any value below
-         *               {@link org.bitcoinj.protocols.channels.PaymentChannelCloseException.CloseReason#CLIENT_REQUESTED_CLOSE} as "unrecoverable error" and all others as
+         *               {@link PaymentChannelCloseException.CloseReason#CLIENT_REQUESTED_CLOSE} as "unrecoverable error" and all others as
          *               "try again once and see if it works then"
          */
         void destroyConnection(PaymentChannelCloseException.CloseReason reason);
 
 
         /**
-         * <p>Queries if the expire time proposed by server is acceptable. If <code>false</code> is return the channel
-         * will be closed with a  {@link org.bitcoinj.protocols.channels.PaymentChannelCloseException.CloseReason#TIME_WINDOW_UNACCEPTABLE}.</p>
+         * <p>Queries if the expire time proposed by server is acceptable. If {@code false} is return the channel
+         * will be closed with a  {@link PaymentChannelCloseException.CloseReason#TIME_WINDOW_UNACCEPTABLE}.</p>
          * @param expireTime The time, in seconds,  when this channel will be closed by the server. Note this is in absolute time, i.e. seconds since 1970-01-01T00:00:00.
-         * @return <code>true</code> if the proposed time is acceptable <code>false</code> otherwise.
+         * @return {@code true} if the proposed time is acceptable {@code false} otherwise.
          */
         boolean acceptExpireTime(long expireTime);
 
         /**
          * <p>Indicates the channel has been successfully opened and
-         * {@link org.bitcoinj.protocols.channels.PaymentChannelClient#incrementPayment(Coin)}
+         * {@link PaymentChannelClient#incrementPayment(Coin)}
          * may be called at will.</p>
          *
-         * <p>Called while holding a lock on the {@link org.bitcoinj.protocols.channels.PaymentChannelClient}
+         * <p>Called while holding a lock on the {@link PaymentChannelClient}
          * object - be careful about reentrancy</p>
          *
          * @param wasInitiated If true, the channel is newly opened. If false, it was resumed.
@@ -147,6 +148,41 @@ interface ClientConnection {
         void channelOpen(boolean wasInitiated);
     }
 
+    /**
+     * Set Client payment channel properties.
+     */
+    interface ClientChannelProperties {
+        /**
+         * Modify the sendRequest used for the contract.
+         * @param sendRequest the current sendRequest.
+         * @return the modified sendRequest.
+         */
+        SendRequest modifyContractSendRequest(SendRequest sendRequest);
+
+        /**
+         *  The maximum acceptable min payment. If the server suggests a higher amount
+         *  the channel creation will be aborted.
+         */
+        Coin acceptableMinPayment();
+
+        /**
+         *  The time in seconds, relative to now, on how long this channel should be kept open. Note that is is
+         *  a proposal to the server. The server may in turn propose something different.
+         *  See {@link IPaymentChannelClient.ClientConnection#acceptExpireTime(long)}
+         *
+         */
+        long timeWindow();
+
+        /**
+         * An enum indicating which versions to support:
+         * VERSION_1: use only version 1 of the protocol
+         * VERSION_2_ALLOW_1: suggest version 2 but allow downgrade to version 1
+         * VERSION_2: suggest version 2 and enforce use of version 2
+         *
+         */
+        PaymentChannelClient.VersionSelector versionSelector();
+    }
+
     /**
      * An implementor of this interface creates payment channel clients that "talk back" with the given connection.
      * The client might be a PaymentChannelClient, or an RPC interface, or something else entirely.
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClient.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClient.java
index 3bb0ed1b8ae..b0114a1628d 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClient.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClient.java
@@ -20,6 +20,7 @@
 import org.bitcoinj.core.*;
 import org.bitcoinj.protocols.channels.PaymentChannelCloseException.CloseReason;
 import org.bitcoinj.utils.Threading;
+import org.bitcoinj.wallet.SendRequest;
 import org.bitcoinj.wallet.Wallet;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -30,7 +31,7 @@
 import net.jcip.annotations.GuardedBy;
 import org.bitcoin.paymentchannel.Protos;
 import org.slf4j.LoggerFactory;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import javax.annotation.Nullable;
 import java.util.concurrent.locks.ReentrantLock;
@@ -56,6 +57,7 @@ public class PaymentChannelClient implements IPaymentChannelClient {
     private static final org.slf4j.Logger log = LoggerFactory.getLogger(PaymentChannelClient.class);
 
     protected final ReentrantLock lock = Threading.lock("channelclient");
+    protected final ClientChannelProperties clientChannelProperties;
 
     // Used to track the negotiated version number
     @GuardedBy("lock") private int majorVersion;
@@ -167,14 +169,12 @@ public boolean isServerVersionAccepted(int major, int minor) {
      * @param conn A callback listener which represents the connection to the server (forwards messages we generate to
      *             the server)
      */
-    public PaymentChannelClient(Wallet wallet, ECKey myKey, Coin maxValue, Sha256Hash serverId,
-                                ClientConnection conn) {
-        this(wallet,myKey,maxValue,serverId, conn, VersionSelector.VERSION_2_ALLOW_1);
+    public PaymentChannelClient(Wallet wallet, ECKey myKey, Coin maxValue, Sha256Hash serverId, ClientConnection conn) {
+        this(wallet,myKey,maxValue,serverId, null, conn);
     }
 
     /**
      * Constructs a new channel manager which waits for {@link PaymentChannelClient#connectionOpen()} before acting.
-     * A default time window of {@link #DEFAULT_TIME_WINDOW} will be used.
      *
      * @param wallet The wallet which will be paid from, and where completed transactions will be committed.
      *               Must already have a {@link StoredPaymentChannelClientStates} object in its extensions set.
@@ -186,42 +186,13 @@ public PaymentChannelClient(Wallet wallet, ECKey myKey, Coin maxValue, Sha256Has
      * @param serverId An arbitrary hash representing this channel. This must uniquely identify the server. If an
      *                 existing stored channel exists in the wallet's {@link StoredPaymentChannelClientStates}, then an
      *                 attempt will be made to resume that channel.
-     * @param conn A callback listener which represents the connection to the server (forwards messages we generate to
-     *             the server)
-     * @param versionSelector An enum indicating which versions to support:
-     *                        VERSION_1: use only version 1 of the protocol
-     *                        VERSION_2_ALLOW_1: suggest version 2 but allow downgrade to version 1
-     *                        VERSION_2: suggest version 2 and enforce use of version 2
-     *
-     */
-    public PaymentChannelClient(Wallet wallet, ECKey myKey, Coin maxValue, Sha256Hash serverId,
-                                ClientConnection conn, VersionSelector versionSelector) {
-      this(wallet,myKey,maxValue,serverId, DEFAULT_TIME_WINDOW, null, conn, versionSelector);
-    }
-
-    /**
-     * Constructs a new channel manager which waits for {@link PaymentChannelClient#connectionOpen()} before acting.
-     *
-     * @param wallet The wallet which will be paid from, and where completed transactions will be committed.
-     *               Must already have a {@link StoredPaymentChannelClientStates} object in its extensions set.
-     * @param myKey A freshly generated keypair used for the multisig contract and refund output.
-     * @param maxValue The maximum value the server is allowed to request that we lock into this channel until the
-     *                 refund transaction unlocks. Note that if there is a previously open channel, the refund
-     *                 transaction used in this channel may be larger than maxValue. Thus, maxValue is not a method for
-     *                 limiting the amount payable through this channel.
-     * @param serverId An arbitrary hash representing this channel. This must uniquely identify the server. If an
-     *                 existing stored channel exists in the wallet's {@link StoredPaymentChannelClientStates}, then an
-     *                 attempt will be made to resume that channel.
-     * @param timeWindow The time in seconds, relative to now, on how long this channel should be kept open. Note that is is
-     *                   a proposal to the server. The server may in turn propose something different.
-     *                   See {@link org.bitcoinj.protocols.channels.IPaymentChannelClient.ClientConnection#acceptExpireTime(long)}
      * @param userKeySetup Key derived from a user password, used to decrypt myKey, if it is encrypted, during setup.
      * @param conn A callback listener which represents the connection to the server (forwards messages we generate to
      *             the server)
      */
-    public PaymentChannelClient(Wallet wallet, ECKey myKey, Coin maxValue, Sha256Hash serverId, long timeWindow,
+    public PaymentChannelClient(Wallet wallet, ECKey myKey, Coin maxValue, Sha256Hash serverId,
                                 @Nullable KeyParameter userKeySetup, ClientConnection conn) {
-        this(wallet, myKey, maxValue, serverId, timeWindow, userKeySetup, conn, VersionSelector.VERSION_2_ALLOW_1);
+        this(wallet, myKey, maxValue, serverId, userKeySetup, defaultChannelProperties, conn);
     }
 
     /**
@@ -237,28 +208,28 @@ public PaymentChannelClient(Wallet wallet, ECKey myKey, Coin maxValue, Sha256Has
      * @param serverId An arbitrary hash representing this channel. This must uniquely identify the server. If an
      *                 existing stored channel exists in the wallet's {@link StoredPaymentChannelClientStates}, then an
      *                 attempt will be made to resume that channel.
-     * @param timeWindow The time in seconds, relative to now, on how long this channel should be kept open. Note that is is
-     *                   a proposal to the server. The server may in turn propose something different.
-     *                   See {@link org.bitcoinj.protocols.channels.IPaymentChannelClient.ClientConnection#acceptExpireTime(long)}
      * @param userKeySetup Key derived from a user password, used to decrypt myKey, if it is encrypted, during setup.
+     * @param clientChannelProperties Modify the channel's properties. You may extend {@link DefaultClientChannelProperties}
      * @param conn A callback listener which represents the connection to the server (forwards messages we generate to
      *             the server)
-     * @param versionSelector An enum indicating which versions to support:
-     *                        VERSION_1: use only version 1 of the protocol
-     *                        VERSION_2_ALLOW_1: suggest version 2 but allow downgrade to version 1
-     *                        VERSION_2: suggest version 2 and enforce use of version 2
      */
-    public PaymentChannelClient(Wallet wallet, ECKey myKey, Coin maxValue, Sha256Hash serverId, long timeWindow,
-                                @Nullable KeyParameter userKeySetup, ClientConnection conn, VersionSelector versionSelector) {
+    public PaymentChannelClient(Wallet wallet, ECKey myKey, Coin maxValue, Sha256Hash serverId,
+                                @Nullable KeyParameter userKeySetup, @Nullable ClientChannelProperties clientChannelProperties,
+                                ClientConnection conn) {
         this.wallet = checkNotNull(wallet);
         this.myKey = checkNotNull(myKey);
         this.maxValue = checkNotNull(maxValue);
         this.serverId = checkNotNull(serverId);
-        checkState(timeWindow >= 0);
-        this.timeWindow = timeWindow;
         this.conn = checkNotNull(conn);
         this.userKeySetup = userKeySetup;
-        this.versionSelector = versionSelector;
+        if (clientChannelProperties == null) {
+            this.clientChannelProperties = defaultChannelProperties;
+        } else {
+            this.clientChannelProperties = clientChannelProperties;
+        }
+        this.timeWindow = clientChannelProperties.timeWindow();
+        checkState(timeWindow >= 0);
+        this.versionSelector = clientChannelProperties.versionSelector();
     }
 
     /** 
@@ -299,12 +270,12 @@ private CloseReason receiveInitiate(Protos.Initiate initiate, Coin contractValue
 
         // For now we require a hard-coded value. In future this will have to get more complex and dynamic as the fees
         // start to float.
-        final long MIN_PAYMENT = Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.value;
-        if (initiate.getMinPayment() != MIN_PAYMENT) {
-            log.error("Server requested a min payment of {} but we expected {}", initiate.getMinPayment(), MIN_PAYMENT);
+        final long maxMin = clientChannelProperties.acceptableMinPayment().value;
+        if (initiate.getMinPayment() > maxMin) {
+            log.error("Server requested a min payment of {} but we only accept up to {}", initiate.getMinPayment(), maxMin);
             errorBuilder.setCode(Protos.Error.ErrorCode.MIN_PAYMENT_TOO_LARGE);
-            errorBuilder.setExpectedValue(MIN_PAYMENT);
-            missing = Coin.valueOf(initiate.getMinPayment() - MIN_PAYMENT);
+            errorBuilder.setExpectedValue(maxMin);
+            missing = Coin.valueOf(initiate.getMinPayment() - maxMin);
             return CloseReason.SERVER_REQUESTED_TOO_MUCH_VALUE;
         }
 
@@ -322,7 +293,7 @@ private CloseReason receiveInitiate(Protos.Initiate initiate, Coin contractValue
                 return CloseReason.NO_ACCEPTABLE_VERSION;
         }
         try {
-            state.initiate(userKeySetup);
+            state.initiate(userKeySetup, clientChannelProperties);
         } catch (ValueOutOfRangeException e) {
             log.error("Value out of range when trying to initiate", e);
             errorBuilder.setCode(Protos.Error.ErrorCode.CHANNEL_VALUE_TOO_LARGE);
@@ -378,7 +349,8 @@ private CloseReason receiveInitiate(Protos.Initiate initiate, Coin contractValue
     }
 
     @GuardedBy("lock")
-    private void receiveRefund(Protos.TwoWayChannelMessage refundMsg, @Nullable KeyParameter userKey) throws VerificationException {
+    private void receiveRefund(Protos.TwoWayChannelMessage refundMsg, @Nullable KeyParameter userKey)
+            throws SignatureDecodeException, VerificationException {
         checkState(majorVersion == 1);
         checkState(step == InitStep.WAITING_FOR_REFUND_RETURN && refundMsg.hasReturnRefund());
         log.info("Got RETURN_REFUND message, providing signed contract");
@@ -436,9 +408,6 @@ private void receiveChannelOpen() throws VerificationException {
         conn.channelOpen(wasInitiated);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void receiveMessage(Protos.TwoWayChannelMessage msg) throws InsufficientMoneyException {
         lock.lock();
@@ -501,11 +470,13 @@ public void receiveMessage(Protos.TwoWayChannelMessage msg) throws InsufficientM
                         closeReason = CloseReason.REMOTE_SENT_INVALID_MESSAGE;
                         break;
                 }
-            } catch (VerificationException e) {
+            } catch (SignatureDecodeException | VerificationException e) {
                 log.error("Caught verification exception handling message from server", e);
                 errorBuilder = Protos.Error.newBuilder()
-                        .setCode(Protos.Error.ErrorCode.BAD_TRANSACTION)
-                        .setExplanation(e.getMessage());
+                        .setCode(Protos.Error.ErrorCode.BAD_TRANSACTION);
+                final String message = e.getMessage();
+                if (message != null)
+                    errorBuilder.setExplanation(message);
                 closeReason = CloseReason.REMOTE_SENT_INVALID_MESSAGE;
             } catch (IllegalStateException e) {
                 log.error("Caught illegal state exception handling message from server", e);
@@ -540,7 +511,7 @@ private void receiveClose(Protos.TwoWayChannelMessage msg) throws VerificationEx
         checkState(lock.isHeldByCurrentThread());
         if (msg.hasSettlement()) {
             Transaction settleTx = wallet.getParams().getDefaultSerializer().makeTransaction(msg.getSettlement().getTx().toByteArray());
-            log.info("CLOSE message received with settlement tx {}", settleTx.getHash());
+            log.info("CLOSE message received with settlement tx {}", settleTx.getTxId());
             // TODO: set source
             if (state != null && state().isSettlementTransaction(settleTx)) {
                 // The wallet has a listener on it that the state object will use to do the right thing at this
@@ -566,7 +537,7 @@ private void receiveClose(Protos.TwoWayChannelMessage msg) throws VerificationEx
      * intending to reopen the channel later. There is likely little reason to use this in a stateless protocol.</p>
      *
      * <p>Note that this <b>MUST</b> still be called even after either
-     * {@link ClientConnection#destroyConnection(org.bitcoinj.protocols.channels.PaymentChannelCloseException.CloseReason)} or
+     * {@link IPaymentChannelClient.ClientConnection#destroyConnection(PaymentChannelCloseException.CloseReason)} or
      * {@link PaymentChannelClient#settle()} is called, to actually handle the connection close logic.</p>
      */
     @Override
@@ -586,7 +557,7 @@ public void connectionClosed() {
      * payment transaction.</p>
      *
      * <p>Note that this only generates a CLOSE message for the server and calls
-     * {@link ClientConnection#destroyConnection(CloseReason)} to settle the connection, it does not
+     * {@link IPaymentChannelClient.ClientConnection#destroyConnection(PaymentChannelCloseException.CloseReason)} to settle the connection, it does not
      * actually handle connection close logic, and {@link PaymentChannelClient#connectionClosed()} must still be called
      * after the connection fully closes.</p>
      *
@@ -631,8 +602,8 @@ public void connectionOpen() {
                     .setTimeWindowSecs(timeWindow);
 
             if (storedChannel != null) {
-                versionNegotiationBuilder.setPreviousChannelContractHash(ByteString.copyFrom(storedChannel.contract.getHash().getBytes()));
-                log.info("Begun version handshake, attempting to reopen channel with contract hash {}", storedChannel.contract.getHash());
+                versionNegotiationBuilder.setPreviousChannelContractHash(ByteString.copyFrom(storedChannel.contract.getTxId().getBytes()));
+                log.info("Begun version handshake, attempting to reopen channel with contract hash {}", storedChannel.contract.getTxId());
             } else
                 log.info("Begun version handshake creating new channel");
 
@@ -723,7 +694,7 @@ public void run() {
                     increasePaymentFuture = null;
                     lock.unlock();
                 }
-            }, MoreExecutors.sameThreadExecutor());
+            }, MoreExecutors.directExecutor());
 
             conn.sendToServer(Protos.TwoWayChannelMessage.newBuilder()
                     .setUpdatePayment(updatePaymentBuilder)
@@ -754,4 +725,28 @@ private void receivePaymentAck(Protos.PaymentAck paymentAck) {
         // Ensure the future runs without the client lock held.
         future.set(new PaymentIncrementAck(value, paymentAck.getInfo()));
     }
+
+    public static class DefaultClientChannelProperties implements ClientChannelProperties {
+
+        @Override
+        public SendRequest modifyContractSendRequest(SendRequest sendRequest) {
+            return sendRequest;
+        }
+
+        @Override
+        public Coin acceptableMinPayment() { return Transaction.REFERENCE_DEFAULT_MIN_TX_FEE; }
+
+        @Override
+        public long timeWindow() {
+            return DEFAULT_TIME_WINDOW;
+        }
+
+        @Override
+        public VersionSelector versionSelector() {
+            return VersionSelector.VERSION_2_ALLOW_1;
+        }
+
+    }
+
+    public static DefaultClientChannelProperties defaultChannelProperties = new DefaultClientChannelProperties();
 }
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientConnection.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientConnection.java
index 43491ed85a6..0326165eb8e 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientConnection.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientConnection.java
@@ -23,6 +23,7 @@
 import org.bitcoinj.core.Utils;
 import org.bitcoinj.net.NioClient;
 import org.bitcoinj.net.ProtobufConnection;
+import org.bitcoinj.protocols.channels.IPaymentChannelClient.ClientChannelProperties;
 import org.bitcoinj.wallet.Wallet;
 
 import com.google.common.util.concurrent.ListenableFuture;
@@ -30,7 +31,7 @@
 
 import com.google.protobuf.ByteString;
 import org.bitcoin.paymentchannel.Protos;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import javax.annotation.Nullable;
 import java.io.IOException;
@@ -49,7 +50,7 @@ public class PaymentChannelClientConnection {
     /**
      * Attempts to open a new connection to and open a payment channel with the given host and port, blocking until the
      * connection is open. The server is requested to keep the channel open for
-     * {@link org.bitcoinj.protocols.channels.PaymentChannelClient#DEFAULT_TIME_WINDOW}
+     * {@link PaymentChannelClient#DEFAULT_TIME_WINDOW}
      * seconds. If the server proposes a longer time the channel will be closed.
      *
      * @param server         The host/port pair where the server is listening.
@@ -68,44 +69,14 @@ public class PaymentChannelClientConnection {
      */
     public PaymentChannelClientConnection(InetSocketAddress server, int timeoutSeconds, Wallet wallet, ECKey myKey,
                                           Coin maxValue, String serverId) throws IOException, ValueOutOfRangeException {
-        this(server, timeoutSeconds, wallet, myKey, maxValue, serverId,
-                PaymentChannelClient.VersionSelector.VERSION_2_ALLOW_1);
+        this(server, timeoutSeconds, wallet, myKey, maxValue, serverId, null);
     }
 
     /**
      * Attempts to open a new connection to and open a payment channel with the given host and port, blocking until the
-     * connection is open. The server is requested to keep the channel open for
-     * {@link org.bitcoinj.protocols.channels.PaymentChannelClient#DEFAULT_TIME_WINDOW}
-     * seconds. If the server proposes a longer time the channel will be closed.
-     *
-     * @param server          The host/port pair where the server is listening.
-     * @param timeoutSeconds  The connection timeout and read timeout during initialization. This should be large enough
-     *                        to accommodate ECDSA signature operations and network latency.
-     * @param wallet          The wallet which will be paid from, and where completed transactions will be committed.
-     *                        Must be unencrypted. Must already have a {@link StoredPaymentChannelClientStates} object in its extensions set.
-     * @param myKey           A freshly generated keypair used for the multisig contract and refund output.
-     * @param maxValue        The maximum value this channel is allowed to request
-     * @param serverId        A unique ID which is used to attempt reopening of an existing channel.
-     *                        This must be unique to the server, and, if your application is exposing payment channels to some
-     *                        API, this should also probably encompass some caller UID to avoid applications opening channels
-     *                        which were created by others.
-     * @param versionSelector An enum indicating which versions to support:
-     *                        VERSION_1: use only version 1 of the protocol
-     *                        VERSION_2_ALLOW_1: suggest version 2 but allow downgrade to version 1
-     *                        VERSION_2: suggest version 2 and enforce use of version 2
-     * @throws IOException              if there's an issue using the network.
-     * @throws ValueOutOfRangeException if the balance of wallet is lower than maxValue.
-     */
-    public PaymentChannelClientConnection(InetSocketAddress server, int timeoutSeconds, Wallet wallet, ECKey myKey,
-                                          Coin maxValue, String serverId, PaymentChannelClient.VersionSelector versionSelector) throws IOException, ValueOutOfRangeException {
-        this(server, timeoutSeconds, wallet, myKey, maxValue, serverId,
-                PaymentChannelClient.DEFAULT_TIME_WINDOW, null, versionSelector);
-    }
-
-    /**
-     * Attempts to open a new connection to and open a payment channel with the given host and port, blocking until the
-     * connection is open.  The server is requested to keep the channel open for {@param timeWindow}
-     * seconds. If the server proposes a longer time the channel will be closed.
+     * connection is open.  The server is requested to keep the channel open for
+     * {@link PaymentChannelClient#DEFAULT_TIME_WINDOW} seconds.
+     * If the server proposes a longer time the channel will be closed.
      *
      * @param server          The host/port pair where the server is listening.
      * @param timeoutSeconds  The connection timeout and read timeout during initialization. This should be large enough
@@ -119,22 +90,19 @@ public PaymentChannelClientConnection(InetSocketAddress server, int timeoutSecon
      *                        This must be unique to the server, and, if your application is exposing payment channels to some
      *                        API, this should also probably encompass some caller UID to avoid applications opening channels
      *                        which were created by others.
-     * @param timeWindow      The time in seconds, relative to now, on how long this channel should be kept open.
      * @param userKeySetup    Key derived from a user password, used to decrypt myKey, if it is encrypted, during setup.
      * @throws IOException              if there's an issue using the network.
      * @throws ValueOutOfRangeException if the balance of wallet is lower than maxValue.
      */
     public PaymentChannelClientConnection(InetSocketAddress server, int timeoutSeconds, Wallet wallet, ECKey myKey,
-                                          Coin maxValue, String serverId, final long timeWindow,
-                                          @Nullable KeyParameter userKeySetup) throws IOException, ValueOutOfRangeException {
-        this(server, timeoutSeconds, wallet, myKey, maxValue, serverId,
-                timeWindow, userKeySetup, PaymentChannelClient.VersionSelector.VERSION_2_ALLOW_1);
+                                          Coin maxValue, String serverId, @Nullable KeyParameter userKeySetup) throws IOException, ValueOutOfRangeException {
+        this(server, timeoutSeconds, wallet, myKey, maxValue, serverId, userKeySetup, PaymentChannelClient.defaultChannelProperties);
     }
 
 
     /**
      * Attempts to open a new connection to and open a payment channel with the given host and port, blocking until the
-     * connection is open.  The server is requested to keep the channel open for {@param timeWindow}
+     * connection is open.  The server is requested to keep the channel open for {@code timeoutSeconds}
      * seconds. If the server proposes a longer time the channel will be closed.
      *
      * @param server The host/port pair where the server is listening.
@@ -149,24 +117,20 @@ public PaymentChannelClientConnection(InetSocketAddress server, int timeoutSecon
      *                 This must be unique to the server, and, if your application is exposing payment channels to some
      *                 API, this should also probably encompass some caller UID to avoid applications opening channels
      *                 which were created by others.
-     * @param timeWindow The time in seconds, relative to now, on how long this channel should be kept open.
      * @param userKeySetup Key derived from a user password, used to decrypt myKey, if it is encrypted, during setup.
-     * @param versionSelector An enum indicating which versions to support:
-     *                        VERSION_1: use only version 1 of the protocol
-     *                        VERSION_2_ALLOW_1: suggest version 2 but allow downgrade to version 1
-     *                        VERSION_2: suggest version 2 and enforce use of version 2
+     * @param clientChannelProperties Modifier to change the channel's configuration.
      *
      * @throws IOException if there's an issue using the network.
      * @throws ValueOutOfRangeException if the balance of wallet is lower than maxValue.
      */
     public PaymentChannelClientConnection(InetSocketAddress server, int timeoutSeconds, Wallet wallet, ECKey myKey,
-                                          Coin maxValue, String serverId, final long timeWindow,
-                                          @Nullable KeyParameter userKeySetup, PaymentChannelClient.VersionSelector versionSelector)
+                                          Coin maxValue, String serverId,
+                                          @Nullable KeyParameter userKeySetup, final ClientChannelProperties clientChannelProperties)
             throws IOException, ValueOutOfRangeException {
         // Glue the object which vends/ingests protobuf messages in order to manage state to the network object which
         // reads/writes them to the wire in length prefixed form.
-        channelClient = new PaymentChannelClient(wallet, myKey, maxValue, Sha256Hash.of(serverId.getBytes()), timeWindow,
-                userKeySetup, new PaymentChannelClient.ClientConnection() {
+        channelClient = new PaymentChannelClient(wallet, myKey, maxValue, Sha256Hash.of(serverId.getBytes()),
+                userKeySetup, clientChannelProperties, new PaymentChannelClient.ClientConnection() {
             @Override
             public void sendToServer(Protos.TwoWayChannelMessage msg) {
                 wireParser.write(msg);
@@ -180,7 +144,7 @@ public void destroyConnection(PaymentChannelCloseException.CloseReason reason) {
 
             @Override
             public boolean acceptExpireTime(long expireTime) {
-                return expireTime <= (timeWindow + Utils.currentTimeSeconds() + 60);  // One extra minute to compensate for time skew and latency
+                return expireTime <= (clientChannelProperties.timeWindow() + Utils.currentTimeSeconds() + 60);  // One extra minute to compensate for time skew and latency
             }
 
             @Override
@@ -189,7 +153,7 @@ public void channelOpen(boolean wasInitiated) {
                 // Inform the API user that we're done and ready to roll.
                 channelOpenFuture.set(PaymentChannelClientConnection.this);
             }
-        }, versionSelector);
+        });
 
         // And glue back in the opposite direction - network to the channelClient.
         wireParser = new ProtobufConnection<Protos.TwoWayChannelMessage>(new ProtobufConnection.Listener<Protos.TwoWayChannelMessage>() {
@@ -227,7 +191,7 @@ public void connectionClosed(ProtobufConnection<Protos.TwoWayChannelMessage> han
      *
      * <p>After this future completes successfully, you may call
      * {@link PaymentChannelClientConnection#incrementPayment(Coin)} or
-     * {@link PaymentChannelClientConnection#incrementPayment(Coin, com.google.protobuf.ByteString, KeyParameter)} to
+     * {@link PaymentChannelClientConnection#incrementPayment(Coin, ByteString, KeyParameter)} to
      * begin paying the server.</p>
      */
     public ListenableFuture<PaymentChannelClientConnection> getChannelOpenFuture() {
@@ -246,21 +210,7 @@ public ListenableFuture<PaymentChannelClientConnection> getChannelOpenFuture() {
     public ListenableFuture<PaymentIncrementAck> incrementPayment(Coin size) throws ValueOutOfRangeException, IllegalStateException {
         return channelClient.incrementPayment(size, null, null);
     }
-    /**
-     * Increments the total value which we pay the server.
-     *
-     * @param size How many satoshis to increment the payment by (note: not the new total).
-     * @param info Information about this payment increment, used to extend this protocol.
-     * @throws ValueOutOfRangeException If the size is negative or would pay more than this channel's total value
-     *                                  ({@link PaymentChannelClientConnection#state()}.getTotalValue())
-     * @throws IllegalStateException If the channel has been closed or is not yet open
-     *                               (see {@link PaymentChannelClientConnection#getChannelOpenFuture()} for the second)
-     */
-    /*
-    public ListenableFuture<PaymentIncrementAck> incrementPayment(Coin size, ByteString info) throws ValueOutOfRangeException, IllegalStateException {
-        return channelClient.incrementPayment(size, info, null);
-    }
-*/
+
     /**
      * Increments the total value which we pay the server.
      *
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientState.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientState.java
index dd4e0b6cd55..eb540102c58 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientState.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClientState.java
@@ -22,16 +22,18 @@
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
+
 import org.bitcoinj.core.*;
 import org.bitcoinj.crypto.TransactionSignature;
+import org.bitcoinj.protocols.channels.IPaymentChannelClient.ClientChannelProperties;
 import org.bitcoinj.script.Script;
 import org.bitcoinj.utils.Threading;
-import org.bitcoinj.wallet.SendRequest;
 import org.bitcoinj.wallet.Wallet;
 import org.bitcoinj.wallet.listeners.WalletCoinsReceivedEventListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import javax.annotation.Nullable;
 
@@ -60,14 +62,14 @@
  * the given time (within a few hours), the channel must be closed or else the client will broadcast the refund
  * transaction and take back all the money once the expiry time is reached.</p>
  *
- * <p>To begin, the client calls {@link PaymentChannelV1ClientState#initiate()}, which moves the channel into state
+ * <p>To begin, the client calls {@link PaymentChannelClientState#initiate(KeyParameter, IPaymentChannelClient.ClientChannelProperties)}, which moves the channel into state
  * INITIATED and creates the initial multi-sig contract and refund transaction. If the wallet has insufficient funds an
  * exception will be thrown at this point. Once this is done, call
  * {@link PaymentChannelV1ClientState#getIncompleteRefundTransaction()} and pass the resultant transaction through to the
  * server. Once you have retrieved the signature, use {@link PaymentChannelV1ClientState#provideRefundSignature(byte[], KeyParameter)}.
- * You must then call {@link PaymentChannelV1ClientState#storeChannelInWallet(Sha256Hash)} to store the refund transaction
+ * You must then call {@link PaymentChannelClientState#storeChannelInWallet(Sha256Hash)} to store the refund transaction
  * in the wallet, protecting you against a malicious server attempting to destroy all your coins. At this point, you can
- * provide the server with the multi-sig contract (via {@link PaymentChannelV1ClientState#getContract()}) safely.
+ * provide the server with the multi-sig contract (via {@link PaymentChannelClientState#getContract()}) safely.
  * </p>
  */
 public abstract class PaymentChannelClientState {
@@ -103,7 +105,7 @@ public enum State {
     protected StoredClientChannel storedChannel;
 
     PaymentChannelClientState(StoredClientChannel storedClientChannel, Wallet wallet) throws VerificationException {
-        this.stateMachine = new StateMachine<State>(State.UNINITIALISED, getStateTransitions());
+        this.stateMachine = new StateMachine<>(State.UNINITIALISED, getStateTransitions());
         this.wallet = checkNotNull(wallet);
         this.myKey = checkNotNull(storedClientChannel.myKey);
         this.serverKey = checkNotNull(storedClientChannel.serverKey);
@@ -126,9 +128,9 @@ public synchronized boolean isSettlementTransaction(Transaction tx) {
 
     /**
      * Creates a state object for a payment channel client. It is expected that you be ready to
-     * {@link PaymentChannelV1ClientState#initiate()} after construction (to avoid creating objects for channels which are
+     * {@link PaymentChannelClientState#initiate(KeyParameter, IPaymentChannelClient.ClientChannelProperties)} after construction (to avoid creating objects for channels which are
      * not going to finish opening) and thus some parameters provided here are only used in
-     * {@link PaymentChannelV1ClientState#initiate()} to create the Multisig contract and refund transaction.
+     * {@link PaymentChannelClientState#initiate(KeyParameter, IPaymentChannelClient.ClientChannelProperties)} to create the Multisig contract and refund transaction.
      *
      * @param wallet a wallet that contains at least the specified amount of value.
      * @param myKey a freshly generated private key for this channel.
@@ -140,7 +142,7 @@ public synchronized boolean isSettlementTransaction(Transaction tx) {
      */
     public PaymentChannelClientState(Wallet wallet, ECKey myKey, ECKey serverKey,
                                      Coin value, long expiryTimeInSeconds) throws VerificationException {
-        this.stateMachine = new StateMachine<State>(State.UNINITIALISED, getStateTransitions());
+        this.stateMachine = new StateMachine<>(State.UNINITIALISED, getStateTransitions());
         this.wallet = checkNotNull(wallet);
         this.serverKey = checkNotNull(serverKey);
         this.myKey = checkNotNull(myKey);
@@ -158,7 +160,7 @@ public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coi
                 synchronized (PaymentChannelClientState.this) {
                     if (getContractInternal() == null) return;
                     if (isSettlementTransaction(tx)) {
-                        log.info("Close: transaction {} closed contract {}", tx.getHash(), getContractInternal().getHash());
+                        log.info("Close: transaction {} closed contract {}", tx.getTxId(), getContractInternal().getTxId());
                         // Record the fact that it was closed along with the transaction that closed it.
                         stateMachine.transition(State.CLOSED);
                         if (storedChannel == null) return;
@@ -188,7 +190,7 @@ public void onSuccess(TransactionConfidence result) {
             public void onFailure(Throwable t) {
                 Throwables.propagate(t);
             }
-        });
+        }, MoreExecutors.directExecutor());
     }
 
     private synchronized void deleteChannelFromWallet() {
@@ -211,37 +213,28 @@ public synchronized State getState() {
      * Creates the initial multisig contract and incomplete refund transaction which can be requested at the appropriate
      * time using {@link PaymentChannelV1ClientState#getIncompleteRefundTransaction} and
      * {@link PaymentChannelV1ClientState#getContract()}. The way the contract is crafted can be adjusted by
-     * overriding {@link PaymentChannelV1ClientState#editContractSendRequest(org.bitcoinj.wallet.Wallet.SendRequest)}.
      * By default unconfirmed coins are allowed to be used, as for micropayments the risk should be relatively low.
      *
      * @throws ValueOutOfRangeException if the value being used is too small to be accepted by the network
      * @throws InsufficientMoneyException if the wallet doesn't contain enough balance to initiate
      */
     public void initiate() throws ValueOutOfRangeException, InsufficientMoneyException {
-        initiate(null);
+        initiate(null, PaymentChannelClient.defaultChannelProperties);
     }
 
     /**
      * Creates the initial multisig contract and incomplete refund transaction which can be requested at the appropriate
      * time using {@link PaymentChannelV1ClientState#getIncompleteRefundTransaction} and
-     * {@link PaymentChannelV1ClientState#getContract()}. The way the contract is crafted can be adjusted by
-     * overriding {@link PaymentChannelV1ClientState#editContractSendRequest(org.bitcoinj.wallet.Wallet.SendRequest)}.
+     * {@link PaymentChannelClientState#getContract()}.
      * By default unconfirmed coins are allowed to be used, as for micropayments the risk should be relatively low.
      * @param userKey Key derived from a user password, needed for any signing when the wallet is encrypted.
-     *                  The wallet KeyCrypter is assumed.
+     *                The wallet KeyCrypter is assumed.
+     * @param clientChannelProperties Modify the channel's configuration.
      *
      * @throws ValueOutOfRangeException   if the value being used is too small to be accepted by the network
      * @throws InsufficientMoneyException if the wallet doesn't contain enough balance to initiate
      */
-    public abstract void initiate(@Nullable KeyParameter userKey) throws ValueOutOfRangeException, InsufficientMoneyException;
-
-    /**
-     * You can override this method in order to control the construction of the initial contract that creates the
-     * channel. For example if you want it to only use specific coins, you can adjust the coin selector here.
-     * The default implementation does nothing.
-     */
-    protected void editContractSendRequest(SendRequest req) {
-    }
+    public abstract void initiate(@Nullable KeyParameter userKey, ClientChannelProperties clientChannelProperties) throws ValueOutOfRangeException, InsufficientMoneyException;
 
     /**
      * Gets the contract which was used to initialize this channel
@@ -254,7 +247,7 @@ private synchronized Transaction makeUnsignedChannelContract(Coin valueToMe) thr
         // Our output always comes first.
         // TODO: We should drop myKey in favor of output key + multisig key separation
         // (as its always obvious who the client is based on T2 output order)
-        tx.addOutput(valueToMe, myKey.toAddress(wallet.getParams()));
+        tx.addOutput(valueToMe, LegacyAddress.fromKey(wallet.getParams(), myKey));
         return tx;
     }
 
@@ -392,7 +385,7 @@ public synchronized void storeChannelInWallet(Sha256Hash id) {
 
     /**
      * Returns the fees that will be paid if the refund transaction has to be claimed because the server failed to settle
-     * the channel properly. May only be called after {@link PaymentChannelV1ClientState#initiate()}
+     * the channel properly. May only be called after {@link PaymentChannelClientState#initiate(KeyParameter, IPaymentChannelClient.ClientChannelProperties)}
      */
     public abstract Coin getRefundTxFees();
 
@@ -424,7 +417,7 @@ public synchronized Coin getValueSpent() {
 
     /**
      * Gets the contract without changing the state machine
-     * @return
+     * @return the contract.
      */
     protected abstract Transaction getContractInternal();
 
@@ -433,7 +426,7 @@ public synchronized Coin getValueSpent() {
     /**
      * Gets the script that is signed. In the case of a P2SH contract this is the
      * script inside the P2SH script.
-     * @return
+     * @return the signed script.
      */
     protected abstract Script getSignedScript();
 }
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelCloseException.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelCloseException.java
index 0c6d6773ce3..4ea8f77057a 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelCloseException.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelCloseException.java
@@ -34,7 +34,7 @@ public enum CloseReason {
         // Values after here indicate its probably possible to try reopening channel again
 
         /**
-         * <p>The {@link org.bitcoinj.protocols.channels.PaymentChannelClient#settle()} method was called or the
+         * <p>The {@link PaymentChannelClient#settle()} method was called or the
          * client sent a CLOSE message.</p>
          * <p>As long as the server received the CLOSE message, this means that the channel is settling and the payment
          * transaction (if any) will be broadcast. If the client attempts to open a new connection, a new channel will
@@ -43,7 +43,7 @@ public enum CloseReason {
         CLIENT_REQUESTED_CLOSE,
 
         /**
-         * <p>The {@link org.bitcoinj.protocols.channels.PaymentChannelServer#close()} method was called or server
+         * <p>The {@link PaymentChannelServer#close()} method was called or server
          * sent a CLOSE message.</p>
          *
          * <p>This may occur if the server opts to close the connection for some reason, or automatically if the channel
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServer.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServer.java
index f53daf22ba2..46fe15472cc 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServer.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServer.java
@@ -17,6 +17,7 @@
 package org.bitcoinj.protocols.channels;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.AsyncFunction;
 import org.bitcoinj.core.*;
 import org.bitcoinj.protocols.channels.PaymentChannelCloseException.CloseReason;
 import org.bitcoinj.utils.Threading;
@@ -25,10 +26,12 @@
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.protobuf.ByteString;
 import net.jcip.annotations.GuardedBy;
 import org.bitcoin.paymentchannel.Protos;
 import org.slf4j.LoggerFactory;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import javax.annotation.Nullable;
 import java.util.Map;
@@ -117,9 +120,35 @@ public interface ServerConnection {
          */
         @Nullable
         ListenableFuture<ByteString> paymentIncrease(Coin by, Coin to, @Nullable ByteString info);
+
+        /**
+         * <p>Called when a channel is being closed and must be signed, possibly with an encrypted key.</p>
+         * @return A future for the (nullable) KeyParameter for the ECKey, or {@code null} if no key is required.
+         */
+        @Nullable
+        ListenableFuture<KeyParameter> getUserKey();
     }
     private final ServerConnection conn;
 
+    public interface ServerChannelProperties {
+        /**
+         * The size of the payment that the client is requested to pay in the initiate phase.
+         */
+        Coin getMinPayment();
+
+        /**
+         * The maximum allowed channel time window in seconds.
+         * Note that the server need to be online for the whole time the channel is open.
+         * Failure to do this could cause loss of all payments received on the channel.
+         */
+        long getMaxTimeWindow();
+
+        /**
+         * The minimum allowed channel time window in seconds, must be larger than 7200.
+         */
+        long getMinTimeWindow();
+    }
+
     // Used to track the negotiated version number
     @GuardedBy("lock") private int majorVersion;
 
@@ -135,6 +164,10 @@ public interface ServerConnection {
     // The key used for multisig in this channel
     @GuardedBy("lock") private ECKey myKey;
 
+    // The fee server charges for managing (and settling the channel).
+    // This is will be requested in the setup via the min_payment field in the initiate message.
+    private final Coin minPayment;
+
     // The minimum accepted channel value
     private final Coin minAcceptedChannelSize;
 
@@ -178,7 +211,7 @@ public interface ServerConnection {
      */
     public PaymentChannelServer(TransactionBroadcaster broadcaster, Wallet wallet,
                                 Coin minAcceptedChannelSize, ServerConnection conn) {
-        this(broadcaster, wallet, minAcceptedChannelSize, DEFAULT_MIN_TIME_WINDOW, DEFAULT_MAX_TIME_WINDOW, conn);
+        this(broadcaster, wallet, minAcceptedChannelSize, new DefaultServerChannelProperties(), conn);
     }
 
     /**
@@ -192,22 +225,21 @@ public PaymentChannelServer(TransactionBroadcaster broadcaster, Wallet wallet,
      *                               and may cause fees to be require to settle the channel. A reasonable value depends
      *                               entirely on the expected maximum for the channel, and should likely be somewhere
      *                               between a few bitcents and a bitcoin.
-     * @param minTimeWindow The minimum allowed channel time window in seconds, must be larger than 7200.
-     * @param maxTimeWindow The maximum allowed channel time window in seconds. Note that the server need to be online for the whole time the channel is open.
-     *                              Failure to do this could cause loss of all payments received on the channel.
+     * @param serverChannelProperties Modify the channel's properties. You may extend {@link DefaultServerChannelProperties}
      * @param conn A callback listener which represents the connection to the client (forwards messages we generate to
      *              the client and will close the connection on request)
      */
     public PaymentChannelServer(TransactionBroadcaster broadcaster, Wallet wallet,
-                                Coin minAcceptedChannelSize, long minTimeWindow, long maxTimeWindow, ServerConnection conn) {
+                                Coin minAcceptedChannelSize, ServerChannelProperties serverChannelProperties, ServerConnection conn) {
+        minTimeWindow = serverChannelProperties.getMinTimeWindow();
+        maxTimeWindow = serverChannelProperties.getMaxTimeWindow();
         if (minTimeWindow > maxTimeWindow) throw new IllegalArgumentException("minTimeWindow must be less or equal to maxTimeWindow");
         if (minTimeWindow < HARD_MIN_TIME_WINDOW) throw new IllegalArgumentException("minTimeWindow must be larger than" + HARD_MIN_TIME_WINDOW  + " seconds");
         this.broadcaster = checkNotNull(broadcaster);
         this.wallet = checkNotNull(wallet);
+        this.minPayment = checkNotNull(serverChannelProperties.getMinPayment());
         this.minAcceptedChannelSize = checkNotNull(minAcceptedChannelSize);
         this.conn = checkNotNull(conn);
-        this.minTimeWindow = minTimeWindow;
-        this.maxTimeWindow = maxTimeWindow;
     }
 
     /**
@@ -290,7 +322,7 @@ private void receiveVersionMessage(Protos.TwoWayChannelMessage msg) throws Verif
                 .setMultisigKey(ByteString.copyFrom(myKey.getPubKey()))
                 .setExpireTimeSecs(expireTime)
                 .setMinAcceptedChannelSize(minAcceptedChannelSize.value)
-                .setMinPayment(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.value);
+                .setMinPayment(minPayment.value);
 
         conn.sendToClient(Protos.TwoWayChannelMessage.newBuilder()
                 .setInitiate(initiateBuilder)
@@ -342,7 +374,7 @@ private void multisigContractPropogated(Protos.ProvideContract providedContract,
             state.storeChannelInWallet(PaymentChannelServer.this);
             try {
                 receiveUpdatePaymentMessage(providedContract.getInitialPayment(), false /* no ack msg */);
-            } catch (VerificationException e) {
+            } catch (SignatureDecodeException | VerificationException e) {
                 log.error("Initial payment failed to verify", e);
                 error(e.getMessage(), Protos.Error.ErrorCode.BAD_TRANSACTION, CloseReason.REMOTE_SENT_INVALID_MESSAGE);
                 return;
@@ -387,13 +419,14 @@ private void receiveContractMessage(Protos.TwoWayChannelMessage msg) throws Veri
                 .addListener(new Runnable() {
                     @Override
                     public void run() {
-                        multisigContractPropogated(providedContract, contract.getHash());
+                        multisigContractPropogated(providedContract, contract.getTxId());
                     }
                 }, Threading.SAME_THREAD);
     }
 
     @GuardedBy("lock")
-    private void receiveUpdatePaymentMessage(Protos.UpdatePayment msg, boolean sendAck) throws VerificationException, ValueOutOfRangeException, InsufficientMoneyException {
+    private void receiveUpdatePaymentMessage(Protos.UpdatePayment msg, boolean sendAck) throws SignatureDecodeException,
+            VerificationException, ValueOutOfRangeException, InsufficientMoneyException {
         log.info("Got a payment update");
 
         Coin lastBestPayment = state.getBestValueToMe();
@@ -425,7 +458,7 @@ public void onFailure(Throwable t) {
                         log.info("Failed retrieving paymentIncrease info future");
                         error("Failed processing payment update", Protos.Error.ErrorCode.OTHER, CloseReason.UPDATE_PAYMENT_FAILED);
                     }
-                });
+                }, MoreExecutors.directExecutor());
             }
         }
 
@@ -482,7 +515,7 @@ public void receiveMessage(Protos.TwoWayChannelMessage msg) {
             } catch (InsufficientMoneyException e) {
                 log.error("Caught insufficient money exception handling message from client", e);
                 error(e.getMessage(), Protos.Error.ErrorCode.BAD_TRANSACTION, CloseReason.REMOTE_SENT_INVALID_MESSAGE);
-            } catch (IllegalStateException e) {
+            } catch (SignatureDecodeException e) {
                 log.error("Caught illegal state exception handling message from client", e);
                 error(e.getMessage(), Protos.Error.ErrorCode.SYNTAX_ERROR, CloseReason.REMOTE_SENT_INVALID_MESSAGE);
             }
@@ -495,8 +528,9 @@ private void error(String message, Protos.Error.ErrorCode errorCode, CloseReason
         log.error(message);
         Protos.Error.Builder errorBuilder;
         errorBuilder = Protos.Error.newBuilder()
-                .setCode(errorCode)
-                .setExplanation(message);
+                .setCode(errorCode);
+        if (message != null)
+            errorBuilder.setExplanation(message);
         conn.sendToClient(Protos.TwoWayChannelMessage.newBuilder()
                 .setError(errorBuilder)
                 .setType(Protos.TwoWayChannelMessage.MessageType.ERROR)
@@ -520,7 +554,19 @@ private void settlePayment(final CloseReason clientRequestedClose) throws Insuff
         // close() on us here below via the stored channel state.
         // TODO: Strongly separate the lifecycle of the payment channel from the TCP connection in these classes.
         channelSettling = true;
-        Futures.addCallback(state.close(), new FutureCallback<Transaction>() {
+        ListenableFuture<KeyParameter> keyFuture = conn.getUserKey();
+        ListenableFuture<Transaction> result;
+        if (keyFuture != null) {
+            result = Futures.transformAsync(conn.getUserKey(), new AsyncFunction<KeyParameter, Transaction>() {
+                @Override
+                public ListenableFuture<Transaction> apply(KeyParameter userKey) throws Exception {
+                    return state.close(userKey);
+                }
+            }, MoreExecutors.directExecutor());
+        } else {
+            result = state.close();
+        }
+        Futures.addCallback(result, new FutureCallback<Transaction>() {
             @Override
             public void onSuccess(Transaction result) {
                 // Send the successfully accepted transaction back to the client.
@@ -543,7 +589,7 @@ public void onFailure(Throwable t) {
                 log.error("Failed to broadcast settlement tx", t);
                 conn.destroyConnection(clientRequestedClose);
             }
-        });
+        }, MoreExecutors.directExecutor());
     }
 
     /**
@@ -551,7 +597,7 @@ public void onFailure(Throwable t) {
      * resume this channel in the future and stops generating messages for the client.</p>
      *
      * <p>Note that this <b>MUST</b> still be called even after either
-     * {@link ServerConnection#destroyConnection(CloseReason)} or
+     * {@link PaymentChannelServer.ServerConnection#destroyConnection(PaymentChannelCloseException.CloseReason)} or
      * {@link PaymentChannelServer#close()} is called to actually handle the connection close logic.</p>
      */
     public void connectionClosed() {
@@ -565,7 +611,7 @@ public void connectionClosed() {
                     StoredPaymentChannelServerStates channels = (StoredPaymentChannelServerStates)
                             wallet.getExtensions().get(StoredPaymentChannelServerStates.EXTENSION_ID);
                     if (channels != null) {
-                        StoredServerChannel storedServerChannel = channels.getChannel(state.getContract().getHash());
+                        StoredServerChannel storedServerChannel = channels.getChannel(state.getContract().getTxId());
                         if (storedServerChannel != null) {
                             storedServerChannel.clearConnectedHandler();
                         }
@@ -594,7 +640,7 @@ public void connectionOpen() {
 
     /**
      * <p>Closes the connection by generating a settle message for the client and calls
-     * {@link ServerConnection#destroyConnection(CloseReason)}. Note that this does not broadcast
+     * {@link PaymentChannelServer.ServerConnection#destroyConnection(PaymentChannelCloseException.CloseReason)}. Note that this does not broadcast
      * the payment transaction and the client may still resume the same channel if they reconnect</p>
      * <p>
      * <p>Note that {@link PaymentChannelServer#connectionClosed()} must still be called after the connection fully
@@ -613,4 +659,27 @@ public void close() {
             lock.unlock();
         }
     }
+
+    /**
+     * Extend this class and override the values you want to change.
+     */
+    public static class DefaultServerChannelProperties implements ServerChannelProperties {
+
+        @Override
+        public Coin getMinPayment() {
+            return Transaction.REFERENCE_DEFAULT_MIN_TX_FEE;
+        }
+
+        @Override
+        public long getMaxTimeWindow() {
+            return DEFAULT_MAX_TIME_WINDOW;
+        }
+
+        @Override
+        public long getMinTimeWindow() {
+            return DEFAULT_MIN_TIME_WINDOW;
+        }
+
+    }
+
 }
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServerListener.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServerListener.java
index 2881c04671e..1f97bc9615b 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServerListener.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServerListener.java
@@ -28,6 +28,7 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.protobuf.ByteString;
 import org.bitcoin.paymentchannel.Protos;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import javax.annotation.Nullable;
 
@@ -88,6 +89,12 @@ public ServerHandler(final SocketAddress address, final int timeoutSeconds) {
                 @Override public ListenableFuture<ByteString> paymentIncrease(Coin by, Coin to, @Nullable ByteString info) {
                     return eventHandler.paymentIncrease(by, to, info);
                 }
+
+                @Nullable
+                @Override
+                public ListenableFuture<KeyParameter> getUserKey() {
+                    return null;
+                }
             });
 
             protobufHandlerListener = new ProtobufConnection.Listener<Protos.TwoWayChannelMessage>() {
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServerState.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServerState.java
index a5c9a78543a..ef091847aed 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServerState.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServerState.java
@@ -24,12 +24,14 @@
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
 import org.bitcoinj.core.*;
 import org.bitcoinj.crypto.TransactionSignature;
 import org.bitcoinj.script.Script;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import javax.annotation.Nullable;
 
@@ -116,7 +118,7 @@ public enum State {
 
     PaymentChannelServerState(StoredServerChannel storedServerChannel, Wallet wallet, TransactionBroadcaster broadcaster) throws VerificationException {
         synchronized (storedServerChannel) {
-            this.stateMachine = new StateMachine<State>(State.UNINITIALISED, getStateTransitions());
+            this.stateMachine = new StateMachine<>(State.UNINITIALISED, getStateTransitions());
             this.wallet = checkNotNull(wallet);
             this.broadcaster = checkNotNull(broadcaster);
             this.contract = checkNotNull(storedServerChannel.contract);
@@ -140,7 +142,7 @@ public enum State {
      * @param minExpireTime The earliest time at which the client can claim the refund transaction (UNIX timestamp of block)
      */
     public PaymentChannelServerState(TransactionBroadcaster broadcaster, Wallet wallet, ECKey serverKey, long minExpireTime) {
-        this.stateMachine = new StateMachine<State>(State.UNINITIALISED, getStateTransitions());
+        this.stateMachine = new StateMachine<>(State.UNINITIALISED, getStateTransitions());
         this.serverKey = checkNotNull(serverKey);
         this.wallet = checkNotNull(wallet);
         this.broadcaster = checkNotNull(broadcaster);
@@ -193,7 +195,7 @@ public synchronized ListenableFuture<PaymentChannelServerState> provideContract(
         final SettableFuture<PaymentChannelServerState> future = SettableFuture.create();
         Futures.addCallback(broadcaster.broadcastTransaction(contract).future(), new FutureCallback<Transaction>() {
             @Override public void onSuccess(Transaction transaction) {
-                log.info("Successfully broadcast multisig contract {}. Channel now open.", transaction.getHashAsString());
+                log.info("Successfully broadcast multisig contract {}. Channel now open.", transaction.getTxId());
                 try {
                     // Manually add the contract to the wallet, overriding the isRelevant checks so we can track
                     // it and check for double-spends later
@@ -211,7 +213,7 @@ public synchronized ListenableFuture<PaymentChannelServerState> provideContract(
                 stateMachine.transition(State.ERROR);
                 future.setException(throwable);
             }
-        });
+        }, MoreExecutors.directExecutor());
         return future;
     }
 
@@ -219,14 +221,14 @@ public synchronized ListenableFuture<PaymentChannelServerState> provideContract(
     protected synchronized SendRequest makeUnsignedChannelContract(Coin valueToMe) {
         Transaction tx = new Transaction(wallet.getParams());
         if (!getTotalValue().subtract(valueToMe).equals(Coin.ZERO)) {
-            tx.addOutput(getTotalValue().subtract(valueToMe), getClientKey().toAddress(wallet.getParams()));
+            tx.addOutput(getTotalValue().subtract(valueToMe), LegacyAddress.fromKey(wallet.getParams(), getClientKey()));
         }
         tx.addInput(contract.getOutput(0));
         return SendRequest.forTx(tx);
     }
 
     /**
-     * Called when the client provides us with a new signature and wishes to increment total payment by size.		+
+     * Called when the client provides us with a new signature and wishes to increment total payment by size.
      * Verifies the provided signature and only updates values if everything checks out.
      * If the new refundSize is not the lowest we have seen, it is simply ignored.
      *
@@ -235,11 +237,13 @@ protected synchronized SendRequest makeUnsignedChannelContract(Coin valueToMe) {
      * @throws VerificationException If the signature does not verify or size is out of range (incl being rejected by the network as dust).
      * @return true if there is more value left on the channel, false if it is now fully used up.
      */
-    public synchronized boolean incrementPayment(Coin refundSize, byte[] signatureBytes) throws VerificationException, ValueOutOfRangeException, InsufficientMoneyException {
+    public synchronized boolean incrementPayment(Coin refundSize, byte[] signatureBytes)
+            throws SignatureDecodeException, VerificationException, ValueOutOfRangeException,
+            InsufficientMoneyException {
         stateMachine.checkState(State.READY);
         checkNotNull(refundSize);
         checkNotNull(signatureBytes);
-        TransactionSignature signature = TransactionSignature.decodeFromBitcoin(signatureBytes, true);
+        TransactionSignature signature = TransactionSignature.decodeFromBitcoin(signatureBytes, true, false);
         // We allow snapping to zero for the payment amount because it's treated specially later, but not less than
         // the dust level because that would prevent the transaction from being relayed/mined.
         final boolean fullyUsedUp = refundSize.equals(Coin.ZERO);
@@ -257,8 +261,8 @@ public synchronized boolean incrementPayment(Coin refundSize, byte[] signatureBy
         // Get the wallet's copy of the contract (ie with confidence information), if this is null, the wallet
         // was not connected to the peergroup when the contract was broadcast (which may cause issues down the road, and
         // disables our double-spend check next)
-        Transaction walletContract = wallet.getTransaction(contract.getHash());
-        checkNotNull(walletContract, "Wallet did not contain multisig contract {} after state was marked READY", contract.getHash());
+        Transaction walletContract = wallet.getTransaction(contract.getTxId());
+        checkNotNull(walletContract, "Wallet did not contain multisig contract {} after state was marked READY", contract.getTxId());
 
         // Note that we check for DEAD state here, but this test is essentially useless in production because we will
         // miss most double-spends due to bloom filtering right now anyway. This will eventually fixed by network-wide
@@ -300,7 +304,20 @@ public synchronized boolean incrementPayment(Coin refundSize, byte[] signatureBy
      *         will never complete, a timeout should be used.
      * @throws InsufficientMoneyException If the payment tx would have cost more in fees to spend than it is worth.
      */
-    public abstract ListenableFuture<Transaction> close() throws InsufficientMoneyException;
+    public ListenableFuture<Transaction> close() throws InsufficientMoneyException {
+        return close(null);
+    }
+
+    /**
+     * <p>Closes this channel and broadcasts the highest value payment transaction on the network.</p>
+     *
+     * @param userKey The AES key to use for decryption of the private key. If null then no decryption is required.
+     * @return a future which completes when the provided multisig contract successfully broadcasts, or throws if the
+     *         broadcast fails for some reason. Note that if the network simply rejects the transaction, this future
+     *         will never complete, a timeout should be used.
+     * @throws InsufficientMoneyException If the payment tx would have cost more in fees to spend than it is worth.
+     */
+    public abstract ListenableFuture<Transaction> close(@Nullable KeyParameter userKey) throws InsufficientMoneyException;
 
     /**
      * Gets the highest payment to ourselves (which we will receive on settle(), not including fees)
@@ -351,7 +368,7 @@ public synchronized void storeChannelInWallet(@Nullable PaymentChannelServer con
         if (storedServerChannel != null)
             return;
 
-        log.info("Storing state with contract hash {}.", getContract().getHash());
+        log.info("Storing state with contract hash {}.", getContract().getTxId());
         StoredPaymentChannelServerStates channels = (StoredPaymentChannelServerStates)
                 wallet.addOrGetExistingExtension(new StoredPaymentChannelServerStates(wallet, broadcaster));
         storedServerChannel = new StoredServerChannel(this, getMajorVersion(), getContract(), getClientOutput(), getExpiryTime(), serverKey, getClientKey(), bestValueToMe, bestValueSignature);
@@ -372,7 +389,7 @@ public Script getContractScript() {
     /**
      * Gets the script that signatures should sign against. This is never a P2SH
      * script, rather the script that would be inside a P2SH script.
-     * @return
+     * @return the script that signatures should sign against.
      */
     protected abstract Script getSignedScript();
 
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ClientState.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ClientState.java
index 57d89887e46..f3a47379e28 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ClientState.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ClientState.java
@@ -20,12 +20,14 @@
 import com.google.common.collect.MultimapBuilder;
 import org.bitcoinj.core.*;
 import org.bitcoinj.crypto.TransactionSignature;
+import org.bitcoinj.protocols.channels.IPaymentChannelClient.ClientChannelProperties;
 import org.bitcoinj.script.Script;
 import org.bitcoinj.script.ScriptBuilder;
+import org.bitcoinj.script.ScriptException;
 import org.bitcoinj.wallet.AllowUnconfirmedCoinSelector;
 import org.bitcoinj.wallet.SendRequest;
 import org.bitcoinj.wallet.Wallet;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.KeyParameter;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import org.slf4j.Logger;
@@ -71,9 +73,9 @@ public class PaymentChannelV1ClientState extends PaymentChannelClientState {
 
     /**
      * Creates a state object for a payment channel client. It is expected that you be ready to
-     * {@link PaymentChannelV1ClientState#initiate()} after construction (to avoid creating objects for channels which are
+     * {@link PaymentChannelClientState#initiate(KeyParameter, IPaymentChannelClient.ClientChannelProperties)} after construction (to avoid creating objects for channels which are
      * not going to finish opening) and thus some parameters provided here are only used in
-     * {@link PaymentChannelV1ClientState#initiate()} to create the Multisig contract and refund transaction.
+     * {@link PaymentChannelClientState#initiate(KeyParameter, IPaymentChannelClient.ClientChannelProperties)} to create the Multisig contract and refund transaction.
      *
      * @param wallet a wallet that contains at least the specified amount of value.
      * @param myKey a freshly generated private key for this channel.
@@ -115,17 +117,17 @@ public int getMajorVersion() {
     /**
      * Creates the initial multisig contract and incomplete refund transaction which can be requested at the appropriate
      * time using {@link PaymentChannelV1ClientState#getIncompleteRefundTransaction} and
-     * {@link PaymentChannelV1ClientState#getContract()}. The way the contract is crafted can be adjusted by
-     * overriding {@link PaymentChannelV1ClientState#editContractSendRequest(org.bitcoinj.core.Wallet.SendRequest)}.
+     * {@link PaymentChannelV1ClientState#getContract()}.
      * By default unconfirmed coins are allowed to be used, as for micropayments the risk should be relatively low.
      * @param userKey Key derived from a user password, needed for any signing when the wallet is encrypted.
-     *                  The wallet KeyCrypter is assumed.
+     *                The wallet KeyCrypter is assumed.
+     * @param clientChannelProperties Modify the channel's configuration.
      *
      * @throws ValueOutOfRangeException   if the value being used is too small to be accepted by the network
      * @throws InsufficientMoneyException if the wallet doesn't contain enough balance to initiate
      */
     @Override
-    public synchronized void initiate(@Nullable KeyParameter userKey) throws ValueOutOfRangeException, InsufficientMoneyException {
+    public synchronized void initiate(@Nullable KeyParameter userKey, ClientChannelProperties clientChannelProperties) throws ValueOutOfRangeException, InsufficientMoneyException {
         final NetworkParameters params = wallet.getParams();
         Transaction template = new Transaction(params);
         // We always place the client key before the server key because, if either side wants some privacy, they can
@@ -139,9 +141,9 @@ public synchronized void initiate(@Nullable KeyParameter userKey) throws ValueOu
             throw new ValueOutOfRangeException("totalValue too small to use");
         SendRequest req = SendRequest.forTx(template);
         req.coinSelector = AllowUnconfirmedCoinSelector.get();
-        editContractSendRequest(req);
         req.shuffleOutputs = false;   // TODO: Fix things so shuffling is usable.
-        req.aesKey = userKey;
+        req = clientChannelProperties.modifyContractSendRequest(req);
+        if (userKey != null) req.aesKey = userKey;
         wallet.completeTx(req);
         Coin multisigFee = req.tx.getFee();
         multisigContract = req.tx;
@@ -161,15 +163,15 @@ public synchronized void initiate(@Nullable KeyParameter userKey) throws ValueOu
             final Coin valueAfterFee = totalValue.subtract(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE);
             if (Transaction.MIN_NONDUST_OUTPUT.compareTo(valueAfterFee) > 0)
                 throw new ValueOutOfRangeException("totalValue too small to use");
-            refundTx.addOutput(valueAfterFee, myKey.toAddress(params));
+            refundTx.addOutput(valueAfterFee, LegacyAddress.fromKey(params, myKey));
             refundFees = multisigFee.add(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE);
         } else {
-            refundTx.addOutput(totalValue, myKey.toAddress(params));
+            refundTx.addOutput(totalValue, LegacyAddress.fromKey(params, myKey));
             refundFees = multisigFee;
         }
         refundTx.getConfidence().setSource(TransactionConfidence.Source.SELF);
-        log.info("initiated channel with multi-sig contract {}, refund {}", multisigContract.getHashAsString(),
-                refundTx.getHashAsString());
+        log.info("initiated channel with multi-sig contract {}, refund {}", multisigContract.getTxId(),
+                refundTx.getTxId());
         stateMachine.transition(State.INITIATED);
         // Client should now call getIncompleteRefundTransaction() and send it to the server.
     }
@@ -225,10 +227,10 @@ public synchronized Transaction getIncompleteRefundTransaction() {
      * the appropriate time if necessary.</p>
      */
     public synchronized void provideRefundSignature(byte[] theirSignature, @Nullable KeyParameter userKey)
-            throws VerificationException {
+            throws SignatureDecodeException, VerificationException {
         checkNotNull(theirSignature);
         stateMachine.checkState(State.WAITING_FOR_SIGNED_REFUND);
-        TransactionSignature theirSig = TransactionSignature.decodeFromBitcoin(theirSignature, true);
+        TransactionSignature theirSig = TransactionSignature.decodeFromBitcoin(theirSignature, true, false);
         if (theirSig.sigHashMode() != Transaction.SigHash.NONE || !theirSig.anyoneCanPay())
             throw new VerificationException("Refund signature was not SIGHASH_NONE|SIGHASH_ANYONECANPAY");
         // Sign the refund transaction ourselves.
@@ -265,7 +267,7 @@ protected long getExpiryTime() {
         StoredPaymentChannelClientStates channels = (StoredPaymentChannelClientStates)
                 wallet.getExtensions().get(StoredPaymentChannelClientStates.EXTENSION_ID);
         checkNotNull(channels, "You have not added the StoredPaymentChannelClientStates extension to the wallet.");
-        checkState(channels.getChannel(id, multisigContract.getHash()) == null);
+        checkState(channels.getChannel(id, multisigContract.getTxId()) == null);
         storedChannel = new StoredClientChannel(getMajorVersion(), id, multisigContract, refundTx, myKey, serverKey, valueToMe, refundFees, 0, true);
         channels.putChannel(storedChannel);
     }
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ServerState.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ServerState.java
index 3bf1df3f57a..76389d48653 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ServerState.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ServerState.java
@@ -27,10 +27,13 @@
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.bouncycastle.crypto.params.KeyParameter;
 
+import javax.annotation.Nullable;
 import java.util.Locale;
 
 import static com.google.common.base.Preconditions.*;
@@ -163,8 +166,9 @@ protected ECKey getClientKey() {
     }
 
     // Signs the first input of the transaction which must spend the multisig contract.
-    private void signMultisigInput(Transaction tx, Transaction.SigHash hashType, boolean anyoneCanPay) {
-        TransactionSignature signature = tx.calculateSignature(0, serverKey, getContractScript(), hashType, anyoneCanPay);
+    private void signMultisigInput(Transaction tx, Transaction.SigHash hashType,
+                                   boolean anyoneCanPay, @Nullable KeyParameter userKey) {
+        TransactionSignature signature = tx.calculateSignature(0, serverKey, userKey, getContractScript(), hashType, anyoneCanPay);
         byte[] mySig = signature.encodeToBitcoin();
         Script scriptSig = ScriptBuilder.createMultiSigInputScriptBytes(ImmutableList.of(bestValueSignature, mySig));
         tx.getInput(0).setScriptSig(scriptSig);
@@ -174,20 +178,21 @@ private void signMultisigInput(Transaction tx, Transaction.SigHash hashType, boo
     /**
      * <p>Closes this channel and broadcasts the highest value payment transaction on the network.</p>
      *
-     * <p>This will set the state to {@link State#CLOSED} if the transaction is successfully broadcast on the network.
-     * If we fail to broadcast for some reason, the state is set to {@link State#ERROR}.</p>
+     * <p>This will set the state to {@link PaymentChannelServerState.State#CLOSED} if the transaction is successfully broadcast on the network.
+     * If we fail to broadcast for some reason, the state is set to {@link PaymentChannelServerState.State#ERROR}.</p>
      *
-     * <p>If the current state is before {@link State#READY} (ie we have not finished initializing the channel), we
-     * simply set the state to {@link State#CLOSED} and let the client handle getting its refund transaction confirmed.
+     * <p>If the current state is before {@link PaymentChannelServerState.State#READY} (ie we have not finished initializing the channel), we
+     * simply set the state to {@link PaymentChannelServerState.State#CLOSED} and let the client handle getting its refund transaction confirmed.
      * </p>
      *
+     * @param userKey The AES key to use for decryption of the private key. If null then no decryption is required.
      * @return a future which completes when the provided multisig contract successfully broadcasts, or throws if the
      *         broadcast fails for some reason. Note that if the network simply rejects the transaction, this future
      *         will never complete, a timeout should be used.
      * @throws InsufficientMoneyException If the payment tx would have cost more in fees to spend than it is worth.
      */
     @Override
-    public synchronized ListenableFuture<Transaction> close() throws InsufficientMoneyException {
+    public synchronized ListenableFuture<Transaction> close(@Nullable KeyParameter userKey) throws InsufficientMoneyException {
         if (storedServerChannel != null) {
             StoredServerChannel temp = storedServerChannel;
             storedServerChannel = null;
@@ -217,7 +222,7 @@ public synchronized ListenableFuture<Transaction> close() throws InsufficientMon
             // know how to sign. Note that this signature does actually have to be valid, so we can't use a dummy
             // signature to save time, because otherwise completeTx will try to re-sign it to make it valid and then
             // die. We could probably add features to the SendRequest API to make this a bit more efficient.
-            signMultisigInput(tx, Transaction.SigHash.NONE, true);
+            signMultisigInput(tx, Transaction.SigHash.NONE, true, userKey);
             // Let wallet handle adding additional inputs/fee as necessary.
             req.shuffleOutputs = false;
             req.missingSigsMode = Wallet.MissingSigsMode.USE_DUMMY_SIG;
@@ -230,7 +235,7 @@ public synchronized ListenableFuture<Transaction> close() throws InsufficientMon
                 throw new InsufficientMoneyException(feePaidForPayment.subtract(bestValueToMe), msg);
             }
             // Now really sign the multisig input.
-            signMultisigInput(tx, Transaction.SigHash.ALL, false);
+            signMultisigInput(tx, Transaction.SigHash.ALL, false, userKey);
             // Some checks that shouldn't be necessary but it can't hurt to check.
             tx.verify();  // Sanity check syntax.
             for (TransactionInput input : tx.getInputs())
@@ -247,7 +252,7 @@ public synchronized ListenableFuture<Transaction> close() throws InsufficientMon
         ListenableFuture<Transaction> future = broadcaster.broadcastTransaction(tx).future();
         Futures.addCallback(future, new FutureCallback<Transaction>() {
             @Override public void onSuccess(Transaction transaction) {
-                log.info("TX {} propagated, channel successfully closed.", transaction.getHash());
+                log.info("TX {} propagated, channel successfully closed.", transaction.getTxId());
                 stateMachine.transition(State.CLOSED);
                 closedFuture.set(transaction);
             }
@@ -257,7 +262,7 @@ public synchronized ListenableFuture<Transaction> close() throws InsufficientMon
                 stateMachine.transition(State.ERROR);
                 closedFuture.setException(throwable);
             }
-        });
+        }, MoreExecutors.directExecutor());
         return closedFuture;
     }
 
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ClientState.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ClientState.java
index c35470dd719..f87fc15bd01 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ClientState.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ClientState.java
@@ -21,6 +21,7 @@
 import com.google.common.collect.MultimapBuilder;
 import org.bitcoinj.core.*;
 import org.bitcoinj.crypto.TransactionSignature;
+import org.bitcoinj.protocols.channels.IPaymentChannelClient.ClientChannelProperties;
 import org.bitcoinj.script.Script;
 import org.bitcoinj.script.ScriptBuilder;
 import org.bitcoinj.wallet.AllowUnconfirmedCoinSelector;
@@ -28,7 +29,7 @@
 import org.bitcoinj.wallet.Wallet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import javax.annotation.Nullable;
 import java.math.BigInteger;
@@ -99,7 +100,7 @@ public int getMajorVersion() {
     }
 
     @Override
-    public synchronized void initiate(@Nullable KeyParameter userKey) throws ValueOutOfRangeException, InsufficientMoneyException {
+    public synchronized void initiate(@Nullable KeyParameter userKey, ClientChannelProperties clientChannelProperties) throws ValueOutOfRangeException, InsufficientMoneyException {
         final NetworkParameters params = wallet.getParams();
         Transaction template = new Transaction(params);
         // There is also probably a change output, but we don't bother shuffling them as it's obvious from the
@@ -113,9 +114,9 @@ public synchronized void initiate(@Nullable KeyParameter userKey) throws ValueOu
             throw new ValueOutOfRangeException("totalValue too small to use");
         SendRequest req = SendRequest.forTx(template);
         req.coinSelector = AllowUnconfirmedCoinSelector.get();
-        editContractSendRequest(req);
         req.shuffleOutputs = false;   // TODO: Fix things so shuffling is usable.
-        req.aesKey = userKey;
+        req = clientChannelProperties.modifyContractSendRequest(req);
+        if (userKey != null) req.aesKey = userKey;
         wallet.completeTx(req);
         Coin multisigFee = req.tx.getFee();
         contract = req.tx;
@@ -133,10 +134,10 @@ public synchronized void initiate(@Nullable KeyParameter userKey) throws ValueOu
             final Coin valueAfterFee = totalValue.subtract(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE);
             if (Transaction.MIN_NONDUST_OUTPUT.compareTo(valueAfterFee) > 0)
                 throw new ValueOutOfRangeException("totalValue too small to use");
-            refundTx.addOutput(valueAfterFee, myKey.toAddress(params));
+            refundTx.addOutput(valueAfterFee, LegacyAddress.fromKey(params, myKey));
             refundFees = multisigFee.add(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE);
         } else {
-            refundTx.addOutput(totalValue, myKey.toAddress(params));
+            refundTx.addOutput(totalValue, LegacyAddress.fromKey(params, myKey));
             refundFees = multisigFee;
         }
 
@@ -146,7 +147,7 @@ public synchronized void initiate(@Nullable KeyParameter userKey) throws ValueOu
         refundTx.getInput(0).setScriptSig(ScriptBuilder.createCLTVPaymentChannelP2SHRefund(refundSignature, redeemScript));
 
         refundTx.getConfidence().setSource(TransactionConfidence.Source.SELF);
-        log.info("initiated channel with contract {}", contract.getHashAsString());
+        log.info("initiated channel with contract {}", contract.getTxId());
         stateMachine.transition(State.SAVE_STATE_IN_WALLET);
         // Client should now call getIncompleteRefundTransaction() and send it to the server.
     }
@@ -198,7 +199,7 @@ public synchronized Coin getRefundTxFees() {
         StoredPaymentChannelClientStates channels = (StoredPaymentChannelClientStates)
                 wallet.getExtensions().get(StoredPaymentChannelClientStates.EXTENSION_ID);
         checkNotNull(channels, "You have not added the StoredPaymentChannelClientStates extension to the wallet.");
-        checkState(channels.getChannel(id, contract.getHash()) == null);
+        checkState(channels.getChannel(id, contract.getTxId()) == null);
         storedChannel = new StoredClientChannel(getMajorVersion(), id, contract, refundTx, myKey, serverKey, valueToMe, refundFees, expiryTime, true);
         channels.putChannel(storedChannel);
     }
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ServerState.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ServerState.java
index f15fcc54c97..4612270ceca 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ServerState.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ServerState.java
@@ -21,6 +21,7 @@
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
 import org.bitcoinj.core.*;
 import org.bitcoinj.crypto.TransactionSignature;
@@ -30,7 +31,9 @@
 import org.bitcoinj.wallet.Wallet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.bouncycastle.crypto.params.KeyParameter;
 
+import javax.annotation.Nullable;
 import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.Locale;
@@ -116,7 +119,7 @@ protected void verifyContract(final Transaction contract) {
 
     /**
      * Creates a P2SH script outputting to the client and server pubkeys
-     * @return
+     * @return a P2SH script.
      */
     @Override
     protected Script createOutputScript() {
@@ -132,8 +135,9 @@ protected ECKey getClientKey() {
     }
 
     // Signs the first input of the transaction which must spend the multisig contract.
-    private void signP2SHInput(Transaction tx, Transaction.SigHash hashType, boolean anyoneCanPay) {
-        TransactionSignature signature = tx.calculateSignature(0, serverKey, createP2SHRedeemScript(), hashType, anyoneCanPay);
+    private void signP2SHInput(Transaction tx, Transaction.SigHash hashType,
+                               boolean anyoneCanPay, @Nullable KeyParameter userKey) {
+        TransactionSignature signature = tx.calculateSignature(0, serverKey, userKey, createP2SHRedeemScript(), hashType, anyoneCanPay);
         byte[] mySig = signature.encodeToBitcoin();
         Script scriptSig = ScriptBuilder.createCLTVPaymentChannelP2SHInput(bestValueSignature, mySig, createP2SHRedeemScript());
         tx.getInput(0).setScriptSig(scriptSig);
@@ -142,7 +146,7 @@ private void signP2SHInput(Transaction tx, Transaction.SigHash hashType, boolean
     final SettableFuture<Transaction> closedFuture = SettableFuture.create();
 
     @Override
-    public synchronized ListenableFuture<Transaction> close() throws InsufficientMoneyException {
+    public synchronized ListenableFuture<Transaction> close(@Nullable KeyParameter userKey) throws InsufficientMoneyException {
         if (storedServerChannel != null) {
             StoredServerChannel temp = storedServerChannel;
             storedServerChannel = null;
@@ -172,7 +176,7 @@ public synchronized ListenableFuture<Transaction> close() throws InsufficientMon
             // know how to sign. Note that this signature does actually have to be valid, so we can't use a dummy
             // signature to save time, because otherwise completeTx will try to re-sign it to make it valid and then
             // die. We could probably add features to the SendRequest API to make this a bit more efficient.
-            signP2SHInput(tx, Transaction.SigHash.NONE, true);
+            signP2SHInput(tx, Transaction.SigHash.NONE, true, userKey);
             // Let wallet handle adding additional inputs/fee as necessary.
             req.shuffleOutputs = false;
             req.missingSigsMode = Wallet.MissingSigsMode.USE_DUMMY_SIG;
@@ -185,7 +189,7 @@ public synchronized ListenableFuture<Transaction> close() throws InsufficientMon
                 throw new InsufficientMoneyException(feePaidForPayment.subtract(bestValueToMe), msg);
             }
             // Now really sign the multisig input.
-            signP2SHInput(tx, Transaction.SigHash.ALL, false);
+            signP2SHInput(tx, Transaction.SigHash.ALL, false, userKey);
             // Some checks that shouldn't be necessary but it can't hurt to check.
             tx.verify();  // Sanity check syntax.
             for (TransactionInput input : tx.getInputs())
@@ -202,7 +206,7 @@ public synchronized ListenableFuture<Transaction> close() throws InsufficientMon
         ListenableFuture<Transaction> future = broadcaster.broadcastTransaction(tx).future();
         Futures.addCallback(future, new FutureCallback<Transaction>() {
             @Override public void onSuccess(Transaction transaction) {
-                log.info("TX {} propagated, channel successfully closed.", transaction.getHash());
+                log.info("TX {} propagated, channel successfully closed.", transaction.getTxId());
                 stateMachine.transition(State.CLOSED);
                 closedFuture.set(transaction);
             }
@@ -212,7 +216,7 @@ public synchronized ListenableFuture<Transaction> close() throws InsufficientMon
                 stateMachine.transition(State.ERROR);
                 closedFuture.setException(throwable);
             }
-        });
+        }, MoreExecutors.directExecutor());
         return closedFuture;
     }
 }
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentIncrementAck.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentIncrementAck.java
index 40da762e643..93306440401 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentIncrementAck.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentIncrementAck.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/ServerConnectionEventHandler.java b/core/src/main/java/org/bitcoinj/protocols/channels/ServerConnectionEventHandler.java
index 5751c2c6bc3..f741b609a31 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/ServerConnectionEventHandler.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/ServerConnectionEventHandler.java
@@ -43,8 +43,8 @@ public abstract class ServerConnectionEventHandler {
      * <p>Note that this does <i>NOT</i> actually broadcast the most recent payment transaction, which will be triggered
      * automatically when the channel times out by the {@link StoredPaymentChannelServerStates}, or manually by calling
      * {@link StoredPaymentChannelServerStates#closeChannel(StoredServerChannel)} with the channel returned by
-     * {@link StoredPaymentChannelServerStates#getChannel(org.bitcoinj.core.Sha256Hash)} with the id provided in
-     * {@link ServerConnectionEventHandler#channelOpen(org.bitcoinj.core.Sha256Hash)}</p>
+     * {@link StoredPaymentChannelServerStates#getChannel(Sha256Hash)} with the id provided in
+     * {@link ServerConnectionEventHandler#channelOpen(Sha256Hash)}</p>
      */
     @SuppressWarnings("unchecked")
     // The warning 'unchecked call to write(MessageType)' being suppressed here comes from the build()
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/ServerState.java b/core/src/main/java/org/bitcoinj/protocols/channels/ServerState.java
index 37db23c8002..476a981d126 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/ServerState.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/ServerState.java
@@ -5,8 +5,14 @@
 
 public final class ServerState {
   private ServerState() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   public interface StoredServerPaymentChannelsOrBuilder extends
       // @@protoc_insertion_point(interface_extends:paymentchannels.StoredServerPaymentChannels)
@@ -37,43 +43,38 @@ org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannelOrBuilder
         int index);
   }
   /**
-   * Protobuf type {@code paymentchannels.StoredServerPaymentChannels}
-   *
    * <pre>
    * A set of StoredPaymentChannel's
    * </pre>
+   *
+   * Protobuf type {@code paymentchannels.StoredServerPaymentChannels}
    */
-  public static final class StoredServerPaymentChannels extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class StoredServerPaymentChannels extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:paymentchannels.StoredServerPaymentChannels)
       StoredServerPaymentChannelsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use StoredServerPaymentChannels.newBuilder() to construct.
-    private StoredServerPaymentChannels(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private StoredServerPaymentChannels(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private StoredServerPaymentChannels(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final StoredServerPaymentChannels defaultInstance;
-    public static StoredServerPaymentChannels getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public StoredServerPaymentChannels getDefaultInstanceForType() {
-      return defaultInstance;
+    private StoredServerPaymentChannels() {
+      channels_ = java.util.Collections.emptyList();
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private StoredServerPaymentChannels(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -85,19 +86,20 @@ private StoredServerPaymentChannels(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                 channels_ = new java.util.ArrayList<org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel>();
                 mutable_bitField0_ |= 0x00000001;
               }
-              channels_.add(input.readMessage(org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.PARSER, extensionRegistry));
+              channels_.add(
+                  input.readMessage(org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.PARSER, extensionRegistry));
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
               break;
             }
           }
@@ -106,7 +108,7 @@ private StoredServerPaymentChannels(
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
           channels_ = java.util.Collections.unmodifiableList(channels_);
@@ -120,28 +122,14 @@ private StoredServerPaymentChannels(
       return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels.class, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<StoredServerPaymentChannels> PARSER =
-        new com.google.protobuf.AbstractParser<StoredServerPaymentChannels>() {
-      public StoredServerPaymentChannels parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new StoredServerPaymentChannels(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<StoredServerPaymentChannels> getParserForType() {
-      return PARSER;
-    }
-
     public static final int CHANNELS_FIELD_NUMBER = 1;
     private java.util.List<org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel> channels_;
     /**
@@ -177,10 +165,8 @@ public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannelOrB
       return channels_.get(index);
     }
 
-    private void initFields() {
-      channels_ = java.util.Collections.emptyList();
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -196,18 +182,18 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       for (int i = 0; i < channels_.size(); i++) {
         output.writeMessage(1, channels_.get(i));
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -215,18 +201,55 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(1, channels_.get(i));
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels)) {
+        return super.equals(obj);
+      }
+      org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels other = (org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels) obj;
+
+      boolean result = true;
+      result = result && getChannelsList()
+          .equals(other.getChannelsList());
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (getChannelsCount() > 0) {
+        hash = (37 * hash) + CHANNELS_FIELD_NUMBER;
+        hash = (53 * hash) + getChannelsList().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -250,58 +273,71 @@ public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentCha
     }
     public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code paymentchannels.StoredServerPaymentChannels}
-     *
      * <pre>
      * A set of StoredPaymentChannel's
      * </pre>
+     *
+     * Protobuf type {@code paymentchannels.StoredServerPaymentChannels}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:paymentchannels.StoredServerPaymentChannels)
         org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannelsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -309,7 +345,8 @@ public static final class Builder extends
         return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -322,19 +359,17 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
           getChannelsFieldBuilder();
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (channelsBuilder_ == null) {
@@ -346,19 +381,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannels_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels getDefaultInstanceForType() {
         return org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels build() {
         org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels result = buildPartial();
         if (!result.isInitialized()) {
@@ -367,6 +401,7 @@ public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels b
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels buildPartial() {
         org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels result = new org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels(this);
         int from_bitField0_ = bitField0_;
@@ -383,6 +418,39 @@ public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels b
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels) {
           return mergeFrom((org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels)other);
@@ -413,27 +481,29 @@ public Builder mergeFrom(org.bitcoinj.protocols.channels.ServerState.StoredServe
               channels_ = other.channels_;
               bitField0_ = (bitField0_ & ~0x00000001);
               channelsBuilder_ = 
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getChannelsFieldBuilder() : null;
             } else {
               channelsBuilder_.addAllMessages(other.channels_);
             }
           }
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         for (int i = 0; i < getChannelsCount(); i++) {
           if (!getChannels(i).isInitialized()) {
-            
             return false;
           }
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -443,7 +513,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -462,7 +532,7 @@ private void ensureChannelsIsMutable() {
          }
       }
 
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannelOrBuilder> channelsBuilder_;
 
       /**
@@ -678,11 +748,11 @@ public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.Bu
            getChannelsBuilderList() {
         return getChannelsFieldBuilder().getBuilderList();
       }
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannelOrBuilder> 
           getChannelsFieldBuilder() {
         if (channelsBuilder_ == null) {
-          channelsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+          channelsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannelOrBuilder>(
                   channels_,
                   ((bitField0_ & 0x00000001) == 0x00000001),
@@ -692,16 +762,57 @@ public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.Bu
         }
         return channelsBuilder_;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:paymentchannels.StoredServerPaymentChannels)
     }
 
+    // @@protoc_insertion_point(class_scope:paymentchannels.StoredServerPaymentChannels)
+    private static final org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels DEFAULT_INSTANCE;
     static {
-      defaultInstance = new StoredServerPaymentChannels(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels();
+    }
+
+    public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<StoredServerPaymentChannels>
+        PARSER = new com.google.protobuf.AbstractParser<StoredServerPaymentChannels>() {
+      @java.lang.Override
+      public StoredServerPaymentChannels parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new StoredServerPaymentChannels(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<StoredServerPaymentChannels> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<StoredServerPaymentChannels> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannels getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:paymentchannels.StoredServerPaymentChannels)
   }
 
   public interface StoredServerPaymentChannelOrBuilder extends
@@ -772,60 +883,62 @@ public interface StoredServerPaymentChannelOrBuilder extends
     int getMajorVersion();
 
     /**
-     * <code>optional bytes clientKey = 8;</code>
-     *
      * <pre>
      * Protocol version 2 only - the P2SH hash doesn't contain the required key
      * </pre>
+     *
+     * <code>optional bytes clientKey = 8;</code>
      */
     boolean hasClientKey();
     /**
-     * <code>optional bytes clientKey = 8;</code>
-     *
      * <pre>
      * Protocol version 2 only - the P2SH hash doesn't contain the required key
      * </pre>
+     *
+     * <code>optional bytes clientKey = 8;</code>
      */
     com.google.protobuf.ByteString getClientKey();
   }
   /**
-   * Protobuf type {@code paymentchannels.StoredServerPaymentChannel}
-   *
    * <pre>
    * A server-side payment channel in serialized form, which can be reloaded later if the server restarts
    * </pre>
+   *
+   * Protobuf type {@code paymentchannels.StoredServerPaymentChannel}
    */
-  public static final class StoredServerPaymentChannel extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class StoredServerPaymentChannel extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:paymentchannels.StoredServerPaymentChannel)
       StoredServerPaymentChannelOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use StoredServerPaymentChannel.newBuilder() to construct.
-    private StoredServerPaymentChannel(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private StoredServerPaymentChannel(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private StoredServerPaymentChannel(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final StoredServerPaymentChannel defaultInstance;
-    public static StoredServerPaymentChannel getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public StoredServerPaymentChannel getDefaultInstanceForType() {
-      return defaultInstance;
+    private StoredServerPaymentChannel() {
+      bestValueToMe_ = 0L;
+      bestValueSignature_ = com.google.protobuf.ByteString.EMPTY;
+      refundTransactionUnlockTimeSecs_ = 0L;
+      contractTransaction_ = com.google.protobuf.ByteString.EMPTY;
+      clientOutput_ = com.google.protobuf.ByteString.EMPTY;
+      myKey_ = com.google.protobuf.ByteString.EMPTY;
+      majorVersion_ = 1;
+      clientKey_ = com.google.protobuf.ByteString.EMPTY;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private StoredServerPaymentChannel(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -837,13 +950,6 @@ private StoredServerPaymentChannel(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 8: {
               bitField0_ |= 0x00000001;
               bestValueToMe_ = input.readUInt64();
@@ -884,13 +990,20 @@ private StoredServerPaymentChannel(
               clientKey_ = input.readBytes();
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -901,28 +1014,14 @@ private StoredServerPaymentChannel(
       return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.class, org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<StoredServerPaymentChannel> PARSER =
-        new com.google.protobuf.AbstractParser<StoredServerPaymentChannel>() {
-      public StoredServerPaymentChannel parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new StoredServerPaymentChannel(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<StoredServerPaymentChannel> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int BESTVALUETOME_FIELD_NUMBER = 1;
     private long bestValueToMe_;
@@ -1032,37 +1131,28 @@ public int getMajorVersion() {
     public static final int CLIENTKEY_FIELD_NUMBER = 8;
     private com.google.protobuf.ByteString clientKey_;
     /**
-     * <code>optional bytes clientKey = 8;</code>
-     *
      * <pre>
      * Protocol version 2 only - the P2SH hash doesn't contain the required key
      * </pre>
+     *
+     * <code>optional bytes clientKey = 8;</code>
      */
     public boolean hasClientKey() {
       return ((bitField0_ & 0x00000080) == 0x00000080);
     }
     /**
-     * <code>optional bytes clientKey = 8;</code>
-     *
      * <pre>
      * Protocol version 2 only - the P2SH hash doesn't contain the required key
      * </pre>
+     *
+     * <code>optional bytes clientKey = 8;</code>
      */
     public com.google.protobuf.ByteString getClientKey() {
       return clientKey_;
     }
 
-    private void initFields() {
-      bestValueToMe_ = 0L;
-      bestValueSignature_ = com.google.protobuf.ByteString.EMPTY;
-      refundTransactionUnlockTimeSecs_ = 0L;
-      contractTransaction_ = com.google.protobuf.ByteString.EMPTY;
-      clientOutput_ = com.google.protobuf.ByteString.EMPTY;
-      myKey_ = com.google.protobuf.ByteString.EMPTY;
-      majorVersion_ = 1;
-      clientKey_ = com.google.protobuf.ByteString.EMPTY;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1088,9 +1178,9 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeUInt64(1, bestValueToMe_);
       }
@@ -1115,12 +1205,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000080) == 0x00000080)) {
         output.writeBytes(8, clientKey_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -1156,18 +1246,123 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(8, clientKey_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel)) {
+        return super.equals(obj);
+      }
+      org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel other = (org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel) obj;
+
+      boolean result = true;
+      result = result && (hasBestValueToMe() == other.hasBestValueToMe());
+      if (hasBestValueToMe()) {
+        result = result && (getBestValueToMe()
+            == other.getBestValueToMe());
+      }
+      result = result && (hasBestValueSignature() == other.hasBestValueSignature());
+      if (hasBestValueSignature()) {
+        result = result && getBestValueSignature()
+            .equals(other.getBestValueSignature());
+      }
+      result = result && (hasRefundTransactionUnlockTimeSecs() == other.hasRefundTransactionUnlockTimeSecs());
+      if (hasRefundTransactionUnlockTimeSecs()) {
+        result = result && (getRefundTransactionUnlockTimeSecs()
+            == other.getRefundTransactionUnlockTimeSecs());
+      }
+      result = result && (hasContractTransaction() == other.hasContractTransaction());
+      if (hasContractTransaction()) {
+        result = result && getContractTransaction()
+            .equals(other.getContractTransaction());
+      }
+      result = result && (hasClientOutput() == other.hasClientOutput());
+      if (hasClientOutput()) {
+        result = result && getClientOutput()
+            .equals(other.getClientOutput());
+      }
+      result = result && (hasMyKey() == other.hasMyKey());
+      if (hasMyKey()) {
+        result = result && getMyKey()
+            .equals(other.getMyKey());
+      }
+      result = result && (hasMajorVersion() == other.hasMajorVersion());
+      if (hasMajorVersion()) {
+        result = result && (getMajorVersion()
+            == other.getMajorVersion());
+      }
+      result = result && (hasClientKey() == other.hasClientKey());
+      if (hasClientKey()) {
+        result = result && getClientKey()
+            .equals(other.getClientKey());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasBestValueToMe()) {
+        hash = (37 * hash) + BESTVALUETOME_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getBestValueToMe());
+      }
+      if (hasBestValueSignature()) {
+        hash = (37 * hash) + BESTVALUESIGNATURE_FIELD_NUMBER;
+        hash = (53 * hash) + getBestValueSignature().hashCode();
+      }
+      if (hasRefundTransactionUnlockTimeSecs()) {
+        hash = (37 * hash) + REFUNDTRANSACTIONUNLOCKTIMESECS_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getRefundTransactionUnlockTimeSecs());
+      }
+      if (hasContractTransaction()) {
+        hash = (37 * hash) + CONTRACTTRANSACTION_FIELD_NUMBER;
+        hash = (53 * hash) + getContractTransaction().hashCode();
+      }
+      if (hasClientOutput()) {
+        hash = (37 * hash) + CLIENTOUTPUT_FIELD_NUMBER;
+        hash = (53 * hash) + getClientOutput().hashCode();
+      }
+      if (hasMyKey()) {
+        hash = (37 * hash) + MYKEY_FIELD_NUMBER;
+        hash = (53 * hash) + getMyKey().hashCode();
+      }
+      if (hasMajorVersion()) {
+        hash = (37 * hash) + MAJORVERSION_FIELD_NUMBER;
+        hash = (53 * hash) + getMajorVersion();
+      }
+      if (hasClientKey()) {
+        hash = (37 * hash) + CLIENTKEY_FIELD_NUMBER;
+        hash = (53 * hash) + getClientKey().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -1191,58 +1386,71 @@ public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentCha
     }
     public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code paymentchannels.StoredServerPaymentChannel}
-     *
      * <pre>
      * A server-side payment channel in serialized form, which can be reloaded later if the server restarts
      * </pre>
+     *
+     * Protobuf type {@code paymentchannels.StoredServerPaymentChannel}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:paymentchannels.StoredServerPaymentChannel)
         org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannelOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -1250,7 +1458,8 @@ public static final class Builder extends
         return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -1263,18 +1472,16 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         bestValueToMe_ = 0L;
@@ -1296,19 +1503,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoinj.protocols.channels.ServerState.internal_static_paymentchannels_StoredServerPaymentChannel_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel getDefaultInstanceForType() {
         return org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel build() {
         org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel result = buildPartial();
         if (!result.isInitialized()) {
@@ -1317,6 +1523,7 @@ public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel bu
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel buildPartial() {
         org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel result = new org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel(this);
         int from_bitField0_ = bitField0_;
@@ -1358,6 +1565,39 @@ public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel bu
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel) {
           return mergeFrom((org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel)other);
@@ -1393,30 +1633,29 @@ public Builder mergeFrom(org.bitcoinj.protocols.channels.ServerState.StoredServe
         if (other.hasClientKey()) {
           setClientKey(other.getClientKey());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasBestValueToMe()) {
-          
           return false;
         }
         if (!hasRefundTransactionUnlockTimeSecs()) {
-          
           return false;
         }
         if (!hasContractTransaction()) {
-          
           return false;
         }
         if (!hasMyKey()) {
-          
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1426,7 +1665,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -1674,31 +1913,31 @@ public Builder clearMajorVersion() {
 
       private com.google.protobuf.ByteString clientKey_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>optional bytes clientKey = 8;</code>
-       *
        * <pre>
        * Protocol version 2 only - the P2SH hash doesn't contain the required key
        * </pre>
+       *
+       * <code>optional bytes clientKey = 8;</code>
        */
       public boolean hasClientKey() {
         return ((bitField0_ & 0x00000080) == 0x00000080);
       }
       /**
-       * <code>optional bytes clientKey = 8;</code>
-       *
        * <pre>
        * Protocol version 2 only - the P2SH hash doesn't contain the required key
        * </pre>
+       *
+       * <code>optional bytes clientKey = 8;</code>
        */
       public com.google.protobuf.ByteString getClientKey() {
         return clientKey_;
       }
       /**
-       * <code>optional bytes clientKey = 8;</code>
-       *
        * <pre>
        * Protocol version 2 only - the P2SH hash doesn't contain the required key
        * </pre>
+       *
+       * <code>optional bytes clientKey = 8;</code>
        */
       public Builder setClientKey(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -1710,11 +1949,11 @@ public Builder setClientKey(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>optional bytes clientKey = 8;</code>
-       *
        * <pre>
        * Protocol version 2 only - the P2SH hash doesn't contain the required key
        * </pre>
+       *
+       * <code>optional bytes clientKey = 8;</code>
        */
       public Builder clearClientKey() {
         bitField0_ = (bitField0_ & ~0x00000080);
@@ -1722,34 +1961,75 @@ public Builder clearClientKey() {
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:paymentchannels.StoredServerPaymentChannel)
     }
 
+    // @@protoc_insertion_point(class_scope:paymentchannels.StoredServerPaymentChannel)
+    private static final org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel DEFAULT_INSTANCE;
     static {
-      defaultInstance = new StoredServerPaymentChannel(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel();
+    }
+
+    public static org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<StoredServerPaymentChannel>
+        PARSER = new com.google.protobuf.AbstractParser<StoredServerPaymentChannel>() {
+      @java.lang.Override
+      public StoredServerPaymentChannel parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new StoredServerPaymentChannel(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<StoredServerPaymentChannel> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<StoredServerPaymentChannel> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoinj.protocols.channels.ServerState.StoredServerPaymentChannel getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:paymentchannels.StoredServerPaymentChannel)
   }
 
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_paymentchannels_StoredServerPaymentChannels_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_paymentchannels_StoredServerPaymentChannels_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_paymentchannels_StoredServerPaymentChannel_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_paymentchannels_StoredServerPaymentChannel_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
   }
-  private static com.google.protobuf.Descriptors.FileDescriptor
+  private static  com.google.protobuf.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
@@ -1762,7 +2042,7 @@ public Builder clearClientKey() {
       "nsactionUnlockTimeSecs\030\003 \002(\004\022\033\n\023contract" +
       "Transaction\030\004 \002(\014\022\024\n\014clientOutput\030\005 \001(\014\022" +
       "\r\n\005myKey\030\006 \002(\014\022\027\n\014majorVersion\030\007 \001(\r:\0011\022" +
-      "\021\n\tclientKey\030\010 \001(\014B.\n\037org.bitcoinj.proto",
+      "\021\n\tclientKey\030\010 \001(\014B.\n\037org.bitcoinj.proto" +
       "cols.channelsB\013ServerState"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
@@ -1780,13 +2060,13 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     internal_static_paymentchannels_StoredServerPaymentChannels_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_paymentchannels_StoredServerPaymentChannels_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_paymentchannels_StoredServerPaymentChannels_descriptor,
         new java.lang.String[] { "Channels", });
     internal_static_paymentchannels_StoredServerPaymentChannel_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_paymentchannels_StoredServerPaymentChannel_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_paymentchannels_StoredServerPaymentChannel_descriptor,
         new java.lang.String[] { "BestValueToMe", "BestValueSignature", "RefundTransactionUnlockTimeSecs", "ContractTransaction", "ClientOutput", "MyKey", "MajorVersion", "ClientKey", });
   }
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/StoredPaymentChannelClientStates.java b/core/src/main/java/org/bitcoinj/protocols/channels/StoredPaymentChannelClientStates.java
index 8510a3c3b0c..9f38c4bc0c6 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/StoredPaymentChannelClientStates.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/StoredPaymentChannelClientStates.java
@@ -144,7 +144,7 @@ StoredClientChannel getUsableChannelForServerID(Sha256Hash id) {
             for (StoredClientChannel channel : setChannels) {
                 synchronized (channel) {
                     // Check if the channel is usable (has money, inactive) and if so, activate it.
-                    log.info("Considering channel {} contract {}", channel.hashCode(), channel.contract.getHash());
+                    log.info("Considering channel {} contract {}", channel.hashCode(), channel.contract.getTxId());
                     if (channel.close != null || channel.valueToMe.equals(Coin.ZERO)) {
                         log.info("  ... but is closed or empty");
                         continue;
@@ -172,7 +172,7 @@ public StoredClientChannel getChannel(Sha256Hash id, Sha256Hash contractHash) {
         try {
             Set<StoredClientChannel> setChannels = mapChannels.get(id);
             for (StoredClientChannel channel : setChannels) {
-                if (channel.contract.getHash().equals(contractHash))
+                if (channel.contract.getTxId().equals(contractHash))
                     return channel;
             }
             return null;
@@ -314,7 +314,7 @@ public byte[] serializeWalletExtension() {
                         .setValueToMe(channel.valueToMe.value)
                         .setExpiryTime(channel.expiryTime);
                 if (channel.close != null)
-                    value.setCloseTransactionHash(ByteString.copyFrom(channel.close.getHash().getBytes()));
+                    value.setCloseTransactionHash(ByteString.copyFrom(channel.close.getTxId().getBytes()));
                 builder.addChannels(value);
             }
             return builder.build().toByteArray();
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/StoredPaymentChannelServerStates.java b/core/src/main/java/org/bitcoinj/protocols/channels/StoredPaymentChannelServerStates.java
index 72e4f34fa55..373ed4d5d1b 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/StoredPaymentChannelServerStates.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/StoredPaymentChannelServerStates.java
@@ -47,7 +47,7 @@ public class StoredPaymentChannelServerStates implements WalletExtension {
     static final String EXTENSION_ID = StoredPaymentChannelServerStates.class.getName();
     static final int MAX_SECONDS_TO_WAIT_FOR_BROADCASTER_TO_BE_SET = 10;
 
-    @GuardedBy("lock") @VisibleForTesting final Map<Sha256Hash, StoredServerChannel> mapChannels = new HashMap<Sha256Hash, StoredServerChannel>();
+    @GuardedBy("lock") @VisibleForTesting final Map<Sha256Hash, StoredServerChannel> mapChannels = new HashMap<>();
     private Wallet wallet;
     private final SettableFuture<TransactionBroadcaster> broadcasterFuture = SettableFuture.create();
 
@@ -109,7 +109,7 @@ public static StoredPaymentChannelServerStates getFromWallet(Wallet wallet) {
     public void closeChannel(StoredServerChannel channel) {
         lock.lock();
         try {
-            if (mapChannels.remove(channel.contract.getHash()) == null)
+            if (mapChannels.remove(channel.contract.getTxId()) == null)
                 return;
         } finally {
             lock.unlock();
@@ -190,7 +190,7 @@ public void updatedChannel(final StoredServerChannel channel) {
     public void putChannel(final StoredServerChannel channel) {
         lock.lock();
         try {
-            checkArgument(mapChannels.put(channel.contract.getHash(), checkNotNull(channel)) == null);
+            checkArgument(mapChannels.put(channel.contract.getTxId(), checkNotNull(channel)) == null);
             // Add the difference between real time and Utils.now() so that test-cases can use a mock clock.
             Date autocloseTime = new Date((channel.refundTransactionUnlockTimeSecs + CHANNEL_EXPIRE_OFFSET) * 1000L
                     + (System.currentTimeMillis() - Utils.currentTimeMillis()));
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/StoredServerChannel.java b/core/src/main/java/org/bitcoinj/protocols/channels/StoredServerChannel.java
index b31d48e8c12..14f1d7c00fa 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/StoredServerChannel.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/StoredServerChannel.java
@@ -88,7 +88,7 @@ synchronized void clearConnectedHandler() {
     }
 
     /**
-     * If a handler is connected, call its {@link org.bitcoinj.protocols.channels.PaymentChannelServer#close()}
+     * If a handler is connected, call its {@link PaymentChannelServer#close()}
      * method thus disconnecting the TCP connection.
      */
     synchronized void closeConnectedHandler() {
diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/package-info.java b/core/src/main/java/org/bitcoinj/protocols/channels/package-info.java
index 458f16c40f3..16ebba4aad6 100644
--- a/core/src/main/java/org/bitcoinj/protocols/channels/package-info.java
+++ b/core/src/main/java/org/bitcoinj/protocols/channels/package-info.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/protocols/package-info.java b/core/src/main/java/org/bitcoinj/protocols/package-info.java
index 3d1caf59aa3..28f791bc0e4 100644
--- a/core/src/main/java/org/bitcoinj/protocols/package-info.java
+++ b/core/src/main/java/org/bitcoinj/protocols/package-info.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/protocols/payments/PaymentProtocol.java b/core/src/main/java/org/bitcoinj/protocols/payments/PaymentProtocol.java
index 3a77baf70a5..e440269c50a 100644
--- a/core/src/main/java/org/bitcoinj/protocols/payments/PaymentProtocol.java
+++ b/core/src/main/java/org/bitcoinj/protocols/payments/PaymentProtocol.java
@@ -340,7 +340,7 @@ public static Protos.Payment createPaymentMessage(List<Transaction> transactions
      */
     public static List<Transaction> parseTransactionsFromPaymentMessage(NetworkParameters params,
             Protos.Payment paymentMessage) {
-        final List<Transaction> transactions = new ArrayList<Transaction>(paymentMessage.getTransactionsCount());
+        final List<Transaction> transactions = new ArrayList<>(paymentMessage.getTransactionsCount());
         for (final ByteString transaction : paymentMessage.getTransactionsList())
             transactions.add(params.getDefaultSerializer().makeTransaction(transaction.toByteArray()));
         return transactions;
diff --git a/core/src/main/java/org/bitcoinj/protocols/payments/PaymentSession.java b/core/src/main/java/org/bitcoinj/protocols/payments/PaymentSession.java
index 8988f89c6d5..7b514061270 100644
--- a/core/src/main/java/org/bitcoinj/protocols/payments/PaymentSession.java
+++ b/core/src/main/java/org/bitcoinj/protocols/payments/PaymentSession.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -222,7 +224,7 @@ public PaymentSession(Protos.PaymentRequest request, boolean verifyPki, @Nullabl
      * Returns the outputs of the payment request.
      */
     public List<PaymentProtocol.Output> getOutputs() {
-        List<PaymentProtocol.Output> outputs = new ArrayList<PaymentProtocol.Output>(paymentDetails.getOutputsCount());
+        List<PaymentProtocol.Output> outputs = new ArrayList<>(paymentDetails.getOutputsCount());
         for (Protos.Output output : paymentDetails.getOutputsList()) {
             Coin amount = output.hasAmount() ? Coin.valueOf(output.getAmount()) : null;
             outputs.add(new PaymentProtocol.Output(amount, output.getScript().toByteArray()));
@@ -268,7 +270,7 @@ public Date getDate() {
      * This should always be called before attempting to call sendPayment.
      */
     public boolean isExpired() {
-        return paymentDetails.hasExpires() && System.currentTimeMillis() / 1000L > paymentDetails.getExpires();
+        return paymentDetails.hasExpires() && Utils.currentTimeSeconds() > paymentDetails.getExpires();
     }
 
     /**
diff --git a/core/src/main/java/org/bitcoinj/protocols/payments/package-info.java b/core/src/main/java/org/bitcoinj/protocols/payments/package-info.java
index 0d6de7187dc..72cf934ca5a 100644
--- a/core/src/main/java/org/bitcoinj/protocols/payments/package-info.java
+++ b/core/src/main/java/org/bitcoinj/protocols/payments/package-info.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/script/Script.java b/core/src/main/java/org/bitcoinj/script/Script.java
index 9ddb45ca741..c62638341a2 100644
--- a/core/src/main/java/org/bitcoinj/script/Script.java
+++ b/core/src/main/java/org/bitcoinj/script/Script.java
@@ -2,6 +2,7 @@
  * Copyright 2011 Google Inc.
  * Copyright 2012 Matt Corallo.
  * Copyright 2014 Andreas Schildbach
+ * Copyright 2017 Nicola Atzei
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +24,7 @@
 import com.google.common.collect.Lists;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.spongycastle.crypto.digests.RIPEMD160Digest;
+import org.bouncycastle.crypto.digests.RIPEMD160Digest;
 
 import javax.annotation.Nullable;
 import java.io.ByteArrayInputStream;
@@ -55,11 +56,17 @@ public class Script {
 
     /** Enumeration to encapsulate the type of this script. */
     public enum ScriptType {
-        // Do NOT change the ordering of the following definitions because their ordinals are stored in databases.
-        NO_TYPE,
-        P2PKH,
-        PUB_KEY,
-        P2SH
+        P2PKH(1), // pay to pubkey hash (aka pay to address)
+        P2PK(2), // pay to pubkey
+        P2SH(3), // pay to script hash
+        P2WPKH(4), // pay to witness pubkey hash
+        P2WSH(5); // pay to witness script hash
+
+        public final int id;
+
+        private ScriptType(int id) {
+            this.id = id;
+        }
     }
 
     /** Flags to pass to {@link Script#correctlySpends(Transaction, long, Script, Set)}.
@@ -75,12 +82,17 @@ public enum VerifyFlag {
         MINIMALDATA, // Require minimal encodings for all push operations
         DISCOURAGE_UPGRADABLE_NOPS, // Discourage use of NOPs reserved for upgrades (NOP1-10)
         CLEANSTACK, // Require that only a single stack element remains after evaluation.
-        CHECKLOCKTIMEVERIFY // Enable CHECKLOCKTIMEVERIFY operation
+        CHECKLOCKTIMEVERIFY, // Enable CHECKLOCKTIMEVERIFY operation
+        CHECKSEQUENCEVERIFY // Enable CHECKSEQUENCEVERIFY operation
     }
     public static final EnumSet<VerifyFlag> ALL_VERIFY_FLAGS = EnumSet.allOf(VerifyFlag.class);
 
     private static final Logger log = LoggerFactory.getLogger(Script.class);
     public static final long MAX_SCRIPT_ELEMENT_SIZE = 520;  // bytes
+    private static final int MAX_OPS_PER_SCRIPT = 201;
+    private static final int MAX_STACK_SIZE = 1000;
+    private static final int MAX_PUBKEYS_PER_MULTISIG = 20;
+    private static final int MAX_SCRIPT_SIZE = 10000;
     public static final int SIG_SIZE = 75;
     /** Max number of sigops allowed in a standard p2sh redeem script */
     public static final int MAX_P2SH_SIGOPS = 15;
@@ -101,7 +113,7 @@ private Script() {
 
     // Used from ScriptBuilder.
     Script(List<ScriptChunk> chunks) {
-        this.chunks = Collections.unmodifiableList(new ArrayList<ScriptChunk>(chunks));
+        this.chunks = Collections.unmodifiableList(new ArrayList<>(chunks));
         creationTimeSeconds = Utils.currentTimeSeconds();
     }
 
@@ -131,11 +143,14 @@ public void setCreationTimeSeconds(long creationTimeSeconds) {
     }
 
     /**
-     * Returns the program opcodes as a string, for example "[1234] DUP HASH160"
+     * Returns the program opcodes as a string, for example "[1234] DUP HASH160", or "&lt;empty&gt;".
      */
     @Override
     public String toString() {
-        return Utils.join(chunks);
+        if (!chunks.isEmpty())
+            return Utils.SPACE_JOINER.join(chunks);
+        else
+            return "<empty>";
     }
 
     /** Returns the serialized program as a newly created byte array. */
@@ -173,11 +188,11 @@ public List<ScriptChunk> getChunks() {
      *
      * <p>The reason for this split, instead of just interpreting directly, is to make it easier
      * to reach into a programs structure and pull out bits of data without having to run it.
-     * This is necessary to render the to/from addresses of transactions in a user interface.
+     * This is necessary to render the to addresses of transactions in a user interface.
      * Bitcoin Core does something similar.</p>
      */
     private void parse(byte[] program) throws ScriptException {
-        chunks = new ArrayList<ScriptChunk>(5);   // Common size.
+        chunks = new ArrayList<>(5);   // Common size.
         ByteArrayInputStream bis = new ByteArrayInputStream(program);
         int initialSize = bis.available();
         while (bis.available() > 0) {
@@ -189,17 +204,17 @@ private void parse(byte[] program) throws ScriptException {
                 // Read some bytes of data, where how many is the opcode value itself.
                 dataToRead = opcode;
             } else if (opcode == OP_PUSHDATA1) {
-                if (bis.available() < 1) throw new ScriptException("Unexpected end of script");
+                if (bis.available() < 1) throw new ScriptException(ScriptError.SCRIPT_ERR_UNKNOWN_ERROR, "Unexpected end of script");
                 dataToRead = bis.read();
             } else if (opcode == OP_PUSHDATA2) {
                 // Read a short, then read that many bytes of data.
-                if (bis.available() < 2) throw new ScriptException("Unexpected end of script");
-                dataToRead = bis.read() | (bis.read() << 8);
+                if (bis.available() < 2) throw new ScriptException(ScriptError.SCRIPT_ERR_UNKNOWN_ERROR, "Unexpected end of script");
+                dataToRead = Utils.readUint16FromStream(bis);
             } else if (opcode == OP_PUSHDATA4) {
                 // Read a uint32, then read that many bytes of data.
                 // Though this is allowed, because its value cannot be > 520, it should never actually be used
-                if (bis.available() < 4) throw new ScriptException("Unexpected end of script");
-                dataToRead = ((long)bis.read()) | (((long)bis.read()) << 8) | (((long)bis.read()) << 16) | (((long)bis.read()) << 24);
+                if (bis.available() < 4) throw new ScriptException(ScriptError.SCRIPT_ERR_UNKNOWN_ERROR, "Unexpected end of script");
+                dataToRead = Utils.readUint32FromStream(bis);
             }
 
             ScriptChunk chunk;
@@ -207,7 +222,7 @@ private void parse(byte[] program) throws ScriptException {
                 chunk = new ScriptChunk(opcode, null, startLocationInProgram);
             } else {
                 if (dataToRead > bis.available())
-                    throw new ScriptException("Push of data element that is larger than remaining data");
+                    throw new ScriptException(ScriptError.SCRIPT_ERR_BAD_OPCODE, "Push of data element that is larger than remaining data");
                 byte[] data = new byte[(int)dataToRead];
                 checkState(dataToRead == 0 || bis.read(data, 0, (int)dataToRead) == dataToRead);
                 chunk = new ScriptChunk(opcode, data, startLocationInProgram);
@@ -220,152 +235,80 @@ private void parse(byte[] program) throws ScriptException {
         }
     }
 
-    /**
-     * Returns true if this script is of the form <pubkey> OP_CHECKSIG. This form was originally intended for transactions
-     * where the peers talked to each other directly via TCP/IP, but has fallen out of favor with time due to that mode
-     * of operation being susceptible to man-in-the-middle attacks. It is still used in coinbase outputs and can be
-     * useful more exotic types of transaction, but today most payments are to addresses.
-     */
+    /** @deprecated use {@link ScriptPattern#isP2PK(Script)} */
+    @Deprecated
     public boolean isSentToRawPubKey() {
-        return chunks.size() == 2 && chunks.get(1).equalsOpCode(OP_CHECKSIG) &&
-               !chunks.get(0).isOpCode() && chunks.get(0).data.length > 1;
+        return ScriptPattern.isP2PK(this);
     }
 
-    /**
-     * Returns true if this script is of the form DUP HASH160 <pubkey hash> EQUALVERIFY CHECKSIG, ie, payment to an
-     * address like 1VayNert3x1KzbpzMGt2qdqrAThiRovi8. This form was originally intended for the case where you wish
-     * to send somebody money with a written code because their node is offline, but over time has become the standard
-     * way to make payments due to the short and recognizable base58 form addresses come in.
-     */
-    public boolean isSentToAddress() {
-        return chunks.size() == 5 &&
-               chunks.get(0).equalsOpCode(OP_DUP) &&
-               chunks.get(1).equalsOpCode(OP_HASH160) &&
-               chunks.get(2).data.length == Address.LENGTH &&
-               chunks.get(3).equalsOpCode(OP_EQUALVERIFY) &&
-               chunks.get(4).equalsOpCode(OP_CHECKSIG);
-    }
-
-    /**
-     * An alias for isPayToScriptHash.
-     */
+    /** @deprecated use {@link ScriptPattern#isP2PKH(Script)} */
     @Deprecated
-    public boolean isSentToP2SH() {
-        return isPayToScriptHash();
+    public boolean isSentToAddress() {
+        return ScriptPattern.isP2PKH(this);
     }
 
     /**
-     * <p>If a program matches the standard template DUP HASH160 &lt;pubkey hash&gt; EQUALVERIFY CHECKSIG
-     * then this function retrieves the third element.
-     * In this case, this is useful for fetching the destination address of a transaction.</p>
+     * <p>If the program somehow pays to a hash, returns the hash.</p>
      * 
-     * <p>If a program matches the standard template HASH160 &lt;script hash&gt; EQUAL
-     * then this function retrieves the second element.
-     * In this case, this is useful for fetching the hash of the redeem script of a transaction.</p>
-     * 
-     * <p>Otherwise it throws a ScriptException.</p>
-     *
+     * <p>Otherwise this method throws a ScriptException.</p>
      */
     public byte[] getPubKeyHash() throws ScriptException {
-        if (isSentToAddress())
-            return chunks.get(2).data;
-        else if (isPayToScriptHash())
-            return chunks.get(1).data;
+        if (ScriptPattern.isP2PKH(this))
+            return ScriptPattern.extractHashFromP2PKH(this);
+        else if (ScriptPattern.isP2SH(this))
+            return ScriptPattern.extractHashFromP2SH(this);
+        else if (ScriptPattern.isP2WH(this))
+            return ScriptPattern.extractHashFromP2WH(this);
         else
-            throw new ScriptException("Script not in the standard scriptPubKey form");
-    }
-
-    /**
-     * Returns the public key in this script. If a script contains two constants and nothing else, it is assumed to
-     * be a scriptSig (input) for a pay-to-address output and the second constant is returned (the first is the
-     * signature). If a script contains a constant and an OP_CHECKSIG opcode, the constant is returned as it is
-     * assumed to be a direct pay-to-key scriptPubKey (output) and the first constant is the public key.
-     *
-     * @throws ScriptException if the script is none of the named forms.
-     */
-    public byte[] getPubKey() throws ScriptException {
-        if (chunks.size() != 2) {
-            throw new ScriptException("Script not of right size, expecting 2 but got " + chunks.size());
-        }
-        final ScriptChunk chunk0 = chunks.get(0);
-        final byte[] chunk0data = chunk0.data;
-        final ScriptChunk chunk1 = chunks.get(1);
-        final byte[] chunk1data = chunk1.data;
-        if (chunk0data != null && chunk0data.length > 2 && chunk1data != null && chunk1data.length > 2) {
-            // If we have two large constants assume the input to a pay-to-address output.
-            return chunk1data;
-        } else if (chunk1.equalsOpCode(OP_CHECKSIG) && chunk0data != null && chunk0data.length > 2) {
-            // A large constant followed by an OP_CHECKSIG is the key.
-            return chunk0data;
-        } else {
-            throw new ScriptException("Script did not match expected form: " + this);
-        }
+            throw new ScriptException(ScriptError.SCRIPT_ERR_UNKNOWN_ERROR, "Script not in the standard scriptPubKey form");
     }
 
-    /**
-     * Retrieves the sender public key from a LOCKTIMEVERIFY transaction
-     * @return
-     * @throws ScriptException
-     */
+    @Deprecated
     public byte[] getCLTVPaymentChannelSenderPubKey() throws ScriptException {
-        if (!isSentToCLTVPaymentChannel()) {
-            throw new ScriptException("Script not a standard CHECKLOCKTIMVERIFY transaction: " + this);
-        }
-        return chunks.get(8).data;
+        if (!ScriptPattern.isSentToCltvPaymentChannel(this))
+            throw new ScriptException(ScriptError.SCRIPT_ERR_UNKNOWN_ERROR, "Script not a standard CHECKLOCKTIMVERIFY transaction: " + this);
+        return ScriptPattern.extractSenderPubKeyFromCltvPaymentChannel(this);
     }
 
-    /**
-     * Retrieves the recipient public key from a LOCKTIMEVERIFY transaction
-     * @return
-     * @throws ScriptException
-     */
+    @Deprecated
     public byte[] getCLTVPaymentChannelRecipientPubKey() throws ScriptException {
-        if (!isSentToCLTVPaymentChannel()) {
-            throw new ScriptException("Script not a standard CHECKLOCKTIMVERIFY transaction: " + this);
-        }
-        return chunks.get(1).data;
+        if (!ScriptPattern.isSentToCltvPaymentChannel(this))
+            throw new ScriptException(ScriptError.SCRIPT_ERR_UNKNOWN_ERROR, "Script not a standard CHECKLOCKTIMVERIFY transaction: " + this);
+        return ScriptPattern.extractRecipientPubKeyFromCltvPaymentChannel(this);
     }
 
-    public BigInteger getCLTVPaymentChannelExpiry() {
-        if (!isSentToCLTVPaymentChannel()) {
-            throw new ScriptException("Script not a standard CHECKLOCKTIMEVERIFY transaction: " + this);
-        }
-        return castToBigInteger(chunks.get(4).data, 5);
-    }
-
-    /**
-     * For 2-element [input] scripts assumes that the paid-to-address can be derived from the public key.
-     * The concept of a "from address" isn't well defined in Bitcoin and you should not assume the sender of a
-     * transaction can actually receive coins on it. This method may be removed in future.
-     */
     @Deprecated
-    public Address getFromAddress(NetworkParameters params) throws ScriptException {
-        return new Address(params, Utils.sha256hash160(getPubKey()));
+    public BigInteger getCLTVPaymentChannelExpiry() throws ScriptException {
+        if (!ScriptPattern.isSentToCltvPaymentChannel(this))
+            throw new ScriptException(ScriptError.SCRIPT_ERR_UNKNOWN_ERROR, "Script not a standard CHECKLOCKTIMEVERIFY transaction: " + this);
+        return ScriptPattern.extractExpiryFromCltvPaymentChannel(this);
     }
 
     /**
-     * Gets the destination address from this script, if it's in the required form (see getPubKey).
+     * Gets the destination address from this script, if it's in the required form.
      */
     public Address getToAddress(NetworkParameters params) throws ScriptException {
         return getToAddress(params, false);
     }
 
     /**
-     * Gets the destination address from this script, if it's in the required form (see getPubKey).
+     * Gets the destination address from this script, if it's in the required form.
      * 
      * @param forcePayToPubKey
      *            If true, allow payToPubKey to be casted to the corresponding address. This is useful if you prefer
      *            showing addresses rather than pubkeys.
      */
     public Address getToAddress(NetworkParameters params, boolean forcePayToPubKey) throws ScriptException {
-        if (isSentToAddress())
-            return new Address(params, getPubKeyHash());
-        else if (isPayToScriptHash())
-            return Address.fromP2SHScript(params, this);
-        else if (forcePayToPubKey && isSentToRawPubKey())
-            return ECKey.fromPublicOnly(getPubKey()).toAddress(params);
+        if (ScriptPattern.isP2PKH(this))
+            return LegacyAddress.fromPubKeyHash(params, ScriptPattern.extractHashFromP2PKH(this));
+        else if (ScriptPattern.isP2SH(this))
+            return LegacyAddress.fromScriptHash(params, ScriptPattern.extractHashFromP2SH(this));
+        else if (forcePayToPubKey && ScriptPattern.isP2PK(this))
+            return LegacyAddress.fromKey(params, ECKey.fromPublicOnly(ScriptPattern.extractKeyFromP2PK(this)));
+        else if (ScriptPattern.isP2WH(this))
+            return SegwitAddress.fromHash(params, ScriptPattern.extractHashFromP2WH(this));
         else
-            throw new ScriptException("Cannot cast this script to a pay-to-address type");
+            throw new ScriptException(ScriptError.SCRIPT_ERR_UNKNOWN_ERROR, "Cannot cast this script to an address");
     }
 
     ////////////////////// Interface for writing scripts from scratch ////////////////////////////////
@@ -384,8 +327,7 @@ public static void writeBytes(OutputStream os, byte[] buf) throws IOException {
             os.write(buf);
         } else if (buf.length < 65536) {
             os.write(OP_PUSHDATA2);
-            os.write(0xFF & (buf.length));
-            os.write(0xFF & (buf.length >> 8));
+            Utils.uint16ToByteStreamLE(buf.length, os);
             os.write(buf);
         } else {
             throw new RuntimeException("Unimplemented");
@@ -444,16 +386,30 @@ public static byte[] createInputScript(byte[] signature) {
      * It is expected that this program later on will be updated with proper signatures.
      */
     public Script createEmptyInputScript(@Nullable ECKey key, @Nullable Script redeemScript) {
-        if (isSentToAddress()) {
-            checkArgument(key != null, "Key required to create pay-to-address input script");
+        if (ScriptPattern.isP2PKH(this)) {
+            checkArgument(key != null, "Key required to create P2PKH input script");
             return ScriptBuilder.createInputScript(null, key);
-        } else if (isSentToRawPubKey()) {
+        } else if (ScriptPattern.isP2WPKH(this)) {
+            return ScriptBuilder.createEmpty();
+        } else if (ScriptPattern.isP2PK(this)) {
             return ScriptBuilder.createInputScript(null);
-        } else if (isPayToScriptHash()) {
+        } else if (ScriptPattern.isP2SH(this)) {
             checkArgument(redeemScript != null, "Redeem script required to create P2SH input script");
             return ScriptBuilder.createP2SHMultiSigInputScript(null, redeemScript);
         } else {
-            throw new ScriptException("Do not understand script type: " + this);
+            throw new ScriptException(ScriptError.SCRIPT_ERR_UNKNOWN_ERROR, "Do not understand script type: " + this);
+        }
+    }
+
+    public TransactionWitness createEmptyWitness(ECKey key) {
+        if (ScriptPattern.isP2WPKH(this)) {
+            checkArgument(key != null, "Key required to create P2WPKH witness");
+            return TransactionWitness.EMPTY;
+        } else if (ScriptPattern.isP2PK(this) || ScriptPattern.isP2PKH(this)
+                || ScriptPattern.isP2SH(this)) {
+            return null; // no witness
+        } else {
+            throw new ScriptException(ScriptError.SCRIPT_ERR_UNKNOWN_ERROR, "Do not understand script type: " + this);
         }
     }
 
@@ -463,12 +419,12 @@ public Script createEmptyInputScript(@Nullable ECKey key, @Nullable Script redee
     public Script getScriptSigWithSignature(Script scriptSig, byte[] sigBytes, int index) {
         int sigsPrefixCount = 0;
         int sigsSuffixCount = 0;
-        if (isPayToScriptHash()) {
+        if (ScriptPattern.isP2SH(this)) {
             sigsPrefixCount = 1; // OP_0 <sig>* <redeemScript>
             sigsSuffixCount = 1;
-        } else if (isSentToMultiSig()) {
+        } else if (ScriptPattern.isSentToMultisig(this)) {
             sigsPrefixCount = 1; // OP_0 <sig>*
-        } else if (isSentToAddress()) {
+        } else if (ScriptPattern.isP2PKH(this)) {
             sigsSuffixCount = 1; // <sig> <pubkey>
         }
         return ScriptBuilder.updateScriptWithSignature(scriptSig, sigBytes, index, sigsPrefixCount, sigsSuffixCount);
@@ -494,8 +450,12 @@ public int getSigInsertionIndex(Sha256Hash hash, ECKey signingKey) {
                 // OP_0, skip
             } else {
                 checkNotNull(chunk.data);
-                if (myIndex < redeemScript.findSigInRedeem(chunk.data, hash))
-                    return sigCount;
+                try {
+                    if (myIndex < redeemScript.findSigInRedeem(chunk.data, hash))
+                        return sigCount;
+                } catch (SignatureDecodeException e) {
+                    // ignore
+                }
                 sigCount++;
             }
         }
@@ -520,8 +480,8 @@ private int findKeyInRedeem(ECKey key) {
      * @throws ScriptException if the script type is not understood or is pay to address or is P2SH (run this method on the "Redeem script" instead).
      */
     public List<ECKey> getPubKeys() {
-        if (!isSentToMultiSig())
-            throw new ScriptException("Only usable for multisig scripts.");
+        if (!ScriptPattern.isSentToMultisig(this))
+            throw new ScriptException(ScriptError.SCRIPT_ERR_UNKNOWN_ERROR, "Only usable for multisig scripts.");
 
         ArrayList<ECKey> result = Lists.newArrayList();
         int numKeys = Script.decodeFromOpN(chunks.get(chunks.size() - 2).opcode);
@@ -530,10 +490,10 @@ public List<ECKey> getPubKeys() {
         return result;
     }
 
-    private int findSigInRedeem(byte[] signatureBytes, Sha256Hash hash) {
+    private int findSigInRedeem(byte[] signatureBytes, Sha256Hash hash) throws SignatureDecodeException {
         checkArgument(chunks.get(0).isOpCode()); // P2SH scriptSig
         int numKeys = Script.decodeFromOpN(chunks.get(chunks.size() - 2).opcode);
-        TransactionSignature signature = TransactionSignature.decodeFromBitcoin(signatureBytes, true);
+        TransactionSignature signature = TransactionSignature.decodeFromBitcoin(signatureBytes, true, false);
         for (int i = 0 ; i < numKeys ; i++) {
             if (ECKey.fromPublicOnly(chunks.get(i + 1).data).verify(hash, signature)) {
                 return i;
@@ -573,8 +533,9 @@ private static int getSigOpCount(List<ScriptChunk> chunks, boolean accurate) thr
         return sigOps;
     }
 
-    static int decodeFromOpN(int opcode) {
-        checkArgument((opcode == OP_0 || opcode == OP_1NEGATE) || (opcode >= OP_1 && opcode <= OP_16), "decodeFromOpN called on non OP_N opcode");
+    public static int decodeFromOpN(int opcode) {
+        checkArgument((opcode == OP_0 || opcode == OP_1NEGATE) || (opcode >= OP_1 && opcode <= OP_16),
+                "decodeFromOpN called on non OP_N opcode: %s", ScriptOpCodes.getOpCodeName(opcode));
         if (opcode == OP_0)
             return 0;
         else if (opcode == OP_1NEGATE)
@@ -583,7 +544,7 @@ else if (opcode == OP_1NEGATE)
             return opcode + 1 - OP_1;
     }
 
-    static int encodeToOpN(int value) {
+    public static int encodeToOpN(int value) {
         checkArgument(value >= -1 && value <= 16, "encodeToOpN called for " + value + " which we cannot encode in an opcode.");
         if (value == 0)
             return OP_0;
@@ -629,14 +590,14 @@ public static long getP2SHSigOpCount(byte[] scriptSig) throws ScriptException {
      * Returns number of signatures required to satisfy this script.
      */
     public int getNumberOfSignaturesRequiredToSpend() {
-        if (isSentToMultiSig()) {
+        if (ScriptPattern.isSentToMultisig(this)) {
             // for N of M CHECKMULTISIG script we will need N signatures to spend
             ScriptChunk nChunk = chunks.get(0);
             return Script.decodeFromOpN(nChunk.opcode);
-        } else if (isSentToAddress() || isSentToRawPubKey()) {
-            // pay-to-address and pay-to-pubkey require single sig
+        } else if (ScriptPattern.isP2PKH(this) || ScriptPattern.isP2PK(this)) {
+            // P2PKH and P2PK require single sig
             return 1;
-        } else if (isPayToScriptHash()) {
+        } else if (ScriptPattern.isP2SH(this)) {
             throw new IllegalStateException("For P2SH number of signatures depends on redeem script");
         } else {
             throw new IllegalStateException("Unsupported script type");
@@ -648,89 +609,46 @@ public int getNumberOfSignaturesRequiredToSpend() {
      * be required for certain types of script to estimate target size.
      */
     public int getNumberOfBytesRequiredToSpend(@Nullable ECKey pubKey, @Nullable Script redeemScript) {
-        if (isPayToScriptHash()) {
+        if (ScriptPattern.isP2SH(this)) {
             // scriptSig: <sig> [sig] [sig...] <redeemscript>
             checkArgument(redeemScript != null, "P2SH script requires redeemScript to be spent");
             return redeemScript.getNumberOfSignaturesRequiredToSpend() * SIG_SIZE + redeemScript.getProgram().length;
-        } else if (isSentToMultiSig()) {
+        } else if (ScriptPattern.isSentToMultisig(this)) {
             // scriptSig: OP_0 <sig> [sig] [sig...]
             return getNumberOfSignaturesRequiredToSpend() * SIG_SIZE + 1;
-        } else if (isSentToRawPubKey()) {
+        } else if (ScriptPattern.isP2PK(this)) {
             // scriptSig: <sig>
             return SIG_SIZE;
-        } else if (isSentToAddress()) {
+        } else if (ScriptPattern.isP2PKH(this)) {
             // scriptSig: <sig> <pubkey>
-            int uncompressedPubKeySize = 65;
+            int uncompressedPubKeySize = 65; // very conservative
             return SIG_SIZE + (pubKey != null ? pubKey.getPubKey().length : uncompressedPubKeySize);
+        } else if (ScriptPattern.isP2WPKH(this)) {
+            // scriptSig is empty
+            // witness: <sig> <pubKey>
+            int compressedPubKeySize = 33;
+            return SIG_SIZE + (pubKey != null ? pubKey.getPubKey().length : compressedPubKeySize);
         } else {
             throw new IllegalStateException("Unsupported script type");
         }
     }
 
-    /**
-     * <p>Whether or not this is a scriptPubKey representing a pay-to-script-hash output. In such outputs, the logic that
-     * controls reclamation is not actually in the output at all. Instead there's just a hash, and it's up to the
-     * spending input to provide a program matching that hash. This rule is "soft enforced" by the network as it does
-     * not exist in Bitcoin Core. It means blocks containing P2SH transactions that don't match
-     * correctly are considered valid, but won't be mined upon, so they'll be rapidly re-orgd out of the chain. This
-     * logic is defined by <a href="https://github.com/bitcoin/bips/blob/master/bip-0016.mediawiki">BIP 16</a>.</p>
-     *
-     * <p>bitcoinj does not support creation of P2SH transactions today. The goal of P2SH is to allow short addresses
-     * even for complex scripts (eg, multi-sig outputs) so they are convenient to work with in things like QRcodes or
-     * with copy/paste, and also to minimize the size of the unspent output set (which improves performance of the
-     * Bitcoin system).</p>
-     */
+    /** @deprecated use {@link ScriptPattern#isP2SH(Script)} */
+    @Deprecated
     public boolean isPayToScriptHash() {
-        // We have to check against the serialized form because BIP16 defines a P2SH output using an exact byte
-        // template, not the logical program structure. Thus you can have two programs that look identical when
-        // printed out but one is a P2SH script and the other isn't! :(
-        byte[] program = getProgram();
-        return program.length == 23 &&
-               (program[0] & 0xff) == OP_HASH160 &&
-               (program[1] & 0xff) == 0x14 &&
-               (program[22] & 0xff) == OP_EQUAL;
+        return ScriptPattern.isP2SH(this);
     }
 
-    /**
-     * Returns whether this script matches the format used for multisig outputs: [n] [keys...] [m] CHECKMULTISIG
-     */
+    /** @deprecated use {@link ScriptPattern#isSentToMultisig(Script)} */
+    @Deprecated
     public boolean isSentToMultiSig() {
-        if (chunks.size() < 4) return false;
-        ScriptChunk chunk = chunks.get(chunks.size() - 1);
-        // Must end in OP_CHECKMULTISIG[VERIFY].
-        if (!chunk.isOpCode()) return false;
-        if (!(chunk.equalsOpCode(OP_CHECKMULTISIG) || chunk.equalsOpCode(OP_CHECKMULTISIGVERIFY))) return false;
-        try {
-            // Second to last chunk must be an OP_N opcode and there should be that many data chunks (keys).
-            ScriptChunk m = chunks.get(chunks.size() - 2);
-            if (!m.isOpCode()) return false;
-            int numKeys = decodeFromOpN(m.opcode);
-            if (numKeys < 1 || chunks.size() != 3 + numKeys) return false;
-            for (int i = 1; i < chunks.size() - 2; i++) {
-                if (chunks.get(i).isOpCode()) return false;
-            }
-            // First chunk must be an OP_N opcode too.
-            if (decodeFromOpN(chunks.get(0).opcode) < 1) return false;
-        } catch (IllegalStateException e) {
-            return false;   // Not an OP_N opcode.
-        }
-        return true;
+        return ScriptPattern.isSentToMultisig(this);
     }
 
+    /** @deprecated use {@link ScriptPattern#isSentToCltvPaymentChannel(Script)} */
+    @Deprecated
     public boolean isSentToCLTVPaymentChannel() {
-        if (chunks.size() != 10) return false;
-        // Check that opcodes match the pre-determined format.
-        if (!chunks.get(0).equalsOpCode(OP_IF)) return false;
-        // chunk[1] = recipient pubkey
-        if (!chunks.get(2).equalsOpCode(OP_CHECKSIGVERIFY)) return false;
-        if (!chunks.get(3).equalsOpCode(OP_ELSE)) return false;
-        // chunk[4] = locktime
-        if (!chunks.get(5).equalsOpCode(OP_CHECKLOCKTIMEVERIFY)) return false;
-        if (!chunks.get(6).equalsOpCode(OP_DROP)) return false;
-        if (!chunks.get(7).equalsOpCode(OP_ENDIF)) return false;
-        // chunk[8] = sender pubkey
-        if (!chunks.get(9).equalsOpCode(OP_CHECKSIG)) return false;
-        return true;
+        return ScriptPattern.isSentToCltvPaymentChannel(this);
     }
 
     private static boolean equalsRange(byte[] a, int start, byte[] b) {
@@ -760,13 +678,9 @@ public static byte[] removeAllInstancesOf(byte[] inputScript, byte[] chunkToRemo
             } else if (opcode == OP_PUSHDATA1) {
                 additionalBytes = (0xFF & inputScript[cursor]) + 1;
             } else if (opcode == OP_PUSHDATA2) {
-                additionalBytes = ((0xFF & inputScript[cursor]) |
-                                  ((0xFF & inputScript[cursor+1]) << 8)) + 2;
+                additionalBytes = Utils.readUint16(inputScript, cursor) + 2;
             } else if (opcode == OP_PUSHDATA4) {
-                additionalBytes = ((0xFF & inputScript[cursor]) |
-                                  ((0xFF & inputScript[cursor+1]) << 8) |
-                                  ((0xFF & inputScript[cursor+1]) << 16) |
-                                  ((0xFF & inputScript[cursor+1]) << 24)) + 4;
+                additionalBytes = (int) Utils.readUint32(inputScript, cursor) + 4;
             }
             if (!skip) {
                 try {
@@ -799,47 +713,67 @@ private static boolean castToBool(byte[] data) {
         }
         return false;
     }
-    
+
     /**
      * Cast a script chunk to a BigInteger.
      *
-     * @see #castToBigInteger(byte[], int) for values with different maximum
+     * @see #castToBigInteger(byte[], int, boolean) for values with different maximum
      * sizes.
      * @throws ScriptException if the chunk is longer than 4 bytes.
      */
-    private static BigInteger castToBigInteger(byte[] chunk) throws ScriptException {
-        if (chunk.length > 4)
-            throw new ScriptException("Script attempted to use an integer larger than 4 bytes");
-        return Utils.decodeMPI(Utils.reverseBytes(chunk), false);
+    private static BigInteger castToBigInteger(byte[] chunk, final boolean requireMinimal) throws ScriptException {
+        return castToBigInteger(chunk, 4, requireMinimal);
     }
 
     /**
      * Cast a script chunk to a BigInteger. Normally you would want
-     * {@link #castToBigInteger(byte[])} instead, this is only for cases where
-     * the normal maximum length does not apply (i.e. CHECKLOCKTIMEVERIFY).
+     * {@link #castToBigInteger(byte[], boolean)} instead, this is only for cases where
+     * the normal maximum length does not apply (i.e. CHECKLOCKTIMEVERIFY, CHECKSEQUENCEVERIFY).
      *
      * @param maxLength the maximum length in bytes.
+     * @param requireMinimal check if the number is encoded with the minimum possible number of bytes
      * @throws ScriptException if the chunk is longer than the specified maximum.
      */
-    private static BigInteger castToBigInteger(final byte[] chunk, final int maxLength) throws ScriptException {
+    /* package private */ static BigInteger castToBigInteger(final byte[] chunk, final int maxLength, final boolean requireMinimal) throws ScriptException {
         if (chunk.length > maxLength)
-            throw new ScriptException("Script attempted to use an integer larger than "
-                + maxLength + " bytes");
+            throw new ScriptException(ScriptError.SCRIPT_ERR_UNKNOWN_ERROR, "Script attempted to use an integer larger than " + maxLength + " bytes");
+
+        if (requireMinimal && chunk.length > 0) {
+            // Check that the number is encoded with the minimum possible
+            // number of bytes.
+            //
+            // If the most-significant-byte - excluding the sign bit - is zero
+            // then we're not minimal. Note how this test also rejects the
+            // negative-zero encoding, 0x80.
+            if ((chunk[chunk.length - 1] & 0x7f) == 0) {
+                // One exception: if there's more than one byte and the most
+                // significant bit of the second-most-significant-byte is set
+                // it would conflict with the sign bit. An example of this case
+                // is +-255, which encode to 0xff00 and 0xff80 respectively.
+                // (big-endian).
+                if (chunk.length <= 1 || (chunk[chunk.length - 2] & 0x80) == 0) {
+                    throw  new ScriptException(ScriptError.SCRIPT_ERR_UNKNOWN_ERROR, "non-minimally encoded script number");
+                }
+            }
+        }
+
         return Utils.decodeMPI(Utils.reverseBytes(chunk), false);
     }
 
+    /** @deprecated use {@link ScriptPattern#isOpReturn(Script)} */
+    @Deprecated
     public boolean isOpReturn() {
-        return chunks.size() > 0 && chunks.get(0).equalsOpCode(OP_RETURN);
+        return ScriptPattern.isOpReturn(this);
     }
 
     /**
      * Exposes the script interpreter. Normally you should not use this directly, instead use
-     * {@link org.bitcoinj.core.TransactionInput#verify(org.bitcoinj.core.TransactionOutput)} or
-     * {@link org.bitcoinj.script.Script#correctlySpends(org.bitcoinj.core.Transaction, long, Script)}. This method
+     * {@link TransactionInput#verify(TransactionOutput)} or
+     * {@link Script#correctlySpends(Transaction, int, TransactionWitness, Coin, Script, Set)}. This method
      * is useful if you need more precise control or access to the final state of the stack. This interface is very
      * likely to change in future.
      *
-     * @deprecated Use {@link #executeScript(org.bitcoinj.core.Transaction, long, org.bitcoinj.script.Script, java.util.LinkedList, java.util.Set)}
+     * @deprecated Use {@link #executeScript(Transaction, long, Script, LinkedList, Set)}
      * instead.
      */
     @Deprecated
@@ -854,8 +788,8 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
 
     /**
      * Exposes the script interpreter. Normally you should not use this directly, instead use
-     * {@link org.bitcoinj.core.TransactionInput#verify(org.bitcoinj.core.TransactionOutput)} or
-     * {@link org.bitcoinj.script.Script#correctlySpends(org.bitcoinj.core.Transaction, long, Script)}. This method
+     * {@link TransactionInput#verify(TransactionOutput)} or
+     * {@link Script#correctlySpends(Transaction, int, TransactionWitness, Coin, Script, Set)}. This method
      * is useful if you need more precise control or access to the final state of the stack. This interface is very
      * likely to change in future.
      */
@@ -864,42 +798,42 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
         int opCount = 0;
         int lastCodeSepLocation = 0;
         
-        LinkedList<byte[]> altstack = new LinkedList<byte[]>();
-        LinkedList<Boolean> ifStack = new LinkedList<Boolean>();
+        LinkedList<byte[]> altstack = new LinkedList<>();
+        LinkedList<Boolean> ifStack = new LinkedList<>();
         
         for (ScriptChunk chunk : script.chunks) {
             boolean shouldExecute = !ifStack.contains(false);
+            int opcode = chunk.opcode;
 
-            if (chunk.opcode == OP_0) {
-                if (!shouldExecute)
-                    continue;
+            // Check stack element size
+            if (chunk.data != null && chunk.data.length > MAX_SCRIPT_ELEMENT_SIZE)
+                throw new ScriptException(ScriptError.SCRIPT_ERR_PUSH_SIZE, "Attempted to push a data string larger than 520 bytes");
 
-                stack.add(new byte[] {});
-            } else if (!chunk.isOpCode()) {
-                if (chunk.data.length > MAX_SCRIPT_ELEMENT_SIZE)
-                    throw new ScriptException("Attempted to push a data string larger than 520 bytes");
-                
-                if (!shouldExecute)
-                    continue;
-                
-                stack.add(chunk.data);
-            } else {
-                int opcode = chunk.opcode;
-                if (opcode > OP_16) {
-                    opCount++;
-                    if (opCount > 201)
-                        throw new ScriptException("More script operations than is allowed");
-                }
-                
-                if (opcode == OP_VERIF || opcode == OP_VERNOTIF)
-                    throw new ScriptException("Script included OP_VERIF or OP_VERNOTIF");
-                
-                if (opcode == OP_CAT || opcode == OP_SUBSTR || opcode == OP_LEFT || opcode == OP_RIGHT ||
+            // Note how OP_RESERVED does not count towards the opcode limit.
+            if (opcode > OP_16) {
+                opCount++;
+                if (opCount > MAX_OPS_PER_SCRIPT)
+                    throw new ScriptException(ScriptError.SCRIPT_ERR_OP_COUNT, "More script operations than is allowed");
+            }
+
+            // Disabled opcodes.
+            if (opcode == OP_CAT || opcode == OP_SUBSTR || opcode == OP_LEFT || opcode == OP_RIGHT ||
                     opcode == OP_INVERT || opcode == OP_AND || opcode == OP_OR || opcode == OP_XOR ||
                     opcode == OP_2MUL || opcode == OP_2DIV || opcode == OP_MUL || opcode == OP_DIV ||
                     opcode == OP_MOD || opcode == OP_LSHIFT || opcode == OP_RSHIFT)
-                    throw new ScriptException("Script included a disabled Script Op.");
-                
+                throw new ScriptException(ScriptError.SCRIPT_ERR_DISABLED_OPCODE, "Script included a disabled Script Op.");
+
+            if (shouldExecute && OP_0 <= opcode && opcode <= OP_PUSHDATA4) {
+                // Check minimal push
+                if (verifyFlags.contains(VerifyFlag.MINIMALDATA) && !chunk.isShortestPossiblePushData())
+                    throw new ScriptException(ScriptError.SCRIPT_ERR_MINIMALDATA, "Script included a not minimal push operation.");
+
+                if (opcode == OP_0)
+                    stack.add(new byte[]{});
+                else
+                    stack.add(chunk.data);
+            } else if (shouldExecute || (OP_IF <= opcode && opcode <= OP_ENDIF)){
+
                 switch (opcode) {
                 case OP_IF:
                     if (!shouldExecute) {
@@ -907,7 +841,7 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
                         continue;
                     }
                     if (stack.size() < 1)
-                        throw new ScriptException("Attempted OP_IF on an empty stack");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_UNBALANCED_CONDITIONAL, "Attempted OP_IF on an empty stack");
                     ifStack.add(castToBool(stack.pollLast()));
                     continue;
                 case OP_NOTIF:
@@ -916,25 +850,20 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
                         continue;
                     }
                     if (stack.size() < 1)
-                        throw new ScriptException("Attempted OP_NOTIF on an empty stack");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_UNBALANCED_CONDITIONAL, "Attempted OP_NOTIF on an empty stack");
                     ifStack.add(!castToBool(stack.pollLast()));
                     continue;
                 case OP_ELSE:
                     if (ifStack.isEmpty())
-                        throw new ScriptException("Attempted OP_ELSE without OP_IF/NOTIF");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_UNBALANCED_CONDITIONAL, "Attempted OP_ELSE without OP_IF/NOTIF");
                     ifStack.add(!ifStack.pollLast());
                     continue;
                 case OP_ENDIF:
                     if (ifStack.isEmpty())
-                        throw new ScriptException("Attempted OP_ENDIF without OP_IF/NOTIF");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_UNBALANCED_CONDITIONAL, "Attempted OP_ENDIF without OP_IF/NOTIF");
                     ifStack.pollLast();
                     continue;
-                }
-                
-                if (!shouldExecute)
-                    continue;
-                
-                switch(opcode) {
+
                 // OP_0 is no opcode
                 case OP_1NEGATE:
                     stack.add(Utils.reverseBytes(Utils.encodeMPI(BigInteger.ONE.negate(), false)));
@@ -961,31 +890,31 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
                     break;
                 case OP_VERIFY:
                     if (stack.size() < 1)
-                        throw new ScriptException("Attempted OP_VERIFY on an empty stack");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_VERIFY on an empty stack");
                     if (!castToBool(stack.pollLast()))
-                        throw new ScriptException("OP_VERIFY failed");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_VERIFY, "OP_VERIFY failed");
                     break;
                 case OP_RETURN:
-                    throw new ScriptException("Script called OP_RETURN");
+                    throw new ScriptException(ScriptError.SCRIPT_ERR_OP_RETURN, "Script called OP_RETURN");
                 case OP_TOALTSTACK:
                     if (stack.size() < 1)
-                        throw new ScriptException("Attempted OP_TOALTSTACK on an empty stack");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_TOALTSTACK on an empty stack");
                     altstack.add(stack.pollLast());
                     break;
                 case OP_FROMALTSTACK:
                     if (altstack.size() < 1)
-                        throw new ScriptException("Attempted OP_TOALTSTACK on an empty altstack");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_ALTSTACK_OPERATION, "Attempted OP_FROMALTSTACK on an empty altstack");
                     stack.add(altstack.pollLast());
                     break;
                 case OP_2DROP:
                     if (stack.size() < 2)
-                        throw new ScriptException("Attempted OP_2DROP on a stack with size < 2");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_2DROP on a stack with size < 2");
                     stack.pollLast();
                     stack.pollLast();
                     break;
                 case OP_2DUP:
                     if (stack.size() < 2)
-                        throw new ScriptException("Attempted OP_2DUP on a stack with size < 2");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_2DUP on a stack with size < 2");
                     Iterator<byte[]> it2DUP = stack.descendingIterator();
                     byte[] OP2DUPtmpChunk2 = it2DUP.next();
                     stack.add(it2DUP.next());
@@ -993,7 +922,7 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
                     break;
                 case OP_3DUP:
                     if (stack.size() < 3)
-                        throw new ScriptException("Attempted OP_3DUP on a stack with size < 3");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_3DUP on a stack with size < 3");
                     Iterator<byte[]> it3DUP = stack.descendingIterator();
                     byte[] OP3DUPtmpChunk3 = it3DUP.next();
                     byte[] OP3DUPtmpChunk2 = it3DUP.next();
@@ -1003,7 +932,7 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
                     break;
                 case OP_2OVER:
                     if (stack.size() < 4)
-                        throw new ScriptException("Attempted OP_2OVER on a stack with size < 4");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_2OVER on a stack with size < 4");
                     Iterator<byte[]> it2OVER = stack.descendingIterator();
                     it2OVER.next();
                     it2OVER.next();
@@ -1013,7 +942,7 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
                     break;
                 case OP_2ROT:
                     if (stack.size() < 6)
-                        throw new ScriptException("Attempted OP_2ROT on a stack with size < 6");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_2ROT on a stack with size < 6");
                     byte[] OP2ROTtmpChunk6 = stack.pollLast();
                     byte[] OP2ROTtmpChunk5 = stack.pollLast();
                     byte[] OP2ROTtmpChunk4 = stack.pollLast();
@@ -1029,7 +958,7 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
                     break;
                 case OP_2SWAP:
                     if (stack.size() < 4)
-                        throw new ScriptException("Attempted OP_2SWAP on a stack with size < 4");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_2SWAP on a stack with size < 4");
                     byte[] OP2SWAPtmpChunk4 = stack.pollLast();
                     byte[] OP2SWAPtmpChunk3 = stack.pollLast();
                     byte[] OP2SWAPtmpChunk2 = stack.pollLast();
@@ -1041,7 +970,7 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
                     break;
                 case OP_IFDUP:
                     if (stack.size() < 1)
-                        throw new ScriptException("Attempted OP_IFDUP on an empty stack");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_IFDUP on an empty stack");
                     if (castToBool(stack.getLast()))
                         stack.add(stack.getLast());
                     break;
@@ -1050,24 +979,24 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
                     break;
                 case OP_DROP:
                     if (stack.size() < 1)
-                        throw new ScriptException("Attempted OP_DROP on an empty stack");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_DROP on an empty stack");
                     stack.pollLast();
                     break;
                 case OP_DUP:
                     if (stack.size() < 1)
-                        throw new ScriptException("Attempted OP_DUP on an empty stack");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_DUP on an empty stack");
                     stack.add(stack.getLast());
                     break;
                 case OP_NIP:
                     if (stack.size() < 2)
-                        throw new ScriptException("Attempted OP_NIP on a stack with size < 2");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_NIP on a stack with size < 2");
                     byte[] OPNIPtmpChunk = stack.pollLast();
                     stack.pollLast();
                     stack.add(OPNIPtmpChunk);
                     break;
                 case OP_OVER:
                     if (stack.size() < 2)
-                        throw new ScriptException("Attempted OP_OVER on a stack with size < 2");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_OVER on a stack with size < 2");
                     Iterator<byte[]> itOVER = stack.descendingIterator();
                     itOVER.next();
                     stack.add(itOVER.next());
@@ -1075,10 +1004,10 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
                 case OP_PICK:
                 case OP_ROLL:
                     if (stack.size() < 1)
-                        throw new ScriptException("Attempted OP_PICK/OP_ROLL on an empty stack");
-                    long val = castToBigInteger(stack.pollLast()).longValue();
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_PICK/OP_ROLL on an empty stack");
+                    long val = castToBigInteger(stack.pollLast(), verifyFlags.contains(VerifyFlag.MINIMALDATA)).longValue();
                     if (val < 0 || val >= stack.size())
-                        throw new ScriptException("OP_PICK/OP_ROLL attempted to get data deeper than stack size");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "OP_PICK/OP_ROLL attempted to get data deeper than stack size");
                     Iterator<byte[]> itPICK = stack.descendingIterator();
                     for (long i = 0; i < val; i++)
                         itPICK.next();
@@ -1089,7 +1018,7 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
                     break;
                 case OP_ROT:
                     if (stack.size() < 3)
-                        throw new ScriptException("Attempted OP_ROT on a stack with size < 3");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_ROT on a stack with size < 3");
                     byte[] OPROTtmpChunk3 = stack.pollLast();
                     byte[] OPROTtmpChunk2 = stack.pollLast();
                     byte[] OPROTtmpChunk1 = stack.pollLast();
@@ -1100,7 +1029,7 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
                 case OP_SWAP:
                 case OP_TUCK:
                     if (stack.size() < 2)
-                        throw new ScriptException("Attempted OP_SWAP on a stack with size < 2");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_SWAP on a stack with size < 2");
                     byte[] OPSWAPtmpChunk2 = stack.pollLast();
                     byte[] OPSWAPtmpChunk1 = stack.pollLast();
                     stack.add(OPSWAPtmpChunk2);
@@ -1108,31 +1037,21 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
                     if (opcode == OP_TUCK)
                         stack.add(OPSWAPtmpChunk2);
                     break;
-                case OP_CAT:
-                case OP_SUBSTR:
-                case OP_LEFT:
-                case OP_RIGHT:
-                    throw new ScriptException("Attempted to use disabled Script Op.");
                 case OP_SIZE:
                     if (stack.size() < 1)
-                        throw new ScriptException("Attempted OP_SIZE on an empty stack");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_SIZE on an empty stack");
                     stack.add(Utils.reverseBytes(Utils.encodeMPI(BigInteger.valueOf(stack.getLast().length), false)));
                     break;
-                case OP_INVERT:
-                case OP_AND:
-                case OP_OR:
-                case OP_XOR:
-                    throw new ScriptException("Attempted to use disabled Script Op.");
                 case OP_EQUAL:
                     if (stack.size() < 2)
-                        throw new ScriptException("Attempted OP_EQUALVERIFY on a stack with size < 2");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_EQUAL on a stack with size < 2");
                     stack.add(Arrays.equals(stack.pollLast(), stack.pollLast()) ? new byte[] {1} : new byte[] {});
                     break;
                 case OP_EQUALVERIFY:
                     if (stack.size() < 2)
-                        throw new ScriptException("Attempted OP_EQUALVERIFY on a stack with size < 2");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_EQUALVERIFY on a stack with size < 2");
                     if (!Arrays.equals(stack.pollLast(), stack.pollLast()))
-                        throw new ScriptException("OP_EQUALVERIFY: non-equal data");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_EQUALVERIFY, "OP_EQUALVERIFY: non-equal data");
                     break;
                 case OP_1ADD:
                 case OP_1SUB:
@@ -1141,8 +1060,8 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
                 case OP_NOT:
                 case OP_0NOTEQUAL:
                     if (stack.size() < 1)
-                        throw new ScriptException("Attempted a numeric op on an empty stack");
-                    BigInteger numericOPnum = castToBigInteger(stack.pollLast());
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted a numeric op on an empty stack");
+                    BigInteger numericOPnum = castToBigInteger(stack.pollLast(), verifyFlags.contains(VerifyFlag.MINIMALDATA));
                                         
                     switch (opcode) {
                     case OP_1ADD:
@@ -1176,9 +1095,6 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
                     
                     stack.add(Utils.reverseBytes(Utils.encodeMPI(numericOPnum, false)));
                     break;
-                case OP_2MUL:
-                case OP_2DIV:
-                    throw new ScriptException("Attempted to use disabled Script Op.");
                 case OP_ADD:
                 case OP_SUB:
                 case OP_BOOLAND:
@@ -1192,9 +1108,9 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
                 case OP_MIN:
                 case OP_MAX:
                     if (stack.size() < 2)
-                        throw new ScriptException("Attempted a numeric op on a stack with size < 2");
-                    BigInteger numericOPnum2 = castToBigInteger(stack.pollLast());
-                    BigInteger numericOPnum1 = castToBigInteger(stack.pollLast());
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted a numeric op on a stack with size < 2");
+                    BigInteger numericOPnum2 = castToBigInteger(stack.pollLast(), verifyFlags.contains(VerifyFlag.MINIMALDATA));
+                    BigInteger numericOPnum1 = castToBigInteger(stack.pollLast(), verifyFlags.contains(VerifyFlag.MINIMALDATA));
 
                     BigInteger numericOPresult;
                     switch (opcode) {
@@ -1270,27 +1186,21 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
                     
                     stack.add(Utils.reverseBytes(Utils.encodeMPI(numericOPresult, false)));
                     break;
-                case OP_MUL:
-                case OP_DIV:
-                case OP_MOD:
-                case OP_LSHIFT:
-                case OP_RSHIFT:
-                    throw new ScriptException("Attempted to use disabled Script Op.");
                 case OP_NUMEQUALVERIFY:
                     if (stack.size() < 2)
-                        throw new ScriptException("Attempted OP_NUMEQUALVERIFY on a stack with size < 2");
-                    BigInteger OPNUMEQUALVERIFYnum2 = castToBigInteger(stack.pollLast());
-                    BigInteger OPNUMEQUALVERIFYnum1 = castToBigInteger(stack.pollLast());
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_NUMEQUALVERIFY on a stack with size < 2");
+                    BigInteger OPNUMEQUALVERIFYnum2 = castToBigInteger(stack.pollLast(), verifyFlags.contains(VerifyFlag.MINIMALDATA));
+                    BigInteger OPNUMEQUALVERIFYnum1 = castToBigInteger(stack.pollLast(), verifyFlags.contains(VerifyFlag.MINIMALDATA));
                     
                     if (!OPNUMEQUALVERIFYnum1.equals(OPNUMEQUALVERIFYnum2))
-                        throw new ScriptException("OP_NUMEQUALVERIFY failed");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_NUMEQUALVERIFY, "OP_NUMEQUALVERIFY failed");
                     break;
                 case OP_WITHIN:
                     if (stack.size() < 3)
-                        throw new ScriptException("Attempted OP_WITHIN on a stack with size < 3");
-                    BigInteger OPWITHINnum3 = castToBigInteger(stack.pollLast());
-                    BigInteger OPWITHINnum2 = castToBigInteger(stack.pollLast());
-                    BigInteger OPWITHINnum1 = castToBigInteger(stack.pollLast());
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_WITHIN on a stack with size < 3");
+                    BigInteger OPWITHINnum3 = castToBigInteger(stack.pollLast(), verifyFlags.contains(VerifyFlag.MINIMALDATA));
+                    BigInteger OPWITHINnum2 = castToBigInteger(stack.pollLast(), verifyFlags.contains(VerifyFlag.MINIMALDATA));
+                    BigInteger OPWITHINnum1 = castToBigInteger(stack.pollLast(), verifyFlags.contains(VerifyFlag.MINIMALDATA));
                     if (OPWITHINnum2.compareTo(OPWITHINnum1) <= 0 && OPWITHINnum1.compareTo(OPWITHINnum3) < 0)
                         stack.add(Utils.reverseBytes(Utils.encodeMPI(BigInteger.ONE, false)));
                     else
@@ -1298,7 +1208,7 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
                     break;
                 case OP_RIPEMD160:
                     if (stack.size() < 1)
-                        throw new ScriptException("Attempted OP_RIPEMD160 on an empty stack");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_RIPEMD160 on an empty stack");
                     RIPEMD160Digest digest = new RIPEMD160Digest();
                     byte[] dataToHash = stack.pollLast();
                     digest.update(dataToHash, 0, dataToHash.length);
@@ -1308,7 +1218,7 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
                     break;
                 case OP_SHA1:
                     if (stack.size() < 1)
-                        throw new ScriptException("Attempted OP_SHA1 on an empty stack");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_SHA1 on an empty stack");
                     try {
                         stack.add(MessageDigest.getInstance("SHA-1").digest(stack.pollLast()));
                     } catch (NoSuchAlgorithmException e) {
@@ -1317,17 +1227,17 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
                     break;
                 case OP_SHA256:
                     if (stack.size() < 1)
-                        throw new ScriptException("Attempted OP_SHA256 on an empty stack");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_SHA256 on an empty stack");
                     stack.add(Sha256Hash.hash(stack.pollLast()));
                     break;
                 case OP_HASH160:
                     if (stack.size() < 1)
-                        throw new ScriptException("Attempted OP_HASH160 on an empty stack");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_HASH160 on an empty stack");
                     stack.add(Utils.sha256hash160(stack.pollLast()));
                     break;
                 case OP_HASH256:
                     if (stack.size() < 1)
-                        throw new ScriptException("Attempted OP_SHA256 on an empty stack");
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_SHA256 on an empty stack");
                     stack.add(Sha256Hash.hashTwice(stack.pollLast()));
                     break;
                 case OP_CODESEPARATOR:
@@ -1349,14 +1259,23 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
                     if (!verifyFlags.contains(VerifyFlag.CHECKLOCKTIMEVERIFY)) {
                         // not enabled; treat as a NOP2
                         if (verifyFlags.contains(VerifyFlag.DISCOURAGE_UPGRADABLE_NOPS)) {
-                            throw new ScriptException("Script used a reserved opcode " + opcode);
+                            throw new ScriptException(ScriptError.SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS, "Script used a reserved opcode " + opcode);
+                        }
+                        break;
+                    }
+                    executeCheckLockTimeVerify(txContainingThis, (int) index, stack, verifyFlags);
+                    break;
+                case OP_CHECKSEQUENCEVERIFY:
+                    if (!verifyFlags.contains(VerifyFlag.CHECKSEQUENCEVERIFY)) {
+                        // not enabled; treat as a NOP3
+                        if (verifyFlags.contains(VerifyFlag.DISCOURAGE_UPGRADABLE_NOPS)) {
+                            throw new ScriptException(ScriptError.SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS, "Script used a reserved opcode " + opcode);
                         }
                         break;
                     }
-                    executeCheckLockTimeVerify(txContainingThis, (int) index, script, stack, lastCodeSepLocation, opcode, verifyFlags);
+                    executeCheckSequenceVerify(txContainingThis, (int) index, stack, verifyFlags);
                     break;
                 case OP_NOP1:
-                case OP_NOP3:
                 case OP_NOP4:
                 case OP_NOP5:
                 case OP_NOP6:
@@ -1365,48 +1284,46 @@ public static void executeScript(@Nullable Transaction txContainingThis, long in
                 case OP_NOP9:
                 case OP_NOP10:
                     if (verifyFlags.contains(VerifyFlag.DISCOURAGE_UPGRADABLE_NOPS)) {
-                        throw new ScriptException("Script used a reserved opcode " + opcode);
+                        throw new ScriptException(ScriptError.SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS, "Script used a reserved opcode " + opcode);
                     }
                     break;
                     
                 default:
-                    throw new ScriptException("Script used a reserved opcode " + opcode);
+                    throw new ScriptException(ScriptError.SCRIPT_ERR_BAD_OPCODE, "Script used a reserved or disabled opcode: " + opcode);
                 }
             }
             
-            if (stack.size() + altstack.size() > 1000 || stack.size() + altstack.size() < 0)
-                throw new ScriptException("Stack size exceeded range");
+            if (stack.size() + altstack.size() > MAX_STACK_SIZE || stack.size() + altstack.size() < 0)
+                throw new ScriptException(ScriptError.SCRIPT_ERR_STACK_SIZE, "Stack size exceeded range");
         }
         
         if (!ifStack.isEmpty())
-            throw new ScriptException("OP_IF/OP_NOTIF without OP_ENDIF");
+            throw new ScriptException(ScriptError.SCRIPT_ERR_UNBALANCED_CONDITIONAL, "OP_IF/OP_NOTIF without OP_ENDIF");
     }
 
     // This is more or less a direct translation of the code in Bitcoin Core
-    private static void executeCheckLockTimeVerify(Transaction txContainingThis, int index, Script script, LinkedList<byte[]> stack,
-                                        int lastCodeSepLocation, int opcode,
-                                        Set<VerifyFlag> verifyFlags) throws ScriptException {
+    private static void executeCheckLockTimeVerify(Transaction txContainingThis, int index, LinkedList<byte[]> stack, Set<VerifyFlag> verifyFlags) throws ScriptException {
         if (stack.size() < 1)
-            throw new ScriptException("Attempted OP_CHECKLOCKTIMEVERIFY on a stack with size < 1");
+            throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_CHECKLOCKTIMEVERIFY on a stack with size < 1");
 
         // Thus as a special case we tell CScriptNum to accept up
         // to 5-byte bignums to avoid year 2038 issue.
-        final BigInteger nLockTime = castToBigInteger(stack.getLast(), 5);
+        final BigInteger nLockTime = castToBigInteger(stack.getLast(), 5, verifyFlags.contains(VerifyFlag.MINIMALDATA));
 
         if (nLockTime.compareTo(BigInteger.ZERO) < 0)
-            throw new ScriptException("Negative locktime");
+            throw new ScriptException(ScriptError.SCRIPT_ERR_NEGATIVE_LOCKTIME, "Negative locktime");
 
         // There are two kinds of nLockTime, need to ensure we're comparing apples-to-apples
         if (!(
             ((txContainingThis.getLockTime() <  Transaction.LOCKTIME_THRESHOLD) && (nLockTime.compareTo(Transaction.LOCKTIME_THRESHOLD_BIG)) < 0) ||
             ((txContainingThis.getLockTime() >= Transaction.LOCKTIME_THRESHOLD) && (nLockTime.compareTo(Transaction.LOCKTIME_THRESHOLD_BIG)) >= 0))
         )
-            throw new ScriptException("Locktime requirement type mismatch");
+            throw new ScriptException(ScriptError.SCRIPT_ERR_UNSATISFIED_LOCKTIME, "Locktime requirement type mismatch");
 
         // Now that we know we're comparing apples-to-apples, the
         // comparison is a simple numeric one.
         if (nLockTime.compareTo(BigInteger.valueOf(txContainingThis.getLockTime())) > 0)
-            throw new ScriptException("Locktime requirement not satisfied");
+            throw new ScriptException(ScriptError.SCRIPT_ERR_UNSATISFIED_LOCKTIME, "Locktime requirement not satisfied");
 
         // Finally the nLockTime feature can be disabled and thus
         // CHECKLOCKTIMEVERIFY bypassed if every txin has been
@@ -1419,7 +1336,79 @@ private static void executeCheckLockTimeVerify(Transaction txContainingThis, int
         // inputs, but testing just this input minimizes the data
         // required to prove correct CHECKLOCKTIMEVERIFY execution.
         if (!txContainingThis.getInput(index).hasSequence())
-            throw new ScriptException("Transaction contains a final transaction input for a CHECKLOCKTIMEVERIFY script.");
+            throw new ScriptException(ScriptError.SCRIPT_ERR_UNSATISFIED_LOCKTIME, "Transaction contains a final transaction input for a CHECKLOCKTIMEVERIFY script.");
+    }
+
+    private static void executeCheckSequenceVerify(Transaction txContainingThis, int index, LinkedList<byte[]> stack, Set<VerifyFlag> verifyFlags) throws ScriptException {
+        if (stack.size() < 1)
+            throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_CHECKSEQUENCEVERIFY on a stack with size < 1");
+
+        // Note that elsewhere numeric opcodes are limited to
+        // operands in the range -2**31+1 to 2**31-1, however it is
+        // legal for opcodes to produce results exceeding that
+        // range. This limitation is implemented by CScriptNum's
+        // default 4-byte limit.
+        //
+        // Thus as a special case we tell CScriptNum to accept up
+        // to 5-byte bignums, which are good until 2**39-1, well
+        // beyond the 2**32-1 limit of the nSequence field itself.
+        final long nSequence = castToBigInteger(stack.getLast(), 5, verifyFlags.contains(VerifyFlag.MINIMALDATA)).longValue();
+
+        // In the rare event that the argument may be < 0 due to
+        // some arithmetic being done first, you can always use
+        // 0 MAX CHECKSEQUENCEVERIFY.
+        if (nSequence < 0)
+            throw new ScriptException(ScriptError.SCRIPT_ERR_NEGATIVE_LOCKTIME, "Negative sequence");
+
+        // To provide for future soft-fork extensibility, if the
+        // operand has the disabled lock-time flag set,
+        // CHECKSEQUENCEVERIFY behaves as a NOP.
+        if ((nSequence & TransactionInput.SEQUENCE_LOCKTIME_DISABLE_FLAG) != 0)
+            return;
+
+        // Compare the specified sequence number with the input.
+        checkSequence(nSequence, txContainingThis, index);
+    }
+
+    private static void checkSequence(long nSequence, Transaction txContainingThis, int index) {
+        // Relative lock times are supported by comparing the passed
+        // in operand to the sequence number of the input.
+        long txToSequence = txContainingThis.getInput(index).getSequenceNumber();
+
+        // Fail if the transaction's version number is not set high
+        // enough to trigger BIP 68 rules.
+        if (txContainingThis.getVersion() < 2)
+            throw new ScriptException(ScriptError.SCRIPT_ERR_UNSATISFIED_LOCKTIME, "Transaction version is < 2");
+
+        // Sequence numbers with their most significant bit set are not
+        // consensus constrained. Testing that the transaction's sequence
+        // number do not have this bit set prevents using this property
+        // to get around a CHECKSEQUENCEVERIFY check.
+        if ((txToSequence & TransactionInput.SEQUENCE_LOCKTIME_DISABLE_FLAG) != 0)
+            throw new ScriptException(ScriptError.SCRIPT_ERR_UNSATISFIED_LOCKTIME, "Sequence disable flag is set");
+
+        // Mask off any bits that do not have consensus-enforced meaning
+        // before doing the integer comparisons
+        long nLockTimeMask =  TransactionInput.SEQUENCE_LOCKTIME_TYPE_FLAG | TransactionInput.SEQUENCE_LOCKTIME_MASK;
+        long txToSequenceMasked = txToSequence & nLockTimeMask;
+        long nSequenceMasked = nSequence & nLockTimeMask;
+
+        // There are two kinds of nSequence: lock-by-blockheight
+        // and lock-by-blocktime, distinguished by whether
+        // nSequenceMasked < CTxIn::SEQUENCE_LOCKTIME_TYPE_FLAG.
+        //
+        // We want to compare apples to apples, so fail the script
+        // unless the type of nSequenceMasked being tested is the same as
+        // the nSequenceMasked in the transaction.
+        if (!((txToSequenceMasked < TransactionInput.SEQUENCE_LOCKTIME_TYPE_FLAG && nSequenceMasked < TransactionInput.SEQUENCE_LOCKTIME_TYPE_FLAG) ||
+              (txToSequenceMasked >= TransactionInput.SEQUENCE_LOCKTIME_TYPE_FLAG && nSequenceMasked >= TransactionInput.SEQUENCE_LOCKTIME_TYPE_FLAG))) {
+            throw new ScriptException(ScriptError.SCRIPT_ERR_UNSATISFIED_LOCKTIME, "Relative locktime requirement type mismatch");
+        }
+
+        // Now that we know we're comparing apples-to-apples, the
+        // comparison is a simple numeric one.
+        if (nSequenceMasked > txToSequenceMasked)
+            throw new ScriptException(ScriptError.SCRIPT_ERR_UNSATISFIED_LOCKTIME, "Relative locktime requirement not satisfied");
     }
 
     private static void executeCheckSig(Transaction txContainingThis, int index, Script script, LinkedList<byte[]> stack,
@@ -1429,7 +1418,7 @@ private static void executeCheckSig(Transaction txContainingThis, int index, Scr
             || verifyFlags.contains(VerifyFlag.DERSIG)
             || verifyFlags.contains(VerifyFlag.LOW_S);
         if (stack.size() < 2)
-            throw new ScriptException("Attempted OP_CHECKSIG(VERIFY) on a stack with size < 2");
+            throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_CHECKSIG(VERIFY) on a stack with size < 2");
         byte[] pubKey = stack.pollLast();
         byte[] sigBytes = stack.pollLast();
 
@@ -1453,21 +1442,23 @@ private static void executeCheckSig(Transaction txContainingThis, int index, Scr
             // TODO: Should check hash type is known
             Sha256Hash hash = txContainingThis.hashForSignature(index, connectedScript, (byte) sig.sighashFlags);
             sigValid = ECKey.verify(hash.getBytes(), sig, pubKey);
-        } catch (Exception e1) {
-            // There is (at least) one exception that could be hit here (EOFException, if the sig is too short)
-            // Because I can't verify there aren't more, we use a very generic Exception catch
-
-            // This RuntimeException occurs when signing as we run partial/invalid scripts to see if they need more
+        } catch (SignatureDecodeException e) {
+            // This exception occurs when signing as we run partial/invalid scripts to see if they need more
             // signing work to be done inside LocalTransactionSigner.signInputs.
-            if (!e1.getMessage().contains("Reached past end of ASN.1 stream"))
-                log.warn("Signature checking failed!", e1);
+            // FIXME don't rely on exception message
+            if (e.getMessage() != null && !e.getMessage().contains("Reached past end of ASN.1 stream"))
+                // Don't put critical code here; the above check is not reliable on HotSpot due to optimization:
+                // http://jawspeak.com/2010/05/26/hotspot-caused-exceptions-to-lose-their-stack-traces-in-production-and-the-fix/
+                log.warn("Signature parsing failed!", e);
+        } catch (Exception e) {
+            log.warn("Signature checking failed!", e);
         }
 
         if (opcode == OP_CHECKSIG)
             stack.add(sigValid ? new byte[] {1} : new byte[] {});
         else if (opcode == OP_CHECKSIGVERIFY)
             if (!sigValid)
-                throw new ScriptException("Script failed OP_CHECKSIGVERIFY");
+                throw new ScriptException(ScriptError.SCRIPT_ERR_CHECKSIGVERIFY, "Script failed OP_CHECKSIGVERIFY");
     }
 
     private static int executeMultiSig(Transaction txContainingThis, int index, Script script, LinkedList<byte[]> stack,
@@ -1476,30 +1467,30 @@ private static int executeMultiSig(Transaction txContainingThis, int index, Scri
         final boolean requireCanonical = verifyFlags.contains(VerifyFlag.STRICTENC)
             || verifyFlags.contains(VerifyFlag.DERSIG)
             || verifyFlags.contains(VerifyFlag.LOW_S);
-        if (stack.size() < 2)
-            throw new ScriptException("Attempted OP_CHECKMULTISIG(VERIFY) on a stack with size < 2");
-        int pubKeyCount = castToBigInteger(stack.pollLast()).intValue();
-        if (pubKeyCount < 0 || pubKeyCount > 20)
-            throw new ScriptException("OP_CHECKMULTISIG(VERIFY) with pubkey count out of range");
+        if (stack.size() < 1)
+            throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_CHECKMULTISIG(VERIFY) on a stack with size < 2");
+        int pubKeyCount = castToBigInteger(stack.pollLast(), verifyFlags.contains(VerifyFlag.MINIMALDATA)).intValue();
+        if (pubKeyCount < 0 || pubKeyCount > MAX_PUBKEYS_PER_MULTISIG)
+            throw new ScriptException(ScriptError.SCRIPT_ERR_PUBKEY_COUNT, "OP_CHECKMULTISIG(VERIFY) with pubkey count out of range");
         opCount += pubKeyCount;
-        if (opCount > 201)
-            throw new ScriptException("Total op count > 201 during OP_CHECKMULTISIG(VERIFY)");
+        if (opCount > MAX_OPS_PER_SCRIPT)
+            throw new ScriptException(ScriptError.SCRIPT_ERR_OP_COUNT, "Total op count > 201 during OP_CHECKMULTISIG(VERIFY)");
         if (stack.size() < pubKeyCount + 1)
-            throw new ScriptException("Attempted OP_CHECKMULTISIG(VERIFY) on a stack with size < num_of_pubkeys + 2");
+            throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_CHECKMULTISIG(VERIFY) on a stack with size < num_of_pubkeys + 2");
 
-        LinkedList<byte[]> pubkeys = new LinkedList<byte[]>();
+        LinkedList<byte[]> pubkeys = new LinkedList<>();
         for (int i = 0; i < pubKeyCount; i++) {
             byte[] pubKey = stack.pollLast();
             pubkeys.add(pubKey);
         }
 
-        int sigCount = castToBigInteger(stack.pollLast()).intValue();
+        int sigCount = castToBigInteger(stack.pollLast(), verifyFlags.contains(VerifyFlag.MINIMALDATA)).intValue();
         if (sigCount < 0 || sigCount > pubKeyCount)
-            throw new ScriptException("OP_CHECKMULTISIG(VERIFY) with sig count out of range");
+            throw new ScriptException(ScriptError.SCRIPT_ERR_SIG_COUNT, "OP_CHECKMULTISIG(VERIFY) with sig count out of range");
         if (stack.size() < sigCount + 1)
-            throw new ScriptException("Attempted OP_CHECKMULTISIG(VERIFY) on a stack with size < num_of_pubkeys + num_of_signatures + 3");
+            throw new ScriptException(ScriptError.SCRIPT_ERR_INVALID_STACK_OPERATION, "Attempted OP_CHECKMULTISIG(VERIFY) on a stack with size < num_of_pubkeys + num_of_signatures + 3");
 
-        LinkedList<byte[]> sigs = new LinkedList<byte[]>();
+        LinkedList<byte[]> sigs = new LinkedList<>();
         for (int i = 0; i < sigCount; i++) {
             byte[] sig = stack.pollLast();
             sigs.add(sig);
@@ -1524,7 +1515,7 @@ private static int executeMultiSig(Transaction txContainingThis, int index, Scri
             // We could reasonably move this out of the loop, but because signature verification is significantly
             // more expensive than hashing, its not a big deal.
             try {
-                TransactionSignature sig = TransactionSignature.decodeFromBitcoin(sigs.getFirst(), requireCanonical);
+                TransactionSignature sig = TransactionSignature.decodeFromBitcoin(sigs.getFirst(), requireCanonical, false);
                 Sha256Hash hash = txContainingThis.hashForSignature(index, connectedScript, (byte) sig.sighashFlags);
                 if (ECKey.verify(hash.getBytes(), sig, pubKey))
                     sigs.pollFirst();
@@ -1542,13 +1533,13 @@ private static int executeMultiSig(Transaction txContainingThis, int index, Scri
         // We uselessly remove a stack object to emulate a Bitcoin Core bug.
         byte[] nullDummy = stack.pollLast();
         if (verifyFlags.contains(VerifyFlag.NULLDUMMY) && nullDummy.length > 0)
-            throw new ScriptException("OP_CHECKMULTISIG(VERIFY) with non-null nulldummy: " + Arrays.toString(nullDummy));
+            throw new ScriptException(ScriptError.SCRIPT_ERR_SIG_NULLFAIL, "OP_CHECKMULTISIG(VERIFY) with non-null nulldummy: " + Arrays.toString(nullDummy));
 
         if (opcode == OP_CHECKMULTISIG) {
             stack.add(valid ? new byte[] {1} : new byte[] {});
         } else if (opcode == OP_CHECKMULTISIGVERIFY) {
             if (!valid)
-                throw new ScriptException("Script failed OP_CHECKMULTISIGVERIFY");
+                throw new ScriptException(ScriptError.SCRIPT_ERR_SIG_NULLFAIL, "Script failed OP_CHECKMULTISIGVERIFY");
         }
         return opCount;
     }
@@ -1560,7 +1551,7 @@ private static int executeMultiSig(Transaction txContainingThis, int index, Scri
      *                         Accessing txContainingThis from another thread while this method runs results in undefined behavior.
      * @param scriptSigIndex The index in txContainingThis of the scriptSig (note: NOT the index of the scriptPubKey).
      * @param scriptPubKey The connected scriptPubKey containing the conditions needed to claim the value.
-     * @deprecated Use {@link #correctlySpends(org.bitcoinj.core.Transaction, long, org.bitcoinj.script.Script, java.util.Set)}
+     * @deprecated Use {@link #correctlySpends(Transaction, int, TransactionWitness, Coin, Script, Set)}
      * instead so that verification flags do not change as new verification options
      * are added.
      */
@@ -1576,8 +1567,42 @@ public void correctlySpends(Transaction txContainingThis, long scriptSigIndex, S
      *                         Accessing txContainingThis from another thread while this method runs results in undefined behavior.
      * @param scriptSigIndex The index in txContainingThis of the scriptSig (note: NOT the index of the scriptPubKey).
      * @param scriptPubKey The connected scriptPubKey containing the conditions needed to claim the value.
-     * @param verifyFlags Each flag enables one validation rule. If in doubt, use {@link #correctlySpends(Transaction, long, Script)}
-     *                    which sets all flags.
+     * @param witness Transaction witness belonging to the transaction input containing this script. Needed for SegWit.
+     * @param value Value of the output. Needed for SegWit scripts.
+     * @param verifyFlags Each flag enables one validation rule.
+     */
+    public void correctlySpends(Transaction txContainingThis, int scriptSigIndex, @Nullable TransactionWitness witness, @Nullable Coin value,
+            Script scriptPubKey, Set<VerifyFlag> verifyFlags) throws ScriptException {
+        if (ScriptPattern.isP2WPKH(scriptPubKey)) {
+            // For SegWit, full validation isn't implemented. So we simply check the signature. P2SH_P2WPKH is handled
+            // by the P2SH code for now.
+            if (witness.getPushCount() < 2)
+                throw new ScriptException(ScriptError.SCRIPT_ERR_WITNESS_PROGRAM_WITNESS_EMPTY, witness.toString());
+            TransactionSignature signature;
+            try {
+                signature = TransactionSignature.decodeFromBitcoin(witness.getPush(0), true, true);
+            } catch (SignatureDecodeException x) {
+                throw new ScriptException(ScriptError.SCRIPT_ERR_SIG_DER, "Cannot decode", x);
+            }
+            ECKey pubkey = ECKey.fromPublicOnly(witness.getPush(1));
+            Script scriptCode = ScriptBuilder.createP2PKHOutputScript(pubkey);
+            Sha256Hash sigHash = txContainingThis.hashForWitnessSignature(scriptSigIndex, scriptCode, value,
+                    signature.sigHashMode(), false);
+            boolean validSig = pubkey.verify(sigHash, signature);
+            if (!validSig)
+                throw new ScriptException(ScriptError.SCRIPT_ERR_CHECKSIGVERIFY, "Invalid signature");
+        } else {
+            correctlySpends(txContainingThis, scriptSigIndex, scriptPubKey, verifyFlags);
+        }
+    }
+
+    /**
+     * Verifies that this script (interpreted as a scriptSig) correctly spends the given scriptPubKey.
+     * @param txContainingThis The transaction in which this input scriptSig resides.
+     *                         Accessing txContainingThis from another thread while this method runs results in undefined behavior.
+     * @param scriptSigIndex The index in txContainingThis of the scriptSig (note: NOT the index of the scriptPubKey).
+     * @param scriptPubKey The connected scriptPubKey containing the conditions needed to claim the value.
+     * @param verifyFlags Each flag enables one validation rule.
      */
     public void correctlySpends(Transaction txContainingThis, long scriptSigIndex, Script scriptPubKey,
                                 Set<VerifyFlag> verifyFlags) throws ScriptException {
@@ -1588,22 +1613,24 @@ public void correctlySpends(Transaction txContainingThis, long scriptSigIndex, S
         } catch (ProtocolException e) {
             throw new RuntimeException(e);   // Should not happen unless we were given a totally broken transaction.
         }
-        if (getProgram().length > 10000 || scriptPubKey.getProgram().length > 10000)
-            throw new ScriptException("Script larger than 10,000 bytes");
+        if (getProgram().length > MAX_SCRIPT_SIZE || scriptPubKey.getProgram().length > MAX_SCRIPT_SIZE)
+            throw new ScriptException(ScriptError.SCRIPT_ERR_SCRIPT_SIZE, "Script larger than 10,000 bytes");
         
-        LinkedList<byte[]> stack = new LinkedList<byte[]>();
+        LinkedList<byte[]> stack = new LinkedList<>();
         LinkedList<byte[]> p2shStack = null;
         
         executeScript(txContainingThis, scriptSigIndex, this, stack, verifyFlags);
         if (verifyFlags.contains(VerifyFlag.P2SH))
-            p2shStack = new LinkedList<byte[]>(stack);
+            p2shStack = new LinkedList<>(stack);
         executeScript(txContainingThis, scriptSigIndex, scriptPubKey, stack, verifyFlags);
         
         if (stack.size() == 0)
-            throw new ScriptException("Stack empty at end of script execution.");
-        
+            throw new ScriptException(ScriptError.SCRIPT_ERR_EVAL_FALSE, "Stack empty at end of script execution.");
+
+        List<byte[]> stackCopy = new LinkedList<>(stack);
         if (!castToBool(stack.pollLast()))
-            throw new ScriptException("Script resulted in a non-true stack: " + stack);
+            throw new ScriptException(ScriptError.SCRIPT_ERR_EVAL_FALSE,
+                    "Script resulted in a non-true stack: " + Utils.toString(stackCopy));
 
         // P2SH is pay to script hash. It means that the scriptPubKey has a special form which is a valid
         // program but it has "useless" form that if evaluated as a normal program always returns true.
@@ -1618,10 +1645,10 @@ public void correctlySpends(Transaction txContainingThis, long scriptSigIndex, S
         //     overall scalability and performance.
 
         // TODO: Check if we can take out enforceP2SH if there's a checkpoint at the enforcement block.
-        if (verifyFlags.contains(VerifyFlag.P2SH) && scriptPubKey.isPayToScriptHash()) {
+        if (verifyFlags.contains(VerifyFlag.P2SH) && ScriptPattern.isP2SH(scriptPubKey)) {
             for (ScriptChunk chunk : chunks)
                 if (chunk.isOpCode() && chunk.opcode > OP_16)
-                    throw new ScriptException("Attempted to spend a P2SH scriptPubKey with a script that contained script ops");
+                    throw new ScriptException(ScriptError.SCRIPT_ERR_SIG_PUSHONLY, "Attempted to spend a P2SH scriptPubKey with a script that contained script ops");
             
             byte[] scriptPubKeyBytes = p2shStack.pollLast();
             Script scriptPubKeyP2SH = new Script(scriptPubKeyBytes);
@@ -1629,10 +1656,12 @@ public void correctlySpends(Transaction txContainingThis, long scriptSigIndex, S
             executeScript(txContainingThis, scriptSigIndex, scriptPubKeyP2SH, p2shStack, verifyFlags);
             
             if (p2shStack.size() == 0)
-                throw new ScriptException("P2SH stack empty at end of script execution.");
+                throw new ScriptException(ScriptError.SCRIPT_ERR_EVAL_FALSE, "P2SH stack empty at end of script execution.");
             
+            List<byte[]> p2shStackCopy = new LinkedList<>(p2shStack);
             if (!castToBool(p2shStack.pollLast()))
-                throw new ScriptException("P2SH script execution resulted in a non-true stack");
+                throw new ScriptException(ScriptError.SCRIPT_ERR_EVAL_FALSE,
+                        "P2SH script execution resulted in a non-true stack: " + Utils.toString(p2shStackCopy));
         }
     }
 
@@ -1644,19 +1673,21 @@ private byte[] getQuickProgram() {
     }
 
     /**
-     * Get the {@link org.bitcoinj.script.Script.ScriptType}.
-     * @return The script type.
+     * Get the {@link Script.ScriptType}.
+     * @return The script type, or null if the script is of unknown type
      */
-    public ScriptType getScriptType() {
-        ScriptType type = ScriptType.NO_TYPE;
-        if (isSentToAddress()) {
-            type = ScriptType.P2PKH;
-        } else if (isSentToRawPubKey()) {
-            type = ScriptType.PUB_KEY;
-        } else if (isPayToScriptHash()) {
-            type = ScriptType.P2SH;
-        }
-        return type;
+    public @Nullable ScriptType getScriptType() {
+        if (ScriptPattern.isP2PKH(this))
+            return ScriptType.P2PKH;
+        if (ScriptPattern.isP2PK(this))
+            return ScriptType.P2PK;
+        if (ScriptPattern.isP2SH(this))
+            return ScriptType.P2SH;
+        if (ScriptPattern.isP2WPKH(this))
+            return ScriptType.P2WPKH;
+        if (ScriptPattern.isP2WSH(this))
+            return ScriptType.P2WSH;
+        return null;
     }
 
     @Override
diff --git a/core/src/main/java/org/bitcoinj/script/ScriptBuilder.java b/core/src/main/java/org/bitcoinj/script/ScriptBuilder.java
index 9642409db56..e2a283dab26 100644
--- a/core/src/main/java/org/bitcoinj/script/ScriptBuilder.java
+++ b/core/src/main/java/org/bitcoinj/script/ScriptBuilder.java
@@ -1,5 +1,7 @@
 /*
  * Copyright 2013 Google Inc.
+ * Copyright 2018 Nicola Atzei
+ * Copyright 2019 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,10 +19,16 @@
 package org.bitcoinj.script;
 
 import com.google.common.collect.Lists;
+
 import org.bitcoinj.core.Address;
+import org.bitcoinj.core.LegacyAddress;
 import org.bitcoinj.core.ECKey;
+import org.bitcoinj.core.SegwitAddress;
+import org.bitcoinj.core.Sha256Hash;
+import org.bitcoinj.core.Transaction;
 import org.bitcoinj.core.Utils;
 import org.bitcoinj.crypto.TransactionSignature;
+import org.bitcoinj.script.Script.ScriptType;
 
 import javax.annotation.Nullable;
 import java.math.BigInteger;
@@ -36,7 +44,7 @@
 
 /**
  * <p>Tools for the construction of commonly used script types. You don't normally need this as it's hidden behind
- * convenience methods on {@link org.bitcoinj.core.Transaction}, but they are useful when working with the
+ * convenience methods on {@link Transaction}, but they are useful when working with the
  * protocol at a lower level.</p>
  */
 public class ScriptBuilder {
@@ -49,7 +57,7 @@ public ScriptBuilder() {
 
     /** Creates a fresh ScriptBuilder with the given program as the starting point. */
     public ScriptBuilder(Script template) {
-        chunks = new ArrayList<ScriptChunk>(template.getChunks());
+        chunks = new ArrayList<>(template.getChunks());
     }
 
     /** Adds the given chunk to the end of the program */
@@ -112,11 +120,7 @@ public ScriptBuilder data(int index, byte[] data) {
      * shortest encoding possible.
      */
     public ScriptBuilder number(long num) {
-        if (num >= 0 && num < 16) {
-            return smallNum((int) num);
-        } else {
-            return bigNum(num);
-        }
+        return number(chunks.size(), num);
     }
 
     /**
@@ -124,8 +128,10 @@ public ScriptBuilder number(long num) {
      * uses shortest encoding possible.
      */
     public ScriptBuilder number(int index, long num) {
-        if (num >= 0 && num < 16) {
-            return addChunk(index, new ScriptChunk(Script.encodeToOpN((int) num), null));
+        if (num == -1) {
+            return op(index, OP_1NEGATE);
+        } else if (num >= 0 && num <= 16) {
+            return smallNum(index, (int) num);
         } else {
             return bigNum(index, num);
         }
@@ -135,18 +141,18 @@ public ScriptBuilder number(int index, long num) {
      * Adds the given number as a OP_N opcode to the end of the program.
      * Only handles values 0-16 inclusive.
      * 
-     * @see #number(int)
+     * @see #number(long)
      */
     public ScriptBuilder smallNum(int num) {
         return smallNum(chunks.size(), num);
     }
 
     /** Adds the given number as a push data chunk.
-     * This is intended to use for negative numbers or values > 16, and although
+     * This is intended to use for negative numbers or values greater than 16, and although
      * it will accept numbers in the range 0-16 inclusive, the encoding would be
      * considered non-standard.
      * 
-     * @see #number(int)
+     * @see #number(long)
      */
     protected ScriptBuilder bigNum(long num) {
         return bigNum(chunks.size(), num);
@@ -156,7 +162,7 @@ protected ScriptBuilder bigNum(long num) {
      * Adds the given number as a OP_N opcode to the given index in the program.
      * Only handles values 0-16 inclusive.
      * 
-     * @see #number(int)
+     * @see #number(long)
      */
     public ScriptBuilder smallNum(int index, int num) {
         checkArgument(num >= 0, "Cannot encode negative numbers with smallNum");
@@ -166,11 +172,11 @@ public ScriptBuilder smallNum(int index, int num) {
 
     /**
      * Adds the given number as a push data chunk to the given index in the program.
-     * This is intended to use for negative numbers or values > 16, and although
+     * This is intended to use for negative numbers or values greater than 16, and although
      * it will accept numbers in the range 0-16 inclusive, the encoding would be
      * considered non-standard.
      * 
-     * @see #number(int)
+     * @see #number(long)
      */
     protected ScriptBuilder bigNum(int index, long num) {
         final byte[] data;
@@ -178,7 +184,7 @@ protected ScriptBuilder bigNum(int index, long num) {
         if (num == 0) {
             data = new byte[0];
         } else {
-            Stack<Byte> result = new Stack<Byte>();
+            Stack<Byte> result = new Stack<>();
             final boolean neg = num < 0;
             long absvalue = Math.abs(num);
 
@@ -209,39 +215,74 @@ protected ScriptBuilder bigNum(int index, long num) {
         return addChunk(index, new ScriptChunk(data.length, data));
     }
 
+    /**
+     * Adds true to the end of the program.
+     * @return this
+     */
+    public ScriptBuilder opTrue() {
+        return number(1); // it push OP_1/OP_TRUE
+    }
+
+    /**
+     * Adds true to the given index in the program.
+     * @param index at which insert true
+     * @return this
+     */
+    public ScriptBuilder opTrue(int index) {
+        return number(index, 1); // push OP_1/OP_TRUE
+    }
+
+    /**
+     * Adds false to the end of the program.
+     * @return this
+     */
+    public ScriptBuilder opFalse() {
+        return number(0); // push OP_0/OP_FALSE
+    }
+
+    /**
+     * Adds false to the given index in the program.
+     * @param index at which insert true
+     * @return this
+     */
+    public ScriptBuilder opFalse(int index) {
+        return number(index, 0); // push OP_0/OP_FALSE
+    }
+
     /** Creates a new immutable Script based on the state of the builder. */
     public Script build() {
         return new Script(chunks);
     }
 
+    /** Creates an empty script. */
+    public static Script createEmpty() {
+        return new ScriptBuilder().build();
+    }
+
     /** Creates a scriptPubKey that encodes payment to the given address. */
     public static Script createOutputScript(Address to) {
-        if (to.isP2SHAddress()) {
-            // OP_HASH160 <scriptHash> OP_EQUAL
-            return new ScriptBuilder()
-                .op(OP_HASH160)
-                .data(to.getHash160())
-                .op(OP_EQUAL)
-                .build();
+        if (to instanceof LegacyAddress) {
+            ScriptType scriptType = to.getOutputScriptType();
+            if (scriptType == ScriptType.P2PKH)
+                return createP2PKHOutputScript(to.getHash());
+            else if (scriptType == ScriptType.P2SH)
+                return createP2SHOutputScript(to.getHash());
+            else
+                throw new IllegalStateException("Cannot handle " + scriptType);
+        } else if (to instanceof SegwitAddress) {
+            ScriptBuilder builder = new ScriptBuilder();
+            // OP_0 <pubKeyHash|scriptHash>
+            SegwitAddress toSegwit = (SegwitAddress) to;
+            builder.smallNum(toSegwit.getWitnessVersion());
+            builder.data(toSegwit.getWitnessProgram());
+            return builder.build();
         } else {
-            // OP_DUP OP_HASH160 <pubKeyHash> OP_EQUALVERIFY OP_CHECKSIG
-            return new ScriptBuilder()
-                .op(OP_DUP)
-                .op(OP_HASH160)
-                .data(to.getHash160())
-                .op(OP_EQUALVERIFY)
-                .op(OP_CHECKSIG)
-                .build();
+            throw new IllegalStateException("Cannot handle " + to);
         }
     }
 
-    /** Creates a scriptPubKey that encodes payment to the given raw public key. */
-    public static Script createOutputScript(ECKey key) {
-        return new ScriptBuilder().data(key.getPubKey()).op(OP_CHECKSIG).build();
-    }
-
     /**
-     * Creates a scriptSig that can redeem a pay-to-address output.
+     * Creates a scriptSig that can redeem a P2PKH output.
      * If given signature is null, incomplete scriptSig will be created with OP_0 instead of signature
      */
     public static Script createInputScript(@Nullable TransactionSignature signature, ECKey pubKey) {
@@ -251,7 +292,7 @@ public static Script createInputScript(@Nullable TransactionSignature signature,
     }
 
     /**
-     * Creates a scriptSig that can redeem a pay-to-pubkey output.
+     * Creates a scriptSig that can redeem a P2PK output.
      * If given signature is null, incomplete scriptSig will be created with OP_0 instead of signature
      */
     public static Script createInputScript(@Nullable TransactionSignature signature) {
@@ -276,7 +317,7 @@ public static Script createMultiSigOutputScript(int threshold, List<ECKey> pubke
 
     /** Create a program that satisfies an OP_CHECKMULTISIG program. */
     public static Script createMultiSigInputScript(List<TransactionSignature> signatures) {
-        List<byte[]> sigs = new ArrayList<byte[]>(signatures.size());
+        List<byte[]> sigs = new ArrayList<>(signatures.size());
         for (TransactionSignature signature : signatures) {
             sigs.add(signature.encodeToBitcoin());
         }
@@ -291,16 +332,16 @@ public static Script createMultiSigInputScript(TransactionSignature... signature
 
     /** Create a program that satisfies an OP_CHECKMULTISIG program, using pre-encoded signatures. */
     public static Script createMultiSigInputScriptBytes(List<byte[]> signatures) {
-    	return createMultiSigInputScriptBytes(signatures, null);
+        return createMultiSigInputScriptBytes(signatures, null);
     }
 
     /**
-     * Create a program that satisfies a pay-to-script hashed OP_CHECKMULTISIG program.
+     * Create a program that satisfies a P2SH OP_CHECKMULTISIG program.
      * If given signature list is null, incomplete scriptSig will be created with OP_0 instead of signatures
      */
     public static Script createP2SHMultiSigInputScript(@Nullable List<TransactionSignature> signatures,
                                                        Script multisigProgram) {
-        List<byte[]> sigs = new ArrayList<byte[]>();
+        List<byte[]> sigs = new ArrayList<>();
         if (signatures == null) {
             // create correct number of empty signatures
             int numSigs = multisigProgram.getNumberOfSignaturesRequiredToSpend();
@@ -325,7 +366,7 @@ public static Script createMultiSigInputScriptBytes(List<byte[]> signatures, @Nu
         for (byte[] signature : signatures)
             builder.data(signature);
         if (multisigProgramBytes!= null)
-        	builder.data(multisigProgramBytes);
+            builder.data(multisigProgramBytes);
         return builder.build();
     }
 
@@ -390,6 +431,54 @@ public static Script updateScriptWithSignature(Script scriptSig, byte[] signatur
         return builder.build();
     }
 
+    /** Creates a scriptPubKey that encodes payment to the given raw public key. */
+    public static Script createP2PKOutputScript(byte[] pubKey) {
+        return new ScriptBuilder().data(pubKey).op(OP_CHECKSIG).build();
+    }
+
+    /** Creates a scriptPubKey that encodes payment to the given raw public key. */
+    public static Script createP2PKOutputScript(ECKey pubKey) {
+        return createP2PKOutputScript(pubKey.getPubKey());
+    }
+
+    /**
+     * Creates a scriptPubKey that sends to the given public key hash.
+     */
+    public static Script createP2PKHOutputScript(byte[] hash) {
+        checkArgument(hash.length == LegacyAddress.LENGTH);
+        ScriptBuilder builder = new ScriptBuilder();
+        builder.op(OP_DUP);
+        builder.op(OP_HASH160);
+        builder.data(hash);
+        builder.op(OP_EQUALVERIFY);
+        builder.op(OP_CHECKSIG);
+        return builder.build();
+    }
+
+    /**
+     * Creates a scriptPubKey that sends to the given public key.
+     */
+    public static Script createP2PKHOutputScript(ECKey key) {
+        checkArgument(key.isCompressed());
+        return createP2PKHOutputScript(key.getPubKeyHash());
+    }
+
+    /**
+     * Creates a segwit scriptPubKey that sends to the given public key hash.
+     */
+    public static Script createP2WPKHOutputScript(byte[] hash) {
+        checkArgument(hash.length == SegwitAddress.WITNESS_PROGRAM_LENGTH_PKH);
+        return new ScriptBuilder().smallNum(0).data(hash).build();
+    }
+
+    /**
+     * Creates a segwit scriptPubKey that sends to the given public key.
+     */
+    public static Script createP2WPKHOutputScript(ECKey key) {
+        checkArgument(key.isCompressed());
+        return createP2WPKHOutputScript(key.getPubKeyHash());
+    }
+
     /**
      * Creates a scriptPubKey that sends to the given script hash. Read
      * <a href="https://github.com/bitcoin/bips/blob/master/bip-0016.mediawiki">BIP 16</a> to learn more about this
@@ -408,6 +497,22 @@ public static Script createP2SHOutputScript(Script redeemScript) {
         return ScriptBuilder.createP2SHOutputScript(hash);
     }
 
+    /**
+     * Creates a segwit scriptPubKey that sends to the given script hash.
+     */
+    public static Script createP2WSHOutputScript(byte[] hash) {
+        checkArgument(hash.length == SegwitAddress.WITNESS_PROGRAM_LENGTH_SH);
+        return new ScriptBuilder().smallNum(0).data(hash).build();
+    }
+
+    /**
+     * Creates a segwit scriptPubKey for the given redeem script.
+     */
+    public static Script createP2WSHOutputScript(Script redeemScript) {
+        byte[] hash = Sha256Hash.hash(redeemScript.getProgram());
+        return ScriptBuilder.createP2WSHOutputScript(hash);
+    }
+
     /**
      * Creates a P2SH output script with given public keys and threshold. Given public keys will be placed in
      * redeem script in the lexicographical sorting order.
@@ -422,7 +527,7 @@ public static Script createP2SHOutputScript(int threshold, List<ECKey> pubkeys)
      * redeem script in the lexicographical sorting order.
      */
     public static Script createRedeemScript(int threshold, List<ECKey> pubkeys) {
-        pubkeys = new ArrayList<ECKey>(pubkeys);
+        pubkeys = new ArrayList<>(pubkeys);
         Collections.sort(pubkeys, ECKey.PUBKEY_COMPARATOR);
         return ScriptBuilder.createMultiSigOutputScript(threshold, pubkeys);
     }
@@ -433,7 +538,7 @@ public static Script createRedeemScript(int threshold, List<ECKey> pubkeys) {
      * the ledger.
      */
     public static Script createOpReturnScript(byte[] data) {
-        checkArgument(data.length <= 40);
+        checkArgument(data.length <= 80);
         return new ScriptBuilder().op(OP_RETURN).data(data).build();
     }
 
diff --git a/core/src/main/java/org/bitcoinj/script/ScriptChunk.java b/core/src/main/java/org/bitcoinj/script/ScriptChunk.java
index 41079a48d9a..fc54d4d5c64 100644
--- a/core/src/main/java/org/bitcoinj/script/ScriptChunk.java
+++ b/core/src/main/java/org/bitcoinj/script/ScriptChunk.java
@@ -21,6 +21,8 @@
 import com.google.common.base.Objects;
 
 import javax.annotation.Nullable;
+
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Arrays;
@@ -42,11 +44,11 @@ public class ScriptChunk {
     public final byte[] data;
     private int startLocationInProgram;
 
-    public ScriptChunk(int opcode, byte[] data) {
+    public ScriptChunk(int opcode, @Nullable byte[] data) {
         this(opcode, data, -1);
     }
 
-    public ScriptChunk(int opcode, byte[] data, int startLocationInProgram) {
+    public ScriptChunk(int opcode, @Nullable byte[] data, int startLocationInProgram) {
         this.opcode = opcode;
         this.data = data;
         this.startLocationInProgram = startLocationInProgram;
@@ -123,8 +125,7 @@ public void write(OutputStream stream) throws IOException {
             } else if (opcode == OP_PUSHDATA2) {
                 checkState(data.length <= 0xFFFF);
                 stream.write(OP_PUSHDATA2);
-                stream.write(0xFF & data.length);
-                stream.write(0xFF & (data.length >> 8));
+                Utils.uint16ToByteStreamLE(data.length, stream);
             } else if (opcode == OP_PUSHDATA4) {
                 checkState(data.length <= Script.MAX_SCRIPT_ELEMENT_SIZE);
                 stream.write(OP_PUSHDATA4);
@@ -138,6 +139,17 @@ public void write(OutputStream stream) throws IOException {
         }
     }
 
+    public byte[] toByteArray() {
+        ByteArrayOutputStream stream = new ByteArrayOutputStream();
+        try {
+            write(stream);
+        } catch (IOException e) {
+            // Should not happen as ByteArrayOutputStream does not throw IOException on write
+            throw new RuntimeException(e);
+        }
+        return stream.toByteArray();
+    }
+
     @Override
     public String toString() {
         StringBuilder buf = new StringBuilder();
diff --git a/core/src/main/java/org/bitcoinj/script/ScriptError.java b/core/src/main/java/org/bitcoinj/script/ScriptError.java
new file mode 100644
index 00000000000..cf28d767d18
--- /dev/null
+++ b/core/src/main/java/org/bitcoinj/script/ScriptError.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2017 Nicola Atzei
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bitcoinj.script;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum ScriptError {
+
+    SCRIPT_ERR_OK("OK"),
+    SCRIPT_ERR_UNKNOWN_ERROR("UNKNOWN_ERROR"),
+    SCRIPT_ERR_EVAL_FALSE("EVAL_FALSE"),
+    SCRIPT_ERR_OP_RETURN("OP_RETURN"),
+
+    /* Max sizes */
+    SCRIPT_ERR_SCRIPT_SIZE("SCRIPT_SIZE"),
+    SCRIPT_ERR_PUSH_SIZE("PUSH_SIZE"),
+    SCRIPT_ERR_OP_COUNT("OP_COUNT"),
+    SCRIPT_ERR_STACK_SIZE("STACK_SIZE"),
+    SCRIPT_ERR_SIG_COUNT("SIG_COUNT"),
+    SCRIPT_ERR_PUBKEY_COUNT("PUBKEY_COUNT"),
+
+    /* Failed verify operations */
+    SCRIPT_ERR_VERIFY("VERIFY"),
+    SCRIPT_ERR_EQUALVERIFY("EQUALVERIFY"),
+    SCRIPT_ERR_CHECKMULTISIGVERIFY("CHECKMULTISIGVERIFY"),
+    SCRIPT_ERR_CHECKSIGVERIFY("CHECKSIGVERIFY"),
+    SCRIPT_ERR_NUMEQUALVERIFY("NUMEQUALVERIFY"),
+
+    /* Logical/Format/Canonical errors */
+    SCRIPT_ERR_BAD_OPCODE("BAD_OPCODE"),
+    SCRIPT_ERR_DISABLED_OPCODE("DISABLED_OPCODE"),
+    SCRIPT_ERR_INVALID_STACK_OPERATION("INVALID_STACK_OPERATION"),
+    SCRIPT_ERR_INVALID_ALTSTACK_OPERATION("INVALID_ALTSTACK_OPERATION"),
+    SCRIPT_ERR_UNBALANCED_CONDITIONAL("UNBALANCED_CONDITIONAL"),
+
+    /* CHECKLOCKTIMEVERIFY and CHECKSEQUENCEVERIFY */
+    SCRIPT_ERR_NEGATIVE_LOCKTIME("NEGATIVE_LOCKTIME"),
+    SCRIPT_ERR_UNSATISFIED_LOCKTIME("UNSATISFIED_LOCKTIME"),
+
+    /* Malleability */
+    SCRIPT_ERR_SIG_HASHTYPE("SIG_HASHTYPE"),
+    SCRIPT_ERR_SIG_DER("SIG_DER"),
+    SCRIPT_ERR_MINIMALDATA("MINIMALDATA"),
+    SCRIPT_ERR_SIG_PUSHONLY("SIG_PUSHONLY"),
+    SCRIPT_ERR_SIG_HIGH_S("SIG_HIGH_S"),
+    SCRIPT_ERR_SIG_NULLDUMMY("SIG_NULLDUMMY"),
+    SCRIPT_ERR_PUBKEYTYPE("PUBKEYTYPE"),
+    SCRIPT_ERR_CLEANSTACK("CLEANSTACK"),
+    SCRIPT_ERR_MINIMALIF("MINIMALIF"),
+    SCRIPT_ERR_SIG_NULLFAIL("NULLFAIL"),
+
+    /* softfork safeness */
+    SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS("DISCOURAGE_UPGRADABLE_NOPS"),
+    SCRIPT_ERR_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM("DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM"),
+
+    /* segregated witness */
+    SCRIPT_ERR_WITNESS_PROGRAM_WRONG_LENGTH("WITNESS_PROGRAM_WRONG_LENGTH"),
+    SCRIPT_ERR_WITNESS_PROGRAM_WITNESS_EMPTY("WITNESS_PROGRAM_WITNESS_EMPTY"),
+    SCRIPT_ERR_WITNESS_PROGRAM_MISMATCH("WITNESS_PROGRAM_MISMATCH"),
+    SCRIPT_ERR_WITNESS_MALLEATED("WITNESS_MALLEATED"),
+    SCRIPT_ERR_WITNESS_MALLEATED_P2SH("WITNESS_MALLEATED_P2SH"),
+    SCRIPT_ERR_WITNESS_UNEXPECTED("WITNESS_UNEXPECTED"),
+    SCRIPT_ERR_WITNESS_PUBKEYTYPE("WITNESS_PUBKEYTYPE"),
+
+    SCRIPT_ERR_ERROR_COUNT("ERROR_COUNT");
+
+    private final String mnemonic;
+    private static final Map<String, ScriptError> mnemonicToScriptErrorMap;
+
+    private ScriptError(String name) {
+        this.mnemonic = name;
+    }
+
+    static {
+        mnemonicToScriptErrorMap = new HashMap<>();
+        for (ScriptError err : ScriptError.values()) {
+            mnemonicToScriptErrorMap.put(err.getMnemonic(), err);
+        }
+    }
+
+    public String getMnemonic() {
+        return mnemonic;
+    }
+
+    public static ScriptError fromMnemonic(String name) {
+        ScriptError err = mnemonicToScriptErrorMap.get(name);
+        if (err == null)
+            throw new IllegalArgumentException(name + " is not a valid name");
+        return err;
+    }
+}
diff --git a/core/src/main/java/org/bitcoinj/core/ScriptException.java b/core/src/main/java/org/bitcoinj/script/ScriptException.java
similarity index 67%
rename from core/src/main/java/org/bitcoinj/core/ScriptException.java
rename to core/src/main/java/org/bitcoinj/script/ScriptException.java
index d72bd430a5b..fe3194d1683 100644
--- a/core/src/main/java/org/bitcoinj/core/ScriptException.java
+++ b/core/src/main/java/org/bitcoinj/script/ScriptException.java
@@ -14,16 +14,26 @@
  * limitations under the License.
  */
 
-package org.bitcoinj.core;
+package org.bitcoinj.script;
+
+import org.bitcoinj.core.VerificationException;
 
 @SuppressWarnings("serial")
 public class ScriptException extends VerificationException {
 
-    public ScriptException(String msg) {
+    private final ScriptError err;
+
+    public ScriptException(ScriptError err, String msg) {
         super(msg);
+        this.err = err;
     }
 
-    public ScriptException(String msg, Exception e) {
+    public ScriptException(ScriptError err, String msg, Exception e) {
         super(msg, e);
+        this.err = err;
+    }
+
+    public ScriptError getError() {
+        return err;
     }
 }
diff --git a/core/src/main/java/org/bitcoinj/script/ScriptOpCodes.java b/core/src/main/java/org/bitcoinj/script/ScriptOpCodes.java
index 7a50eea0031..fcd50689032 100644
--- a/core/src/main/java/org/bitcoinj/script/ScriptOpCodes.java
+++ b/core/src/main/java/org/bitcoinj/script/ScriptOpCodes.java
@@ -22,7 +22,7 @@
 
 /**
  * Various constants that define the assembly-like scripting language that forms part of the Bitcoin protocol.
- * See {@link org.bitcoinj.script.Script} for details. Also provides a method to convert them to a string.
+ * See {@link Script} for details. Also provides a method to convert them to a string.
  */
 public class ScriptOpCodes {
     // push value
@@ -145,13 +145,16 @@ public class ScriptOpCodes {
     // block state
     /** Check lock time of the block. Introduced in BIP 65, replacing OP_NOP2 */
     public static final int OP_CHECKLOCKTIMEVERIFY = 0xb1;
+    public static final int OP_CHECKSEQUENCEVERIFY = 0xb2;
 
     // expansion
     public static final int OP_NOP1 = 0xb0;
     /** Deprecated by BIP 65 */
     @Deprecated
     public static final int OP_NOP2 = OP_CHECKLOCKTIMEVERIFY;
-    public static final int OP_NOP3 = 0xb2;
+    /** Deprecated by BIP 112 */
+    @Deprecated
+    public static final int OP_NOP3 = OP_CHECKSEQUENCEVERIFY;
     public static final int OP_NOP4 = 0xb3;
     public static final int OP_NOP5 = 0xb4;
     public static final int OP_NOP6 = 0xb5;
@@ -265,7 +268,7 @@ public class ScriptOpCodes {
         .put(OP_CHECKMULTISIGVERIFY, "CHECKMULTISIGVERIFY")
         .put(OP_NOP1, "NOP1")
         .put(OP_CHECKLOCKTIMEVERIFY, "CHECKLOCKTIMEVERIFY")
-        .put(OP_NOP3, "NOP3")
+        .put(OP_CHECKSEQUENCEVERIFY, "CHECKSEQUENCEVERIFY")
         .put(OP_NOP4, "NOP4")
         .put(OP_NOP5, "NOP5")
         .put(OP_NOP6, "NOP6")
@@ -378,6 +381,7 @@ public class ScriptOpCodes {
         .put("CHECKMULTISIGVERIFY", OP_CHECKMULTISIGVERIFY)
         .put("NOP1", OP_NOP1)
         .put("CHECKLOCKTIMEVERIFY", OP_CHECKLOCKTIMEVERIFY)
+        .put("CHECKSEQUENCEVERIFY", OP_CHECKSEQUENCEVERIFY)
         .put("NOP2", OP_NOP2)
         .put("NOP3", OP_NOP3)
         .put("NOP4", OP_NOP4)
diff --git a/core/src/main/java/org/bitcoinj/script/ScriptPattern.java b/core/src/main/java/org/bitcoinj/script/ScriptPattern.java
new file mode 100644
index 00000000000..3f6321e51a6
--- /dev/null
+++ b/core/src/main/java/org/bitcoinj/script/ScriptPattern.java
@@ -0,0 +1,307 @@
+/*
+ * Copyright 2017 John L. Jegutanis
+ * Copyright 2018 Andreas Schildbach
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bitcoinj.script;
+
+import org.bitcoinj.core.LegacyAddress;
+import org.bitcoinj.core.SegwitAddress;
+import org.bitcoinj.core.Sha256Hash;
+import org.bitcoinj.core.Utils;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.bitcoinj.script.Script.decodeFromOpN;
+import static org.bitcoinj.script.ScriptOpCodes.*;
+
+/**
+ * This is a Script pattern matcher with some typical script patterns
+ */
+public class ScriptPattern {
+    /**
+     * Returns true if this script is of the form {@code DUP HASH160 <pubkey hash> EQUALVERIFY CHECKSIG}, ie, payment to an
+     * address like {@code 1VayNert3x1KzbpzMGt2qdqrAThiRovi8}. This form was originally intended for the case where you wish
+     * to send somebody money with a written code because their node is offline, but over time has become the standard
+     * way to make payments due to the short and recognizable base58 form addresses come in.
+     */
+    public static boolean isP2PKH(Script script) {
+        List<ScriptChunk> chunks = script.chunks;
+        if (chunks.size() != 5)
+            return false;
+        if (!chunks.get(0).equalsOpCode(OP_DUP))
+            return false;
+        if (!chunks.get(1).equalsOpCode(OP_HASH160))
+            return false;
+        byte[] chunk2data = chunks.get(2).data;
+        if (chunk2data == null)
+            return false;
+        if (chunk2data.length != LegacyAddress.LENGTH)
+            return false;
+        if (!chunks.get(3).equalsOpCode(OP_EQUALVERIFY))
+            return false;
+        if (!chunks.get(4).equalsOpCode(OP_CHECKSIG))
+            return false;
+        return true;
+    }
+
+    /**
+     * Extract the pubkey hash from a P2PKH scriptPubKey. It's important that the script is in the correct form, so you
+     * will want to guard calls to this method with {@link #isP2PKH(Script)}.
+     */
+    public static byte[] extractHashFromP2PKH(Script script) {
+        return script.chunks.get(2).data;
+    }
+
+    /**
+     * <p>
+     * Whether or not this is a scriptPubKey representing a P2SH output. In such outputs, the logic that
+     * controls reclamation is not actually in the output at all. Instead there's just a hash, and it's up to the
+     * spending input to provide a program matching that hash.
+     * </p>
+     * <p>
+     * P2SH is described by <a href="https://github.com/bitcoin/bips/blob/master/bip-0016.mediawiki">BIP16</a>.
+     * </p>
+     */
+    public static boolean isP2SH(Script script) {
+        List<ScriptChunk> chunks = script.chunks;
+        // We check for the effective serialized form because BIP16 defines a P2SH output using an exact byte
+        // template, not the logical program structure. Thus you can have two programs that look identical when
+        // printed out but one is a P2SH script and the other isn't! :(
+        // We explicitly test that the op code used to load the 20 bytes is 0x14 and not something logically
+        // equivalent like {@code OP_HASH160 OP_PUSHDATA1 0x14 <20 bytes of script hash> OP_EQUAL}
+        if (chunks.size() != 3)
+            return false;
+        if (!chunks.get(0).equalsOpCode(OP_HASH160))
+            return false;
+        ScriptChunk chunk1 = chunks.get(1);
+        if (chunk1.opcode != 0x14)
+            return false;
+        byte[] chunk1data = chunk1.data;
+        if (chunk1data == null)
+            return false;
+        if (chunk1data.length != LegacyAddress.LENGTH)
+            return false;
+        if (!chunks.get(2).equalsOpCode(OP_EQUAL))
+            return false;
+        return true;
+    }
+
+    /**
+     * Extract the script hash from a P2SH scriptPubKey. It's important that the script is in the correct form, so you
+     * will want to guard calls to this method with {@link #isP2SH(Script)}.
+     */
+    public static byte[] extractHashFromP2SH(Script script) {
+        return script.chunks.get(1).data;
+    }
+
+    /**
+     * Returns true if this script is of the form {@code <pubkey> OP_CHECKSIG}. This form was originally intended for transactions
+     * where the peers talked to each other directly via TCP/IP, but has fallen out of favor with time due to that mode
+     * of operation being susceptible to man-in-the-middle attacks. It is still used in coinbase outputs and can be
+     * useful more exotic types of transaction, but today most payments are to addresses.
+     */
+    public static boolean isP2PK(Script script) {
+        List<ScriptChunk> chunks = script.chunks;
+        if (chunks.size() != 2)
+            return false;
+        ScriptChunk chunk0 = chunks.get(0);
+        if (chunk0.isOpCode())
+            return false;
+        byte[] chunk0data = chunk0.data;
+        if (chunk0data == null)
+            return false;
+        if (chunk0data.length <= 1)
+            return false;
+        if (!chunks.get(1).equalsOpCode(OP_CHECKSIG))
+            return false;
+        return true;
+    }
+
+    /**
+     * Extract the pubkey from a P2SH scriptPubKey. It's important that the script is in the correct form, so you will
+     * want to guard calls to this method with {@link #isP2PK(Script)}.
+     */
+    public static byte[] extractKeyFromP2PK(Script script) {
+        return script.chunks.get(0).data;
+    }
+
+    /**
+     * Returns true if this script is of the form {@code OP_0 <hash>}. This can either be a P2WPKH or P2WSH scriptPubKey. These
+     * two script types were introduced with segwit.
+     */
+    public static boolean isP2WH(Script script) {
+        List<ScriptChunk> chunks = script.chunks;
+        if (chunks.size() != 2)
+            return false;
+        if (!chunks.get(0).equalsOpCode(OP_0))
+            return false;
+        byte[] chunk1data = chunks.get(1).data;
+        if (chunk1data == null)
+            return false;
+        if (chunk1data.length != SegwitAddress.WITNESS_PROGRAM_LENGTH_PKH
+                && chunk1data.length != SegwitAddress.WITNESS_PROGRAM_LENGTH_SH)
+            return false;
+        return true;
+    }
+
+    /**
+     * Returns true if this script is of the form {@code OP_0 <hash>} and hash is 20 bytes long. This can only be a P2WPKH
+     * scriptPubKey. This script type was introduced with segwit.
+     */
+    public static boolean isP2WPKH(Script script) {
+        if (!isP2WH(script))
+            return false;
+        List<ScriptChunk> chunks = script.chunks;
+        if (!chunks.get(0).equalsOpCode(OP_0))
+            return false;
+        byte[] chunk1data = chunks.get(1).data;
+        return chunk1data != null && chunk1data.length == SegwitAddress.WITNESS_PROGRAM_LENGTH_PKH;
+    }
+
+    /**
+     * Returns true if this script is of the form {@code OP_0 <hash>} and hash is 32 bytes long. This can only be a P2WSH
+     * scriptPubKey. This script type was introduced with segwit.
+     */
+    public static boolean isP2WSH(Script script) {
+        if (!isP2WH(script))
+            return false;
+        List<ScriptChunk> chunks = script.chunks;
+        if (!chunks.get(0).equalsOpCode(OP_0))
+            return false;
+        byte[] chunk1data = chunks.get(1).data;
+        return chunk1data != null && chunk1data.length == SegwitAddress.WITNESS_PROGRAM_LENGTH_SH;
+    }
+
+    /**
+     * Extract the pubkey hash from a P2WPKH or the script hash from a P2WSH scriptPubKey. It's important that the
+     * script is in the correct form, so you will want to guard calls to this method with
+     * {@link #isP2WH(Script)}.
+     */
+    public static byte[] extractHashFromP2WH(Script script) {
+        return script.chunks.get(1).data;
+    }
+
+    /**
+     * Returns whether this script matches the format used for m-of-n multisig outputs:
+     * {@code [m] [keys...] [n] CHECKMULTISIG}
+     */
+    public static boolean isSentToMultisig(Script script) {
+        List<ScriptChunk> chunks = script.chunks;
+        if (chunks.size() < 4) return false;
+        ScriptChunk chunk = chunks.get(chunks.size() - 1);
+        // Must end in OP_CHECKMULTISIG[VERIFY].
+        if (!chunk.isOpCode()) return false;
+        if (!(chunk.equalsOpCode(OP_CHECKMULTISIG) || chunk.equalsOpCode(OP_CHECKMULTISIGVERIFY))) return false;
+        try {
+            // Second to last chunk must be an OP_N opcode and there should be that many data chunks (keys).
+            ScriptChunk m = chunks.get(chunks.size() - 2);
+            if (!m.isOpCode()) return false;
+            int numKeys = decodeFromOpN(m.opcode);
+            if (numKeys < 1 || chunks.size() != 3 + numKeys) return false;
+            for (int i = 1; i < chunks.size() - 2; i++) {
+                if (chunks.get(i).isOpCode()) return false;
+            }
+            // First chunk must be an OP_N opcode too.
+            if (decodeFromOpN(chunks.get(0).opcode) < 1) return false;
+        } catch (IllegalStateException e) {
+            return false;   // Not an OP_N opcode.
+        }
+        return true;
+    }
+
+    /**
+     * Returns whether this script matches the format used for LOCKTIMEVERIFY transactions.
+     */
+    public static boolean isSentToCltvPaymentChannel(Script script) {
+        List<ScriptChunk> chunks = script.chunks;
+        if (chunks.size() != 10) return false;
+        // Check that opcodes match the pre-determined format.
+        if (!chunks.get(0).equalsOpCode(OP_IF)) return false;
+        // chunk[1] = recipient pubkey
+        if (!chunks.get(2).equalsOpCode(OP_CHECKSIGVERIFY)) return false;
+        if (!chunks.get(3).equalsOpCode(OP_ELSE)) return false;
+        // chunk[4] = locktime
+        if (!chunks.get(5).equalsOpCode(OP_CHECKLOCKTIMEVERIFY)) return false;
+        if (!chunks.get(6).equalsOpCode(OP_DROP)) return false;
+        if (!chunks.get(7).equalsOpCode(OP_ENDIF)) return false;
+        // chunk[8] = sender pubkey
+        if (!chunks.get(9).equalsOpCode(OP_CHECKSIG)) return false;
+        return true;
+    }
+
+    /**
+     * Retrieves the public key of the sender from a LOCKTIMEVERIFY transaction. It's important that the script is in
+     * the correct form, so you will want to guard calls to this method with
+     * {@link #isSentToCltvPaymentChannel(Script)}.
+     */
+    public static byte[] extractSenderPubKeyFromCltvPaymentChannel(Script script) {
+        return script.chunks.get(8).data;
+    }
+
+    /**
+     * Retrieves the public key of the recipient from a LOCKTIMEVERIFY transaction. It's important that the script is in
+     * the correct form, so you will want to guard calls to this method with
+     * {@link #isSentToCltvPaymentChannel(Script)}.
+     */
+    public static byte[] extractRecipientPubKeyFromCltvPaymentChannel(Script script) {
+        return script.chunks.get(1).data;
+    }
+
+    /**
+     * Retrieves the locktime from a LOCKTIMEVERIFY transaction. It's important that the script is in the correct form,
+     * so you will want to guard calls to this method with {@link #isSentToCltvPaymentChannel(Script)}.
+     */
+    public static BigInteger extractExpiryFromCltvPaymentChannel(Script script) {
+        return Script.castToBigInteger(script.chunks.get(4).data, 5, false);
+    }
+
+    /**
+     * Returns whether this script is using OP_RETURN to store arbitrary data.
+     */
+    public static boolean isOpReturn(Script script) {
+        List<ScriptChunk> chunks = script.chunks;
+        return chunks.size() > 0 && chunks.get(0).equalsOpCode(ScriptOpCodes.OP_RETURN);
+    }
+
+    private static final byte[] SEGWIT_COMMITMENT_HEADER = Utils.HEX.decode("aa21a9ed");
+
+    /**
+     * Returns whether this script matches the pattern for a segwit commitment (in an output of the coinbase
+     * transaction).
+     */
+    public static boolean isWitnessCommitment(Script script) {
+        List<ScriptChunk> chunks = script.chunks;
+        if (chunks.size() < 2)
+            return false;
+        if (!chunks.get(0).equalsOpCode(ScriptOpCodes.OP_RETURN))
+            return false;
+        byte[] chunkData = chunks.get(1).data;
+        if (chunkData == null || chunkData.length != 36)
+            return false;
+        if (!Arrays.equals(Arrays.copyOfRange(chunkData, 0, 4), SEGWIT_COMMITMENT_HEADER))
+            return false;
+        return true;
+    }
+
+    /**
+     * Retrieves the hash from a segwit commitment (in an output of the coinbase transaction).
+     */
+    public static Sha256Hash extractWitnessCommitmentHash(Script script) {
+        return Sha256Hash.wrap(Arrays.copyOfRange(script.chunks.get(1).data, 4, 36));
+    }
+}
diff --git a/core/src/main/java/org/bitcoinj/script/package-info.java b/core/src/main/java/org/bitcoinj/script/package-info.java
index 8198e99ce2a..9dba0b607d8 100644
--- a/core/src/main/java/org/bitcoinj/script/package-info.java
+++ b/core/src/main/java/org/bitcoinj/script/package-info.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/signers/CustomTransactionSigner.java b/core/src/main/java/org/bitcoinj/signers/CustomTransactionSigner.java
index 28f705c6c34..8e92e8b5e47 100644
--- a/core/src/main/java/org/bitcoinj/signers/CustomTransactionSigner.java
+++ b/core/src/main/java/org/bitcoinj/signers/CustomTransactionSigner.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014 Kosta Korenkov
+ * Copyright 2019 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +21,8 @@
 import org.bitcoinj.crypto.ChildNumber;
 import org.bitcoinj.crypto.TransactionSignature;
 import org.bitcoinj.script.Script;
+import org.bitcoinj.script.ScriptException;
+import org.bitcoinj.script.ScriptPattern;
 import org.bitcoinj.wallet.KeyBag;
 import org.bitcoinj.wallet.RedeemData;
 import org.slf4j.Logger;
@@ -32,13 +35,13 @@
 /**
  * <p>This signer may be used as a template for creating custom multisig transaction signers.</p>
  * <p>
- * Concrete implementations have to implement {@link #getSignature(org.bitcoinj.core.Sha256Hash, java.util.List)}
+ * Concrete implementations have to implement {@link #getSignature(Sha256Hash, List)}
  * method returning a signature and a public key of the keypair used to created that signature.
  * It's up to custom implementation where to locate signatures: it may be a network connection,
  * some local API or something else.
  * </p>
  */
-public abstract class CustomTransactionSigner extends StatelessTransactionSigner {
+public abstract class CustomTransactionSigner implements TransactionSigner {
     private static final Logger log = LoggerFactory.getLogger(CustomTransactionSigner.class);
 
     @Override
@@ -57,7 +60,7 @@ public boolean signInputs(ProposedTransaction propTx, KeyBag keyBag) {
                 continue;
             }
             Script scriptPubKey = txOut.getScriptPubKey();
-            if (!scriptPubKey.isPayToScriptHash()) {
+            if (!ScriptPattern.isP2SH(scriptPubKey)) {
                 log.warn("CustomTransactionSigner works only with P2SH transactions");
                 return false;
             }
@@ -68,7 +71,8 @@ public boolean signInputs(ProposedTransaction propTx, KeyBag keyBag) {
                 // We assume if its already signed, its hopefully got a SIGHASH type that will not invalidate when
                 // we sign missing pieces (to check this would require either assuming any signatures are signing
                 // standard output types or a way to get processed signatures out of script execution)
-                txIn.getScriptSig().correctlySpends(tx, i, txIn.getConnectedOutput().getScriptPubKey());
+                txIn.getScriptSig().correctlySpends(tx, i, txIn.getWitness(), txOut.getValue(), txOut.getScriptPubKey(),
+                        Script.ALL_VERIFY_FLAGS);
                 log.warn("Input {} already correctly spends output, assuming SIGHASH type used will be safe and skipping signing.", i);
                 continue;
             } catch (ScriptException e) {
diff --git a/core/src/main/java/org/bitcoinj/signers/LocalTransactionSigner.java b/core/src/main/java/org/bitcoinj/signers/LocalTransactionSigner.java
index ee02a31a645..b93b9e7a9e8 100644
--- a/core/src/main/java/org/bitcoinj/signers/LocalTransactionSigner.java
+++ b/core/src/main/java/org/bitcoinj/signers/LocalTransactionSigner.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014 Kosta Korenkov
+ * Copyright 2019 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +18,20 @@
 package org.bitcoinj.signers;
 
 import java.util.EnumSet;
+
+import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.ECKey;
-import org.bitcoinj.core.ScriptException;
+import org.bitcoinj.core.LegacyAddress;
 import org.bitcoinj.core.Transaction;
 import org.bitcoinj.core.TransactionInput;
+import org.bitcoinj.core.TransactionOutput;
+import org.bitcoinj.core.TransactionWitness;
 import org.bitcoinj.crypto.DeterministicKey;
 import org.bitcoinj.crypto.TransactionSignature;
 import org.bitcoinj.script.Script;
+import org.bitcoinj.script.ScriptBuilder;
+import org.bitcoinj.script.ScriptException;
+import org.bitcoinj.script.ScriptPattern;
 import org.bitcoinj.script.Script.VerifyFlag;
 import org.bitcoinj.wallet.KeyBag;
 import org.bitcoinj.wallet.RedeemData;
@@ -31,18 +39,18 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * <p>{@link TransactionSigner} implementation for signing inputs using keys from provided {@link org.bitcoinj.wallet.KeyBag}.</p>
+ * <p>{@link TransactionSigner} implementation for signing inputs using keys from provided {@link KeyBag}.</p>
  * <p>This signer doesn't create input scripts for tx inputs. Instead it expects inputs to contain scripts with
  * empty sigs and replaces one of the empty sigs with calculated signature.
  * </p>
  * <p>This signer is always implicitly added into every wallet and it is the first signer to be executed during tx
  * completion. As the first signer to create a signature, it stores derivation path of the signing key in a given
- * {@link ProposedTransaction} object that will be also passed then to the next signer in chain. This allows other
+ * {@link TransactionSigner.ProposedTransaction} object that will be also passed then to the next signer in chain. This allows other
  * signers to use correct signing key for P2SH inputs, because all the keys involved in a single P2SH address have
  * the same derivation path.</p>
- * <p>This signer always uses {@link org.bitcoinj.core.Transaction.SigHash#ALL} signing mode.</p>
+ * <p>This signer always uses {@link Transaction.SigHash#ALL} signing mode.</p>
  */
-public class LocalTransactionSigner extends StatelessTransactionSigner {
+public class LocalTransactionSigner implements TransactionSigner {
     private static final Logger log = LoggerFactory.getLogger(LocalTransactionSigner.class);
 
     /**
@@ -63,16 +71,19 @@ public boolean signInputs(ProposedTransaction propTx, KeyBag keyBag) {
         int numInputs = tx.getInputs().size();
         for (int i = 0; i < numInputs; i++) {
             TransactionInput txIn = tx.getInput(i);
-            if (txIn.getConnectedOutput() == null) {
+            final TransactionOutput connectedOutput = txIn.getConnectedOutput();
+            if (connectedOutput == null) {
                 log.warn("Missing connected output, assuming input {} is already signed.", i);
                 continue;
             }
+            Script scriptPubKey = connectedOutput.getScriptPubKey();
 
             try {
                 // We assume if its already signed, its hopefully got a SIGHASH type that will not invalidate when
                 // we sign missing pieces (to check this would require either assuming any signatures are signing
                 // standard output types or a way to get processed signatures out of script execution)
-                txIn.getScriptSig().correctlySpends(tx, i, txIn.getConnectedOutput().getScriptPubKey(), MINIMUM_VERIFY_FLAGS);
+                txIn.getScriptSig().correctlySpends(tx, i, txIn.getWitness(), connectedOutput.getValue(),
+                        connectedOutput.getScriptPubKey(), MINIMUM_VERIFY_FLAGS);
                 log.warn("Input {} already correctly spends output, assuming SIGHASH type used will be safe and skipping signing.", i);
                 continue;
             } catch (ScriptException e) {
@@ -81,8 +92,6 @@ public boolean signInputs(ProposedTransaction propTx, KeyBag keyBag) {
 
             RedeemData redeemData = txIn.getConnectedRedeemData(keyBag);
 
-            Script scriptPubKey = txIn.getConnectedOutput().getScriptPubKey();
-
             // For P2SH inputs we need to share derivation path of the signing key with other signers, so that they
             // use correct key to calculate their signatures.
             // Married keys all have the same derivation path, so we can safely just take first one here.
@@ -91,7 +100,7 @@ public boolean signInputs(ProposedTransaction propTx, KeyBag keyBag) {
                 propTx.keyPaths.put(scriptPubKey, (((DeterministicKey) pubKey).getPath()));
 
             ECKey key;
-            // locate private key in redeem data. For pay-to-address and pay-to-key inputs RedeemData will always contain
+            // locate private key in redeem data. For P2PKH and P2PK inputs RedeemData will always contain
             // only one key (with private bytes). For P2SH inputs RedeemData will contain multiple keys, one of which MAY
             // have private bytes
             if ((key = redeemData.getFullKey()) == null) {
@@ -100,22 +109,37 @@ public boolean signInputs(ProposedTransaction propTx, KeyBag keyBag) {
             }
 
             Script inputScript = txIn.getScriptSig();
-            // script here would be either a standard CHECKSIG program for pay-to-address or pay-to-pubkey inputs or
+            // script here would be either a standard CHECKSIG program for P2PKH or P2PK inputs or
             // a CHECKMULTISIG program for P2SH inputs
             byte[] script = redeemData.redeemScript.getProgram();
             try {
-                TransactionSignature signature = tx.calculateSignature(i, key, script, Transaction.SigHash.ALL, false);
+                if (ScriptPattern.isP2PK(scriptPubKey) || ScriptPattern.isP2PKH(scriptPubKey)
+                        || ScriptPattern.isP2SH(scriptPubKey)) {
+                    TransactionSignature signature = tx.calculateSignature(i, key, script, Transaction.SigHash.ALL,
+                            false);
 
-                // at this point we have incomplete inputScript with OP_0 in place of one or more signatures. We already
-                // have calculated the signature using the local key and now need to insert it in the correct place
-                // within inputScript. For pay-to-address and pay-to-key script there is only one signature and it always
-                // goes first in an inputScript (sigIndex = 0). In P2SH input scripts we need to figure out our relative
-                // position relative to other signers.  Since we don't have that information at this point, and since
-                // we always run first, we have to depend on the other signers rearranging the signatures as needed.
-                // Therefore, always place as first signature.
-                int sigIndex = 0;
-                inputScript = scriptPubKey.getScriptSigWithSignature(inputScript, signature.encodeToBitcoin(), sigIndex);
-                txIn.setScriptSig(inputScript);
+                    // at this point we have incomplete inputScript with OP_0 in place of one or more signatures. We
+                    // already have calculated the signature using the local key and now need to insert it in the
+                    // correct place within inputScript. For P2PKH and P2PK script there is only one signature and it
+                    // always goes first in an inputScript (sigIndex = 0). In P2SH input scripts we need to figure out
+                    // our relative position relative to other signers. Since we don't have that information at this
+                    // point, and since we always run first, we have to depend on the other signers rearranging the
+                    // signatures as needed. Therefore, always place as first signature.
+                    int sigIndex = 0;
+                    inputScript = scriptPubKey.getScriptSigWithSignature(inputScript, signature.encodeToBitcoin(),
+                            sigIndex);
+                    txIn.setScriptSig(inputScript);
+                    txIn.setWitness(null);
+                } else if (ScriptPattern.isP2WPKH(scriptPubKey)) {
+                    Script scriptCode = ScriptBuilder.createP2PKHOutputScript(key);
+                    Coin value = txIn.getValue();
+                    TransactionSignature signature = tx.calculateWitnessSignature(i, key, scriptCode, value,
+                            Transaction.SigHash.ALL, false);
+                    txIn.setScriptSig(ScriptBuilder.createEmpty());
+                    txIn.setWitness(TransactionWitness.redeemP2WPKH(signature, key));
+                } else {
+                    throw new IllegalStateException(script.toString());
+                }
             } catch (ECKey.KeyIsEncryptedException e) {
                 throw e;
             } catch (ECKey.MissingPrivateKeyException e) {
diff --git a/core/src/main/java/org/bitcoinj/signers/MissingSigResolutionSigner.java b/core/src/main/java/org/bitcoinj/signers/MissingSigResolutionSigner.java
index a4c7c5c17e6..c17e478544c 100644
--- a/core/src/main/java/org/bitcoinj/signers/MissingSigResolutionSigner.java
+++ b/core/src/main/java/org/bitcoinj/signers/MissingSigResolutionSigner.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014 Kosta Korenkov
+ * Copyright 2019 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,22 +19,24 @@
 
 import org.bitcoinj.core.ECKey;
 import org.bitcoinj.core.TransactionInput;
+import org.bitcoinj.core.TransactionWitness;
 import org.bitcoinj.crypto.TransactionSignature;
 import org.bitcoinj.script.Script;
 import org.bitcoinj.script.ScriptChunk;
+import org.bitcoinj.script.ScriptPattern;
 import org.bitcoinj.wallet.KeyBag;
 import org.bitcoinj.wallet.Wallet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * This transaction signer resolves missing signatures in accordance with the given {@link org.bitcoinj.wallet.Wallet.MissingSigsMode}.
+ * This transaction signer resolves missing signatures in accordance with the given {@link Wallet.MissingSigsMode}.
  * If missingSigsMode is USE_OP_ZERO this signer does nothing assuming missing signatures are already presented in
  * scriptSigs as OP_0.
  * In MissingSigsMode.THROW mode this signer will throw an exception. It would be MissingSignatureException
  * for P2SH or MissingPrivateKeyException for other transaction types.
  */
-public class MissingSigResolutionSigner extends StatelessTransactionSigner {
+public class MissingSigResolutionSigner implements TransactionSigner {
     private static final Logger log = LoggerFactory.getLogger(MissingSigResolutionSigner.class);
 
     public Wallet.MissingSigsMode missingSigsMode = Wallet.MissingSigsMode.USE_DUMMY_SIG;
@@ -66,8 +69,8 @@ public boolean signInputs(ProposedTransaction propTx, KeyBag keyBag) {
 
             Script scriptPubKey = txIn.getConnectedOutput().getScriptPubKey();
             Script inputScript = txIn.getScriptSig();
-            if (scriptPubKey.isPayToScriptHash() || scriptPubKey.isSentToMultiSig()) {
-                int sigSuffixCount = scriptPubKey.isPayToScriptHash() ? 1 : 0;
+            if (ScriptPattern.isP2SH(scriptPubKey) || ScriptPattern.isSentToMultisig(scriptPubKey)) {
+                int sigSuffixCount = ScriptPattern.isP2SH(scriptPubKey) ? 1 : 0;
                 // all chunks except the first one (OP_0) and the last (redeem script) are signatures
                 for (int j = 1; j < inputScript.getChunks().size() - sigSuffixCount; j++) {
                     ScriptChunk scriptChunk = inputScript.getChunks().get(j);
@@ -79,7 +82,7 @@ public boolean signInputs(ProposedTransaction propTx, KeyBag keyBag) {
                         }
                     }
                 }
-            } else {
+            } else if (ScriptPattern.isP2PK(scriptPubKey) || ScriptPattern.isP2PKH(scriptPubKey)) {
                 if (inputScript.getChunks().get(0).equalsOpCode(0)) {
                     if (missingSigsMode == Wallet.MissingSigsMode.THROW) {
                         throw new ECKey.MissingPrivateKeyException();
@@ -87,8 +90,20 @@ public boolean signInputs(ProposedTransaction propTx, KeyBag keyBag) {
                         txIn.setScriptSig(scriptPubKey.getScriptSigWithSignature(inputScript, dummySig, 0));
                     }
                 }
+            } else if (ScriptPattern.isP2WPKH(scriptPubKey)) {
+                if (txIn.getWitness() == null || txIn.getWitness().equals(TransactionWitness.EMPTY)
+                        || txIn.getWitness().getPush(0).length == 0) {
+                    if (missingSigsMode == Wallet.MissingSigsMode.THROW) {
+                        throw new ECKey.MissingPrivateKeyException();
+                    } else if (missingSigsMode == Wallet.MissingSigsMode.USE_DUMMY_SIG) {
+                        ECKey key = keyBag.findKeyFromPubKeyHash(
+                                ScriptPattern.extractHashFromP2WH(scriptPubKey), Script.ScriptType.P2WPKH);
+                        txIn.setWitness(TransactionWitness.redeemP2WPKH(TransactionSignature.dummy(), key));
+                    }
+                }
+            } else {
+                throw new IllegalStateException("cannot handle: " + scriptPubKey);
             }
-            // TODO handle non-P2SH multisig
         }
         return true;
     }
diff --git a/core/src/main/java/org/bitcoinj/signers/TransactionSigner.java b/core/src/main/java/org/bitcoinj/signers/TransactionSigner.java
index e149bf10a70..663f1bfa075 100644
--- a/core/src/main/java/org/bitcoinj/signers/TransactionSigner.java
+++ b/core/src/main/java/org/bitcoinj/signers/TransactionSigner.java
@@ -20,6 +20,7 @@
 import org.bitcoinj.crypto.ChildNumber;
 import org.bitcoinj.script.Script;
 import org.bitcoinj.wallet.KeyBag;
+import org.bitcoinj.wallet.Wallet;
 
 import java.util.HashMap;
 import java.util.List;
@@ -29,7 +30,7 @@
  * <p>Implementations of this interface are intended to sign inputs of the given transaction. Given transaction may already
  * be partially signed or somehow altered by other signers.</p>
  * <p>To make use of the signer, you need to add it into the  wallet by
- * calling {@link org.bitcoinj.wallet.Wallet#addTransactionSigner(TransactionSigner)}. Signer will be serialized
+ * calling {@link Wallet#addTransactionSigner(TransactionSigner)}. Signer will be serialized
  * along with the wallet data. In order for a wallet to recreate signer after deserialization, each signer
  * should have no-args constructor</p>
  */
@@ -54,7 +55,7 @@ class ProposedTransaction {
 
         public ProposedTransaction(Transaction partialTx) {
             this.partialTx = partialTx;
-            this.keyPaths = new HashMap<Script, List<ChildNumber>>();
+            this.keyPaths = new HashMap<>();
         }
     }
 
@@ -66,16 +67,6 @@ class MissingSignatureException extends RuntimeException {
      */
     boolean isReady();
 
-    /**
-     * Returns byte array of data representing state of this signer. It's used to serialize/deserialize this signer
-     */
-    byte[] serialize();
-
-    /**
-     * Uses given byte array of data to reconstruct internal state of this signer
-     */
-    void deserialize(byte[] data);
-
     /**
      * Signs given transaction's inputs.
      * Returns true if signer is compatible with given transaction (can do something meaningful with it).
diff --git a/core/src/main/java/org/bitcoinj/signers/package-info.java b/core/src/main/java/org/bitcoinj/signers/package-info.java
index 86e35e2f35e..8c652d2c494 100644
--- a/core/src/main/java/org/bitcoinj/signers/package-info.java
+++ b/core/src/main/java/org/bitcoinj/signers/package-info.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -17,4 +19,4 @@
  * local private keys or fetching them from remote servers. The {@link org.bitcoinj.wallet.Wallet} class uses these
  * when sending money.
  */
-package org.bitcoinj.signers;
\ No newline at end of file
+package org.bitcoinj.signers;
diff --git a/core/src/main/java/org/bitcoinj/store/BlockStore.java b/core/src/main/java/org/bitcoinj/store/BlockStore.java
index 188ebb7b33e..26bd41b7897 100644
--- a/core/src/main/java/org/bitcoinj/store/BlockStore.java
+++ b/core/src/main/java/org/bitcoinj/store/BlockStore.java
@@ -16,6 +16,7 @@
 
 package org.bitcoinj.store;
 
+import org.bitcoinj.core.BlockChain;
 import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.core.Sha256Hash;
 import org.bitcoinj.core.StoredBlock;
@@ -46,8 +47,8 @@ public interface BlockStore {
 
     /**
      * Returns the {@link StoredBlock} that represents the top of the chain of greatest total work. Note that this
-     * can be arbitrarily expensive, you probably should use {@link org.bitcoinj.core.BlockChain#getChainHead()}
-     * or perhaps {@link org.bitcoinj.core.BlockChain#getBestChainHeight()} which will run in constant time and
+     * can be arbitrarily expensive, you probably should use {@link BlockChain#getChainHead()}
+     * or perhaps {@link BlockChain#getBestChainHeight()} which will run in constant time and
      * not take any heavyweight locks.
      */
     StoredBlock getChainHead() throws BlockStoreException;
@@ -61,7 +62,7 @@ public interface BlockStore {
     void close() throws BlockStoreException;
 
     /**
-     * Get the {@link org.bitcoinj.core.NetworkParameters} of this store.
+     * Get the {@link NetworkParameters} of this store.
      * @return The network params.
      */
     NetworkParameters getParams();
diff --git a/core/src/main/java/org/bitcoinj/store/ChainFileLockedException.java b/core/src/main/java/org/bitcoinj/store/ChainFileLockedException.java
index 7d7cf0721a1..9bc9c7baa97 100644
--- a/core/src/main/java/org/bitcoinj/store/ChainFileLockedException.java
+++ b/core/src/main/java/org/bitcoinj/store/ChainFileLockedException.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/store/DatabaseFullPrunedBlockStore.java b/core/src/main/java/org/bitcoinj/store/DatabaseFullPrunedBlockStore.java
index 9e9f9e2ab88..e474404b1b4 100644
--- a/core/src/main/java/org/bitcoinj/store/DatabaseFullPrunedBlockStore.java
+++ b/core/src/main/java/org/bitcoinj/store/DatabaseFullPrunedBlockStore.java
@@ -21,6 +21,7 @@
 import com.google.common.collect.Lists;
 import org.bitcoinj.core.*;
 import org.bitcoinj.script.Script;
+import org.bitcoinj.script.Script.ScriptType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,20 +37,17 @@
  * <p>A generic full pruned block store for a relational database.  This generic class requires
  * certain table structures for the block store.</p>
  *
- * <p>The following are the tables and field names/types that are assumed:-</p>
+ * <p>The following are the tables and field names/types that are assumed:</p>
  *
- * <p>
- * <b>setting</b> table
  * <table>
+ *     <caption><b>setting</b> table</caption>
  *     <tr><th>Field Name</th><th>Type (generic)</th></tr>
  *     <tr><td>name</td><td>string</td></tr>
  *     <tr><td>value</td><td>binary</td></tr>
  * </table>
- * </p>
  *
- * <p><br/>
- * <b>headers</b> table
  * <table>
+ *     <caption><b>headers</b> table</caption>
  *     <tr><th>Field Name</th><th>Type (generic)</th></tr>
  *     <tr><td>hash</td><td>binary</td></tr>
  *     <tr><td>chainwork</td><td>binary</td></tr>
@@ -57,22 +55,18 @@
  *     <tr><td>header</td><td>binary</td></tr>
  *     <tr><td>wasundoable</td><td>boolean</td></tr>
  * </table>
- * </p>
  *
- * <p><br/>
- * <b>undoableblocks</b> table
  * <table>
+ *     <caption><b>undoableblocks</b> table</caption>
  *     <tr><th>Field Name</th><th>Type (generic)</th></tr>
  *     <tr><td>hash</td><td>binary</td></tr>
  *     <tr><td>height</td><td>integer</td></tr>
  *     <tr><td>txoutchanges</td><td>binary</td></tr>
  *     <tr><td>transactions</td><td>binary</td></tr>
  * </table>
- * </p>
  *
- * <p><br/>
- * <b>openoutputs</b> table
  * <table>
+ *     <caption><b>openoutputs</b> table</caption>
  *     <tr><th>Field Name</th><th>Type (generic)</th></tr>
  *     <tr><td>hash</td><td>binary</td></tr>
  *     <tr><td>index</td><td>integer</td></tr>
@@ -83,8 +77,6 @@
  *     <tr><td>addresstargetable</td><td>integer</td></tr>
  *     <tr><td>coinbase</td><td>boolean</td></tr>
  * </table>
- * </p>
- *
  */
 public abstract class DatabaseFullPrunedBlockStore implements FullPrunedBlockStore {
     private static final Logger log = LoggerFactory.getLogger(DatabaseFullPrunedBlockStore.class);
@@ -168,8 +160,8 @@ public DatabaseFullPrunedBlockStore(NetworkParameters params, String connectionU
         this.schemaName = schemaName;
         this.username = username;
         this.password = password;
-        this.conn = new ThreadLocal<Connection>();
-        this.allConnections = new LinkedList<Connection>();
+        this.conn = new ThreadLocal<>();
+        this.allConnections = new LinkedList<>();
 
         try {
             Class.forName(getDatabaseDriverClass());
@@ -220,7 +212,7 @@ public DatabaseFullPrunedBlockStore(NetworkParameters params, String connectionU
 
     /**
      * Get the database specific error code that indicated a duplicate key error when inserting a record.
-     * <p>This is the code returned by {@link java.sql.SQLException#getSQLState()}</p>
+     * <p>This is the code returned by {@link SQLException#getSQLState()}</p>
      * @return The database duplicate error code.
      */
     protected abstract String getDuplicateKeyErrorCode();
@@ -246,7 +238,7 @@ protected String getTablesExistSQL() {
      * @return The SQL prepared statements.
      */
     protected List<String> getCompatibilitySQL() {
-        List<String> sqlStatements = new ArrayList<String>();
+        List<String> sqlStatements = new ArrayList<>();
         sqlStatements.add(SELECT_COMPATIBILITY_COINBASE_SQL);
         return sqlStatements;
     }
@@ -255,7 +247,7 @@ protected List<String> getCompatibilitySQL() {
      * Get the SQL to select the transaction outputs for a given address.
      * @return The SQL prepared statement.
      */
-    protected String getTrasactionOutputSelectSQL() {
+    protected String getTransactionOutputSelectSQL() {
         return SELECT_TRANSACTION_OUTPUTS_SQL;
     }
 
@@ -264,7 +256,7 @@ protected String getTrasactionOutputSelectSQL() {
      * @return The SQL drop statements.
      */
     protected List<String> getDropTablesSQL() {
-        List<String> sqlStatements = new ArrayList<String>();
+        List<String> sqlStatements = new ArrayList<>();
         sqlStatements.add(DROP_SETTINGS_TABLE);
         sqlStatements.add(DROP_HEADERS_TABLE);
         sqlStatements.add(DROP_UNDOABLE_TABLE);
@@ -554,7 +546,7 @@ private void createTables() throws SQLException, BlockStoreException {
     }
 
     /**
-     * Create a new store for the given {@link org.bitcoinj.core.NetworkParameters}.
+     * Create a new store for the given {@link NetworkParameters}.
      * @param params The network.
      * @throws BlockStoreException If the store couldn't be created.
      */
@@ -606,7 +598,7 @@ private void initFromDatabase() throws SQLException, BlockStoreException {
         this.verifiedChainHeadBlock = get(hash);
         this.verifiedChainHeadHash = hash;
         if (this.verifiedChainHeadBlock == null) {
-            throw new BlockStoreException("corrupt databse block store - verified head block not found");
+            throw new BlockStoreException("corrupt database block store - verified head block not found");
         }
     }
 
@@ -668,10 +660,7 @@ public void put(StoredBlock storedBlock, StoredUndoableBlock undoableBlock) thro
                 txOutChanges = bos.toByteArray();
             } else {
                 int numTxn = undoableBlock.getTransactions().size();
-                bos.write(0xFF & numTxn);
-                bos.write(0xFF & (numTxn >> 8));
-                bos.write(0xFF & (numTxn >> 16));
-                bos.write(0xFF & (numTxn >> 24));
+                Utils.uint32ToByteStreamLE(numTxn, bos);
                 for (Transaction tx : undoableBlock.getTransactions())
                     tx.bitcoinSerialize(bos);
                 transactions = bos.toByteArray();
@@ -805,12 +794,9 @@ public StoredUndoableBlock getUndoBlock(Sha256Hash hash) throws BlockStoreExcept
             byte[] transactions = results.getBytes(2);
             StoredUndoableBlock block;
             if (txOutChanges == null) {
-                int offset = 0;
-                int numTxn = ((transactions[offset++] & 0xFF)) |
-                        ((transactions[offset++] & 0xFF) << 8) |
-                        ((transactions[offset++] & 0xFF) << 16) |
-                        ((transactions[offset++] & 0xFF) << 24);
-                List<Transaction> transactionList = new LinkedList<Transaction>();
+                int numTxn = (int) Utils.readUint32(transactions, 0);
+                int offset = 4;
+                List<Transaction> transactionList = new LinkedList<>();
                 for (int i = 0; i < numTxn; i++) {
                     Transaction tx = params.getDefaultSerializer().makeTransaction(transactions, offset);
                     transactionList.add(tx);
@@ -965,7 +951,8 @@ public void addUnspentTransactionOutput(UTXO out) throws BlockStoreException {
             s.setLong(4, out.getValue().value);
             s.setBytes(5, out.getScript().getProgram());
             s.setString(6, out.getAddress());
-            s.setInt(7, out.getScript().getScriptType().ordinal());
+            ScriptType scriptType = out.getScript().getScriptType();
+            s.setInt(7, scriptType != null ? scriptType.id : 0);
             s.setBoolean(8, out.isCoinbase());
             s.executeUpdate();
             s.close();
@@ -1119,10 +1106,10 @@ public void deleteStore() throws BlockStoreException {
     /**
      * Calculate the balance for a coinbase, to-address, or p2sh address.
      *
-     * <p>The balance {@link org.bitcoinj.store.DatabaseFullPrunedBlockStore#getBalanceSelectSQL()} returns
+     * <p>The balance {@link DatabaseFullPrunedBlockStore#getBalanceSelectSQL()} returns
      * the balance (summed) as an number, then use calculateClientSide=false</p>
      *
-     * <p>The balance {@link org.bitcoinj.store.DatabaseFullPrunedBlockStore#getBalanceSelectSQL()} returns
+     * <p>The balance {@link DatabaseFullPrunedBlockStore#getBalanceSelectSQL()} returns
      * the all the openoutputs as stored in the DB (binary), then use calculateClientSide=true</p>
      *
      * @param address The address to calculate the balance of
@@ -1156,14 +1143,15 @@ public BigInteger calculateBalanceForAddress(Address address) throws BlockStoreE
     }
 
     @Override
-    public List<UTXO> getOpenTransactionOutputs(List<Address> addresses) throws UTXOProviderException {
+    public List<UTXO> getOpenTransactionOutputs(List<ECKey> keys) throws UTXOProviderException {
         PreparedStatement s = null;
-        List<UTXO> outputs = new ArrayList<UTXO>();
+        List<UTXO> outputs = new ArrayList<>();
         try {
             maybeConnect();
-            s = conn.get().prepareStatement(getTrasactionOutputSelectSQL());
-            for (Address address : addresses) {
-                s.setString(1, address.toString());
+            s = conn.get().prepareStatement(getTransactionOutputSelectSQL());
+            for (ECKey key : keys) {
+                // TODO switch to pubKeyHash in order to support native segwit addresses
+                s.setString(1, LegacyAddress.fromKey(params, key).toString());
                 ResultSet rs = s.executeQuery();
                 while (rs.next()) {
                     Sha256Hash hash = Sha256Hash.wrap(rs.getBytes(1));
diff --git a/core/src/main/java/org/bitcoinj/store/FullPrunedBlockStore.java b/core/src/main/java/org/bitcoinj/store/FullPrunedBlockStore.java
index 5db38f804a2..6c37758ee96 100644
--- a/core/src/main/java/org/bitcoinj/store/FullPrunedBlockStore.java
+++ b/core/src/main/java/org/bitcoinj/store/FullPrunedBlockStore.java
@@ -32,7 +32,7 @@
  * 
  * <p>It should store the {@link StoredUndoableBlock}s of a number of recent blocks before verifiedHead.height and
  * all those after verifiedHead.height.
- * It is advisable to store any {@link StoredUndoableBlock} which has a height > verifiedHead.height - N.
+ * It is advisable to store any {@link StoredUndoableBlock} which has a {@code height > verifiedHead.height - N}.
  * Because N determines the memory usage, it is recommended that N be customizable. N should be chosen such that
  * re-orgs beyond that point are vanishingly unlikely, for example, a few thousand blocks is a reasonable choice.</p>
  * 
@@ -72,17 +72,17 @@ public interface FullPrunedBlockStore extends BlockStore, UTXOProvider {
     StoredUndoableBlock getUndoBlock(Sha256Hash hash) throws BlockStoreException;
     
     /**
-     * Gets a {@link org.bitcoinj.core.UTXO} with the given hash and index, or null if none is found
+     * Gets a {@link UTXO} with the given hash and index, or null if none is found
      */
     UTXO getTransactionOutput(Sha256Hash hash, long index) throws BlockStoreException;
     
     /**
-     * Adds a {@link org.bitcoinj.core.UTXO} to the list of unspent TransactionOutputs
+     * Adds a {@link UTXO} to the list of unspent TransactionOutputs
      */
     void addUnspentTransactionOutput(UTXO out) throws BlockStoreException;
     
     /**
-     * Removes a {@link org.bitcoinj.core.UTXO} from the list of unspent TransactionOutputs
+     * Removes a {@link UTXO} from the list of unspent TransactionOutputs
      * Note that the coinbase of the genesis block should NEVER be spendable and thus never in the list.
      * @throws BlockStoreException if there is an underlying storage issue, or out was not in the list.
      */
diff --git a/core/src/main/java/org/bitcoinj/store/H2FullPrunedBlockStore.java b/core/src/main/java/org/bitcoinj/store/H2FullPrunedBlockStore.java
index efa1e79f087..5c18e0bcbc8 100644
--- a/core/src/main/java/org/bitcoinj/store/H2FullPrunedBlockStore.java
+++ b/core/src/main/java/org/bitcoinj/store/H2FullPrunedBlockStore.java
@@ -1,6 +1,7 @@
 /*
  * Copyright 2012 Matt Corallo.
  * Copyright 2014 Kalpesh Parmar.
+ * Copyright 2019 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,7 +66,7 @@ public class H2FullPrunedBlockStore extends DatabaseFullPrunedBlockStore {
             + "height INT NOT NULL,"
             + "value BIGINT NOT NULL,"
             + "scriptbytes BLOB NOT NULL,"
-            + "toaddress VARCHAR(35),"
+            + "toaddress VARCHAR(74),"
             + "addresstargetable TINYINT,"
             + "coinbase BOOLEAN,"
             + "PRIMARY KEY (hash, index),"
@@ -101,7 +102,7 @@ public H2FullPrunedBlockStore(NetworkParameters params, String dbName, String us
      */
     public H2FullPrunedBlockStore(NetworkParameters params, String dbName, int fullStoreDepth)
             throws BlockStoreException {
-        this(params, DATABASE_CONNECTION_URL_PREFIX + dbName + ";create=true;LOCK_TIMEOUT=60000;DB_CLOSE_ON_EXIT=FALSE", null, null, fullStoreDepth);
+        this(params, dbName, null, null, fullStoreDepth);
     }
 
     /**
@@ -133,7 +134,7 @@ protected String getDuplicateKeyErrorCode() {
 
     @Override
     protected List<String> getCreateTablesSQL() {
-        List<String> sqlStatements = new ArrayList<String>();
+        List<String> sqlStatements = new ArrayList<>();
         sqlStatements.add(CREATE_SETTINGS_TABLE);
         sqlStatements.add(CREATE_HEADERS_TABLE);
         sqlStatements.add(CREATE_UNDOABLE_TABLE);
@@ -143,7 +144,7 @@ protected List<String> getCreateTablesSQL() {
 
     @Override
     protected List<String> getCreateIndexesSQL() {
-        List<String> sqlStatements = new ArrayList<String>();
+        List<String> sqlStatements = new ArrayList<>();
         sqlStatements.add(CREATE_UNDOABLE_TABLE_INDEX);
         sqlStatements.add(CREATE_OUTPUTS_ADDRESS_MULTI_INDEX);
         sqlStatements.add(CREATE_OUTPUTS_ADDRESSTARGETABLE_INDEX);
@@ -162,4 +163,4 @@ protected List<String> getCreateSchemeSQL() {
     protected String getDatabaseDriverClass() {
         return DATABASE_DRIVER_CLASS;
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/bitcoinj/store/LevelDBBlockStore.java b/core/src/main/java/org/bitcoinj/store/LevelDBBlockStore.java
index 90ff4089901..ba3d8255903 100644
--- a/core/src/main/java/org/bitcoinj/store/LevelDBBlockStore.java
+++ b/core/src/main/java/org/bitcoinj/store/LevelDBBlockStore.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/store/LevelDBFullPrunedBlockStore.java b/core/src/main/java/org/bitcoinj/store/LevelDBFullPrunedBlockStore.java
index 443c52a9183..814f953808d 100644
--- a/core/src/main/java/org/bitcoinj/store/LevelDBFullPrunedBlockStore.java
+++ b/core/src/main/java/org/bitcoinj/store/LevelDBFullPrunedBlockStore.java
@@ -30,8 +30,9 @@
 
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.AddressFormatException;
+import org.bitcoinj.core.ECKey;
+import org.bitcoinj.core.LegacyAddress;
 import org.bitcoinj.core.NetworkParameters;
-import org.bitcoinj.core.ScriptException;
 import org.bitcoinj.core.Sha256Hash;
 import org.bitcoinj.core.StoredBlock;
 import org.bitcoinj.core.StoredUndoableBlock;
@@ -39,8 +40,10 @@
 import org.bitcoinj.core.TransactionOutputChanges;
 import org.bitcoinj.core.UTXO;
 import org.bitcoinj.core.UTXOProviderException;
+import org.bitcoinj.core.Utils;
 import org.bitcoinj.core.VerificationException;
 import org.bitcoinj.script.Script;
+import org.bitcoinj.script.ScriptException;
 import org.iq80.leveldb.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -53,7 +56,7 @@
 /**
  * <p>
  * An implementation of a Fully Pruned Block Store using a leveldb implementation as the backing data store.
- * <p>
+ * </p>
  * 
  * <p>
  * Includes number of caches to optimise the initial blockchain download.
@@ -259,9 +262,9 @@ public LevelDBFullPrunedBlockStore(NetworkParameters params, String filename, in
         fullStoreDepth = blockCount;
         this.instrument = instrument;
         this.exitBlock = exitBlock;
-        methodStartTime = new HashMap<String, Stopwatch>();
-        methodCalls = new HashMap<String, Long>();
-        methodTotalTime = new HashMap<String, Long>();
+        methodStartTime = new HashMap<>();
+        methodCalls = new HashMap<>();
+        methodTotalTime = new HashMap<>();
 
         this.filename = filename;
         this.leveldbReadCache = leveldbReadCache;
@@ -314,7 +317,7 @@ private void initFromDb() throws BlockStoreException {
         this.verifiedChainHeadBlock = get(hash);
         this.verifiedChainHeadHash = hash;
         if (this.verifiedChainHeadBlock == null) {
-            throw new BlockStoreException("corrupt databse block store - verified head block not found");
+            throw new BlockStoreException("corrupt database block store - verified head block not found");
         }
     }
 
@@ -419,16 +422,16 @@ public NetworkParameters getParams() {
     }
 
     @Override
-    public List<UTXO> getOpenTransactionOutputs(List<Address> addresses) throws UTXOProviderException {
+    public List<UTXO> getOpenTransactionOutputs(List<ECKey> keys) throws UTXOProviderException {
         // Run this on a snapshot of database so internally consistent result
         // This is critical or if one address paid another could get incorrect
         // results
 
-        List<UTXO> results = new LinkedList<UTXO>();
-        for (Address a : addresses) {
+        List<UTXO> results = new LinkedList<>();
+        for (ECKey key : keys) {
             ByteBuffer bb = ByteBuffer.allocate(21);
             bb.put((byte) KeyType.ADDRESS_HASHINDEX.ordinal());
-            bb.put(a.getHash160());
+            bb.put(key.getPubKeyHash());
 
             ReadOptions ro = new ReadOptions();
             Snapshot sn = db.getSnapshot();
@@ -442,7 +445,7 @@ public List<UTXO> getOpenTransactionOutputs(List<Address> addresses) throws UTXO
                 bbKey.get(); // remove the address_hashindex byte.
                 byte[] addressKey = new byte[20];
                 bbKey.get(addressKey);
-                if (!Arrays.equals(addressKey, a.getHash160())) {
+                if (!Arrays.equals(addressKey, key.getPubKeyHash())) {
                     break;
                 }
                 byte[] hashBytes = new byte[32];
@@ -513,10 +516,7 @@ public void put(StoredBlock storedBlock, StoredUndoableBlock undoableBlock) thro
                 txOutChanges = bos.toByteArray();
             } else {
                 int numTxn = undoableBlock.getTransactions().size();
-                bos.write((int) (0xFF & (numTxn >> 0)));
-                bos.write((int) (0xFF & (numTxn >> 8)));
-                bos.write((int) (0xFF & (numTxn >> 16)));
-                bos.write((int) (0xFF & (numTxn >> 24)));
+                Utils.uint32ToByteStreamLE(numTxn, bos);
                 for (Transaction tx : undoableBlock.getTransactions())
                     tx.bitcoinSerialize(bos);
                 transactions = bos.toByteArray();
@@ -671,10 +671,9 @@ public StoredUndoableBlock getUndoBlock(Sha256Hash hash) throws BlockStoreExcept
                 int txSize = bb.getInt();
                 byte[] transactions = new byte[txSize];
                 bb.get(transactions);
-                int offset = 0;
-                int numTxn = ((transactions[offset++] & 0xFF) << 0) | ((transactions[offset++] & 0xFF) << 8)
-                        | ((transactions[offset++] & 0xFF) << 16) | ((transactions[offset++] & 0xFF) << 24);
-                List<Transaction> transactionList = new LinkedList<Transaction>();
+                int numTxn = (int) Utils.readUint32(transactions, 0);
+                int offset = 4;
+                List<Transaction> transactionList = new LinkedList<>();
                 for (int i = 0; i < numTxn; i++) {
                     Transaction tx = new Transaction(params, transactions, offset);
                     transactionList.add(tx);
@@ -796,7 +795,7 @@ public void addUnspentTransactionOutput(UTXO out) throws BlockStoreException {
             return;
         } else {
             try {
-                a = Address.fromBase58(params, out.getAddress());
+                a = LegacyAddress.fromBase58(params, out.getAddress());
             } catch (AddressFormatException e) {
                 if (instrument)
                     endMethod("addUnspentTransactionOutput");
@@ -805,7 +804,7 @@ public void addUnspentTransactionOutput(UTXO out) throws BlockStoreException {
         }
         ByteBuffer bb = ByteBuffer.allocate(57);
         bb.put((byte) KeyType.ADDRESS_HASHINDEX.ordinal());
-        bb.put(a.getHash160());
+        bb.put(a.getHash());
         bb.put(out.getHash().getBytes());
         bb.putInt((int) out.getIndex());
         byte[] value = new byte[0];
@@ -890,10 +889,10 @@ public void removeUnspentTransactionOutput(UTXO out) throws BlockStoreException
             if (address == null || address.equals("")) {
                 Script sc = out.getScript();
                 a = sc.getToAddress(params);
-                hashBytes = a.getHash160();
+                hashBytes = a.getHash();
             } else {
-                a = Address.fromBase58(params, out.getAddress());
-                hashBytes = a.getHash160();
+                a = LegacyAddress.fromBase58(params, out.getAddress());
+                hashBytes = a.getHash();
             }
         } catch (AddressFormatException e) {
             if (instrument)
@@ -1039,10 +1038,10 @@ public void beginDatabaseBatchWrite() throws BlockStoreException {
             beginMethod("beginDatabaseBatchWrite");
 
         batch = db.createWriteBatch();
-        uncommited = new HashMap<ByteBuffer, byte[]>();
-        uncommitedDeletes = new HashSet<ByteBuffer>();
-        utxoUncommittedCache = new HashMap<ByteBuffer, UTXO>();
-        utxoUncommittedDeletedCache = new HashSet<ByteBuffer>();
+        uncommited = new HashMap<>();
+        uncommitedDeletes = new HashSet<>();
+        utxoUncommittedCache = new HashMap<>();
+        utxoUncommittedDeletedCache = new HashSet<>();
         autoCommit = false;
         if (instrument)
             endMethod("beginDatabaseBatchWrite");
diff --git a/core/src/main/java/org/bitcoinj/store/MemoryBlockStore.java b/core/src/main/java/org/bitcoinj/store/MemoryBlockStore.java
index eb2be66ea0a..f4cc6217eda 100644
--- a/core/src/main/java/org/bitcoinj/store/MemoryBlockStore.java
+++ b/core/src/main/java/org/bitcoinj/store/MemoryBlockStore.java
@@ -22,7 +22,7 @@
 import java.util.Map;
 
 /**
- * Keeps {@link org.bitcoinj.core.StoredBlock}s in memory. Used primarily for unit testing.
+ * Keeps {@link StoredBlock}s in memory. Used primarily for unit testing.
  */
 public class MemoryBlockStore implements BlockStore {
     private LinkedHashMap<Sha256Hash, StoredBlock> blockMap = new LinkedHashMap<Sha256Hash, StoredBlock>() {
diff --git a/core/src/main/java/org/bitcoinj/store/MemoryFullPrunedBlockStore.java b/core/src/main/java/org/bitcoinj/store/MemoryFullPrunedBlockStore.java
index b07fe892f99..6fb16db4a62 100644
--- a/core/src/main/java/org/bitcoinj/store/MemoryFullPrunedBlockStore.java
+++ b/core/src/main/java/org/bitcoinj/store/MemoryFullPrunedBlockStore.java
@@ -90,10 +90,10 @@ class TransactionalHashMap<KeyType, ValueType> {
     HashMap<KeyType, ValueType> map;
     
     public TransactionalHashMap() {
-        tempMap = new ThreadLocal<HashMap<KeyType, ValueType>>();
-        tempSetRemoved = new ThreadLocal<HashSet<KeyType>>();
-        inTransaction = new ThreadLocal<Boolean>();
-        map = new HashMap<KeyType, ValueType>();
+        tempMap = new ThreadLocal<>();
+        tempSetRemoved = new ThreadLocal<>();
+        inTransaction = new ThreadLocal<>();
+        map = new HashMap<>();
     }
     
     public void beginDatabaseBatchWrite() {
@@ -131,7 +131,7 @@ public ValueType get(KeyType key) {
     }
 
     public List<ValueType> values() {
-        List<ValueType> valueTypes = new ArrayList<ValueType>();
+        List<ValueType> valueTypes = new ArrayList<>();
         for (KeyType keyType : map.keySet()) {
             valueTypes.add(get(keyType));
         }
@@ -182,8 +182,8 @@ class TransactionalMultiKeyHashMap<UniqueKeyType, MultiKeyType, ValueType> {
     HashMap<MultiKeyType, Set<UniqueKeyType>> mapKeys;
     
     public TransactionalMultiKeyHashMap() {
-        mapValues = new TransactionalHashMap<UniqueKeyType, ValueType>();
-        mapKeys = new HashMap<MultiKeyType, Set<UniqueKeyType>>();
+        mapValues = new TransactionalHashMap<>();
+        mapKeys = new HashMap<>();
     }
     
     public void BeginTransaction() {
@@ -207,7 +207,7 @@ public void put(UniqueKeyType uniqueKey, MultiKeyType multiKey, ValueType value)
         mapValues.put(uniqueKey, value);
         Set<UniqueKeyType> set = mapKeys.get(multiKey);
         if (set == null) {
-            set = new HashSet<UniqueKeyType>();
+            set = new HashSet<>();
             set.add(uniqueKey);
             mapKeys.put(multiKey, set);
         }else{
@@ -229,7 +229,7 @@ public void removeByMultiKey(MultiKeyType key) {
 }
 
 /**
- * Keeps {@link StoredBlock}s, {@link StoredUndoableBlock}s and {@link org.bitcoinj.core.UTXO}s in memory.
+ * Keeps {@link StoredBlock}s, {@link StoredUndoableBlock}s and {@link UTXO}s in memory.
  * Used primarily for unit testing.
  */
 public class MemoryFullPrunedBlockStore implements FullPrunedBlockStore {
@@ -253,9 +253,9 @@ protected static class StoredBlockAndWasUndoableFlag {
      * @param fullStoreDepth The depth of blocks to keep FullStoredBlocks instead of StoredBlocks
      */
     public MemoryFullPrunedBlockStore(NetworkParameters params, int fullStoreDepth) {
-        blockMap = new TransactionalHashMap<Sha256Hash, StoredBlockAndWasUndoableFlag>();
-        fullBlockMap = new TransactionalMultiKeyHashMap<Sha256Hash, Integer, StoredUndoableBlock>();
-        transactionOutputMap = new TransactionalHashMap<StoredTransactionOutPoint, UTXO>();
+        blockMap = new TransactionalHashMap<>();
+        fullBlockMap = new TransactionalMultiKeyHashMap<>();
+        transactionOutputMap = new TransactionalHashMap<>();
         this.fullStoreDepth = fullStoreDepth > 0 ? fullStoreDepth : 1;
         // Insert the genesis block.
         try {
@@ -412,13 +412,15 @@ public int getChainHeadHeight() throws UTXOProviderException {
     }
 
     @Override
-    public List<UTXO> getOpenTransactionOutputs(List<Address> addresses) throws UTXOProviderException {
+    public List<UTXO> getOpenTransactionOutputs(List<ECKey> keys) throws UTXOProviderException {
         // This is *NOT* optimal: We go through all the outputs and select the ones we are looking for.
         // If someone uses this store for production then they have a lot more to worry about than an inefficient impl :)
-        List<UTXO> foundOutputs = new ArrayList<UTXO>();
+        List<UTXO> foundOutputs = new ArrayList<>();
         List<UTXO> outputsList = transactionOutputMap.values();
         for (UTXO output : outputsList) {
-            for (Address address : addresses) {
+            for (ECKey key : keys) {
+                // TODO switch to pubKeyHash in order to support native segwit addresses
+                Address address = LegacyAddress.fromKey(params, key);
                 if (output.getAddress().equals(address.toString())) {
                     foundOutputs.add(output);
                 }
diff --git a/core/src/main/java/org/bitcoinj/store/MySQLFullPrunedBlockStore.java b/core/src/main/java/org/bitcoinj/store/MySQLFullPrunedBlockStore.java
index 03244255736..c7cd5600c9e 100644
--- a/core/src/main/java/org/bitcoinj/store/MySQLFullPrunedBlockStore.java
+++ b/core/src/main/java/org/bitcoinj/store/MySQLFullPrunedBlockStore.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014 Kalpesh Parmar
+ * Copyright 2019 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +17,7 @@
 
 package org.bitcoinj.store;
 
+import org.bitcoinj.core.Address;
 import org.bitcoinj.core.NetworkParameters;
 
 import java.util.ArrayList;
@@ -24,7 +26,7 @@
 
 /**
  * <p>A full pruned block store using the MySQL database engine. As an added bonus an address index is calculated,
- * so you can use {@link #calculateBalanceForAddress(org.bitcoinj.core.Address)} to quickly look up
+ * so you can use {@link #calculateBalanceForAddress(Address)} to quickly look up
  * the quantity of bitcoins controlled by that address.</p>
  */
 public class MySQLFullPrunedBlockStore extends DatabaseFullPrunedBlockStore {
@@ -62,7 +64,7 @@ public class MySQLFullPrunedBlockStore extends DatabaseFullPrunedBlockStore {
             "    height integer NOT NULL,\n" +
             "    value bigint NOT NULL,\n" +
             "    scriptbytes mediumblob NOT NULL,\n" +
-            "    toaddress varchar(35),\n" +
+            "    toaddress varchar(74),\n" +
             "    addresstargetable tinyint(1),\n" +
             "    coinbase boolean,\n" +
             "    CONSTRAINT openoutputs_pk PRIMARY KEY (hash, `index`) USING BTREE \n" +
@@ -119,13 +121,13 @@ protected String getDeleteOpenoutputsSQL() {
     }
 
     @Override
-    protected String getTrasactionOutputSelectSQL() {
+    protected String getTransactionOutputSelectSQL() {
         return SELECT_TRANSACTION_OUTPUTS_SQL;
     }
 
     @Override
     protected List<String> getCreateTablesSQL() {
-        List<String> sqlStatements = new ArrayList<String>();
+        List<String> sqlStatements = new ArrayList<>();
         sqlStatements.add(CREATE_SETTINGS_TABLE);
         sqlStatements.add(CREATE_HEADERS_TABLE);
         sqlStatements.add(CREATE_UNDOABLE_TABLE);
@@ -135,7 +137,7 @@ protected List<String> getCreateTablesSQL() {
 
     @Override
     protected List<String> getCreateIndexesSQL() {
-        List<String> sqlStatements = new ArrayList<String>();
+        List<String> sqlStatements = new ArrayList<>();
         sqlStatements.add(CREATE_UNDOABLE_TABLE_INDEX);
         sqlStatements.add(CREATE_OUTPUTS_ADDRESS_MULTI_INDEX);
         sqlStatements.add(CREATE_OUTPUTS_ADDRESSTARGETABLE_INDEX);
diff --git a/core/src/main/java/org/bitcoinj/store/PostgresFullPrunedBlockStore.java b/core/src/main/java/org/bitcoinj/store/PostgresFullPrunedBlockStore.java
index a08283bfc8c..2907c5333b1 100644
--- a/core/src/main/java/org/bitcoinj/store/PostgresFullPrunedBlockStore.java
+++ b/core/src/main/java/org/bitcoinj/store/PostgresFullPrunedBlockStore.java
@@ -34,7 +34,7 @@
 
 /**
  * <p>A full pruned block store using the Postgres database engine. As an added bonus an address index is calculated,
- * so you can use {@link #calculateBalanceForAddress(org.bitcoinj.core.Address)} to quickly look up
+ * so you can use {@link #calculateBalanceForAddress(Address)} to quickly look up
  * the quantity of bitcoins controlled by that address.</p>
  */
 public class PostgresFullPrunedBlockStore extends DatabaseFullPrunedBlockStore {
@@ -74,7 +74,7 @@ public class PostgresFullPrunedBlockStore extends DatabaseFullPrunedBlockStore {
             "    height integer NOT NULL,\n" +
             "    value bigint NOT NULL,\n" +
             "    scriptbytes bytea NOT NULL,\n" +
-            "    toaddress character varying(35),\n" +
+            "    toaddress character varying(74),\n" +
             "    addresstargetable smallint,\n" +
             "    coinbase boolean,\n" +
             "    CONSTRAINT openoutputs_pk PRIMARY KEY (hash,index)\n" +
@@ -133,7 +133,7 @@ protected String getDuplicateKeyErrorCode() {
 
     @Override
     protected List<String> getCreateTablesSQL() {
-        List<String> sqlStatements = new ArrayList<String>();
+        List<String> sqlStatements = new ArrayList<>();
         sqlStatements.add(CREATE_SETTINGS_TABLE);
         sqlStatements.add(CREATE_HEADERS_TABLE);
         sqlStatements.add(CREATE_UNDOABLE_TABLE);
@@ -143,7 +143,7 @@ protected List<String> getCreateTablesSQL() {
 
     @Override
     protected List<String> getCreateIndexesSQL() {
-        List<String> sqlStatements = new ArrayList<String>();
+        List<String> sqlStatements = new ArrayList<>();
         sqlStatements.add(CREATE_UNDOABLE_TABLE_INDEX);
         sqlStatements.add(CREATE_OUTPUTS_ADDRESS_MULTI_INDEX);
         sqlStatements.add(CREATE_OUTPUTS_ADDRESSTARGETABLE_INDEX);
@@ -154,7 +154,7 @@ protected List<String> getCreateIndexesSQL() {
 
     @Override
     protected List<String> getCreateSchemeSQL() {
-        List<String> sqlStatements = new ArrayList<String>();
+        List<String> sqlStatements = new ArrayList<>();
         sqlStatements.add("CREATE SCHEMA IF NOT EXISTS " + schemaName);
         sqlStatements.add("set search_path to '" + schemaName +"'");
         return sqlStatements;
@@ -181,10 +181,7 @@ public void put(StoredBlock storedBlock, StoredUndoableBlock undoableBlock) thro
                 txOutChanges = bos.toByteArray();
             } else {
                 int numTxn = undoableBlock.getTransactions().size();
-                bos.write(0xFF & numTxn);
-                bos.write(0xFF & (numTxn >> 8));
-                bos.write(0xFF & (numTxn >> 16));
-                bos.write(0xFF & (numTxn >> 24));
+                Utils.uint32ToByteStreamLE(numTxn, bos);
                 for (Transaction tx : undoableBlock.getTransactions())
                     tx.bitcoinSerialize(bos);
                 transactions = bos.toByteArray();
@@ -258,4 +255,4 @@ public void put(StoredBlock storedBlock, StoredUndoableBlock undoableBlock) thro
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/bitcoinj/store/SPVBlockStore.java b/core/src/main/java/org/bitcoinj/store/SPVBlockStore.java
index 8a3427780c8..9a6cd59aff8 100644
--- a/core/src/main/java/org/bitcoinj/store/SPVBlockStore.java
+++ b/core/src/main/java/org/bitcoinj/store/SPVBlockStore.java
@@ -24,6 +24,7 @@
 import java.io.*;
 import java.nio.*;
 import java.nio.channels.*;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.locks.*;
 
@@ -40,12 +41,11 @@ public class SPVBlockStore implements BlockStore {
     private static final Logger log = LoggerFactory.getLogger(SPVBlockStore.class);
 
     /** The default number of headers that will be stored in the ring buffer. */
-    public static final int DEFAULT_NUM_HEADERS = 5000;
+    public static final int DEFAULT_CAPACITY = 5000;
     public static final String HEADER_MAGIC = "SPVB";
 
     protected volatile MappedByteBuffer buffer;
-    protected int numHeaders;
-    protected NetworkParameters params;
+    protected final NetworkParameters params;
 
     protected ReentrantLock lock = Threading.lock("SPVBlockStore");
 
@@ -68,7 +68,7 @@ protected boolean removeEldestEntry(Map.Entry<Sha256Hash, StoredBlock> entry) {
     //
     // We don't care about the value in this cache. It is always notFoundMarker. Unfortunately LinkedHashSet does not
     // provide the removeEldestEntry control.
-    protected static final Object notFoundMarker = new Object();
+    private static final Object NOT_FOUND_MARKER = new Object();
     protected LinkedHashMap<Sha256Hash, Object> notFoundCache = new LinkedHashMap<Sha256Hash, Object>() {
         @Override
         protected boolean removeEldestEntry(Map.Entry<Sha256Hash, Object> entry) {
@@ -78,26 +78,55 @@ protected boolean removeEldestEntry(Map.Entry<Sha256Hash, Object> entry) {
     // Used to stop other applications/processes from opening the store.
     protected FileLock fileLock = null;
     protected RandomAccessFile randomAccessFile = null;
+    private int fileLength;
+    private final String fileAbsolutePath;
 
     /**
-     * Creates and initializes an SPV block store. Will create the given file if it's missing. This operation
-     * will block on disk.
+     * Creates and initializes an SPV block store that can hold {@link #DEFAULT_CAPACITY} block headers. Will create the
+     * given file if it's missing. This operation will block on disk.
+     * @param file file to use for the block store
+     * @throws BlockStoreException if something goes wrong
      */
     public SPVBlockStore(NetworkParameters params, File file) throws BlockStoreException {
+        this(params, file, DEFAULT_CAPACITY, false);
+    }
+
+    /**
+     * Creates and initializes an SPV block store that can hold a given amount of blocks. Will create the given file if
+     * it's missing. This operation will block on disk.
+     * @param file file to use for the block store
+     * @param capacity custom capacity in number of block headers
+     * @param grow wether or not to migrate an existing block store of different capacity
+     * @throws BlockStoreException if something goes wrong
+     */
+    public SPVBlockStore(NetworkParameters params, File file, int capacity, boolean grow) throws BlockStoreException {
         checkNotNull(file);
+        fileAbsolutePath = file.getAbsolutePath();
         this.params = checkNotNull(params);
+        checkArgument(capacity > 0);
         try {
-            this.numHeaders = DEFAULT_NUM_HEADERS;
             boolean exists = file.exists();
             // Set up the backing file.
             randomAccessFile = new RandomAccessFile(file, "rw");
-            long fileSize = getFileSize();
+            fileLength = getFileSize(capacity);
             if (!exists) {
                 log.info("Creating new SPV block chain file " + file);
-                randomAccessFile.setLength(fileSize);
-            } else if (randomAccessFile.length() != fileSize) {
-                throw new BlockStoreException("File size on disk does not match expected size: " +
-                        randomAccessFile.length() + " vs " + fileSize);
+                randomAccessFile.setLength(fileLength);
+            } else {
+                final long currentLength = randomAccessFile.length();
+                if (currentLength != fileLength) {
+                    if ((currentLength - FILE_PROLOGUE_BYTES) % RECORD_SIZE != 0)
+                        throw new BlockStoreException(
+                                "File size on disk indicates this is not a block store: " + currentLength);
+                    else if (!grow)
+                        throw new BlockStoreException("File size on disk does not match expected size: " + currentLength
+                                + " vs " + fileLength);
+                    else if (fileLength < randomAccessFile.length())
+                        throw new BlockStoreException(
+                                "Shrinking is unsupported: " + currentLength + " vs " + fileLength);
+                    else
+                        randomAccessFile.setLength(fileLength);
+                }
             }
 
             FileChannel channel = randomAccessFile.getChannel();
@@ -110,14 +139,13 @@ public SPVBlockStore(NetworkParameters params, File file) throws BlockStoreExcep
             // inconsistent. However the only process accessing it is us, via this mapping, so our own view will
             // always be correct. Once we establish the mmap the underlying file and channel can go away. Note that
             // the details of mmapping vary between platforms.
-            buffer = channel.map(FileChannel.MapMode.READ_WRITE, 0, fileSize);
+            buffer = channel.map(FileChannel.MapMode.READ_WRITE, 0, fileLength);
 
             // Check or initialize the header bytes to ensure we don't try to open some random file.
-            byte[] header;
             if (exists) {
-                header = new byte[4];
+                byte[] header = new byte[4];
                 buffer.get(header);
-                if (!new String(header, "US-ASCII").equals(HEADER_MAGIC))
+                if (!new String(header, StandardCharsets.US_ASCII).equals(HEADER_MAGIC))
                     throw new BlockStoreException("Header bytes do not equal " + HEADER_MAGIC);
             } else {
                 initNewStore(params);
@@ -150,8 +178,8 @@ private void initNewStore(NetworkParameters params) throws Exception {
     }
 
     /** Returns the size in bytes of the file that is used to store the chain with the current parameters. */
-    public final int getFileSize() {
-        return RECORD_SIZE * numHeaders + FILE_PROLOGUE_BYTES /* extra kilobyte for stuff */;
+    public static final int getFileSize(int capacity) {
+        return RECORD_SIZE * capacity + FILE_PROLOGUE_BYTES /* extra kilobyte for stuff */;
     }
 
     @Override
@@ -162,7 +190,7 @@ public void put(StoredBlock block) throws BlockStoreException {
         lock.lock();
         try {
             int cursor = getRingCursor(buffer);
-            if (cursor == getFileSize()) {
+            if (cursor == fileLength) {
                 // Wrapped around.
                 cursor = FILE_PROLOGUE_BYTES;
             }
@@ -194,14 +222,13 @@ public StoredBlock get(Sha256Hash hash) throws BlockStoreException {
             // wrapped around.
             int cursor = getRingCursor(buffer);
             final int startingPoint = cursor;
-            final int fileSize = getFileSize();
             final byte[] targetHashBytes = hash.getBytes();
             byte[] scratch = new byte[32];
             do {
                 cursor -= RECORD_SIZE;
                 if (cursor < FILE_PROLOGUE_BYTES) {
                     // We hit the start, so wrap around.
-                    cursor = fileSize - RECORD_SIZE;
+                    cursor = fileLength - RECORD_SIZE;
                 }
                 // Cursor is now at the start of the next record to check, so read the hash and compare it.
                 buffer.position(cursor);
@@ -214,7 +241,7 @@ public StoredBlock get(Sha256Hash hash) throws BlockStoreException {
                 }
             } while (cursor != startingPoint);
             // Not found.
-            notFoundCache.put(hash, notFoundMarker);
+            notFoundCache.put(hash, NOT_FOUND_MARKER);
             return null;
         } catch (ProtocolException e) {
             throw new RuntimeException(e);  // Cannot happen.
@@ -236,8 +263,9 @@ public StoredBlock getChainHead() throws BlockStoreException {
                 buffer.get(headHash);
                 Sha256Hash hash = Sha256Hash.wrap(headHash);
                 StoredBlock block = get(hash);
-                if (block == null)
-                    throw new BlockStoreException("Corrupted block store: could not find chain head: " + hash);
+                if (block == null) 
+                    throw new BlockStoreException("Corrupted block store: could not find chain head: " + hash 
+                                                          +"\nFile path: "+ fileAbsolutePath);
                 lastChainHead = block;
             }
             return lastChainHead;
@@ -262,12 +290,9 @@ public void setChainHead(StoredBlock chainHead) throws BlockStoreException {
     public void close() throws BlockStoreException {
         try {
             buffer.force();
-            if (System.getProperty("os.name").toLowerCase().contains("win")) {
-                log.info("Windows mmap hack: Forcing buffer cleaning");
-                WindowsMMapHack.forceRelease(buffer);
-            }
             buffer = null;  // Allow it to be GCd and the underlying file mapping to go away.
             randomAccessFile.close();
+            blockCache.clear();
         } catch (IOException e) {
             throw new BlockStoreException(e);
         }
@@ -303,4 +328,22 @@ private void setRingCursor(ByteBuffer buffer, int newCursor) {
         checkArgument(newCursor >= 0);
         buffer.putInt(4, newCursor);
     }
+
+    public void clear() throws Exception {
+        lock.lock();
+        try {
+            // Clear caches
+            blockCache.clear();
+            notFoundCache.clear();
+            // Clear file content
+            buffer.position(0);
+            long fileLength = randomAccessFile.length();
+            for (int i = 0; i < fileLength; i++) {
+                buffer.put((byte)0);
+            }
+            // Initialize store again
+            buffer.position(0);
+            initNewStore(params);
+        } finally { lock.unlock(); }
+    }
 }
diff --git a/core/src/main/java/org/bitcoinj/store/WindowsMMapHack.java b/core/src/main/java/org/bitcoinj/store/WindowsMMapHack.java
deleted file mode 100644
index 035d4f21de0..00000000000
--- a/core/src/main/java/org/bitcoinj/store/WindowsMMapHack.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.bitcoinj.store;
-
-import sun.misc.*;
-import sun.nio.ch.*;
-
-import java.nio.*;
-
-/**
- * <p>This class knows how to force an mmap'd ByteBuffer to reliquish its file handles before it becomes garbage collected,
- * by exploiting implementation details of the HotSpot JVM implementation.</p>
- *
- * <p>This is required on Windows because otherwise an attempt to delete a file that is still mmapped will fail. This can
- * happen when a user requests a "restore from seed" function, which involves deleting and recreating the chain file.
- * At some point we should stop using mmap in SPVBlockStore and we can then delete this class.</p>
- *
- * <p>It is a separate class to avoid hitting unknown imports when running on other JVMs.</p>
- */
-public class WindowsMMapHack {
-    public static void forceRelease(MappedByteBuffer buffer) {
-        Cleaner cleaner = ((DirectBuffer) buffer).cleaner();
-        if (cleaner != null) cleaner.clean();
-    }
-}
diff --git a/core/src/main/java/org/bitcoinj/store/package-info.java b/core/src/main/java/org/bitcoinj/store/package-info.java
index 929cf916171..d96820179f7 100644
--- a/core/src/main/java/org/bitcoinj/store/package-info.java
+++ b/core/src/main/java/org/bitcoinj/store/package-info.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/uri/BitcoinURI.java b/core/src/main/java/org/bitcoinj/uri/BitcoinURI.java
index a4502c6760e..8d9508fceea 100644
--- a/core/src/main/java/org/bitcoinj/uri/BitcoinURI.java
+++ b/core/src/main/java/org/bitcoinj/uri/BitcoinURI.java
@@ -85,8 +85,8 @@ public class BitcoinURI {
     public static final String FIELD_PAYMENT_REQUEST_URL = "r";
 
     /**
-     * URI for Bitcoin network. Use {@link org.bitcoinj.params.AbstractBitcoinNetParams#BITCOIN_SCHEME} if you specifically
-     * need Bitcoin, or use {@link org.bitcoinj.core.NetworkParameters#getUriScheme} to get the scheme
+     * URI for Bitcoin network. Use {@link AbstractBitcoinNetParams#BITCOIN_SCHEME} if you specifically
+     * need Bitcoin, or use {@link NetworkParameters#getUriScheme} to get the scheme
      * from network parameters.
      */
     @Deprecated
@@ -98,7 +98,7 @@ public class BitcoinURI {
     /**
      * Contains all the parameters in the order in which they were processed
      */
-    private final Map<String, Object> parameterMap = new LinkedHashMap<String, Object>();
+    private final Map<String, Object> parameterMap = new LinkedHashMap<>();
 
     /**
      * Constructs a new BitcoinURI from the given string. Can be for any network.
@@ -146,9 +146,10 @@ public BitcoinURI(@Nullable NetworkParameters params, String input) throws Bitco
         String blockchainInfoScheme = scheme + "://";
         String correctScheme = scheme + ":";
         String schemeSpecificPart;
-        if (input.startsWith(blockchainInfoScheme)) {
+        final String inputLc = input.toLowerCase(Locale.US);
+        if (inputLc.startsWith(blockchainInfoScheme)) {
             schemeSpecificPart = input.substring(blockchainInfoScheme.length());
-        } else if (input.startsWith(correctScheme)) {
+        } else if (inputLc.startsWith(correctScheme)) {
             schemeSpecificPart = input.substring(correctScheme.length());
         } else {
             throw new BitcoinURIParseException("Unsupported URI scheme: " + uri.getScheme());
@@ -175,7 +176,7 @@ public BitcoinURI(@Nullable NetworkParameters params, String input) throws Bitco
         if (!addressToken.isEmpty()) {
             // Attempt to parse the addressToken as a Bitcoin address for this network
             try {
-                Address address = Address.fromBase58(params, addressToken);
+                Address address = Address.fromString(params, addressToken);
                 putWithValidation(FIELD_ADDRESS, address);
             } catch (final AddressFormatException e) {
                 throw new BitcoinURIParseException("Bad address", e);
@@ -255,7 +256,7 @@ private void putWithValidation(String key, Object value) throws BitcoinURIParseE
     }
 
     /**
-     * The Bitcoin Address from the URI, if one was present. It's possible to have Bitcoin URI's with no address if a
+     * The Bitcoin address from the URI, if one was present. It's possible to have Bitcoin URI's with no address if a
      * r= payment protocol parameter is specified, though this form is not recommended as older wallets can't understand
      * it.
      */
@@ -299,7 +300,7 @@ public final String getPaymentRequestUrl() {
      * all subsequent URLs are fallbacks.
      */
     public List<String> getPaymentRequestUrls() {
-        ArrayList<String> urls = new ArrayList<String>();
+        ArrayList<String> urls = new ArrayList<>();
         while (true) {
             int i = urls.size();
             String paramName = FIELD_PAYMENT_REQUEST_URL + (i > 0 ? Integer.toString(i) : "");
diff --git a/core/src/main/java/org/bitcoinj/uri/OptionalFieldValidationException.java b/core/src/main/java/org/bitcoinj/uri/OptionalFieldValidationException.java
index fbac47c6ec8..655b87bf7c6 100644
--- a/core/src/main/java/org/bitcoinj/uri/OptionalFieldValidationException.java
+++ b/core/src/main/java/org/bitcoinj/uri/OptionalFieldValidationException.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,7 +17,7 @@
 package org.bitcoinj.uri;
 
 /**
- * <p>Exception to provide the following to {@link org.bitcoinj.uri.BitcoinURI}:</p>
+ * <p>Exception to provide the following to {@link BitcoinURI}:</p>
  * <ul>
  * <li>Provision of parsing error messages</li>
  * </ul>
diff --git a/core/src/main/java/org/bitcoinj/uri/RequiredFieldValidationException.java b/core/src/main/java/org/bitcoinj/uri/RequiredFieldValidationException.java
index 5b0df64911d..7a246761e94 100644
--- a/core/src/main/java/org/bitcoinj/uri/RequiredFieldValidationException.java
+++ b/core/src/main/java/org/bitcoinj/uri/RequiredFieldValidationException.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/uri/package-info.java b/core/src/main/java/org/bitcoinj/uri/package-info.java
index b1fc1857f49..2b61afaa240 100644
--- a/core/src/main/java/org/bitcoinj/uri/package-info.java
+++ b/core/src/main/java/org/bitcoinj/uri/package-info.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/orchid/src/com/subgraph/orchid/data/Base32.java b/core/src/main/java/org/bitcoinj/utils/Base32.java
similarity index 83%
rename from orchid/src/com/subgraph/orchid/data/Base32.java
rename to core/src/main/java/org/bitcoinj/utils/Base32.java
index f0067eefdb1..dce7003fff4 100644
--- a/orchid/src/com/subgraph/orchid/data/Base32.java
+++ b/core/src/main/java/org/bitcoinj/utils/Base32.java
@@ -1,6 +1,6 @@
-package com.subgraph.orchid.data;
+// Copied from orchid Tor lib.
 
-import com.subgraph.orchid.TorException;
+package org.bitcoinj.utils;
 
 public class Base32 {
 	private final static String BASE32_CHARS = "abcdefghijklmnopqrstuvwxyz234567";
@@ -12,7 +12,7 @@ public static String base32Encode(byte[] source) {
 	public static String base32Encode(byte[] source, int offset, int length) {
 		final int nbits = length * 8;
 		if(nbits % 5 != 0) 
-			throw new TorException("Base32 input length must be a multiple of 5 bits");
+			throw new IllegalArgumentException("Base32 input length must be a multiple of 5 bits");
 		
 		final int outlen = nbits / 5;
 		final StringBuffer outbuffer = new StringBuffer();
@@ -32,7 +32,7 @@ public static byte[] base32Decode(String source) {
 		
 		int nbits = source.length() * 5;
 		if(nbits % 8 != 0) 
-			throw new TorException("Base32 decoded array must be a muliple of 8 bits");
+			throw new IllegalArgumentException("Base32 decoded array must be a muliple of 8 bits");
 		
 		int outlen = nbits / 8;
 		byte[] outbytes = new byte[outlen];
@@ -59,7 +59,7 @@ private static int decodeByte(int bitOffset, int b0, int b1, int b2) {
 		case 32:
 			return ls(b0, 5) + (b1 & 0xFF);
 		}
-		throw new TorException("Illegal bit offset");
+		throw new IllegalArgumentException("Illegal bit offset");
 	}
 	
 	private static int ls(int n, int shift) {
@@ -81,7 +81,7 @@ else if(b > 0x31 && b < 0x38)
 			else if(b > 0x40 && b < 0x5B) 
 				ints[i] = b - 0x41;
 			else
-				throw new TorException("Illegal character in base32 encoded string: "+ s.charAt(i));
+				throw new IllegalArgumentException("Illegal character in base32 encoded string: "+ s.charAt(i));
 		}
 		return ints;
 	}
diff --git a/core/src/main/java/org/bitcoinj/utils/BaseTaggableObject.java b/core/src/main/java/org/bitcoinj/utils/BaseTaggableObject.java
index 14f2814aadd..1aea28540e5 100644
--- a/core/src/main/java/org/bitcoinj/utils/BaseTaggableObject.java
+++ b/core/src/main/java/org/bitcoinj/utils/BaseTaggableObject.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -30,7 +32,6 @@
 public class BaseTaggableObject implements TaggableObject {
     @Nullable protected Map<String, ByteString> tags;
 
-    /** {@inheritDoc} */
     @Override
     @Nullable
     public synchronized ByteString maybeGetTag(String tag) {
@@ -40,7 +41,6 @@ public synchronized ByteString maybeGetTag(String tag) {
             return tags.get(tag);
     }
 
-    /** {@inheritDoc} */
     @Override
     public ByteString getTag(String tag) {
         ByteString b = maybeGetTag(tag);
@@ -49,17 +49,15 @@ public ByteString getTag(String tag) {
         return b;
     }
 
-    /** {@inheritDoc} */
     @Override
     public synchronized void setTag(String tag, ByteString value) {
         checkNotNull(tag);
         checkNotNull(value);
         if (tags == null)
-            tags = new HashMap<String, ByteString>();
+            tags = new HashMap<>();
         tags.put(tag, value);
     }
 
-    /** {@inheritDoc} */
     @Override
     public synchronized Map<String, ByteString> getTags() {
         if (tags != null)
diff --git a/core/src/main/java/org/bitcoinj/utils/BlockFileLoader.java b/core/src/main/java/org/bitcoinj/utils/BlockFileLoader.java
index 77869e79649..ae728e9842c 100644
--- a/core/src/main/java/org/bitcoinj/utils/BlockFileLoader.java
+++ b/core/src/main/java/org/bitcoinj/utils/BlockFileLoader.java
@@ -16,6 +16,8 @@
 
 package org.bitcoinj.utils;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import org.bitcoinj.core.Block;
 import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.core.ProtocolException;
@@ -36,46 +38,62 @@
  * blocks together. Importing block data with this tool can be a lot faster than syncing over the network, if you
  * have the files available.</p>
  * 
- * <p>In order to comply with Iterator&lt;Block>, this class swallows a lot of IOExceptions, which may result in a few
+ * <p>In order to comply with {@link Iterator}, this class swallows a lot of {@link IOException}s, which may result in a few
  * blocks being missed followed by a huge set of orphan blocks.</p>
  * 
- * <p>To blindly import all files which can be found in Bitcoin Core (version >= 0.8) datadir automatically,
- * try this code fragment:<br>
- * BlockFileLoader loader = new BlockFileLoader(BlockFileLoader.getReferenceClientBlockFileList());<br>
- * for (Block block : loader) {<br>
- * &nbsp;&nbsp;try { chain.add(block); } catch (Exception e) { }<br>
+ * <p>To blindly import all files which can be found in Bitcoin Core (version 0.8 or higher) datadir automatically,
+ * try this code fragment:
+ * {@code
+ * BlockFileLoader loader = new BlockFileLoader(BlockFileLoader.getReferenceClientBlockFileList());
+ * for (Block block : loader) {
+ * try { chain.add(block); } catch (Exception e) { }
+ * }
  * }</p>
  */
 public class BlockFileLoader implements Iterable<Block>, Iterator<Block> {
     /**
      * Gets the list of files which contain blocks from Bitcoin Core.
      */
-    public static List<File> getReferenceClientBlockFileList() {
-        String defaultDataDir;
-        String OS = System.getProperty("os.name").toLowerCase();
-        if (OS.indexOf("win") >= 0) {
-            defaultDataDir = System.getenv("APPDATA") + "\\.bitcoin\\blocks\\";
-        } else if (OS.indexOf("mac") >= 0 || (OS.indexOf("darwin") >= 0)) {
-            defaultDataDir = System.getProperty("user.home") + "/Library/Application Support/Bitcoin/blocks/";
-        } else {
-            defaultDataDir = System.getProperty("user.home") + "/.bitcoin/blocks/";
-        }
-        
-        List<File> list = new LinkedList<File>();
+    public static List<File> getReferenceClientBlockFileList(File blocksDir) {
+        checkArgument(blocksDir.isDirectory(), "%s is not a directory", blocksDir);
+        List<File> list = new LinkedList<>();
         for (int i = 0; true; i++) {
-            File file = new File(defaultDataDir + String.format(Locale.US, "blk%05d.dat", i));
+            File file = new File(blocksDir, String.format(Locale.US, "blk%05d.dat", i));
             if (!file.exists())
                 break;
             list.add(file);
         }
         return list;
     }
-    
+
+    public static List<File> getReferenceClientBlockFileList() {
+        return getReferenceClientBlockFileList(defaultBlocksDir());
+    }
+
+    public static File defaultBlocksDir() {
+        final File defaultBlocksDir;
+        if (Utils.isWindows()) {
+            defaultBlocksDir = new File(System.getenv("APPDATA") + "\\.bitcoin\\blocks\\");
+        } else if (Utils.isMac()) {
+            defaultBlocksDir = new File(System.getProperty("user.home") + "/Library/Application Support/Bitcoin/blocks/");
+        } else if (Utils.isLinux()) {
+            defaultBlocksDir = new File(System.getProperty("user.home") + "/.bitcoin/blocks/");
+        } else {
+            throw new RuntimeException("Unsupported system");
+        }
+        return defaultBlocksDir;
+    }
+
     private Iterator<File> fileIt;
+    private File file = null;
     private FileInputStream currentFileStream = null;
     private Block nextBlock = null;
     private NetworkParameters params;
-    
+
+    public BlockFileLoader(NetworkParameters params, File blocksDir) {
+        this(params, getReferenceClientBlockFileList(blocksDir));
+    }
+
     public BlockFileLoader(NetworkParameters params, List<File> files) {
         fileIt = files.iterator();
         this.params = params;
@@ -119,8 +137,9 @@ private void loadNextBlock() {
                     currentFileStream = null;
                     return;
                 }
+                file = fileIt.next();
                 try {
-                    currentFileStream = new FileInputStream(fileIt.next());
+                    currentFileStream = new FileInputStream(file);
                 } catch (FileNotFoundException e) {
                     currentFileStream = null;
                 }
@@ -155,6 +174,8 @@ private void loadNextBlock() {
                 } catch (ProtocolException e) {
                     nextBlock = null;
                     continue;
+                } catch (Exception e) {
+                    throw new RuntimeException("unexpected problem with block in " + file, e);
                 }
                 break;
             } catch (IOException e) {
diff --git a/core/src/main/java/org/bitcoinj/utils/BtcAutoFormat.java b/core/src/main/java/org/bitcoinj/utils/BtcAutoFormat.java
index 0ac08c207a3..8db38886e9b 100644
--- a/core/src/main/java/org/bitcoinj/utils/BtcAutoFormat.java
+++ b/core/src/main/java/org/bitcoinj/utils/BtcAutoFormat.java
@@ -40,10 +40,10 @@
  * of consecutive zeros in the number that is displayed, and includes either a currency code or
  * symbol in the formatted value to indicate which denomination was chosen.
  *
- * <p>When parsing <code>String</code> representations of Bitcoin monetary values, instances of
+ * <p>When parsing {@code String} representations of Bitcoin monetary values, instances of
  * this class automatically recognize units indicators consisting of currency codes and
  * symbols, including including those containing currency or metric prefixes such as
- * <code>"¢"</code> or <code>"c"</code> to indicate hundredths, and interpret each number being
+ * {@code "¢"} or {@code "c"} to indicate hundredths, and interpret each number being
  * parsed in accordance with the recognized denominational units.
  *
  * <p>A more detailed explanation, including examples, is in the documentation for the {@link
@@ -60,8 +60,8 @@
 public final class BtcAutoFormat extends BtcFormat {
 
     /**
-     * Enum for specifying the style of currency indicators thas are used
-     * when formatting, ether codes or symbols.
+     * Enum for specifying the style of currency indicators that are used
+     * when formatting, either codes or symbols.
      */
     public enum Style {
 
@@ -83,9 +83,9 @@ public enum Style {
             @Override void apply(DecimalFormat decimalFormat) {
                 /* To switch to using codes from symbols, we replace each single occurrence of the
                  * currency-sign character with two such characters in a row.
-                 * We also insert a space character between every occurence of this character and an
-                 * adjacent numerical digit or negative sign (that is, between the currency-sign and
-                 * the signed-number). */
+                 * We also insert a space character between every occurrence of this character and
+                 * an adjacent numerical digit or negative sign (that is, between the currency-sign
+                 * and the signed-number). */
                 decimalFormat.applyPattern(
                     negify(decimalFormat.toPattern()).replaceAll("¤","¤¤").
                                                       replaceAll("([#0.,E-])¤¤","$1 ¤¤").
@@ -171,7 +171,7 @@ Subtract each of (a), (b) and (c) from the true value, and choose the
         return places;
     }
 
-    /** Returns the <code>int</code> value indicating coin denomination.  This is what causes
+    /** Returns the {@code int} value indicating coin denomination.  This is what causes
      *  the number in a parsed value that lacks a units indicator to be interpreted as a quantity
      *  of bitcoins. */
     @Override
diff --git a/core/src/main/java/org/bitcoinj/utils/BtcFixedFormat.java b/core/src/main/java/org/bitcoinj/utils/BtcFixedFormat.java
index 8e7a2a8d6d2..a4c706c5458 100644
--- a/core/src/main/java/org/bitcoinj/utils/BtcFixedFormat.java
+++ b/core/src/main/java/org/bitcoinj/utils/BtcFixedFormat.java
@@ -19,8 +19,11 @@
 import static org.bitcoinj.core.Coin.SMALLEST_UNIT_EXPONENT;
 import static com.google.common.base.Preconditions.checkArgument;
 import com.google.common.base.Objects;
+import org.bitcoinj.core.Coin;
+
 import java.math.BigInteger;
 import java.text.DecimalFormat;
+import java.text.Format;
 import java.text.NumberFormat;
 import java.util.Locale;
 import java.util.List;
@@ -28,21 +31,22 @@
 /**
  * <p>This class, a concrete extension of {@link BtcFormat}, is distinguished in that each
  * instance formats and by-default parses all Bitcoin monetary values in units of a single
- * denomination that is specified at the time that instance is constructed.
+ * denomination that is specified at the time that instance is constructed.</p>
  *
  * <p>By default, neither currency codes nor symbols are included in formatted values as
  * output, nor recognized in parsed values as input.  The can be overridden by applying a
- * custom pattern using either the {@link BtcFormat.Builder#localizedPattern} or {@link BtcFormat.Builder#localizedPattern} methods, as described in the documentation for the {@link BtcFormat.Builder}
- * class.<ol>
+ * custom pattern using either the {@link BtcFormat.Builder#localizedPattern} or
+ * {@link BtcFormat.Builder#localizedPattern} methods, as described in the documentation for
+ * the {@link BtcFormat.Builder} class.</p>
  *
  * <p>A more detailed explanation, including examples, is in the documentation for the
  * {@link BtcFormat} class, and further information beyond that is in the documentation for the
- * {@link java.text.Format} class, from which this class descends.
+ * {@link Format} class, from which this class descends.</p>
 
- * @see          java.text.Format
- * @see          java.text.NumberFormat
- * @see          java.text.DecimalFormat
- * @see          org.bitcoinj.core.Coin
+ * @see Format
+ * @see NumberFormat
+ * @see DecimalFormat
+ * @see Coin
  */
 
 public final class BtcFixedFormat extends BtcFormat {
@@ -66,7 +70,7 @@ public final class BtcFixedFormat extends BtcFormat {
     public static final int[] REPEATING_TRIPLETS = {3,3,3,3,3};
 
     /** The number of places the decimal point of formatted values is shifted rightward from
-     *  thet same value expressed in bitcoins. */
+     *  the same value expressed in bitcoins. */
     private final int scale;
 
     /** Constructor */
@@ -82,7 +86,7 @@ protected BtcFixedFormat(
     }
 
     /** Return the decimal-place shift for this object's unit-denomination.  For example, if
-     * the denomination is millibitcoins, this method will return the value <code>3</code>.  As
+     * the denomination is millibitcoins, this method will return the value {@code 3}.  As
      * a side-effect, prefixes the currency signs of the underlying NumberFormat object.  This
      * method is invoked by the superclass when formatting.  The arguments are ignored because
      * the denomination is fixed regardless of the value being formatted.
@@ -94,14 +98,14 @@ protected int scale(BigInteger satoshis, int fractionPlaces) {
     }
 
     /** Return the decimal-place shift for this object's fixed unit-denomination.  For example, if
-     *  the denomination is millibitcoins, this method will return the value <code>3</code>.  */
+     *  the denomination is millibitcoins, this method will return the value {@code 3}.  */
     @Override
     public int scale() { return scale; }
 
     /**
      * Return the currency code that identifies the units in which values formatted and
      * (by-default) parsed by this instance are denominated.  For example, if the formatter's
-     * denomination is millibitcoins, then this method will return <code>"mBTC"</code>,
+     * denomination is millibitcoins, then this method will return {@code "mBTC"},
      * assuming the default base currency-code is not overridden using a
      * {@link BtcFormat.Builder}.  */
     public String code() { return prefixCode(coinCode(), scale); }
@@ -109,12 +113,12 @@ protected int scale(BigInteger satoshis, int fractionPlaces) {
     /**
      * Return the currency symbol that identifies the units in which values formatted by this
      * instance are denominated. For example, when invoked on an instance denominated in
-     * millibitcoins, this method by default returns <code>"₥฿"</code>, depending on the
+     * millibitcoins, this method by default returns {@code "₥฿"}, depending on the
      * locale.  */
     public String symbol() { return prefixSymbol(coinSymbol(), scale); }
 
     /** Return the fractional decimal-placing used when formatting.  This method returns an
-     *  <code>int</code> array.  The value of the first element is the minimum number of
+     *  {@code int} array.  The value of the first element is the minimum number of
      *  decimal places to be used in all cases, limited to a precision of satoshis.  The value
      *  of each successive element is the size of an optional place-group that will be applied,
      *  possibly partially, if useful for expressing precision.  The actual size of each group
diff --git a/core/src/main/java/org/bitcoinj/utils/BtcFormat.java b/core/src/main/java/org/bitcoinj/utils/BtcFormat.java
index a8d2bbfdf53..34b7095baaa 100644
--- a/core/src/main/java/org/bitcoinj/utils/BtcFormat.java
+++ b/core/src/main/java/org/bitcoinj/utils/BtcFormat.java
@@ -48,13 +48,15 @@
 
 /**
  * <p>Instances of this class format and parse locale-specific numerical
- * representations of Bitcoin monetary values.
+ * representations of Bitcoin monetary values.</p>
  *
  * <p>A primary goal of this class is to minimize the danger of
  * human-misreading of monetary values due to mis-counting the number
  * of zeros (or, more generally, of decimal places) in the number that
  * represents a Bitcoin monetary value.  Some of the features offered for doing this
- * are: <ol>
+ * are:</p>
+ *
+ * <ol>
  *   <li>automatic adjustment of denominational units in which a
  *       value is represented so as to lessen the number of adjacent zeros,
  *   <li>use of locale-specific decimal-separators to group digits in
@@ -63,17 +65,19 @@
  *   <li>access to character information that allows for vertical
  *       alignment of tabular columns of formatted values.</ol>
  *
- * <h3>Basic Usage</h3>
+ * <h2>Basic Usage</h2>
+ *
+ * <p>Basic usage is very simple:</p>
  *
- * Basic usage is very simple: <ol>
+ * <ol>
  *   <li>Construct a new formatter object using one of the factory methods. 
  *   <li>Format a value by passing it as an argument to the
  *       {@link BtcFormat#format(Object)} method. 
- *   <li>Parse a value by passing a <code>String</code>-type
+ *   <li>Parse a value by passing a {@code String}-type
  *       representation of it to the {@link BtcFormat#parse(String)} method.</ol>
  *
  * <p>For example, depending on your locale, values might be formatted
- * and parsed as follows:
+ * and parsed as follows:</p>
  *
  * <blockquote><pre>
  * BtcFormat f = BtcFormat.getInstance();
@@ -83,120 +87,122 @@
  * Coin all = f.parseObject("M฿ 21");             <strong>// All the money in the world</strong>
  * </pre></blockquote>
  *
- * <h3>Auto-Denomination versus Fixed-Denomination</h3>
+ * <h2>Auto-Denomination versus Fixed-Denomination</h2>
  *
- * There are two provided concrete classes, one that automatically denominates values to
+ * <p>There are two provided concrete classes, one that automatically denominates values to
  * be formatted, {@link BtcAutoFormat}, and another that formats any value in units of a
- * fixed, specified denomination, {@link BtcFixedFormat}.  
+ * fixed, specified denomination, {@link BtcFixedFormat}.</p>
  *
- * <h5>Automatic Denomination</h5>
+ * <h3>Automatic Denomination</h3>
  *
- * Automatic denomination means that the formatter adjusts the denominational units in which a
+ * <p>Automatic denomination means that the formatter adjusts the denominational units in which a
  * formatted number is expressed based on the monetary value that number represents.  An
  * auto-denominating formatter is defined by its style, specified by one of the enumerated
  * values of {@link BtcAutoFormat.Style}.  There are two styles constants: {@link
  * BtcAutoFormat.Style#CODE} (the default), and {@link BtcAutoFormat.Style#SYMBOL}.  The
- * difference is that the <code>CODE</code> style uses an internationally-distinct currency
- * code, such as <code>"BTC"</code>, to indicate the units of denomination, while the
- * <code>SYMBOL</code> style uses a possibly-ambiguous currency symbol such as
- * <code>"฿"</code>.
+ * difference is that the {@code CODE} style uses an internationally-distinct currency
+ * code, such as {@code "BTC"}, to indicate the units of denomination, while the
+ * {@code SYMBOL} style uses a possibly-ambiguous currency symbol such as
+ * {@code "฿"}.</p>
  *
  * <p>The denomination used when formatting will be either bitcoin, millicoin
  * or microcoin, depending on the value being represented, chosen so as to minimize the number
  * of consecutive zeros displayed without losing precision.  For example, depending on the
- * locale, a value of one bitcoin might be formatted as <pre>฿1.00</pre> where a value
- * exceeding that by one satoshi would be <pre>µ฿1,000,000.01</pre>
+ * locale, a value of one bitcoin might be formatted as {@code ฿1.00} where a value
+ * exceeding that by one satoshi would be {@code µ฿1,000,000.01}</p>
  *
- * <h5>Fixed Denomination</h5>
+ * <h3>Fixed Denomination</h3>
  * 
- * Fixed denomination means that the same denomination of units is used for every value that is
+ * <p>Fixed denomination means that the same denomination of units is used for every value that is
  * formatted or parsed by a given formatter instance.  A fixed-denomination formatter is
  * defined by its scale, which is the number of places one must shift the decimal point in
  * increasing precision to convert the representation of a given quantity of bitcoins into a
  * representation of the same value denominated in the formatter's units.  For example, a scale
- * value of <code>3</code> specifies a denomination of millibitcoins, because to represent
- * <code>1.0000 BTC</code>, or one bitcoin, in millibitcoins, one shifts the decimal point
- * three places, that is, to <code>1000.0 mBTC</code>.
+ * value of {@code 3} specifies a denomination of millibitcoins, because to represent
+ * {@code 1.0000 BTC}, or one bitcoin, in millibitcoins, one shifts the decimal point
+ * three places, that is, to {@code 1000.0 mBTC}.</p>
+ *
+ * <h2>Construction</h2>
  *
- * <h3>Construction</h3>
+ * <p>There are two ways to obtain an instance of this class:</p>
  *
- * There are two ways to obtain an instance of this class: <ol>
+ * <ol>
  *   <li>Use one of the factory methods; or
  *   <li>Use a {@link BtcFormat.Builder} object.</ol>
  *
  * <p>The factory methods are appropriate for basic use where the default
- * configuration is either used or modified.  The <code>Builder</code>
+ * configuration is either used or modified.  The {@link Builder}
  * class provides more control over the configuration, and gives
  * access to some features not available through the factory methods,
- * such as using custom formatting patterns and currency symbols.
+ * such as using custom formatting patterns and currency symbols.</p>
  *
- * <h5>Factory Methods</h5>
+ * <h3>Factory Methods</h3>
  *
- * Although formatting and parsing is performed by one of the concrete
+ * <p>Although formatting and parsing is performed by one of the concrete
  * subclasses, you can obtain formatters using the various static factory
- * methods of this abstract base class <code>BtcFormat</code>.  There
+ * methods of this abstract base class {@link BtcFormat}.  There
  * are a variety of overloaded methods that allow you to obtain a
- * formatter that behaves according to your needs.
+ * formatter that behaves according to your needs.</p>
  *
  * <p>The primary distinction is between automatic- and
  * fixed-denomination formatters.  By default, the
- * <code>getInstance()</code> method with no arguments returns a new,
- * automatic-denominating <code>BtcAutoFormat</code> instance for your
+ * {@code getInstance()} method with no arguments returns a new,
+ * automatic-denominating {@link BtcAutoFormat} instance for your
  * default locale that will display exactly two fractional decimal
  * places and a currency code.  For example, if you happen to be in
- * the USA:
+ * the USA:</p>
  *
  * <blockquote><pre>
  * BtcFormat f = BtcFormat.getInstance();
  * String s = f.format(Coin.COIN); <strong>// "BTC 1.00"</strong>
  * </pre></blockquote>
  *
- * <p>The first argument to <code>getInstance()</code> can determine
+ * <p>The first argument to {@code getInstance()} can determine
  * whether you get an auto- or fixed-denominating formatter.  If the
- * type of the first argument is an <code>int</code>, then the value
- * of that <code>int</code> will be interpreted as the decimal-place scale of
+ * type of the first argument is an {@code int}, then the value
+ * of that {@code int} will be interpreted as the decimal-place scale of
  * the {@link BtcFixedFormat} instance that is returned, and thus will
  * determine its denomination.  For example, if you want to format
- * values in units of microbitcoins:
+ * values in units of microbitcoins:</p>
  *
  * <blockquote><pre>BtcFormat m = BtcFormat.getInstance(6);
- *String s = m.format(Coin.COIN); <strong>// "1,000,000.00"</strong>
- * </blockquote>
+ * String s = m.format(Coin.COIN); <strong>// "1,000,000.00"</strong>
+ * </pre></blockquote>
  *
- * <p>This class provides several constants bound to common scale values:
+ * <p>This class provides several constants bound to common scale values:</p>
  *
  * <blockquote><pre>BtcFormat milliFormat = BtcFormat.getInstance(MILLICOIN_SCALE);</pre></blockquote>
  *
  * <p>Alternatively, if the type of the first argument to
- * <code>getInstance()</code> is one of the enumerated values of the
- * {@link BtcAutoFormat.Style} type, either <code>CODE</code> or
- * <code>SYMBOL</code>, then you will get a {@link BtcAutoFormat}
+ * {@code getInstance()} is one of the enumerated values of the
+ * {@link BtcAutoFormat.Style} type, either {@link BtcAutoFormat.Style#CODE} or
+ * {@link BtcAutoFormat.Style#SYMBOL}, then you will get a {@link BtcAutoFormat}
  * instance that uses either a currency code or symbol, respectively,
- * to indicate the results of its auto-denomination.
+ * to indicate the results of its auto-denomination.</p>
  *
  * <blockquote><pre>
  * BtcFormat s = BtcFormat.getInstance(SYMBOL);
  * Coin value = Coin.parseCoin("0.1234");
  * String mil = s.format(value);              <strong>// "₥฿123.40"</strong>
  * String mic = s.format(value.divide(1000)); <strong>// "µ฿123.40"</strong>
- * </blockquote>
+ * </pre></blockquote>
  *
  * <p>An alternative way to specify whether you want an auto- or fixed-denomination formatter
  * is to use one of the factory methods that is named to indicate that characteristics of the
  * new instance returned.  For fixed-denomination formatters, these methods are {@link
  * #getCoinInstance()}, {@link #getMilliInstance()}, and {@link #getMicroInstance()}.  These
- * three methods are equivalent to invoking <code>getInstance()</code> with a first argument of
- * <code>0</code>, <code>3</code> and <code>6</code>, respectively.  For auto-denominating
+ * three methods are equivalent to invoking {@code getInstance()} with a first argument of
+ * {@code 0}, {@code 3} and {@code 6}, respectively.  For auto-denominating
  * formatters the relevant factory methods are {@link #getCodeInstance()} and {@link
- * #getSymbolInstance()}, which are equivalent to <code>getInstance(Style.CODE)</code>, and
- * <code>getInstance(Style.SYMBOL)</code>.
+ * #getSymbolInstance()}, which are equivalent to {@code getInstance(Style.CODE)}, and
+ * {@code getInstance(Style.SYMBOL)}.</p>
  *
  * <p>Regardless of how you specify whether your new formatter is to be of automatic- or
  * fixed-denomination, the next (and possibly first) parameter to each of the factory methods
- * is an optional <code>Locale</code> value.
+ * is an optional {@link Locale} value.</p>
  *
- * For example, here we construct four instances for the same locale that each format
- * differently the same one-bitcoin value:
+ * <p>For example, here we construct four instances for the same locale that each format
+ * differently the same one-bitcoin value:</p>
  *
  * <blockquote><pre>
  * <strong>// Next line returns "1,00 BTC"</strong>
@@ -209,36 +215,36 @@
  * BtcFormat.getInstance(4, Locale.GERMANY).format(Coin.COIN);
  * </pre></blockquote>
  *
- * Omitting such a <code>Locale</code> parameter will give you a
- * formatter for your default locale.
+ * <p>Omitting such a {@link Locale} parameter will give you a
+ * formatter for your default locale.</p>
  *
  * <p>The final (and possibly only) arguments to the factory methods serve to set the default
  * number of fractional decimal places that will be displayed when formatting monetary values.
- * In the case of an auto-denominating formatter, this can be a single <code>int</code> value,
+ * In the case of an auto-denominating formatter, this can be a single {@code int} value,
  * which will determine the number of fractional decimal places to be used in all cases, except
  * where either (1) doing so would provide a place for fractional satoshis, or (2) that default
- * value is overridden when invoking the <code>format()</code> method as described below.
+ * value is overridden when invoking the {@code format()} method as described below.</p>
  *
  * <p>In the case of a fixed-denomination formatter, you can pass any number of
- * <code>int</code> values.  The first will determine the minimum number of fractional decimal
- * places, and each following <code>int</code> value specifies the size of an optional group of
+ * {@code int} values.  The first will determine the minimum number of fractional decimal
+ * places, and each following {@code int} value specifies the size of an optional group of
  * decimal-places to be displayed only if useful for expressing precision.  As with auto-denominating
  * formatters, numbers will never be formatted with a decimal place that represents a
  * fractional quantity of satoshis, and these defaults can be overridden by arguments to the
- * <code>format()</code> method.  See below for examples.
+ * {@code format()} method.  See below for examples.</p>
  *
- * <h5>The <code>Builder</code> Class</h5>
+ * <h3>The {@link Builder} Class</h3>
  *
- * A new {@link BtcFormat.Builder} instance is returned by the {@link #builder()} method.  Such
- * an object has methods that set the configuration parameters of a <code>BtcFormat</code>
- * object.  Its {@link Builder#build()} method constructs and returns a <code>BtcFormat</code> instance
- * configured according to those settings.
+ * <p>A new {@link BtcFormat.Builder} instance is returned by the {@link #builder()} method.  Such
+ * an object has methods that set the configuration parameters of a {@link BtcFormat}
+ * object.  Its {@link Builder#build()} method constructs and returns a {@link BtcFormat} instance
+ * configured according to those settings.</p>
  *
  * <p>In addition to setter-methods that correspond to the factory-method parameters explained
- * above, a <code>Builder</code> also allows you to specify custom formatting and parsing
+ * above, a {@link Builder} also allows you to specify custom formatting and parsing
  * patterns and currency symbols and codes.  For example, rather than using the default
  * currency symbol, which has the same unicode character point as the national currency symbol of
- * Thailand, some people prefer to use a capital letter "B" with a vertical overstrike.
+ * Thailand, some people prefer to use a capital letter "B" with a vertical overstrike.</p>
  *
  * <blockquote><pre>
  * BtcFormat.Builder builder = BtcFormat.builder();
@@ -248,7 +254,7 @@
  * String out = f.format(COIN); <strong>// "B⃦1.00" depending on locale</strong>
  * </pre></blockquote>
  *
- * The <code>Builder</code> methods are chainable.  So, for example, if you are
+ * The {@link Builder} methods are chainable.  So, for example, if you are
  * deferential to ISO 4217, you might construct a formatter in a single line this way:
  *
  * <blockquote><pre>
@@ -256,32 +262,32 @@
  * String out = f.format(COIN); <strong>// "XBT 1.00"</strong>
  * </pre></blockquote>
  *
- * <p>See the documentation of the {@link BtcFormat.Builder} class for details.
+ * <p>See the documentation of the {@link BtcFormat.Builder} class for details.</p>
  *
- * <h3>Formatting</h3>
+ * <h2>Formatting</h2>
  *
  * <p>You format a Bitcoin monetary value by passing it to the {@link BtcFormat#format(Object)}
- * method.  This argument can be either a {@link org.bitcoinj.core.Coin}-type object or a
- * numerical object such as {@link java.lang.Long} or {@link java.math.BigDecimal}.
- * Integer-based types such as {@link java.math.BigInteger} are interpreted as representing a
- * number of satoshis, while a {@link java.math.BigDecimal} is interpreted as representing a
+ * method.  This argument can be either a {@link Coin}-type object or a
+ * numerical object such as {@link Long} or {@link BigDecimal}.
+ * Integer-based types such as {@link BigInteger} are interpreted as representing a
+ * number of satoshis, while a {@link BigDecimal} is interpreted as representing a
  * number of bitcoins.  A value having a fractional amount of satoshis is rounded to the
  * nearest whole satoshi at least, and possibly to a greater unit depending on the number of
- * fractional decimal-places displayed.  The <code>format()</code> method will not accept an
- * argument whose type is <code>String</code>, <code>Float</code> nor <code>Double</code>.
+ * fractional decimal-places displayed.  The {@code format()} method will not accept an
+ * argument whose type is {@link String}, {@link Float} nor {@link Double}.</p>
  *
  * <p>Subsequent to the monetary value to be formatted, the {@link #format(Object)} method also
- * accepts as arguments optional <code>int</code> values that specify the number of decimal
+ * accepts as arguments optional {@code int} values that specify the number of decimal
  * places to use to represent the fractional portion of the number.  This overrides the
  * default, and enables a single formatter instance to be reused, formatting different values
  * that require different numbers of fractional decimal places.  These parameters have the same
  * meaning as those that set the default values in the factory methods as described above.
- * Namely, a single <code>int</code> value determines the minimum number of fractional decimal
+ * Namely, a single {@code int} value determines the minimum number of fractional decimal
  * places that will be used in all cases, to a precision limit of satoshis.  Instances of
- * {@link BtcFixedFormat} also accept a variable-length sequence of additional <code>int</code>
+ * {@link BtcFixedFormat} also accept a variable-length sequence of additional {@code int}
  * values, each of which specifies the size of a group of fractional decimal-places to be used
  * in addition to all preceding places, only if useful to express precision, and only to a
- * maximum precision of satoshis.  For example:
+ * maximum precision of satoshis.  For example:</p>
  *
  * <blockquote><pre>
  * BtcFormat f = BtcFormat.getCoinInstance();
@@ -298,7 +304,7 @@
  * place to fractions of satoshis, then the size of that group will be reduced to a maximum
  * precision of satoshis.  Either all or none of the allowed decimal places of that group will
  * still be applied as doing so is useful for expressing the precision of the value being
- * formatted.
+ * formatted.</p>
  *
  * <p>Several convenient constants of repeating group-size sequences are provided:
  * {@link BtcFixedFormat#REPEATING_PLACES}, {@link
@@ -307,7 +313,7 @@
  * of one, two and three decimals places, respectively.  For example,
  * to display only as many fractional places as useful in order to
  * prevent hanging zeros on the least-significant end of formatted
- * numbers:
+ * numbers:</p>
  *
  * <blockquote><pre>
  * format(value, 0, REPEATING_PLACES);
@@ -316,9 +322,9 @@
  * <p>When using an automatically-denominating formatter, you might
  * want to know what denomination was chosen.  You can get the
  * currency-units indicator, as well as any other field in the
- * formatted output, by using a {@link java.text.FieldPosition} instance
+ * formatted output, by using a {@link FieldPosition} instance
  * constructed using an appropriate constant from the {@link
- * java.text.NumberFormat.Field} class:
+ * NumberFormat.Field} class:</p>
  *
  * <blockquote><pre>
  * BtcFormat de = BtcFormat.getInstance(Locale.GERMANY);
@@ -330,9 +336,9 @@
  * </pre></blockquote>
  *
  * <p>When using a fixed-denomination formatter whose scale can be expressed as a standard
- * "metric" prefix, you can invoke the <code>code()</code> and <code>symbol()</code> methods to
- * obtain a <code>String</code> whose value is the appropriate currency code or symbol,
- * respectively, for that formatter.
+ * "metric" prefix, you can invoke the {@code code()} and {@code symbol()} methods to
+ * obtain a {@link String} whose value is the appropriate currency code or symbol,
+ * respectively, for that formatter.</p>
  *
  * <blockquote><pre>
  * BtcFixedFormat kilo = (BtcFixedFormat)BtcFormat(-3); <strong>// scale -3 for kilocoins</strong>
@@ -344,11 +350,11 @@
  * BtcFormat(4).code(); <strong>// unnamed denomination has no code; raises exception</strong>
  * </pre></blockquote>
  *
- * <h5>Formatting for Tabular Columns</h5>
+ * <h3>Formatting for Tabular Columns</h3>
  *
- * When displaying tables of monetary values, you can lessen the
+ * <p>When displaying tables of monetary values, you can lessen the
  * risk of human misreading-error by vertically aligning the decimal
- * separator of those values.  This example demonstrates one way to do that:
+ * separator of those values.  This example demonstrates one way to do that:</p>
  *
  * <blockquote><pre>
  * <strong>// The elements of this array are the values we will format:</strong>
@@ -361,12 +367,12 @@
  * String[] output = new String[rows.length];
  * int[] indexes = new int[rows.length];
  * int maxIndex = 0;
- * for (int i = 0; i < rows.length; i++) {
+ * for (int i = 0; i &lt; rows.length; i++) {
  *     output[i] = f.format(rows[i], new StringBuffer(), fp).toString();
  *     indexes[i] = fp.getBeginIndex();
- *     if (indexes[i] > maxIndex) maxIndex = indexes[i];
+ *     if (indexes[i] &gt; maxIndex) maxIndex = indexes[i];
  * }
- * for (int i = 0; i < output.length; i++) {
+ * for (int i = 0; i &lt; output.length; i++) {
  *     System.out.println(repeat(" ", (maxIndex - indexes[i])) + output[i]);
  * }
  * </pre></blockquote>
@@ -386,85 +392,85 @@
  *          0.00000001
  * </pre></blockquote>
  *
- * If you need to vertically-align columns printed in a proportional font,
- * then see the documentation for the {@link java.text.NumberFormat} class
- * for an explanation of how to do that.
+ * <p>If you need to vertically-align columns printed in a proportional font,
+ * then see the documentation for the {@link NumberFormat} class
+ * for an explanation of how to do that.</p>
  *
- * <h3>Parsing</h3>
+ * <h2>Parsing</h2>
  *
- * <p>The {@link #parse(String)} method accepts a <code>String</code> argument, and returns a
+ * <p>The {@link #parse(String)} method accepts a {@link String} argument, and returns a
  * {@link Coin}-type value.  The difference in parsing behavior between instances of {@link
  * BtcFixedFormat} and {@link BtcAutoFormat} is analogous to the difference in formatting
  * behavior between instances of those classes.  Instances of {@link BtcAutoFormat} recognize
- * currency codes and symbols in the <code>String</code> being parsed, and interpret them as
+ * currency codes and symbols in the {@link String} being parsed, and interpret them as
  * indicators of the units in which the number being parsed is denominated.  On the other hand,
  * instances of {@link BtcFixedFormat} by default recognize no codes nor symbols, but rather
  * interpret every number as being denominated in the units that were specified when
  * constructing the instance doing the parsing.  This default behavior of {@link
  * BtcFixedFormat} can be overridden by setting a parsing pattern that includes a currency sign
- * using the {@link BtcFormat.Builder#pattern()} method.
+ * using the {@link BtcFormat.Builder#pattern()} method.</p>
  *
- * <p>The {@link BtcAutoFormat#parse(String)}</code> method of {@link BtcAutoFormat} (and of
+ * <p>The {@link BtcAutoFormat#parse(String)} method of {@link BtcAutoFormat} (and of
  * {@link BtcAutoFormat} configured with applicable non-default pattern) will recognize a
  * variety of currency symbols and codes, including all standard international (metric)
  * prefixes from micro to mega.  For example, denominational units of microcoins may be
- * specified by <code>µ฿</code>, <code>u฿</code>, <code>µB⃦</code>, <code>µɃ</code>,
- * <code>µBTC</code> or other appropriate permutations of those characters.  Additionally, if
+ * specified by {@code µ฿}, {@code u฿}, {@code µB⃦}, {@code µɃ},
+ * {@code µBTC} or other appropriate permutations of those characters.  Additionally, if
  * either or both of a custom currency code or symbol is configured using {@link
  * BtcFormat.Builder#code} or {@link BtcFormat.Builder#code}, then such code or symbol will
- * be recognized in addition to those recognized by default..
+ * be recognized in addition to those recognized by default.</p>
  *
  * <p>Instances of this class that recognize currency signs will recognize both currency
  * symbols and codes, regardless of which that instance uses for formatting.  However, if the
- * style is <code>CODE</code> (and unless overridden by a custom pattern) then a space character must
- * separate the units indicator from the number.  When parsing with a <code>SYMBOL</code>-style
- * <code>BtcFormat</code> instance, on the other hand, whether or not the units indicator must
+ * style is {@code CODE} (and unless overridden by a custom pattern) then a space character must
+ * separate the units indicator from the number.  When parsing with a {@code SYMBOL}-style
+ * {@code BtcFormat} instance, on the other hand, whether or not the units indicator must
  * be separated by a space from the number is determined by the locale.  The {@link
  * BtcFormat#pattern()} method returns a representation of the pattern that
  * can be examined to determine whether a space must separate currency signs from numbers in
- * parsed <code>String</code>s.
+ * parsed {@link String}s.</p>
  *
  * <p>When parsing, if the currency-units indicator is absent, then a {@link BtcAutoFormat}
  * instance will infer a denomination of bitcoins while a {@link BtcFixedFormat} will infer the
  * denomination in which it expresses formatted values.  Note: by default (unless overridden by
  * a custom pattern), if the locale or style requires a space to separate the number from the
  * units indicator, that space must be present in the String to be parsed, even if the units
- * indicator is absent.
+ * indicator is absent.</p>
  *
- * <p>The <code>parse()</code> method returns an instance of the
+ * <p>The {@code parse()} method returns an instance of the
  * {@link Coin} class.  Therefore, attempting to parse a value greater
- * than the maximum that a <code>Coin</code> object can represent will
- * raise a <code>ParseException</code>, as will any other detected
- * parsing error.
+ * than the maximum that a {@code Coin} object can represent will
+ * raise a {@code ParseException}, as will any other detected
+ * parsing error.</p>
  *
- *  <h3>Limitations</h3>
+ *  <h2>Limitations</h2>
  *
- *  <h5>Parsing</h5>
+ *  <h3>Parsing</h3>
  *
- * Parsing is performed by an underlying {@link java.text.NumberFormat} object.  While this
+ * <p>Parsing is performed by an underlying {@link NumberFormat} object. While this
  * delivers the benefit of recognizing locale-specific patterns, some have criticized other
  * aspects of its behavior.  For example, see <a
  * href="http://www.ibm.com/developerworks/library/j-numberformat/">this article by Joe Sam
  * Shirah</a>.  In particular, explicit positive-signs are not recognized.  If you are parsing
  * input from end-users, then you should consider whether you would benefit from any of the
- * work-arounds mentioned in that article.
+ * work-arounds mentioned in that article.</p>
  *
- * <h5>Exotic Locales</h5>
+ * <h3>Exotic Locales</h3>
  *
- * This class is not well-tested in locales that use non-ascii
+ * <p>This class is not well-tested in locales that use non-ascii
  * character sets, especially those where writing proceeds from
- * right-to-left.  Helpful feedback in that regard is appreciated.
+ * right-to-left.  Helpful feedback in that regard is appreciated.</p>
  *
- * <h3>Thread-Safety</h3>
+ * <h2>Thread-Safety</h2>
  *
- * <p>Instances of this class are immutable.
+ * <p>Instances of this class are immutable.</p>
  *
- * @see          java.text.Format
- * @see          java.text.NumberFormat
- * @see          java.text.DecimalFormat
- * @see          java.text.DecimalFormatSymbols
- * @see          java.text.FieldPosition
- * @see          org.bitcoinj.core.Coin
+ * @see Format
+ * @see NumberFormat
+ * @see DecimalFormat
+ * @see DecimalFormatSymbols
+ * @see FieldPosition
+ * @see Coin
  */
 
 public abstract class BtcFormat extends Format {
@@ -505,16 +511,16 @@ public abstract class BtcFormat extends Format {
     protected final List<Integer> decimalGroups;
 
     /* Scale is the number of decimal-places difference from same value in bitcoins */
-    /** A constant useful for specifying a denomination of bitcoins, the <code>int</code> value
-     *  <code>0</code>. */
+    /** A constant useful for specifying a denomination of bitcoins, the {@code int} value
+     *  {@code 0}. */
     public static final int COIN_SCALE = 0;
 
-    /** A constant useful for specifying a denomination of millibitcoins, the <code>int</code>
-     *  value <code>3</code>. */
+    /** A constant useful for specifying a denomination of millibitcoins, the {@code int}
+     *  value {@code 3}. */
     public static final int MILLICOIN_SCALE = 3;
 
-    /** A constant useful for specifying a denomination of microbitcoins, the <code>int</code>
-     *  value <code>6</code>. */
+    /** A constant useful for specifying a denomination of microbitcoins, the {@code int}
+     *  value {@code 6}. */
     public static final int MICROCOIN_SCALE = 6;
 
     /** Return the number of decimal places by which any value denominated in the
@@ -526,12 +532,12 @@ public abstract class BtcFormat extends Format {
     /**
      * <p>This class constructs new instances of {@link BtcFormat}, allowing for the
      * configuration of those instances before they are constructed.  After obtaining a
-     * <code>Builder</code> object from the {@link BtcFormat#builder()} method, invoke the
-     * necessary setter methods to obtain your desired configuration.  Finaly, the {@link
-     * #build()} method returns a new <code>BtcFormat</code> object that has the specified
+     * {@code Builder} object from the {@link BtcFormat#builder()} method, invoke the
+     * necessary setter methods to obtain your desired configuration.  Finally, the {@link
+     * #build()} method returns a new {@code BtcFormat} object that has the specified
      * configuration.
      *
-     * <p>All the setter methods override defaults.  Invoking <code>build()</code> without invoking any
+     * <p>All the setter methods override defaults.  Invoking {@code build()} without invoking any
      * of the setting methods is equivalent to invoking {@link BtcFormat#getInstance()} with no arguments.
      *
      * <p>Each setter methods returns the same instance on which it is invoked,
@@ -562,11 +568,11 @@ BtcFormat newInstance(Builder b) {
 
         private Builder() {}
 
-        /** Specify the new <code>BtcFormat</code> is to be automatically-denominating.
-         * The argument determines which of either codes or symbols the new <code>BtcFormat</code>
+        /** Specify the new {@code BtcFormat} is to be automatically-denominating.
+         * The argument determines which of either codes or symbols the new {@code BtcFormat}
          * will use by default to indicate the denominations it chooses when formatting values.
          *
-         * <p>Note that the <code>Style</code> argument specifies the
+         * <p>Note that the {@code Style} argument specifies the
          * <em>default</em> style, which is overridden by invoking
          * either {@link #pattern(String)} or {@link #localizedPattern(String)}.
          *
@@ -584,24 +590,24 @@ public Builder style(BtcAutoFormat.Style val) {
          * This is equivalent to the {@link #minimumFractionDigits(int)} method, but named
          * appropriately for the context of generating {@link BtcAutoFormat} instances.
          *
-         *  <p>If neither this method nor <code>minimumFactionDigits()</code> is invoked, the default value
-         *  will be <code>2</code>. */
+         *  <p>If neither this method nor {@code minimumFactionDigits()} is invoked, the default value
+         *  will be {@code 2}. */
         public Builder fractionDigits(int val) { return minimumFractionDigits(val); }
 
         /** Specify a fixed-denomination of units to use when formatting and parsing values.
          *  The argument specifies the number of decimal places, in increasing
          *  precision, by which each formatted value will differ from that same value
          *  denominated in bitcoins.  For example, a denomination of millibitcoins is specified
-         *  with a value of <code>3</code>.
+         *  with a value of {@code 3}.
          *
-         * <p>The <code>BtcFormat</code> class provides appropriately named
-         * <code>int</code>-type constants for the three common values, {@link BtcFormat#COIN_SCALE},
+         * <p>The {@code BtcFormat} class provides appropriately named
+         * {@code int}-type constants for the three common values, {@link BtcFormat#COIN_SCALE},
          * {@link BtcFormat#MILLICOIN_SCALE} {@link BtcFormat#MICROCOIN_SCALE}.
          *
          * <p>If neither this method nor {@link #style(BtcAutoFormat.Style)} is invoked on a
-         * <code>Builder</code>, then the <code>BtcFormat</code> will default to a
+         * {@link Builder}, then the {@link BtcFormat} will default to a
          * fixed-denomination of bitcoins, equivalent to invoking this method with an argument
-         * of <code>0</code>. */
+         * of {@code 0}. */
         public Builder scale(int val) {
             if (variant == Variant.AUTO)
                 throw new IllegalStateException("You cannot invoke both scale() and style()");
@@ -614,8 +620,8 @@ public Builder scale(int val) {
          *  This method is equivalent to {@link #fractionDigits(int)}, but named appropriately for
          *  the context of generating a fixed-denomination formatter.
          *
-         *  <p>If neither this method nor <code>fractionDigits()</code> is invoked, the default value
-         *  will be <code>2</code>.  */
+         *  <p>If neither this method nor {@code fractionDigits()} is invoked, the default value
+         *  will be {@code 2}.  */
         public Builder minimumFractionDigits(int val) { minimumFractionDigits = val;  return this; }
 
         /** Specify the sizes of a variable number of optional decimal-place groups in the
@@ -625,17 +631,17 @@ public Builder scale(int val) {
          *  satoshis.
          *
          *  <p>If this method is not invoked, then the number of fractional decimal places will
-         *  be limited to the value passed to {@link #minimumFractionDigits}, or <code>2</code>
+         *  be limited to the value passed to {@link #minimumFractionDigits}, or {@code 2}
          *  if that method is not invoked. */
         public Builder fractionGroups(int... val) { fractionGroups = val; return this; }
 
-        /** Specify the {@link java.util.Locale} for formatting and parsing.
+        /** Specify the {@link Locale} for formatting and parsing.
          *  If this method is not invoked, then the runtime default locale will be used. */
         public Builder locale(Locale val) { locale = val; return this; }
 
         /** Specify a currency symbol to be used in the denomination-unit indicators
          *  of formatted values.  This method only sets the symbol, but does not cause
-         *  it to be used.  You must also invoke either <code>style(SYMBOL)</code>, or else apply
+         *  it to be used.  You must also invoke either {@code style(SYMBOL)}, or else apply
          *  a custom pattern that includes a single currency-sign character by invoking either
          *  {@link #pattern(String)} or {@link #localizedPattern(String)}.
          *
@@ -645,7 +651,7 @@ public Builder scale(int val) {
 
         /** Specify a custom currency code to be used in the denomination-unit indicators
          *  of formatted values.  This method only sets the code, but does not cause
-         *  it to be used.  You must also invoke either <code>style(CODE)</code>, or else apply
+         *  it to be used.  You must also invoke either {@code style(CODE)}, or else apply
          *  a custom pattern that includes a double currency-sign character by invoking either
          *  {@link #pattern(String)} or {@link #localizedPattern(String)}.
          *
@@ -654,7 +660,7 @@ public Builder scale(int val) {
         public Builder code(String val) { code = val; return this; }
 
         /** Use the given pattern when formatting and parsing.  The format of this pattern is
-         *  identical to that used by the {@link java.text.DecimalFormat} class.
+         *  identical to that used by the {@link DecimalFormat} class.
          *
          *  <p>If the pattern lacks a negative subpattern, then the formatter will indicate
          *  negative values by placing a minus sign immediately preceding the number part of
@@ -681,10 +687,10 @@ public Builder pattern(String val) {
         } 
 
         /** Use the given localized-pattern for formatting and parsing.  The format of this
-         *  pattern is identical to the patterns used by the {@link java.text.DecimalFormat}
+         *  pattern is identical to the patterns used by the {@link DecimalFormat}
          *  class.
          *
-         *  <p>The pattern is localized according to the locale of the <code>BtcFormat</code>
+         *  <p>The pattern is localized according to the locale of the {@code BtcFormat}
          *  instance, the symbols for which can be examined by inspecting the {@link
          *  java.text.DecimalFormatSymbols} object returned by {@link BtcFormat#symbols()}.
          *  So, for example, if you are in Germany, then the non-localized pattern of
@@ -715,7 +721,7 @@ public Builder localizedPattern(String val) {
         }
 
         /** Return a new {@link BtcFormat} instance.  The object returned will be configured according
-         *  to the state of this <code>Builder</code> instance at the time this method is invoked. */
+         *  to the state of this {@code Builder} instance at the time this method is invoked. */
         public BtcFormat build() {
             BtcFormat f = variant.newInstance(this);
             if (symbol != "" || code != "") { synchronized(f.numberFormat) {
@@ -762,7 +768,7 @@ protected BtcFormat(DecimalFormat numberFormat, int minDecimals, List<Integer> g
     /**
      * Return a new instance of this class using all defaults.  The returned formatter will
      * auto-denominate values so as to minimize zeros without loss of precision and display a
-     * currency code, for example "<code>BTC</code>", to indicate that denomination.  The
+     * currency code, for example "{@code BTC}", to indicate that denomination.  The
      * returned object will uses the default locale for formatting the number and placement of
      * the currency-code.  Two fractional decimal places will be displayed in all formatted numbers.
      */
@@ -770,14 +776,14 @@ protected BtcFormat(DecimalFormat numberFormat, int minDecimals, List<Integer> g
 
     /**
      * Return a new auto-denominating instance that will indicate units using a currency
-     * symbol, for example, <code>"฿"</code>.  Formatting and parsing will be done
+     * symbol, for example, {@code "฿"}.  Formatting and parsing will be done
      * according to the default locale.
      */
     public static BtcFormat getSymbolInstance() { return getSymbolInstance(defaultLocale()); }
 
     /**
      * Return a new auto-denominating instance that will indicate units using a currency
-     * code, for example, <code>"BTC"</code>.  Formatting and parsing will be done
+     * code, for example, {@code "BTC"}.  Formatting and parsing will be done
      * according to the default locale.
      */
     public static BtcFormat getCodeInstance() { return getCodeInstance(defaultLocale()); }
@@ -785,7 +791,7 @@ protected BtcFormat(DecimalFormat numberFormat, int minDecimals, List<Integer> g
     /**
      * Return a new symbol-style auto-formatter with the given number of fractional decimal
      * places.  Denominational units will be indicated using a currency symbol, for example,
-     * <code>"฿"</code>.  The returned object will format the fraction-part of numbers using
+     * {@code "฿"}.  The returned object will format the fraction-part of numbers using
      * the given number of decimal places, or fewer as necessary to avoid giving a place to
      * fractional satoshis.  Formatting and parsing will be done according to the default
      * locale.
@@ -797,26 +803,26 @@ public static BtcFormat getSymbolInstance(int fractionPlaces) {
     /**
      * Return a new code-style auto-formatter with the given number of fractional decimal
      * places.  Denominational units will be indicated using a currency code, for example,
-     * <code>"BTC"</code>.  The returned object will format the fraction-part of numbers using
+     * {@code "BTC"}.  The returned object will format the fraction-part of numbers using
      * the given number of decimal places, or fewer as necessary to avoid giving a place to
      * fractional satoshis.  Formatting and parsing will be done according to the default
      * locale.
      */
     public static BtcFormat getCodeInstance(int minDecimals) {
-	return getCodeInstance(defaultLocale(), minDecimals);
+        return getCodeInstance(defaultLocale(), minDecimals);
     }
 
     /**
      * Return a new code-style auto-formatter for the given locale.  The returned object will
      * select denominational units based on each value being formatted, and will indicate those
-     * units using a currency code, for example, <code>"mBTC"</code>.
+     * units using a currency code, for example, {@code "mBTC"}.
      */
     public static BtcFormat getInstance(Locale locale) { return getCodeInstance(locale); }
 
     /**
      * Return a new code-style auto-formatter for the given locale.  The returned object will
      * select denominational units based on each value being formatted, and will indicate those
-     * units using a currency code, for example, <code>"mBTC"</code>.
+     * units using a currency code, for example, {@code "mBTC"}.
      */
     public static BtcFormat getCodeInstance(Locale locale) { return getInstance(CODE, locale); }
 
@@ -824,51 +830,51 @@ public static BtcFormat getCodeInstance(int minDecimals) {
      * Return a new code-style auto-formatter for the given locale with the given number of
      * fraction places.  The returned object will select denominational units based on each
      * value being formatted, and will indicate those units using a currency code, for example,
-     * <code>"mBTC"</code>.  The returned object will format the fraction-part of numbers using
+     * {@code "mBTC"}.  The returned object will format the fraction-part of numbers using
      * the given number of decimal places, or fewer as necessary to avoid giving a place to
      * fractional satoshis.
      */
     public static BtcFormat getInstance(Locale locale, int minDecimals) {
-	return getCodeInstance(locale, minDecimals);
+        return getCodeInstance(locale, minDecimals);
     }
 
     /**
      * Return a new code-style auto-formatter for the given locale with the given number of
      * fraction places.  The returned object will select denominational units based on each
      * value being formatted, and will indicate those units using a currency code, for example,
-     * <code>"mBTC"</code>.  The returned object will format the fraction-part of numbers using
+     * {@code "mBTC"}.  The returned object will format the fraction-part of numbers using
      * the given number of decimal places, or fewer as necessary to avoid giving a place to
      * fractional satoshis.
      */
     public static BtcFormat getCodeInstance(Locale locale, int minDecimals) {
-	return getInstance(CODE, locale, minDecimals);
+        return getInstance(CODE, locale, minDecimals);
     }
 
     /**
      * Return a new symbol-style auto-formatter for the given locale.  The returned object will
      * select denominational units based on each value being formatted, and will indicate those
-     * units using a currency symbol, for example, <code>"µ฿"</code>.
+     * units using a currency symbol, for example, {@code "µ฿"}.
      */
     public static BtcFormat getSymbolInstance(Locale locale) {
-	return getInstance(SYMBOL, locale);
+        return getInstance(SYMBOL, locale);
     }
 
     /**
      * Return a new symbol-style auto-formatter for the given locale with the given number of
      * fraction places.  The returned object will select denominational units based on each
      * value being formatted, and will indicate those units using a currency symbol, for example,
-     * <code>"µ฿"</code>.  The returned object will format the fraction-part of numbers using
+     * {@code "µ฿"}.  The returned object will format the fraction-part of numbers using
      * the given number of decimal places, or fewer as necessary to avoid giving a place to
      * fractional satoshis.
      */
     public static BtcFormat getSymbolInstance(Locale locale, int fractionPlaces) {
-	return getInstance(SYMBOL, locale, fractionPlaces);
+        return getInstance(SYMBOL, locale, fractionPlaces);
     }
 
     /**
      * Return a new auto-denominating formatter.  The returned object will indicate the
      * denominational units of formatted values using either a currency symbol, such as,
-     * <code>"฿"</code>, or code, such as <code>"mBTC"</code>, depending on the value of
+     * {@code "฿"}, or code, such as {@code "mBTC"}, depending on the value of
      * the argument.  Formatting and parsing will be done according to the default locale.
      */
     public static BtcFormat getInstance(Style style) { return getInstance(style, defaultLocale()); }
@@ -876,43 +882,43 @@ public static BtcFormat getSymbolInstance(Locale locale, int fractionPlaces) {
     /**
      * Return a new auto-denominating formatter with the given number of fractional decimal
      * places.  The returned object will indicate the denominational units of formatted values
-     * using either a currency symbol, such as, <code>"฿"</code>, or code, such as
-     * <code>"mBTC"</code>, depending on the value of the first argument.  The returned object
+     * using either a currency symbol, such as, {@code "฿"}, or code, such as
+     * {@code "mBTC"}, depending on the value of the first argument.  The returned object
      * will format the fraction-part of numbers using the given number of decimal places, or
      * fewer as necessary to avoid giving a place to fractional satoshis.  Formatting and
      * parsing will be done according to the default locale.
      */
     public static BtcFormat getInstance(Style style, int fractionPlaces) {
-	return getInstance(style, defaultLocale(), fractionPlaces);
+        return getInstance(style, defaultLocale(), fractionPlaces);
     }
 
     /**
      * Return a new auto-formatter with the given style for the given locale.
      * The returned object that will auto-denominate each formatted value, and
      * will indicate that denomination using either a currency code, such as
-     * "<code>BTC</code>", or symbol, such as "<code>฿</code>", depending on the value
+     * {@code "BTC"}, or symbol, such as {@code "฿"}, depending on the value
      * of the first argument. 
      * <p>The number of fractional decimal places in formatted number will be two, or fewer
      * as necessary to avoid giving a place to fractional satoshis.
      */
     public static BtcFormat getInstance(Style style, Locale locale) {
-	return getInstance(style, locale, 2);
+        return getInstance(style, locale, 2);
     }
 
     /**
      * Return a new auto-formatter for the given locale with the given number of fraction places.
      * The returned object will automatically-denominate each formatted
      * value, and will indicate that denomination using either a currency code,
-     * such as <code>"mBTC"</code>, or symbol, such as "<code>฿</code>",
+     * such as {@code "mBTC"}, or symbol, such as {@code "฿"},
      * according to the given style argument.  It will format each number
      * according to the given locale.
      *
      * <p>The third parameter is the number of fractional decimal places to use for each
-     * formatted number, reduced as neccesary when formatting to avoid giving a place to
+     * formatted number, reduced as necessary when formatting to avoid giving a place to
      * fractional satoshis.
      */
     public static BtcFormat getInstance(Style style, Locale locale, int fractionPlaces) {
-	return new BtcAutoFormat(locale, style, fractionPlaces);
+        return new BtcAutoFormat(locale, style, fractionPlaces);
     }
 
     /**
@@ -923,7 +929,7 @@ public static BtcFormat getInstance(Style style, Locale locale, int fractionPlac
     public static BtcFormat getCoinInstance() { return getCoinInstance(defaultLocale()); }
 
     private static List<Integer> boxAsList(int[] elements) throws IllegalArgumentException {
-        List<Integer> list = new ArrayList<Integer>(elements.length);
+        List<Integer> list = new ArrayList<>(elements.length);
         for (int e : elements) {
             checkArgument(e > 0, "Size of decimal group must be at least one.");
             list.add(e);
@@ -936,7 +942,7 @@ private static List<Integer> boxAsList(int[] elements) throws IllegalArgumentExc
      * returned object will format and parse values according to the default locale, and will
      * format the fraction part of numbers with at least two decimal places.  The sizes of
      * additional groups of decimal places can be specified by a variable number of
-     * <code>int</code> arguments.  Each optional decimal-place group will be applied only if
+     * {@code int} arguments.  Each optional decimal-place group will be applied only if
      * useful for expressing precision, and will be only partially applied if necessary to
      * avoid giving a place to fractional satoshis.
      */
@@ -1044,7 +1050,7 @@ public static BtcFormat getMicroInstance(Locale locale, int scale, int... groups
     }
 
     /**
-     * Return a new fixeed-denomination formatter with the specified fractional decimal
+     * Return a new fixed-denomination formatter with the specified fractional decimal
      * placing.  The first argument specifies the denomination as the size of the
      * shift from coin-denomination in increasingly-precise decimal places.  The returned object will format
      * and parse values according to the default locale, and will format the fractional part of
@@ -1058,7 +1064,7 @@ public static BtcFormat getInstance(int scale, int minDecimals, int... groups) {
     }
 
     /**
-     * Return a new fixeed-denomination formatter.  The argument specifies the denomination as
+     * Return a new fixed-denomination formatter.  The argument specifies the denomination as
      * the size of the shift from coin-denomination in increasingly-precise decimal places.
      * The returned object will format and parse values according to the default locale, and
      * will format the fractional part of numbers with two decimal places, or fewer as
@@ -1069,7 +1075,7 @@ public static BtcFormat getInstance(int scale) {
     }
 
     /**
-     * Return a new fixeed-denomination formatter for the given locale.  The first argument
+     * Return a new fixed-denomination formatter for the given locale.  The first argument
      * specifies the denomination as the size of the shift from coin-denomination in
      * increasingly-precise decimal places.  The returned object will format and parse values
      * according to the locale specified by the second argument, and will format the fractional
@@ -1099,7 +1105,7 @@ public static BtcFormat getInstance(int scale, Locale locale, int minDecimals, i
      * of the shift from coin-denomination in increasingly-precise decimal places.  The third
      * parameter is the minimum number of fractional decimal places to use.  The third argument
      * specifies the minimum number of fractional decimal places in formatted numbers.  The
-     * last argument is a <code>List</code> of <code>Integer</code> values, each of which
+     * last argument is a {@code List} of {@link Integer} values, each of which
      * specifies the size of an additional group of fractional decimal places to use as
      * necessary to avoid rounding, down to a maximum precision of satoshis.
      */
@@ -1107,17 +1113,15 @@ public static BtcFormat getInstance(int scale, Locale locale, int minDecimals, L
         return new BtcFixedFormat(locale, scale, minDecimals, groups);
     }
 
-    /***********************/
-    /****** FORMATTING *****/
-    /***********************/
+    // ****** FORMATTING *****
 
     /**
-     * Formats a bitcoin monetary value and returns an {@link java.text.AttributedCharacterIterator}.
+     * Formats a bitcoin monetary value and returns an {@link AttributedCharacterIterator}.
      * By iterating, you can examine what fields apply to each character.  This can be useful
      * since a character may be part of more than one field, for example a grouping separator
      * that is also part of the integer field.
      *
-     * @see java.text.AttributedCharacterIterator
+     * @see AttributedCharacterIterator
      */
     @Override
     public AttributedCharacterIterator formatToCharacterIterator(Object obj) { synchronized(numberFormat) {
@@ -1127,19 +1131,19 @@ public AttributedCharacterIterator formatToCharacterIterator(Object obj) { synch
         AttributedCharacterIterator i = numberFormat.formatToCharacterIterator(units);
         numberFormat.setDecimalFormatSymbols(anteSigns);
         setFormatterDigits(numberFormat, anteDigits.get(0), anteDigits.get(1));
-	return i;
+        return i;
     }}
 
     /**
      * Formats a bitcoin value as a number and possibly a units indicator and appends the
      * resulting text to the given string buffer.  The type of monetary value argument can be
-     * any one of any of the following classes: <code>{@link Coin}</code>,
-     * <code>Integer</code>, <code>Long</code>, <code>BigInteger</code>,
-     * <code>BigDecimal</code>.  Numeric types that can represent only an integer are interpreted
-     * as that number of satoshis.  The value of a <code>BigDecimal</code> is interpreted as that
+     * any one of any of the following classes: {@link Coin},
+     * {@link Integer}, {@link Long}, {@link BigInteger},
+     * {@link BigDecimal}.  Numeric types that can represent only an integer are interpreted
+     * as that number of satoshis.  The value of a {@link BigDecimal} is interpreted as that
      * number of bitcoins, rounded to the nearest satoshi as necessary.
      *
-     * @return the <code>StringBuffer</code> passed in as <code>toAppendTo</code>
+     * @return the {@link StringBuffer} passed in as {@code toAppendTo}
      */
     @Override
     public StringBuffer format(Object qty, StringBuffer toAppendTo, FieldPosition pos) {
@@ -1148,11 +1152,11 @@ public StringBuffer format(Object qty, StringBuffer toAppendTo, FieldPosition po
 
     /**
      * Formats a bitcoin value as a number and possibly a units indicator to a
-     * <code>String</code>.The type of monetary value argument can be any one of any of the
-     * following classes: <code>{@link Coin}</code>, <code>Integer</code>, <code>Long</code>,
-     * <code>BigInteger</code>, <code>BigDecimal</code>.  Numeric types that can represent only
+     * {@link String}.The type of monetary value argument can be any one of any of the
+     * following classes: {@link Coin}, {@link Integer}, {@link Long},
+     * {@link BigInteger}, {@link BigDecimal}.  Numeric types that can represent only
      * an integer are interpreted as that number of satoshis.  The value of a
-     * <code>BigDecimal</code> is interpreted as that number of bitcoins, rounded to the
+     * {@link BigDecimal} is interpreted as that number of bitcoins, rounded to the
      * nearest satoshi as necessary.
      *
      * @param minDecimals The minimum number of decimal places in the fractional part of the formatted number
@@ -1166,10 +1170,10 @@ public String format(Object qty, int minDecimals, int... fractionGroups) {
     /**
      * Formats a bitcoin value as a number and possibly a units indicator and appends the
      * resulting text to the given string buffer.  The type of monetary value argument can be
-     * any one of any of the following classes: <code>{@link Coin}</code>,
-     * <code>Integer</code>, <code>Long</code>, <code>BigInteger</code>,
-     * <code>BigDecimal</code>.  Numeric types that can represent only an integer are interpreted
-     * as that number of satoshis.  The value of a <code>BigDecimal</code> is interpreted as that
+     * any one of any of the following classes: {@link Coin},
+     * {@link Integer}, {@link Long}, {@link BigInteger},
+     * {@link BigDecimal}.  Numeric types that can represent only an integer are interpreted
+     * as that number of satoshis.  The value of a {@link BigDecimal} is interpreted as that
      * number of bitcoins, rounded to the nearest satoshi as necessary.
      *
      * @param minDecimals The minimum number of decimal places in the fractional part of the formatted number
@@ -1197,7 +1201,7 @@ private StringBuffer format(Object qty, StringBuffer toAppendTo, FieldPosition p
     }    
 
     /**
-     * Return the denomination for formatting the given value.  The returned <code>int</code>
+     * Return the denomination for formatting the given value.  The returned {@code int}
      * is the size of the decimal-place shift between the given Bitcoin-value denominated in
      * bitcoins and that same value as formatted.  A fixed-denomination formatter will ignore
      * the arguments.
@@ -1243,7 +1247,7 @@ private static ImmutableList<Integer> setFormatterDigits(DecimalFormat formatter
     }
 
     /** Return the number of fractional decimal places to be displayed when formatting
-     *  the given number of monetory units of the denomination indicated by the given decimal scale value,
+     *  the given number of monetary units of the denomination indicated by the given decimal scale value,
      *  where 0 = coin, 3 = millicoin, and so on.
      *
      *  @param unitCount      the number of monetary units to be formatted
@@ -1278,31 +1282,29 @@ private static int calculateFractionPlaces(
      * client is permitted to pass us, and return a BigInteger representing the
      * number of satoshis having the equivalent value. */
     private static BigInteger inSatoshis(Object qty) {
-	BigInteger satoshis;
+        BigInteger satoshis;
         // the value might be bitcoins or satoshis
-	if (qty instanceof Long || qty instanceof Integer)
-	    satoshis = BigInteger.valueOf(((Number)qty).longValue());
-	else if (qty instanceof BigInteger)
-	    satoshis = (BigInteger)qty;
-	else if (qty instanceof BigDecimal)
-	    satoshis = ((BigDecimal)qty).movePointRight(Coin.SMALLEST_UNIT_EXPONENT).
+        if (qty instanceof Long || qty instanceof Integer)
+            satoshis = BigInteger.valueOf(((Number)qty).longValue());
+        else if (qty instanceof BigInteger)
+            satoshis = (BigInteger)qty;
+        else if (qty instanceof BigDecimal)
+            satoshis = ((BigDecimal)qty).movePointRight(Coin.SMALLEST_UNIT_EXPONENT).
                        setScale(0,BigDecimal.ROUND_HALF_UP).unscaledValue();
-	else if (qty instanceof Coin)
-	    satoshis = BigInteger.valueOf(((Coin)qty).value);
-	else
-	    throw new IllegalArgumentException("Cannot format a " + qty.getClass().getSimpleName() +
+        else if (qty instanceof Coin)
+            satoshis = BigInteger.valueOf(((Coin)qty).value);
+        else
+            throw new IllegalArgumentException("Cannot format a " + qty.getClass().getSimpleName() +
                                                " as a Bicoin value");
         return satoshis;
     }
 
-    /********************/
-    /****** PARSING *****/
-    /********************/
+    // ****** PARSING *****
 
     /**
-      * Parse a <code>String</code> representation of a Bitcoin monetary value.  Returns a
-      * {@link org.bitcoinj.core.Coin} object that represents the parsed value.
-      * @see java.text.NumberFormat */
+      * Parse a {@link String} representation of a Bitcoin monetary value.  Returns a
+      * {@link Coin} object that represents the parsed value.
+      * @see NumberFormat */
     @Override
     public final Object parseObject(String source, ParsePosition pos) { return parse(source, pos); }
 
@@ -1342,7 +1344,7 @@ ScaleMatcher[] denomMatchers() {
     }
 
     /** Set both the currency symbol and international code of the underlying {@link
-      * java.text.NumberFormat} object to the value of the given <code>String</code>.
+      * java.text.NumberFormat} object to the value of the given {@link String}.
       * This method is invoked in the process of parsing, not formatting.
       *
       * Only invoke this from code synchronized on the value of the first argument, and don't
@@ -1378,7 +1380,6 @@ private static DecimalFormatSymbols setSymbolAndCode(DecimalFormat numberFormat,
      *
      * @param scale Number of places the decimal point will be shifted when formatting
      *              a quantity of satoshis.
-     * @return The DecimalFormatSymbols before changing
      */
     protected static void prefixUnitsIndicator(DecimalFormat numberFormat, int scale) {
         checkState(Thread.holdsLock(numberFormat)); // make sure caller intends to reset before changing
@@ -1388,7 +1389,7 @@ protected static void prefixUnitsIndicator(DecimalFormat numberFormat, int scale
         );
     }
 
-    /** Parse a <code>String</code> representation of a Bitcoin monetary value.  If this
+    /** Parse a {@link String} representation of a Bitcoin monetary value.  If this
      * object's pattern includes a currency sign, either symbol or code, as by default is true
      * for instances of {@link BtcAutoFormat} and false for instances of {@link
      * BtcFixedFormat}, then denominated (i.e., prefixed) currency signs in the parsed String
@@ -1442,7 +1443,7 @@ public Coin parse(String source, ParsePosition pos) {
         return coin;
     }
 
-    /** Parse a <code>String</code> representation of a Bitcoin monetary value.  If this
+    /** Parse a {@link String} representation of a Bitcoin monetary value.  If this
      * object's pattern includes a currency sign, either symbol or code, as by default is true
      * for instances of {@link BtcAutoFormat} and false for instances of {@link
      * BtcFixedFormat}, then denominated (i.e., prefixed) currency signs in the parsed String
@@ -1462,9 +1463,7 @@ public Coin parse(String source) throws ParseException {
         return (Coin)parseObject(source);
     }
 
-    /*********************************/
     /****** END OF PARSING STUFF *****/
-    /*********************************/
 
     protected static String prefixCode(String code, int scale) {
         switch (scale) {
@@ -1502,7 +1501,7 @@ protected static String prefixSymbol(String symbol, int scale) {
      *
      *  <p>This method accommodates an imperfection in the Java formatting code and distributed
      *  locale data.  To wit: the subpattern for negative numbers is optional and not all
-     *  locales have one. In those cases, {@link java.text.DecimalFormat} will indicate numbers
+     *  locales have one. In those cases, {@link DecimalFormat} will indicate numbers
      *  less than zero by adding a negative sign as the first character of the prefix of the
      *  positive subpattern.
      *
@@ -1522,12 +1521,12 @@ protected static String negify(String pattern) {
 
     /**
      * Return an array of all locales for which the getInstance() method of this class can
-     * return localized instances.  See {@link java.text.NumberFormat#getAvailableLocales()}
+     * return localized instances.  See {@link NumberFormat#getAvailableLocales()}
      */
     public static Locale[] getAvailableLocales() { return NumberFormat.getAvailableLocales(); }
 
     /** Return the unprefixed currency symbol for bitcoins configured for this object.  The
-     *  return value of this method is constant throughough the life of an instance.  */
+     *  return value of this method is constant throughout the life of an instance.  */
     public String coinSymbol() { synchronized(numberFormat) {
         return numberFormat.getDecimalFormatSymbols().getCurrencySymbol();
     }}
diff --git a/core/src/main/java/org/bitcoinj/utils/CIDRUtils.java b/core/src/main/java/org/bitcoinj/utils/CIDRUtils.java
new file mode 100644
index 00000000000..fe4c553e112
--- /dev/null
+++ b/core/src/main/java/org/bitcoinj/utils/CIDRUtils.java
@@ -0,0 +1,112 @@
+/*
+* The MIT License
+*
+* Copyright (c) 2013 Edin Dazdarevic (edin.dazdarevic@gmail.com)
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+*
+* */
+
+package org.bitcoinj.utils;
+
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A class that enables to get an IP range from CIDR specification. It supports
+ * both IPv4 and IPv6.
+ * Adapted from https://github.com/edazdarevic/CIDRUtils/
+ */
+public class CIDRUtils {
+
+    private InetAddress inetAddress;
+    private InetAddress startAddress;
+    private InetAddress endAddress;
+    private final int prefixLength;
+
+    public CIDRUtils(String addr, Integer prefixLength) {
+
+        try {
+            inetAddress = InetAddress.getByName(addr);
+            this.prefixLength = prefixLength;
+            calculate();
+        } catch (UnknownHostException e) {
+            // No dns lookup is performed because InetAddress methods are supposed to be invoked with numeric address
+            // parameters, so this is unreachable code.
+            throw new RuntimeException(e);
+        }        
+    }
+
+    private void calculate() throws UnknownHostException {
+        ByteBuffer maskBuffer;
+        int targetSize;
+        if (inetAddress.getAddress().length == 4) {
+            maskBuffer = ByteBuffer.allocate(4).putInt(-1);
+            targetSize = 4;
+        } else {
+            maskBuffer = ByteBuffer.allocate(16).putLong(-1L).putLong(-1L);
+            targetSize = 16;
+        }
+        BigInteger mask = (new BigInteger(1, maskBuffer.array())).not().shiftRight(prefixLength);
+        BigInteger ipVal = new BigInteger(1, inetAddress.getAddress());
+
+        BigInteger startIp = ipVal.and(mask);
+        BigInteger endIp = startIp.add(mask.not());
+
+        byte[] startIpArr = toBytes(startIp.toByteArray(), targetSize);
+        byte[] endIpArr = toBytes(endIp.toByteArray(), targetSize);
+
+        this.startAddress = InetAddress.getByAddress(startIpArr);
+        this.endAddress = InetAddress.getByAddress(endIpArr);
+
+    }
+
+    private byte[] toBytes(byte[] array, int targetSize) {
+        int counter = 0;
+        List<Byte> newArr = new ArrayList<Byte>();
+        while (counter < targetSize && (array.length - 1 - counter >= 0)) {
+            newArr.add(0, array[array.length - 1 - counter]);
+            counter++;
+        }
+
+        int size = newArr.size();
+        for (int i = 0; i < (targetSize - size); i++) {
+
+            newArr.add(0, (byte) 0);
+        }
+
+        byte[] ret = new byte[newArr.size()];
+        for (int i = 0; i < newArr.size(); i++) {
+            ret[i] = newArr.get(i);
+        }
+        return ret;
+    }
+
+    public boolean isInRange(InetAddress address) {
+        BigInteger start = new BigInteger(1, this.startAddress.getAddress());
+        BigInteger end = new BigInteger(1, this.endAddress.getAddress());
+        BigInteger target = new BigInteger(1, address.getAddress());
+
+        int st = start.compareTo(target);
+        int te = target.compareTo(end);
+
+        return (st == -1 || st == 0) && (te == -1 || te == 0);
+    }    
+}
\ No newline at end of file
diff --git a/core/src/main/java/org/bitcoinj/utils/ContextPropagatingThreadFactory.java b/core/src/main/java/org/bitcoinj/utils/ContextPropagatingThreadFactory.java
index ca0cb761f57..ba8f4b2bcf6 100644
--- a/core/src/main/java/org/bitcoinj/utils/ContextPropagatingThreadFactory.java
+++ b/core/src/main/java/org/bitcoinj/utils/ContextPropagatingThreadFactory.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -21,7 +23,7 @@
 import java.util.concurrent.*;
 
 /**
- * A {@link java.util.concurrent.ThreadFactory} that propagates a {@link org.bitcoinj.core.Context} from the creating
+ * A {@link ThreadFactory} that propagates a {@link Context} from the creating
  * thread into the new thread. This factory creates daemon threads.
  */
 public class ContextPropagatingThreadFactory implements ThreadFactory {
diff --git a/core/src/main/java/org/bitcoinj/utils/DaemonThreadFactory.java b/core/src/main/java/org/bitcoinj/utils/DaemonThreadFactory.java
index 1f3d9d28e79..3be08f5aeda 100644
--- a/core/src/main/java/org/bitcoinj/utils/DaemonThreadFactory.java
+++ b/core/src/main/java/org/bitcoinj/utils/DaemonThreadFactory.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/utils/Fiat.java b/core/src/main/java/org/bitcoinj/utils/Fiat.java
index e7c9165cc0e..977f03c9389 100644
--- a/core/src/main/java/org/bitcoinj/utils/Fiat.java
+++ b/core/src/main/java/org/bitcoinj/utils/Fiat.java
@@ -21,13 +21,14 @@
 import java.io.Serializable;
 import java.math.BigDecimal;
 
+import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.Monetary;
 import com.google.common.base.Objects;
 import com.google.common.math.LongMath;
 import com.google.common.primitives.Longs;
 
 /**
- * Represents a monetary fiat value. It was decided to not fold this into {@link org.bitcoinj.core.Coin} because of type
+ * Represents a monetary fiat value. It was decided to not fold this into {@link Coin} because of type
  * safety. Fiat values always come with an attached currency code.
  * 
  * This class is immutable.
@@ -73,19 +74,33 @@ public String getCurrencyCode() {
     }
 
     /**
-     * Parses an amount expressed in the way humans are used to.
-     * <p>
-     * <p/>
-     * This takes string in a format understood by {@link BigDecimal#BigDecimal(String)}, for example "0", "1", "0.10",
-     * "1.23E3", "1234.5E-5".
-     * 
+     * <p>Parses an amount expressed in the way humans are used to.</p>
+     * <p>This takes string in a format understood by {@link BigDecimal#BigDecimal(String)}, for example "0", "1", "0.10",
+     * "1.23E3", "1234.5E-5".</p>
+     *
      * @throws IllegalArgumentException
-     *             if you try to specify fractional satoshis, or a value out of range.
+     *             if you try to specify more than 4 digits after the comma, or a value out of range.
      */
     public static Fiat parseFiat(final String currencyCode, final String str) {
         try {
-            long val = new BigDecimal(str).movePointRight(SMALLEST_UNIT_EXPONENT)
-                    .toBigIntegerExact().longValue();
+            long val = new BigDecimal(str).movePointRight(SMALLEST_UNIT_EXPONENT).longValueExact();
+            return Fiat.valueOf(currencyCode, val);
+        } catch (ArithmeticException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    /**
+     * <p>Parses an amount expressed in the way humans are used to. The amount is cut to 4 digits after the comma.</p>
+     * <p>This takes string in a format understood by {@link BigDecimal#BigDecimal(String)}, for example "0", "1", "0.10",
+     * "1.23E3", "1234.5E-5".</p>
+     *
+     * @throws IllegalArgumentException
+     *             if you try to specify a value out of range.
+     */
+    public static Fiat parseFiatInexact(final String currencyCode, final String str) {
+        try {
+            long val = new BigDecimal(str).movePointRight(SMALLEST_UNIT_EXPONENT).longValue();
             return Fiat.valueOf(currencyCode, val);
         } catch (ArithmeticException e) {
             throw new IllegalArgumentException(e);
@@ -141,7 +156,7 @@ public boolean isZero() {
     }
 
     /**
-     * Returns true if the monetary value represented by this instance is greater than that of the given other Coin,
+     * Returns true if the monetary value represented by this instance is greater than that of the given other Fiat,
      * otherwise false.
      */
     public boolean isGreaterThan(Fiat other) {
@@ -149,7 +164,7 @@ public boolean isGreaterThan(Fiat other) {
     }
 
     /**
-     * Returns true if the monetary value represented by this instance is less than that of the given other Coin,
+     * Returns true if the monetary value represented by this instance is less than that of the given other Fiat,
      * otherwise false.
      */
     public boolean isLessThan(Fiat other) {
@@ -168,7 +183,7 @@ public Fiat negate() {
     }
 
     /**
-     * Returns the number of satoshis of this monetary value. It's deprecated in favour of accessing {@link #value}
+     * Returns the number of "smallest units" of this monetary value. It's deprecated in favour of accessing {@link #value}
      * directly.
      */
     public long longValue() {
@@ -189,8 +204,8 @@ public String toFriendlyString() {
 
     /**
      * <p>
-     * Returns the value as a plain string denominated in BTC. The result is unformatted with no trailing zeroes. For
-     * instance, a value of 150000 satoshis gives an output string of "0.0015" BTC
+     * Returns the value as a plain string. The result is unformatted with no trailing zeroes. For
+     * instance, a value of 150000 "smallest units" gives an output string of "0.0015".
      * </p>
      */
     public String toPlainString() {
diff --git a/core/src/main/java/org/bitcoinj/utils/MonetaryFormat.java b/core/src/main/java/org/bitcoinj/utils/MonetaryFormat.java
index 60297ab868c..c364fd3e91d 100644
--- a/core/src/main/java/org/bitcoinj/utils/MonetaryFormat.java
+++ b/core/src/main/java/org/bitcoinj/utils/MonetaryFormat.java
@@ -28,6 +28,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.Monetary;
@@ -59,6 +60,12 @@ public final class MonetaryFormat {
     public static final String CODE_MBTC = "mBTC";
     /** Currency code for base 1/1000000 Bitcoin. */
     public static final String CODE_UBTC = "µBTC";
+    /** Currency symbol for base 1 Bitcoin. */
+    public static final String SYMBOL_BTC = "\u20bf";
+    /** Currency symbol for base 1/1000 Bitcoin. */
+    public static final String SYMBOL_MBTC = "m" + SYMBOL_BTC;
+    /** Currency symbol for base 1/1000000 Bitcoin. */
+    public static final String SYMBOL_UBTC = "µ" + SYMBOL_BTC;
 
     public static final int MAX_DECIMALS = 8;
 
@@ -149,7 +156,7 @@ public MonetaryFormat minDecimals(int minDecimals) {
      * </p>
      * 
      * <p>
-     * For example, if you pass <tt>4,2</tt> it will add four decimals to your formatted string if needed, and then add
+     * For example, if you pass {@code 4,2} it will add four decimals to your formatted string if needed, and then add
      * another two decimals if needed. At this point, rather than adding further decimals the value will be rounded.
      * </p>
      * 
@@ -157,7 +164,7 @@ public MonetaryFormat minDecimals(int minDecimals) {
      *            any number numbers of decimals, one for each group
      */
     public MonetaryFormat optionalDecimals(int... groups) {
-        List<Integer> decimalGroups = new ArrayList<Integer>(groups.length);
+        List<Integer> decimalGroups = new ArrayList<>(groups.length);
         for (int group : groups)
             decimalGroups.add(group);
         return new MonetaryFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
@@ -172,7 +179,7 @@ public MonetaryFormat optionalDecimals(int... groups) {
      * </p>
      * 
      * <p>
-     * For example, if you pass <tt>1,8</tt> it will up to eight decimals to your formatted string if needed. After
+     * For example, if you pass {@code 1,8} it will up to eight decimals to your formatted string if needed. After
      * these have been used up, rather than adding further decimals the value will be rounded.
      * </p>
      * 
@@ -183,7 +190,7 @@ public MonetaryFormat optionalDecimals(int... groups) {
      */
     public MonetaryFormat repeatOptionalDecimals(int decimals, int repetitions) {
         checkArgument(repetitions >= 0);
-        List<Integer> decimalGroups = new ArrayList<Integer>(repetitions);
+        List<Integer> decimalGroups = new ArrayList<>(repetitions);
         for (int i = 0; i < repetitions; i++)
             decimalGroups.add(decimals);
         return new MonetaryFormat(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups,
@@ -291,6 +298,10 @@ public MonetaryFormat withLocale(Locale locale) {
     }
 
     public MonetaryFormat() {
+        this(false);
+    }
+
+    public MonetaryFormat(boolean useBitcoinSymbol) {
         // defaults
         this.negativeSign = '-';
         this.positiveSign = 0; // none
@@ -301,9 +312,9 @@ public MonetaryFormat() {
         this.shift = 0;
         this.roundingMode = RoundingMode.HALF_UP;
         this.codes = new String[MAX_DECIMALS];
-        this.codes[0] = CODE_BTC;
-        this.codes[3] = CODE_MBTC;
-        this.codes[6] = CODE_UBTC;
+        this.codes[0] = useBitcoinSymbol ? SYMBOL_BTC : CODE_BTC;
+        this.codes[3] = useBitcoinSymbol ? SYMBOL_MBTC : CODE_MBTC;
+        this.codes[6] = useBitcoinSymbol ? SYMBOL_UBTC : CODE_UBTC;
         this.codeSeparator = ' ';
         this.codePrefixed = true;
     }
@@ -393,7 +404,7 @@ else if (positiveSign != 0)
     }
 
     /**
-     * Parse a human readable coin value to a {@link org.bitcoinj.core.Coin} instance.
+     * Parse a human readable coin value to a {@link Coin} instance.
      * 
      * @throws NumberFormatException
      *             if the string cannot be parsed for some reason
@@ -403,7 +414,7 @@ public Coin parse(String str) throws NumberFormatException {
     }
 
     /**
-     * Parse a human readable fiat value to a {@link org.bitcoinj.utils.Fiat} instance.
+     * Parse a human readable fiat value to a {@link Fiat} instance.
      * 
      * @throws NumberFormatException
      *             if the string cannot be parsed for some reason
@@ -451,4 +462,45 @@ public String code() {
             throw new NumberFormatException("missing code for shift: " + shift);
         return codes[shift];
     }
+
+    /**
+     * Two formats are equal if they have the same parameters.
+     */
+    @Override
+    public boolean equals(final Object o) {
+        if (o == this)
+            return true;
+        if (o == null || o.getClass() != getClass())
+            return false;
+        final MonetaryFormat other = (MonetaryFormat) o;
+        if (!Objects.equals(this.negativeSign, other.negativeSign))
+            return false;
+        if (!Objects.equals(this.positiveSign, other.positiveSign))
+            return false;
+        if (!Objects.equals(this.zeroDigit, other.zeroDigit))
+            return false;
+        if (!Objects.equals(this.decimalMark, other.decimalMark))
+            return false;
+        if (!Objects.equals(this.minDecimals, other.minDecimals))
+            return false;
+        if (!Objects.equals(this.decimalGroups, other.decimalGroups))
+            return false;
+        if (!Objects.equals(this.shift, other.shift))
+            return false;
+        if (!Objects.equals(this.roundingMode, other.roundingMode))
+            return false;
+        if (!Arrays.equals(this.codes, other.codes))
+            return false;
+        if (!Objects.equals(this.codeSeparator, other.codeSeparator))
+            return false;
+        if (!Objects.equals(this.codePrefixed, other.codePrefixed))
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(negativeSign, positiveSign, zeroDigit, decimalMark, minDecimals, decimalGroups, shift,
+                roundingMode, Arrays.hashCode(codes), codeSeparator, codePrefixed);
+    }
 }
diff --git a/core/src/main/java/org/bitcoinj/utils/TaggableObject.java b/core/src/main/java/org/bitcoinj/utils/TaggableObject.java
index 60c74cde6e1..561a516593b 100644
--- a/core/src/main/java/org/bitcoinj/utils/TaggableObject.java
+++ b/core/src/main/java/org/bitcoinj/utils/TaggableObject.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -37,7 +39,7 @@ public interface TaggableObject {
     @Nullable ByteString maybeGetTag(String tag);
 
     /**
-     * Returns the immutable byte array associated with the given tag name, or throws {@link java.lang.IllegalArgumentException}
+     * Returns the immutable byte array associated with the given tag name, or throws {@link IllegalArgumentException}
      * if that tag wasn't set yet.
      */
     ByteString getTag(String tag);
diff --git a/core/src/main/java/org/bitcoinj/utils/Threading.java b/core/src/main/java/org/bitcoinj/utils/Threading.java
index bbbdbdfd983..c3e1db5f234 100644
--- a/core/src/main/java/org/bitcoinj/utils/Threading.java
+++ b/core/src/main/java/org/bitcoinj/utils/Threading.java
@@ -50,10 +50,8 @@ public class Threading {
     public static Executor USER_THREAD;
 
     /**
-     * A dummy executor that just invokes the runnable immediately. Use this over
-     * {@link com.google.common.util.concurrent.MoreExecutors#sameThreadExecutor()} because the latter creates a new
-     * object each time in order to implement the more complex {@link ExecutorService} interface, which is overkill
-     * for our needs.
+     * A dummy executor that just invokes the runnable immediately. Use this over more complex executors
+     * (e.g. those extending {@link ExecutorService}), which are overkill for our needs.
      */
     public static final Executor SAME_THREAD;
 
@@ -95,7 +93,7 @@ public static class UserThread extends Thread implements Executor {
         public UserThread() {
             super("bitcoinj user thread");
             setDaemon(true);
-            tasks = new LinkedBlockingQueue<Runnable>();
+            tasks = new LinkedBlockingQueue<>();
             start();
         }
 
diff --git a/core/src/main/java/org/bitcoinj/utils/VersionTally.java b/core/src/main/java/org/bitcoinj/utils/VersionTally.java
index 5e37bbc3f3d..1985264a549 100644
--- a/core/src/main/java/org/bitcoinj/utils/VersionTally.java
+++ b/core/src/main/java/org/bitcoinj/utils/VersionTally.java
@@ -99,7 +99,7 @@ public Integer getCountAtOrAbove(final long version) {
     public void initialize(final BlockStore blockStore, final StoredBlock chainHead)
         throws BlockStoreException {
         StoredBlock versionBlock = chainHead;
-        final Stack<Long> versions = new Stack<Long>();
+        final Stack<Long> versions = new Stack<>();
 
         // We don't know how many blocks back we can go, so load what we can first
         versions.push(versionBlock.getHeader().getVersion());
diff --git a/core/src/main/java/org/bitcoinj/wallet/AllRandomKeysRotating.java b/core/src/main/java/org/bitcoinj/wallet/AllRandomKeysRotating.java
index 5624ef83586..d8b504da122 100644
--- a/core/src/main/java/org/bitcoinj/wallet/AllRandomKeysRotating.java
+++ b/core/src/main/java/org/bitcoinj/wallet/AllRandomKeysRotating.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/wallet/AllowUnconfirmedCoinSelector.java b/core/src/main/java/org/bitcoinj/wallet/AllowUnconfirmedCoinSelector.java
index 1d0528350dc..855c7afe271 100644
--- a/core/src/main/java/org/bitcoinj/wallet/AllowUnconfirmedCoinSelector.java
+++ b/core/src/main/java/org/bitcoinj/wallet/AllowUnconfirmedCoinSelector.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/wallet/BasicKeyChain.java b/core/src/main/java/org/bitcoinj/wallet/BasicKeyChain.java
index 04b0990f0e4..453eb5d77d0 100644
--- a/core/src/main/java/org/bitcoinj/wallet/BasicKeyChain.java
+++ b/core/src/main/java/org/bitcoinj/wallet/BasicKeyChain.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2013 Google Inc.
+ * Copyright 2019 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +19,7 @@
 
 import org.bitcoinj.core.BloomFilter;
 import org.bitcoinj.core.ECKey;
+import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.crypto.*;
 import org.bitcoinj.utils.ListenerRegistration;
 import org.bitcoinj.utils.Threading;
@@ -26,7 +28,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.protobuf.ByteString;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import javax.annotation.Nullable;
 import java.util.*;
@@ -44,7 +46,7 @@
 public class BasicKeyChain implements EncryptableKeyChain {
     private final ReentrantLock lock = Threading.lock("BasicKeyChain");
 
-    // Maps used to let us quickly look up a key given data we find in transcations or the block chain.
+    // Maps used to let us quickly look up a key given data we find in transactions or the block chain.
     private final LinkedHashMap<ByteString, ECKey> hashToKeys;
     private final LinkedHashMap<ByteString, ECKey> pubkeyToKeys;
     @Nullable private final KeyCrypter keyCrypter;
@@ -58,9 +60,9 @@ public BasicKeyChain() {
 
     public BasicKeyChain(@Nullable KeyCrypter crypter) {
         this.keyCrypter = crypter;
-        hashToKeys = new LinkedHashMap<ByteString, ECKey>();
-        pubkeyToKeys = new LinkedHashMap<ByteString, ECKey>();
-        listeners = new CopyOnWriteArrayList<ListenerRegistration<KeyChainEventListener>>();
+        hashToKeys = new LinkedHashMap<>();
+        pubkeyToKeys = new LinkedHashMap<>();
+        listeners = new CopyOnWriteArrayList<>();
     }
 
     /** Returns the {@link KeyCrypter} in use or null if the key chain is not encrypted. */
@@ -99,7 +101,7 @@ public List<ECKey> getKeys(@Nullable KeyPurpose purpose, int numberOfKeys) {
             if (hashToKeys.size() < numberOfKeys) {
                 checkState(keyCrypter == null);
 
-                List<ECKey> keys = new ArrayList<ECKey>();
+                List<ECKey> keys = new ArrayList<>();
                 for (int i = 0; i < numberOfKeys - hashToKeys.size(); i++) {
                     keys.add(new ECKey());
                 }
@@ -109,7 +111,7 @@ public List<ECKey> getKeys(@Nullable KeyPurpose purpose, int numberOfKeys) {
                 queueOnKeysAdded(immutableKeys);
             }
 
-            List<ECKey> keysToReturn = new ArrayList<ECKey>();
+            List<ECKey> keysToReturn = new ArrayList<>();
             int count = 0;
             while (hashToKeys.values().iterator().hasNext() && numberOfKeys != count) {
                 keysToReturn.add(hashToKeys.values().iterator().next());
@@ -125,7 +127,7 @@ public List<ECKey> getKeys(@Nullable KeyPurpose purpose, int numberOfKeys) {
     public List<ECKey> getKeys() {
         lock.lock();
         try {
-            return new ArrayList<ECKey>(hashToKeys.values());
+            return new ArrayList<>(hashToKeys.values());
         } finally {
             lock.unlock();
         }
@@ -145,7 +147,7 @@ public int importKeys(List<? extends ECKey> keys) {
             for (ECKey key : keys) {
                 checkKeyEncryptionStateMatches(key);
             }
-            List<ECKey> actuallyAdded = new ArrayList<ECKey>(keys.size());
+            List<ECKey> actuallyAdded = new ArrayList<>(keys.size());
             for (final ECKey key : keys) {
                 if (hasKey(key)) continue;
                 actuallyAdded.add(key);
@@ -203,19 +205,19 @@ public void importKey(ECKey key) {
         }
     }
 
-    public ECKey findKeyFromPubHash(byte[] pubkeyHash) {
+    public ECKey findKeyFromPubHash(byte[] pubKeyHash) {
         lock.lock();
         try {
-            return hashToKeys.get(ByteString.copyFrom(pubkeyHash));
+            return hashToKeys.get(ByteString.copyFrom(pubKeyHash));
         } finally {
             lock.unlock();
         }
     }
 
-    public ECKey findKeyFromPubKey(byte[] pubkey) {
+    public ECKey findKeyFromPubKey(byte[] pubKey) {
         lock.lock();
         try {
-            return pubkeyToKeys.get(ByteString.copyFrom(pubkey));
+            return pubkeyToKeys.get(ByteString.copyFrom(pubKey));
         } finally {
             lock.unlock();
         }
@@ -284,7 +286,7 @@ public long getEarliestKeyCreationTime() {
     }
 
     public List<ListenerRegistration<KeyChainEventListener>> getListeners() {
-        return new ArrayList<ListenerRegistration<KeyChainEventListener>>(listeners);
+        return new ArrayList<>(listeners);
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -294,7 +296,7 @@ public List<ListenerRegistration<KeyChainEventListener>> getListeners() {
     ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
     Map<ECKey, Protos.Key.Builder> serializeToEditableProtobufs() {
-        Map<ECKey, Protos.Key.Builder> result = new LinkedHashMap<ECKey, Protos.Key.Builder>();
+        Map<ECKey, Protos.Key.Builder> result = new LinkedHashMap<>();
         for (ECKey ecKey : hashToKeys.values()) {
             Protos.Key.Builder protoKey = serializeEncryptableItem(ecKey);
             protoKey.setPublicKey(ByteString.copyFrom(ecKey.getPubKey()));
@@ -306,7 +308,7 @@ Map<ECKey, Protos.Key.Builder> serializeToEditableProtobufs() {
     @Override
     public List<Protos.Key> serializeToProtobuf() {
         Collection<Protos.Key.Builder> builders = serializeToEditableProtobufs().values();
-        List<Protos.Key> result = new ArrayList<Protos.Key>(builders.size());
+        List<Protos.Key> result = new ArrayList<>(builders.size());
         for (Protos.Key.Builder builder : builders) result.add(builder.build());
         return result;
     }
@@ -407,7 +409,11 @@ public void addEventListener(KeyChainEventListener listener) {
 
     @Override
     public void addEventListener(KeyChainEventListener listener, Executor executor) {
-        listeners.add(new ListenerRegistration<KeyChainEventListener>(listener, executor));
+        addEventListener(new ListenerRegistration<>(listener, executor));
+    }
+
+    public void addEventListener(ListenerRegistration<KeyChainEventListener> listener) {
+        listeners.add(listener);
     }
 
     @Override
@@ -434,8 +440,8 @@ public void run() {
     ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
     /**
-     * Convenience wrapper around {@link #toEncrypted(org.bitcoinj.crypto.KeyCrypter,
-     * org.spongycastle.crypto.params.KeyParameter)} which uses the default Scrypt key derivation algorithm and
+     * Convenience wrapper around {@link #toEncrypted(KeyCrypter,
+     * org.bouncycastle.crypto.params.KeyParameter)} which uses the default Scrypt key derivation algorithm and
      * parameters, derives a key from the given password and returns the created key.
      */
     @Override
@@ -449,7 +455,7 @@ public BasicKeyChain toEncrypted(CharSequence password) {
 
     /**
      * Encrypt the wallet using the KeyCrypter and the AES key. A good default KeyCrypter to use is
-     * {@link org.bitcoinj.crypto.KeyCrypterScrypt}.
+     * {@link KeyCrypterScrypt}.
      *
      * @param keyCrypter The KeyCrypter that specifies how to encrypt/ decrypt a key
      * @param aesKey AES key to use (normally created using KeyCrypter#deriveKey and cached as it is time consuming
@@ -474,6 +480,9 @@ public BasicKeyChain toEncrypted(KeyCrypter keyCrypter, KeyParameter aesKey) {
                     throw new KeyCrypterException("The key " + key.toString() + " cannot be successfully decrypted after encryption so aborting wallet encryption.");
                 encrypted.importKeyLocked(encryptedKey);
             }
+            for (ListenerRegistration<KeyChainEventListener> listener : listeners) {
+                encrypted.listeners.add(listener);
+            }
             return encrypted;
         } finally {
             lock.unlock();
@@ -499,6 +508,9 @@ public BasicKeyChain toDecrypted(KeyParameter aesKey) {
             for (ECKey key : hashToKeys.values()) {
                 decrypted.importKeyLocked(key.decrypt(aesKey));
             }
+            for (ListenerRegistration<KeyChainEventListener> listener : listeners) {
+                decrypted.listeners.add(listener);
+            }
             return decrypted;
         } finally {
             lock.unlock();
@@ -618,4 +630,13 @@ public List<ECKey> findKeysBefore(long timeSecs) {
             lock.unlock();
         }
     }
+
+    public String toString(boolean includePrivateKeys, @Nullable KeyParameter aesKey, NetworkParameters params) {
+        final StringBuilder builder = new StringBuilder();
+        List<ECKey> keys = getKeys();
+        Collections.sort(keys, ECKey.AGE_COMPARATOR);
+        for (ECKey key : keys)
+            key.formatKeyWithAddress(includePrivateKeys, aesKey, builder, params, null, "imported");
+        return builder.toString();
+    }
 }
diff --git a/core/src/main/java/org/bitcoinj/wallet/CoinSelection.java b/core/src/main/java/org/bitcoinj/wallet/CoinSelection.java
index 758402109fd..4b33704d67a 100644
--- a/core/src/main/java/org/bitcoinj/wallet/CoinSelection.java
+++ b/core/src/main/java/org/bitcoinj/wallet/CoinSelection.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -18,10 +20,11 @@
 import org.bitcoinj.core.TransactionOutput;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * Represents the results of a
- * {@link CoinSelector#select(Coin, java.util.List)} operation. A
+ * {@link CoinSelector#select(Coin, List)} operation. A
  * coin selection represents a list of spendable transaction outputs that sum together to give valueGathered.
  * Different coin selections could be produced by different coin selectors from the same input set, according
  * to their varying policies.
diff --git a/core/src/main/java/org/bitcoinj/wallet/CoinSelector.java b/core/src/main/java/org/bitcoinj/wallet/CoinSelector.java
index e656416a230..2fd2d770c6c 100644
--- a/core/src/main/java/org/bitcoinj/wallet/CoinSelector.java
+++ b/core/src/main/java/org/bitcoinj/wallet/CoinSelector.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/wallet/DecryptingKeyBag.java b/core/src/main/java/org/bitcoinj/wallet/DecryptingKeyBag.java
index b9f1e46f70f..bf51a4c04d5 100644
--- a/core/src/main/java/org/bitcoinj/wallet/DecryptingKeyBag.java
+++ b/core/src/main/java/org/bitcoinj/wallet/DecryptingKeyBag.java
@@ -17,7 +17,8 @@
 package org.bitcoinj.wallet;
 
 import org.bitcoinj.core.ECKey;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bitcoinj.script.Script;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import javax.annotation.Nullable;
 
@@ -28,7 +29,7 @@
 
 /**
  * A DecryptingKeyBag filters a pre-existing key bag, decrypting keys as they are requested using the provided
- * AES key. If the keys are encrypted and no AES key provided, {@link org.bitcoinj.core.ECKey.KeyIsEncryptedException}
+ * AES key. If the keys are encrypted and no AES key provided, {@link ECKey.KeyIsEncryptedException}
  * will be thrown.
  */
 public class DecryptingKeyBag implements KeyBag {
@@ -54,7 +55,7 @@ else if (key.isEncrypted()) {
     }
 
     private RedeemData maybeDecrypt(RedeemData redeemData) {
-        List<ECKey> decryptedKeys = new ArrayList<ECKey>();
+        List<ECKey> decryptedKeys = new ArrayList<>();
         for (ECKey key : redeemData.keys) {
             decryptedKeys.add(maybeDecrypt(key));
         }
@@ -63,14 +64,14 @@ private RedeemData maybeDecrypt(RedeemData redeemData) {
 
     @Nullable
     @Override
-    public ECKey findKeyFromPubHash(byte[] pubkeyHash) {
-        return maybeDecrypt(target.findKeyFromPubHash(pubkeyHash));
+    public ECKey findKeyFromPubKeyHash(byte[] pubKeyHash, @Nullable Script.ScriptType scriptType) {
+        return maybeDecrypt(target.findKeyFromPubKeyHash(pubKeyHash, scriptType));
     }
 
     @Nullable
     @Override
-    public ECKey findKeyFromPubKey(byte[] pubkey) {
-        return maybeDecrypt(target.findKeyFromPubKey(pubkey));
+    public ECKey findKeyFromPubKey(byte[] pubKey) {
+        return maybeDecrypt(target.findKeyFromPubKey(pubKey));
     }
 
     @Nullable
diff --git a/core/src/main/java/org/bitcoinj/wallet/DefaultCoinSelector.java b/core/src/main/java/org/bitcoinj/wallet/DefaultCoinSelector.java
index e2144a2fa22..43dae9af026 100644
--- a/core/src/main/java/org/bitcoinj/wallet/DefaultCoinSelector.java
+++ b/core/src/main/java/org/bitcoinj/wallet/DefaultCoinSelector.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -32,10 +34,10 @@
 public class DefaultCoinSelector implements CoinSelector {
     @Override
     public CoinSelection select(Coin target, List<TransactionOutput> candidates) {
-        ArrayList<TransactionOutput> selected = new ArrayList<TransactionOutput>();
+        ArrayList<TransactionOutput> selected = new ArrayList<>();
         // Sort the inputs by age*value so we get the highest "coindays" spent.
         // TODO: Consider changing the wallets internal format to track just outputs and keep them ordered.
-        ArrayList<TransactionOutput> sortedOutputs = new ArrayList<TransactionOutput>(candidates);
+        ArrayList<TransactionOutput> sortedOutputs = new ArrayList<>(candidates);
         // When calculating the wallet balance, we may be asked to select all possible coins, if so, avoid sorting
         // them in order to improve performance.
         // TODO: Take in network parameters when instanatiated, and then test against the current network. Or just have a boolean parameter for "give me everything"
@@ -97,7 +99,6 @@ public static boolean isSelectable(Transaction tx) {
                type.equals(TransactionConfidence.ConfidenceType.PENDING) &&
                confidence.getSource().equals(TransactionConfidence.Source.SELF) &&
                // In regtest mode we expect to have only one peer, so we won't see transactions propagate.
-               // TODO: The value 1 below dates from a time when transactions we broadcast *to* were counted, set to 0
-               (confidence.numBroadcastPeers() > 1 || tx.getParams().getId().equals(NetworkParameters.ID_REGTEST));
+               (confidence.numBroadcastPeers() > 0 || tx.getParams().getId().equals(NetworkParameters.ID_REGTEST));
     }
 }
diff --git a/core/src/main/java/org/bitcoinj/wallet/DefaultKeyChainFactory.java b/core/src/main/java/org/bitcoinj/wallet/DefaultKeyChainFactory.java
index d2180c8b1c5..1c58d13e153 100644
--- a/core/src/main/java/org/bitcoinj/wallet/DefaultKeyChainFactory.java
+++ b/core/src/main/java/org/bitcoinj/wallet/DefaultKeyChainFactory.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014 devrandom
+ * Copyright 2019 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,32 +18,49 @@
 package org.bitcoinj.wallet;
 
 import org.bitcoinj.crypto.*;
+import org.bitcoinj.script.Script;
+
+import com.google.common.collect.ImmutableList;
 
 /**
  * Default factory for creating keychains while de-serializing.
  */
 public class DefaultKeyChainFactory implements KeyChainFactory {
     @Override
-    public DeterministicKeyChain makeKeyChain(Protos.Key key, Protos.Key firstSubKey, DeterministicSeed seed, KeyCrypter crypter, boolean isMarried) {
+    public DeterministicKeyChain makeKeyChain(Protos.Key key, Protos.Key firstSubKey, DeterministicSeed seed,
+            KeyCrypter crypter, boolean isMarried, Script.ScriptType outputScriptType,
+            ImmutableList<ChildNumber> accountPath) {
+        DeterministicKeyChain chain;
+        if (isMarried)
+            chain = new MarriedKeyChain(seed, crypter, outputScriptType, accountPath);
+        else
+            chain = new DeterministicKeyChain(seed, crypter, outputScriptType, accountPath);
+        return chain;
+    }
+
+    @Override
+    public DeterministicKeyChain makeWatchingKeyChain(Protos.Key key, Protos.Key firstSubKey,
+            DeterministicKey accountKey, boolean isFollowingKey, boolean isMarried, Script.ScriptType outputScriptType)
+            throws UnreadableWalletException {
         DeterministicKeyChain chain;
         if (isMarried)
-            chain = new MarriedKeyChain(seed, crypter);
+            chain = new MarriedKeyChain(accountKey, outputScriptType);
+        else if (isFollowingKey)
+            chain = DeterministicKeyChain.builder().watchAndFollow(accountKey).outputScriptType(outputScriptType).build();
         else
-            chain = new DeterministicKeyChain(seed, crypter);
+            chain = DeterministicKeyChain.builder().watch(accountKey).outputScriptType(outputScriptType).build();
         return chain;
     }
 
     @Override
-    public DeterministicKeyChain makeWatchingKeyChain(Protos.Key key, Protos.Key firstSubKey, DeterministicKey accountKey,
-                                                      boolean isFollowingKey, boolean isMarried) throws UnreadableWalletException {
-        if (!accountKey.getPath().equals(DeterministicKeyChain.ACCOUNT_ZERO_PATH))
-            throw new UnreadableWalletException("Expecting account key but found key with path: " +
-                    HDUtils.formatPath(accountKey.getPath()));
+    public DeterministicKeyChain makeSpendingKeyChain(Protos.Key key, Protos.Key firstSubKey,
+            DeterministicKey accountKey, boolean isMarried, Script.ScriptType outputScriptType)
+            throws UnreadableWalletException {
         DeterministicKeyChain chain;
         if (isMarried)
-            chain = new MarriedKeyChain(accountKey);
+            chain = new MarriedKeyChain(accountKey, outputScriptType);
         else
-            chain = new DeterministicKeyChain(accountKey, isFollowingKey);
+            chain = DeterministicKeyChain.builder().spend(accountKey).outputScriptType(outputScriptType).build();
         return chain;
     }
 }
diff --git a/core/src/main/java/org/bitcoinj/wallet/DefaultRiskAnalysis.java b/core/src/main/java/org/bitcoinj/wallet/DefaultRiskAnalysis.java
index 80714ce9088..9d0d52855e1 100644
--- a/core/src/main/java/org/bitcoinj/wallet/DefaultRiskAnalysis.java
+++ b/core/src/main/java/org/bitcoinj/wallet/DefaultRiskAnalysis.java
@@ -21,6 +21,7 @@
 import org.bitcoinj.core.ECKey;
 import org.bitcoinj.core.ECKey.ECDSASignature;
 import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.core.SignatureDecodeException;
 import org.bitcoinj.core.Transaction;
 import org.bitcoinj.core.TransactionConfidence;
 import org.bitcoinj.core.TransactionInput;
@@ -89,6 +90,13 @@ private Result analyzeIsFinal() {
             return Result.NON_FINAL;
         }
 
+        // Relative time-locked transactions are risky too. We can't check the locks because usually we don't know the
+        // spent outputs (to know when they were created).
+        if (tx.hasRelativeLockTime()) {
+            nonFinal = tx;
+            return Result.NON_FINAL;
+        }
+
         if (wallet == null)
             return null;
 
@@ -114,7 +122,7 @@ private Result analyzeIsFinal() {
 
     /**
      * The reason a transaction is considered non-standard, returned by
-     * {@link #isStandard(org.bitcoinj.core.Transaction)}.
+     * {@link #isStandard(Transaction)}.
      */
     public enum RuleViolation {
         NONE,
@@ -133,7 +141,7 @@ public enum RuleViolation {
      */
     public static RuleViolation isStandard(Transaction tx) {
         // TODO: Finish this function off.
-        if (tx.getVersion() > 1 || tx.getVersion() < 1) {
+        if (tx.getVersion() > 2 || tx.getVersion() < 1) {
             log.warn("TX considered non-standard due to unknown version number {}", tx.getVersion());
             return RuleViolation.VERSION;
         }
@@ -165,7 +173,9 @@ public static RuleViolation isStandard(Transaction tx) {
      * Checks the output to see if the script violates a standardness rule. Not complete.
      */
     public static RuleViolation isOutputStandard(TransactionOutput output) {
-        if (output.getValue().compareTo(MIN_ANALYSIS_NONDUST_OUTPUT) < 0)
+        // OP_RETURN has usually output value zero, so we exclude that from the MIN_ANALYSIS_NONDUST_OUTPUT check
+        if (!output.getScriptPubKey().isOpReturn() 
+                && output.getValue().compareTo(MIN_ANALYSIS_NONDUST_OUTPUT) < 0)
             return RuleViolation.DUST;
         for (ScriptChunk chunk : output.getScriptPubKey().getChunks()) {
             if (chunk.isPushData() && !chunk.isShortestPossiblePushData())
@@ -183,7 +193,7 @@ public static RuleViolation isInputStandard(TransactionInput input) {
                 ECDSASignature signature;
                 try {
                     signature = ECKey.ECDSASignature.decodeFromDER(chunk.data);
-                } catch (RuntimeException x) {
+                } catch (SignatureDecodeException x) {
                     // Doesn't look like a signature.
                     signature = null;
                 }
@@ -236,11 +246,11 @@ public Transaction getNonFinal() {
     @Override
     public String toString() {
         if (!analyzed)
-            return "Pending risk analysis for " + tx.getHashAsString();
+            return "Pending risk analysis for " + tx.getTxId();
         else if (nonFinal != null)
-            return "Risky due to non-finality of " + nonFinal.getHashAsString();
+            return "Risky due to non-finality of " + nonFinal.getTxId();
         else if (nonStandard != null)
-            return "Risky due to non-standard tx " + nonStandard.getHashAsString();
+            return "Risky due to non-standard tx " + nonStandard.getTxId();
         else
             return "Non-risky";
     }
diff --git a/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java b/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java
index 6bfbd2f9219..7828581ca4f 100644
--- a/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java
+++ b/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java
@@ -1,7 +1,6 @@
 /*
- * Copyright 2014 The bitcoinj developers.
- * Copyright 2015 Andreas Schildbach
- *
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -23,9 +22,11 @@
 import org.bitcoinj.core.Utils;
 import org.bitcoinj.crypto.*;
 import org.bitcoinj.script.Script;
+import org.bitcoinj.utils.ListenerRegistration;
 import org.bitcoinj.utils.Threading;
 import org.bitcoinj.wallet.listeners.KeyChainEventListener;
 
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterators;
@@ -33,7 +34,7 @@
 import com.google.protobuf.ByteString;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import javax.annotation.Nullable;
 import java.math.BigInteger;
@@ -49,10 +50,10 @@
 /**
  * <p>A deterministic key chain is a {@link KeyChain} that uses the
  * <a href="https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki">BIP 32 standard</a>, as implemented by
- * {@link org.bitcoinj.crypto.DeterministicHierarchy}, to derive all the keys in the keychain from a master seed.
+ * {@link DeterministicHierarchy}, to derive all the keys in the keychain from a master seed.
  * This type of wallet is extremely convenient and flexible. Although backing up full wallet files is always a good
  * idea, to recover money only the root seed needs to be preserved and that is a number small enough that it can be
- * written down on paper or, when represented using a BIP 39 {@link org.bitcoinj.crypto.MnemonicCode},
+ * written down on paper or, when represented using a BIP 39 {@link MnemonicCode},
  * dictated over the phone (possibly even memorized).</p>
  *
  * <p>Deterministic key chains have other advantages: parts of the key tree can be selectively revealed to allow
@@ -62,14 +63,14 @@
  * A watching wallet is not instantiated using the public part of the master key as you may imagine. Instead, you
  * need to take the account key (first child of the master key) and provide the public part of that to the watching
  * wallet instead. You can do this by calling {@link #getWatchingKey()} and then serializing it with
- * {@link org.bitcoinj.crypto.DeterministicKey#serializePubB58(org.bitcoinj.core.NetworkParameters)}. The resulting "xpub..." string encodes
+ * {@link DeterministicKey#serializePubB58(NetworkParameters)}. The resulting "xpub..." string encodes
  * sufficient information about the account key to create a watching chain via
- * {@link org.bitcoinj.crypto.DeterministicKey#deserializeB58(org.bitcoinj.crypto.DeterministicKey, String, org.bitcoinj.core.NetworkParameters)}
+ * {@link DeterministicKey#deserializeB58(DeterministicKey, String, NetworkParameters)}
  * (with null as the first parameter) and then
- * {@link DeterministicKeyChain#DeterministicKeyChain(org.bitcoinj.crypto.DeterministicKey)}.</p>
+ * {@link Builder#watch(DeterministicKey)}.</p>
  *
- * <p>This class builds on {@link org.bitcoinj.crypto.DeterministicHierarchy} and
- * {@link org.bitcoinj.crypto.DeterministicKey} by adding support for serialization to and from protobufs,
+ * <p>This class builds on {@link DeterministicHierarchy} and
+ * {@link DeterministicKey} by adding support for serialization to and from protobufs,
  * and encryption of parts of the key tree. Internally it arranges itself as per the BIP 32 spec, with the seed being
  * used to derive a master key, which is then used to derive an account key, the account key is used to derive two
  * child keys called the <i>internal</i> and <i>external</i> parent keys (for change and handing out addresses respectively)
@@ -93,6 +94,8 @@
  * keys, you can request 33 keys before more keys will be calculated and the Bloom filter rebuilt and rebroadcast.
  * But even when you are requesting the 33rd key, you will still be looking 100 keys ahead.
  * </p>
+ * 
+ * @author Andreas Schildbach
  */
 @SuppressWarnings("PublicStaticCollectionField")
 public class DeterministicKeyChain implements EncryptableKeyChain {
@@ -104,6 +107,8 @@ public class DeterministicKeyChain implements EncryptableKeyChain {
     private DeterministicHierarchy hierarchy;
     @Nullable private DeterministicKey rootKey;
     @Nullable private DeterministicSeed seed;
+    private final Script.ScriptType outputScriptType;
+    private final ImmutableList<ChildNumber> accountPath;
 
     // Paths through the key tree. External keys are ones that are communicated to other parties. Internal keys are
     // keys created for change addresses, coinbases, mixing, etc - anything that isn't communicated. The distinction
@@ -111,14 +116,15 @@ public class DeterministicKeyChain implements EncryptableKeyChain {
     // that feature yet. In future we might hand out different accounts for cases where we wish to hand payers
     // a payment request that can generate lots of addresses independently.
     // The account path may be overridden by subclasses.
+    // m / 0'
     public static final ImmutableList<ChildNumber> ACCOUNT_ZERO_PATH = ImmutableList.of(ChildNumber.ZERO_HARDENED);
+    // m / 1'
+    public static final ImmutableList<ChildNumber> ACCOUNT_ONE_PATH = ImmutableList.of(ChildNumber.ONE_HARDENED);
+    // m / 44' / 0' / 0'
+    public static final ImmutableList<ChildNumber> BIP44_ACCOUNT_ZERO_PATH = ImmutableList.of(new ChildNumber(44, true),
+            ChildNumber.ZERO_HARDENED, ChildNumber.ZERO_HARDENED);
     public static final ImmutableList<ChildNumber> EXTERNAL_SUBPATH = ImmutableList.of(ChildNumber.ZERO);
     public static final ImmutableList<ChildNumber> INTERNAL_SUBPATH = ImmutableList.of(ChildNumber.ONE);
-    public static final ImmutableList<ChildNumber> EXTERNAL_PATH = HDUtils.concat(ACCOUNT_ZERO_PATH, EXTERNAL_SUBPATH);
-    public static final ImmutableList<ChildNumber> INTERNAL_PATH = HDUtils.concat(ACCOUNT_ZERO_PATH, INTERNAL_SUBPATH);
-    // m / 44' / 0' / 0'
-    public static final ImmutableList<ChildNumber> BIP44_ACCOUNT_ZERO_PATH =
-            ImmutableList.of(new ChildNumber(44, true), ChildNumber.ZERO_HARDENED, ChildNumber.ZERO_HARDENED);
 
     // We try to ensure we have at least this many keys ready and waiting to be handed out via getKey().
     // See docs for getLookaheadSize() for more info on what this is for. The -1 value means it hasn't been calculated
@@ -162,12 +168,16 @@ private int calcDefaultLookaheadThreshold() {
 
     public static class Builder<T extends Builder<T>> {
         protected SecureRandom random;
-        protected int bits = 128;
+        protected int bits = DeterministicSeed.DEFAULT_SEED_ENTROPY_BITS;
         protected String passphrase;
-        protected long seedCreationTimeSecs;
+        protected long creationTimeSecs = 0;
         protected byte[] entropy;
         protected DeterministicSeed seed;
-        protected DeterministicKey watchingKey;
+        protected Script.ScriptType outputScriptType = Script.ScriptType.P2PKH;
+        protected DeterministicKey watchingKey = null;
+        protected boolean isFollowing = false;
+        protected DeterministicKey spendingKey = null;
+        protected ImmutableList<ChildNumber> accountPath = null;
 
         protected Builder() {
         }
@@ -182,8 +192,9 @@ protected T self() {
          * if the starting entropy is the same. You should provide the creation time in seconds since the UNIX epoch for the
          * seed: this lets us know from what part of the chain we can expect to see derived keys appear.
          */
-        public T entropy(byte[] entropy) {
+        public T entropy(byte[] entropy, long creationTimeSecs) {
             this.entropy = entropy;
+            this.creationTimeSecs = creationTimeSecs;
             return self();
         }
 
@@ -197,7 +208,7 @@ public T seed(DeterministicSeed seed) {
         }
 
         /**
-         * Generates a new key chain with entropy selected randomly from the given {@link java.security.SecureRandom}
+         * Generates a new key chain with entropy selected randomly from the given {@link SecureRandom}
          * object and of the requested size in bits.  The derived seed is further protected with a user selected passphrase
          * (see BIP 39).
          * @param random the random number generator - use new SecureRandom().
@@ -210,7 +221,7 @@ public T random(SecureRandom random, int bits) {
         }
 
         /**
-         * Generates a new key chain with 128 bits of entropy selected randomly from the given {@link java.security.SecureRandom}
+         * Generates a new key chain with 128 bits of entropy selected randomly from the given {@link SecureRandom}
          * object.  The derived seed is further protected with a user selected passphrase
          * (see BIP 39).
          * @param random the random number generator - use new SecureRandom().
@@ -220,13 +231,39 @@ public T random(SecureRandom random) {
             return self();
         }
 
-        public T watchingKey(DeterministicKey watchingKey) {
-            this.watchingKey = watchingKey;
+        /**
+         * Creates a key chain that watches the given account key.
+         */
+        public T watch(DeterministicKey accountKey) {
+            checkState(accountPath == null, "either watch or accountPath");
+            this.watchingKey = accountKey;
+            this.isFollowing = false;
             return self();
         }
 
-        public T seedCreationTimeSecs(long seedCreationTimeSecs) {
-            this.seedCreationTimeSecs = seedCreationTimeSecs;
+        /**
+         * Creates a deterministic key chain with the given watch key and that follows some other keychain. In a married
+         * wallet following keychain represents "spouse". Watch key has to be an account key.
+         */
+        public T watchAndFollow(DeterministicKey accountKey) {
+            checkState(accountPath == null, "either watchAndFollow or accountPath");
+            this.watchingKey = accountKey;
+            this.isFollowing = true;
+            return self();
+        }
+
+        /**
+         * Creates a key chain that can spend from the given account key.
+         */
+        public T spend(DeterministicKey accountKey) {
+            checkState(accountPath == null, "either spend or accountPath");
+            this.spendingKey = accountKey;
+            this.isFollowing = false;
+            return self();
+        }
+
+        public T outputScriptType(Script.ScriptType outputScriptType) {
+            this.outputScriptType = outputScriptType;
             return self();
         }
 
@@ -237,25 +274,36 @@ public T passphrase(String passphrase) {
             return self();
         }
 
+        /**
+         * Use an account path other than the default {@link DeterministicKeyChain#ACCOUNT_ZERO_PATH}.
+         */
+        public T accountPath(ImmutableList<ChildNumber> accountPath) {
+            checkState(watchingKey == null, "either watch or accountPath");
+            this.accountPath = checkNotNull(accountPath);
+            return self();
+        }
+
         public DeterministicKeyChain build() {
-            checkState(random != null || entropy != null || seed != null || watchingKey!= null, "Must provide either entropy or random or seed or watchingKey");
             checkState(passphrase == null || seed == null, "Passphrase must not be specified with seed");
-            DeterministicKeyChain chain;
 
-            if (random != null) {
-                // Default passphrase to "" if not specified
-                chain = new DeterministicKeyChain(random, bits, getPassphrase(), seedCreationTimeSecs);
-            } else if (entropy != null) {
-                chain = new DeterministicKeyChain(entropy, getPassphrase(), seedCreationTimeSecs);
-            } else if (seed != null) {
-                seed.setCreationTimeSeconds(seedCreationTimeSecs);
-                chain = new DeterministicKeyChain(seed);
-            } else {
-                watchingKey.setCreationTimeSeconds(seedCreationTimeSecs);
-                chain = new DeterministicKeyChain(watchingKey);
-            }
+            if (accountPath == null)
+                accountPath = ACCOUNT_ZERO_PATH;
 
-            return chain;
+            if (random != null)
+                // Default passphrase to "" if not specified
+                return new DeterministicKeyChain(new DeterministicSeed(random, bits, getPassphrase()), null,
+                        outputScriptType, accountPath);
+            else if (entropy != null)
+                return new DeterministicKeyChain(new DeterministicSeed(entropy, getPassphrase(), creationTimeSecs),
+                        null, outputScriptType, accountPath);
+            else if (seed != null)
+                return new DeterministicKeyChain(seed, null, outputScriptType, accountPath);
+            else if (watchingKey != null)
+                return new DeterministicKeyChain(watchingKey, isFollowing, true, outputScriptType);
+            else if (spendingKey != null)
+                return new DeterministicKeyChain(spendingKey, false, false, outputScriptType);
+            else
+                throw new IllegalStateException();
         }
 
         protected String getPassphrase() {
@@ -268,102 +316,65 @@ public static Builder<?> builder() {
     }
 
     /**
-     * Generates a new key chain with entropy selected randomly from the given {@link java.security.SecureRandom}
-     * object and the default entropy size.
+     * <p>
+     * Creates a deterministic key chain from a watched or spendable account key. If {@code isWatching} flag is set,
+     * then creates a deterministic key chain that watches the given (public only) root key. You can use this to
+     * calculate balances and generally follow along, but spending is not possible with such a chain. If it is not set,
+     * then this creates a deterministic key chain that allows spending. If {@code isFollowing} flag is set(only allowed
+     * if {@code isWatching} is set) then this keychain follows some other keychain. In a married wallet following
+     * keychain represents "spouse's" keychain.
+     * </p>
+     * 
+     * <p>
+     * This constructor is not stable across releases! If you need a stable API, use {@link #builder()} to use a
+     * {@link Builder}.
+     * </p>
      */
-    public DeterministicKeyChain(SecureRandom random) {
-        this(random, DeterministicSeed.DEFAULT_SEED_ENTROPY_BITS, DEFAULT_PASSPHRASE_FOR_MNEMONIC, Utils.currentTimeSeconds());
-    }
-
-    /**
-     * Generates a new key chain with entropy selected randomly from the given {@link java.security.SecureRandom}
-     * object and of the requested size in bits.
-     */
-    public DeterministicKeyChain(SecureRandom random, int bits) {
-        this(random, bits, DEFAULT_PASSPHRASE_FOR_MNEMONIC, Utils.currentTimeSeconds());
-    }
-
-    /**
-     * Generates a new key chain with entropy selected randomly from the given {@link java.security.SecureRandom}
-     * object and of the requested size in bits.  The derived seed is further protected with a user selected passphrase
-     * (see BIP 39).
-     */
-    public DeterministicKeyChain(SecureRandom random, int bits, String passphrase, long seedCreationTimeSecs) {
-        this(new DeterministicSeed(random, bits, passphrase, seedCreationTimeSecs));
-    }
-
-    /**
-     * Creates a deterministic key chain starting from the given entropy. All keys yielded by this chain will be the same
-     * if the starting seed is the same. You should provide the creation time in seconds since the UNIX epoch for the
-     * seed: this lets us know from what part of the chain we can expect to see derived keys appear.
-     */
-    public DeterministicKeyChain(byte[] entropy, String passphrase, long seedCreationTimeSecs) {
-        this(new DeterministicSeed(entropy, passphrase, seedCreationTimeSecs));
-    }
-
-    /**
-     * Creates a deterministic key chain starting from the given seed. All keys yielded by this chain will be the same
-     * if the starting seed is the same.
-     */
-    protected DeterministicKeyChain(DeterministicSeed seed) {
-        this(seed, null);
-    }
+    public DeterministicKeyChain(DeterministicKey key, boolean isFollowing, boolean isWatching,
+            Script.ScriptType outputScriptType) {
+        if (isWatching)
+            checkArgument(key.isPubKeyOnly(), "Private subtrees not currently supported for watching keys: if you got this key from DKC.getWatchingKey() then use .dropPrivate().dropParent() on it first.");
+        else
+            checkArgument(key.hasPrivKey(), "Private subtrees are required.");
+        checkArgument(isWatching || !isFollowing, "Can only follow a key that is watched");
 
-    /**
-     * Creates a deterministic key chain that watches the given (public only) root key. You can use this to calculate
-     * balances and generally follow along, but spending is not possible with such a chain. Currently you can't use
-     * this method to watch an arbitrary fragment of some other tree, this limitation may be removed in future.
-     */
-    public DeterministicKeyChain(DeterministicKey watchingKey) {
-        checkArgument(watchingKey.isPubKeyOnly(), "Private subtrees not currently supported: if you got this key from DKC.getWatchingKey() then use .dropPrivate().dropParent() on it first.");
-        checkArgument(watchingKey.getPath().size() == getAccountPath().size(), "You can only watch an account key currently");
         basicKeyChain = new BasicKeyChain();
         this.seed = null;
-        rootKey = null;
-        addToBasicChain(watchingKey);
-        hierarchy = new DeterministicHierarchy(watchingKey);
-        initializeHierarchyUnencrypted(watchingKey);
-    }
-
-    /**
-     * <p>Creates a deterministic key chain with the given watch key. If <code>isFollowing</code> flag is set then this keychain follows
-     * some other keychain. In a married wallet following keychain represents "spouse's" keychain.</p>
-     * <p>Watch key has to be an account key.</p>
-     */
-    protected DeterministicKeyChain(DeterministicKey watchKey, boolean isFollowing) {
-        this(watchKey);
+        this.rootKey = null;
+        basicKeyChain.importKey(key);
+        hierarchy = new DeterministicHierarchy(key);
+        this.accountPath = key.getPath();
+        this.outputScriptType = outputScriptType;
+        initializeHierarchyUnencrypted(key);
         this.isFollowing = isFollowing;
     }
 
     /**
-     * Creates a deterministic key chain with the given watch key and that follows some other keychain. In a married
-     * wallet following keychain represents "spouse"
-     * Watch key has to be an account key.
-     */
-    public static DeterministicKeyChain watchAndFollow(DeterministicKey watchKey) {
-        return new DeterministicKeyChain(watchKey, true);
-    }
-
-    /**
-     * Creates a key chain that watches the given account key.
-     */
-    public static DeterministicKeyChain watch(DeterministicKey accountKey) {
-        return new DeterministicKeyChain(accountKey);
-    }
-
-    /**
-     * For use in {@link KeyChainFactory} during deserialization.
+     * <p>
+     * Creates a deterministic key chain with an encrypted deterministic seed using the provided account path. Using
+     * {@link KeyCrypter KeyCrypter} to decrypt.
+     * </p>
+     * 
+     * <p>
+     * This constructor is not stable across releases! If you need a stable API, use {@link #builder()} to use a
+     * {@link Builder}.
+     * </p>
      */
-    protected DeterministicKeyChain(DeterministicSeed seed, @Nullable KeyCrypter crypter) {
+    protected DeterministicKeyChain(DeterministicSeed seed, @Nullable KeyCrypter crypter,
+            Script.ScriptType outputScriptType, ImmutableList<ChildNumber> accountPath) {
+        checkArgument(outputScriptType == null || outputScriptType == Script.ScriptType.P2PKH
+                || outputScriptType == Script.ScriptType.P2WPKH, "Only P2PKH or P2WPKH allowed.");
+        this.outputScriptType = outputScriptType != null ? outputScriptType : Script.ScriptType.P2PKH;
+        this.accountPath = accountPath;
         this.seed = seed;
         basicKeyChain = new BasicKeyChain(crypter);
         if (!seed.isEncrypted()) {
             rootKey = HDKeyDerivation.createMasterPrivateKey(checkNotNull(seed.getSeedBytes()));
             rootKey.setCreationTimeSeconds(seed.getCreationTimeSeconds());
-            addToBasicChain(rootKey);
+            basicKeyChain.importKey(rootKey);
             hierarchy = new DeterministicHierarchy(rootKey);
             for (int i = 1; i <= getAccountPath().size(); i++) {
-                addToBasicChain(hierarchy.get(getAccountPath().subList(0, i), false, true));
+                basicKeyChain.importKey(hierarchy.get(getAccountPath().subList(0, i), false, true));
             }
             initializeHierarchyUnencrypted(rootKey);
         }
@@ -376,7 +387,7 @@ protected DeterministicKeyChain(DeterministicSeed seed, @Nullable KeyCrypter cry
      * For use in encryption when {@link #toEncrypted(KeyCrypter, KeyParameter)} is called, so that
      * subclasses can override that method and create an instance of the right class.
      *
-     * See also {@link #makeKeyChainFromSeed(DeterministicSeed)}
+     * See also {@link #makeKeyChainFromSeed(DeterministicSeed, ImmutableList, Script.ScriptType)}
      */
     protected DeterministicKeyChain(KeyCrypter crypter, KeyParameter aesKey, DeterministicKeyChain chain) {
         // Can't encrypt a watching chain.
@@ -384,6 +395,8 @@ protected DeterministicKeyChain(KeyCrypter crypter, KeyParameter aesKey, Determi
         checkNotNull(chain.seed);
 
         checkArgument(!chain.rootKey.isEncrypted(), "Chain already encrypted");
+        this.accountPath = chain.getAccountPath();
+        this.outputScriptType = chain.outputScriptType;
 
         this.issuedExternalKeys = chain.issuedExternalKeys;
         this.issuedInternalKeys = chain.issuedInternalKeys;
@@ -416,11 +429,17 @@ protected DeterministicKeyChain(KeyCrypter crypter, KeyParameter aesKey, Determi
             hierarchy.putKey(key);
             basicKeyChain.importKey(key);
         }
+        for (ListenerRegistration<KeyChainEventListener> listener : chain.basicKeyChain.getListeners()) {
+            basicKeyChain.addEventListener(listener);
+        }
+    }
+
+    public ImmutableList<ChildNumber> getAccountPath() {
+        return accountPath;
     }
 
-    /** Override in subclasses to use a different account derivation path */
-    protected ImmutableList<ChildNumber> getAccountPath() {
-        return ACCOUNT_ZERO_PATH;
+    public Script.ScriptType getOutputScriptType() {
+        return outputScriptType;
     }
 
     private DeterministicKey encryptNonLeaf(KeyParameter aesKey, DeterministicKeyChain chain,
@@ -437,8 +456,8 @@ private DeterministicKey encryptNonLeaf(KeyParameter aesKey, DeterministicKeyCha
     private void initializeHierarchyUnencrypted(DeterministicKey baseKey) {
         externalParentKey = hierarchy.deriveChild(getAccountPath(), false, false, ChildNumber.ZERO);
         internalParentKey = hierarchy.deriveChild(getAccountPath(), false, false, ChildNumber.ONE);
-        addToBasicChain(externalParentKey);
-        addToBasicChain(internalParentKey);
+        basicKeyChain.importKey(externalParentKey);
+        basicKeyChain.importKey(internalParentKey);
     }
 
     /** Returns a freshly derived key that has not been returned by this method before. */
@@ -488,7 +507,7 @@ public List<DeterministicKey> getKeys(KeyPurpose purpose, int numberOfKeys) {
             // and calculate the full lookahead zone there, so network requests will always use the right amount.
             List<DeterministicKey> lookahead = maybeLookAhead(parentKey, index, 0, 0);
             basicKeyChain.importKeys(lookahead);
-            List<DeterministicKey> keys = new ArrayList<DeterministicKey>(numberOfKeys);
+            List<DeterministicKey> keys = new ArrayList<>(numberOfKeys);
             for (int i = 0; i < numberOfKeys; i++) {
                 ImmutableList<ChildNumber> path = HDUtils.append(parentKey.getPath(), new ChildNumber(index - numberOfKeys + i, false));
                 DeterministicKey k = hierarchy.get(path, false, false);
@@ -514,10 +533,6 @@ private void checkForBitFlip(DeterministicKey k) {
             throw new IllegalStateException(String.format(Locale.US, "Bit-flip check failed: %s vs %s", Arrays.toString(rederived), Arrays.toString(actual)));
     }
 
-    private void addToBasicChain(DeterministicKey key) {
-        basicKeyChain.importKeys(ImmutableList.of(key));
-    }
-
     /**
      * Mark the DeterministicKey as used.
      * Also correct the issued{Internal|External}Keys counter, because all lower children seem to be requested already.
@@ -618,10 +633,10 @@ public DeterministicKey getKeyByPath(List<ChildNumber> path, boolean create) {
     }
 
     /**
-     * <p>An alias for <code>getKeyByPath(getAccountPath())</code>.</p>
+     * <p>An alias for {@code getKeyByPath(getAccountPath())}.</p>
      *
      * <p>Use this when you would like to create a watching key chain that follows this one, but can't spend money from it.
-     * The returned key can be serialized and then passed into {@link #watch(org.bitcoinj.crypto.DeterministicKey)}
+     * The returned key can be serialized and then passed into {@link Builder#watch(DeterministicKey)}
      * on another system to watch the hierarchy.</p>
      *
      * <p>Note that the returned key is not pubkey only unless this key chain already is: the returned key can still
@@ -732,6 +747,9 @@ protected List<Protos.Key> serializeMyselfToProtobuf() {
             Protos.Key.Builder mnemonicEntry = BasicKeyChain.serializeEncryptableItem(seed);
             mnemonicEntry.setType(Protos.Key.Type.DETERMINISTIC_MNEMONIC);
             serializeSeedEncryptableItem(seed, mnemonicEntry);
+            for (ChildNumber childNumber : getAccountPath()) {
+                mnemonicEntry.addAccountPath(childNumber.i());
+            }
             entries.add(mnemonicEntry.build());
         }
         Map<ECKey, Protos.Key.Builder> keys = basicKeyChain.serializeToEditableProtobufs();
@@ -759,6 +777,8 @@ protected List<Protos.Key> serializeMyselfToProtobuf() {
             if (key.getParent() != null) {
                 // HD keys inherit the timestamp of their parent if they have one, so no need to serialize it.
                 proto.clearCreationTimestamp();
+            } else {
+                proto.setOutputScriptType(Protos.Key.OutputScriptType.valueOf(outputScriptType.name()));
             }
             entries.add(proto.build());
         }
@@ -781,11 +801,19 @@ public static List<DeterministicKeyChain> fromProtobuf(List<Protos.Key> keys, @N
         int lookaheadSize = -1;
         int sigsRequiredToSpend = 1;
 
+        List<ChildNumber> accountPath = newArrayList();
+        Script.ScriptType outputScriptType = Script.ScriptType.P2PKH;
         PeekingIterator<Protos.Key> iter = Iterators.peekingIterator(keys.iterator());
         while (iter.hasNext()) {
             Protos.Key key = iter.next();
             final Protos.Key.Type t = key.getType();
             if (t == Protos.Key.Type.DETERMINISTIC_MNEMONIC) {
+                accountPath = newArrayList();
+                for (int i : key.getAccountPathList()) {
+                    accountPath.add(new ChildNumber(i));
+                }
+                if (accountPath.isEmpty())
+                    accountPath = ACCOUNT_ZERO_PATH;
                 if (chain != null) {
                     checkState(lookaheadSize >= 0);
                     chain.setLookaheadSize(lookaheadSize);
@@ -832,9 +860,12 @@ public static List<DeterministicKeyChain> fromProtobuf(List<Protos.Key> keys, @N
                 // Deserialize the public key and path.
                 LazyECPoint pubkey = new LazyECPoint(ECKey.CURVE.getCurve(), key.getPublicKey().toByteArray());
                 final ImmutableList<ChildNumber> immutablePath = ImmutableList.copyOf(path);
+                if (key.hasOutputScriptType())
+                    outputScriptType = Script.ScriptType.valueOf(key.getOutputScriptType().name());
                 // Possibly create the chain, if we didn't already do so yet.
                 boolean isWatchingAccountKey = false;
                 boolean isFollowingKey = false;
+                boolean isSpendingKey = false;
                 // save previous chain if any if the key is marked as following. Current key and the next ones are to be
                 // placed in new following key chain
                 if (key.getDeterministicKey().getIsFollowing()) {
@@ -852,13 +883,21 @@ public static List<DeterministicKeyChain> fromProtobuf(List<Protos.Key> keys, @N
                 if (chain == null) {
                     // If this is not a following chain and previous was, this must be married
                     boolean isMarried = !isFollowingKey && !chains.isEmpty() && chains.get(chains.size() - 1).isFollowing();
-                    if (seed == null) {
+                    // If this has a private key but no seed, then all we know is the spending key H
+                    if (seed == null && key.hasSecretBytes()) {
+                        DeterministicKey accountKey = new DeterministicKey(immutablePath, chainCode, pubkey, new BigInteger(1, key.getSecretBytes().toByteArray()), null);
+                        accountKey.setCreationTimeSeconds(key.getCreationTimestamp() / 1000);
+                        chain = factory.makeSpendingKeyChain(key, iter.peek(), accountKey, isMarried, outputScriptType);
+                        isSpendingKey = true;
+                    } else if (seed == null) {
                         DeterministicKey accountKey = new DeterministicKey(immutablePath, chainCode, pubkey, null, null);
                         accountKey.setCreationTimeSeconds(key.getCreationTimestamp() / 1000);
-                        chain = factory.makeWatchingKeyChain(key, iter.peek(), accountKey, isFollowingKey, isMarried);
+                        chain = factory.makeWatchingKeyChain(key, iter.peek(), accountKey, isFollowingKey, isMarried,
+                                outputScriptType);
                         isWatchingAccountKey = true;
                     } else {
-                        chain = factory.makeKeyChain(key, iter.peek(), seed, crypter, isMarried);
+                        chain = factory.makeKeyChain(key, iter.peek(), seed, crypter, isMarried,
+                                outputScriptType, ImmutableList.<ChildNumber> builder().addAll(accountPath).build());
                         chain.lookaheadSize = LAZY_CALCULATE_LOOKAHEAD;
                         // If the seed is encrypted, then the chain is incomplete at this point. However, we will load
                         // it up below as we parse in the keys. We just need to check at the end that we've loaded
@@ -867,7 +906,7 @@ public static List<DeterministicKeyChain> fromProtobuf(List<Protos.Key> keys, @N
                 }
                 // Find the parent key assuming this is not the root key, and not an account key for a watching chain.
                 DeterministicKey parent = null;
-                if (!path.isEmpty() && !isWatchingAccountKey) {
+                if (!path.isEmpty() && !isWatchingAccountKey && !isSpendingKey) {
                     ChildNumber index = path.removeLast();
                     parent = chain.hierarchy.get(path, false, false);
                     path.add(index);
@@ -897,21 +936,27 @@ public static List<DeterministicKeyChain> fromProtobuf(List<Protos.Key> keys, @N
                 if (!isWatchingAccountKey) {
                     // If the non-encrypted case, the non-leaf keys (account, internal, external) have already
                     // been rederived and inserted at this point. In the encrypted case though,
-                    // we can't rederive and we must reinsert, potentially building the heirarchy object
+                    // we can't rederive and we must reinsert, potentially building the hierarchy object
                     // if need be.
-                    if (path.size() == 0) {
+                    if (path.isEmpty()) {
                         // Master key.
                         if (chain.rootKey == null) {
                             chain.rootKey = detkey;
                             chain.hierarchy = new DeterministicHierarchy(detkey);
                         }
-                    } else if (path.size() == chain.getAccountPath().size() + 1) {
+                    } else if ((path.size() == chain.getAccountPath().size() + 1) || isSpendingKey) {
+                        // Constant 0 is used for external chain and constant 1 for internal chain
+                        // (also known as change addresses). https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki
                         if (detkey.getChildNumber().num() == 0) {
+                            // External chain is used for addresses that are meant to be visible outside of the wallet
+                            // (e.g. for receiving payments).
                             chain.externalParentKey = detkey;
                             chain.issuedExternalKeys = key.getDeterministicKey().getIssuedSubkeys();
                             lookaheadSize = Math.max(lookaheadSize, key.getDeterministicKey().getLookaheadSize());
                             sigsRequiredToSpend = key.getDeterministicKey().getSigsRequiredToSpend();
                         } else if (detkey.getChildNumber().num() == 1) {
+                            // Internal chain is used for addresses which are not meant to be visible outside of the
+                            // wallet and is used for return transaction change.
                             chain.internalParentKey = detkey;
                             chain.issuedInternalKeys = key.getDeterministicKey().getIssuedSubkeys();
                         }
@@ -970,10 +1015,10 @@ public DeterministicKeyChain toDecrypted(KeyParameter aesKey) {
         checkState(seed.isEncrypted());
         String passphrase = DEFAULT_PASSPHRASE_FOR_MNEMONIC; // FIXME allow non-empty passphrase
         DeterministicSeed decSeed = seed.decrypt(getKeyCrypter(), passphrase, aesKey);
-        DeterministicKeyChain chain = makeKeyChainFromSeed(decSeed);
+        DeterministicKeyChain chain = makeKeyChainFromSeed(decSeed, getAccountPath(), outputScriptType);
         // Now double check that the keys match to catch the case where the key is wrong but padding didn't catch it.
         if (!chain.getWatchingKey().getPubKeyPoint().equals(getWatchingKey().getPubKeyPoint()))
-            throw new KeyCrypterException("Provided AES key is wrong");
+            throw new KeyCrypterException.PublicPrivateMismatch("Provided AES key is wrong");
         chain.lookaheadSize = lookaheadSize;
         // Now copy the (pubkey only) leaf keys across to avoid rederiving them. The private key bytes are missing
         // anyway so there's nothing to decrypt.
@@ -989,6 +1034,9 @@ public DeterministicKeyChain toDecrypted(KeyParameter aesKey) {
         }
         chain.issuedExternalKeys = issuedExternalKeys;
         chain.issuedInternalKeys = issuedInternalKeys;
+        for (ListenerRegistration<KeyChainEventListener> listener : basicKeyChain.getListeners()) {
+            chain.basicKeyChain.addEventListener(listener);
+        }
         return chain;
     }
 
@@ -997,8 +1045,9 @@ public DeterministicKeyChain toDecrypted(KeyParameter aesKey) {
      * Subclasses should override this to create an instance of the subclass instead of a plain DKC.
      * This is used in encryption/decryption.
      */
-    protected DeterministicKeyChain makeKeyChainFromSeed(DeterministicSeed seed) {
-        return new DeterministicKeyChain(seed);
+    protected DeterministicKeyChain makeKeyChainFromSeed(DeterministicSeed seed, ImmutableList<ChildNumber> accountPath,
+            Script.ScriptType outputScriptType) {
+        return new DeterministicKeyChain(seed, null, outputScriptType, accountPath);
     }
 
     @Override
@@ -1156,12 +1205,12 @@ private List<DeterministicKey> maybeLookAhead(DeterministicKey parent, int issue
         final int needed = issued + lookaheadSize + lookaheadThreshold - numChildren;
 
         if (needed <= lookaheadThreshold)
-            return new ArrayList<DeterministicKey>();
+            return new ArrayList<>();
 
         log.info("{} keys needed for {} = {} issued + {} lookahead size + {} lookahead threshold - {} num children",
                 needed, parent.getPathAsString(), issued, lookaheadSize, lookaheadThreshold, numChildren);
 
-        List<DeterministicKey> result  = new ArrayList<DeterministicKey>(needed);
+        List<DeterministicKey> result  = new ArrayList<>(needed);
         final Stopwatch watch = Stopwatch.createStarted();
         int nextChild = numChildren;
         for (int i = 0; i < needed; i++) {
@@ -1218,32 +1267,35 @@ public DeterministicSeed getSeed() {
     }
 
     // For internal usage only
-    /* package */ List<ECKey> getKeys(boolean includeLookahead) {
+    /* package */ List<DeterministicKey> getKeys(boolean includeLookahead, boolean includeParents) {
         List<ECKey> keys = basicKeyChain.getKeys();
+        List<DeterministicKey> result = new LinkedList<>();
         if (!includeLookahead) {
             int treeSize = internalParentKey.getPath().size();
-            List<ECKey> issuedKeys = new LinkedList<ECKey>();
             for (ECKey key : keys) {
                 DeterministicKey detkey = (DeterministicKey) key;
                 DeterministicKey parent = detkey.getParent();
-                if (parent == null) continue;
-                if (detkey.getPath().size() <= treeSize) continue;
-                if (parent.equals(internalParentKey) && detkey.getChildNumber().i() >= issuedInternalKeys) continue;
-                if (parent.equals(externalParentKey) && detkey.getChildNumber().i() >= issuedExternalKeys) continue;
-                issuedKeys.add(detkey);
+                if (!includeParents && parent == null) continue;
+                if (!includeParents && detkey.getPath().size() <= treeSize) continue;
+                if (internalParentKey.equals(parent) && detkey.getChildNumber().i() >= issuedInternalKeys) continue;
+                if (externalParentKey.equals(parent) && detkey.getChildNumber().i() >= issuedExternalKeys) continue;
+                result.add(detkey);
             }
-            return issuedKeys;
+        } else {
+            for (ECKey key : keys)
+                result.add((DeterministicKey) key);
+            // TODO includeParents is ignored here
         }
-        return keys;
+        return result;
     }
 
     /**
      * Returns only the external keys that have been issued by this chain, lookahead not included.
      */
-    public List<ECKey> getIssuedReceiveKeys() {
-        final List<ECKey> keys = new ArrayList<ECKey>(getKeys(false));
-        for (Iterator<ECKey> i = keys.iterator(); i.hasNext();) {
-            DeterministicKey parent = ((DeterministicKey) i.next()).getParent();
+    public List<DeterministicKey> getIssuedReceiveKeys() {
+        final List<DeterministicKey> keys = new ArrayList<>(getKeys(false, false));
+        for (Iterator<DeterministicKey> i = keys.iterator(); i.hasNext();) {
+            DeterministicKey parent = i.next().getParent();
             if (parent == null || !externalParentKey.equals(parent))
                 i.remove();
         }
@@ -1255,7 +1307,7 @@ public List<ECKey> getIssuedReceiveKeys() {
      */
     public List<DeterministicKey> getLeafKeys() {
         ImmutableList.Builder<DeterministicKey> keys = ImmutableList.builder();
-        for (ECKey key : getKeys(true)) {
+        for (ECKey key : getKeys(true, false)) {
             DeterministicKey dKey = (DeterministicKey) key;
             if (dKey.getPath().size() == getAccountPath().size() + 2) {
                 keys.add(dKey);
@@ -1314,31 +1366,70 @@ public Script freshOutputScript(KeyPurpose purpose) {
         throw new UnsupportedOperationException();
     }
 
-    public String toString(boolean includePrivateKeys, NetworkParameters params) {
+    public void printAllPubKeysAsHex(StringBuilder stringBuilder) {
+        for (ECKey key : getKeys(false, false))
+            stringBuilder.append('"').append(Utils.HEX.encode(key.getPubKey())).append('"').append(",\n");
+    }
+
+    @Override
+    public String toString() {
+        MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(this).omitNullValues();
+        helper.addValue(outputScriptType);
+        helper.add("accountPath", accountPath);
+        helper.add("lookaheadSize", lookaheadSize);
+        helper.add("lookaheadThreshold", lookaheadThreshold);
+        if (isFollowing)
+            helper.addValue("following");
+        return helper.toString();
+    }
+
+    public String toString(boolean includeLookahead, boolean includePrivateKeys, @Nullable KeyParameter aesKey, NetworkParameters params) {
         final DeterministicKey watchingKey = getWatchingKey();
         final StringBuilder builder = new StringBuilder();
         if (seed != null) {
-            if (seed.isEncrypted()) {
-                builder.append("Seed is encrypted\n");
-            } else if (includePrivateKeys) {
-                final List<String> words = seed.getMnemonicCode();
-                builder.append("Seed as words: ").append(Utils.join(words)).append('\n');
-                builder.append("Seed as hex:   ").append(seed.toHexString()).append('\n');
+            if (includePrivateKeys) {
+                DeterministicSeed decryptedSeed = seed.isEncrypted()
+                        ? seed.decrypt(getKeyCrypter(), DEFAULT_PASSPHRASE_FOR_MNEMONIC, aesKey)
+                        : seed;
+                final List<String> words = decryptedSeed.getMnemonicCode();
+                builder.append("Seed as words:     ").append(Utils.SPACE_JOINER.join(words)).append('\n');
+                builder.append("Seed as hex:       ").append(decryptedSeed.toHexString()).append('\n');
+            } else {
+                if (seed.isEncrypted())
+                    builder.append("Seed is encrypted\n");
             }
-            builder.append("Seed birthday: ").append(seed.getCreationTimeSeconds()).append("  [")
+            builder.append("Seed birthday:     ").append(seed.getCreationTimeSeconds()).append("  [")
                     .append(Utils.dateTimeFormat(seed.getCreationTimeSeconds() * 1000)).append("]\n");
         } else {
-            builder.append("Key birthday:  ").append(watchingKey.getCreationTimeSeconds()).append("  [")
+            builder.append("Key birthday:      ").append(watchingKey.getCreationTimeSeconds()).append("  [")
                     .append(Utils.dateTimeFormat(watchingKey.getCreationTimeSeconds() * 1000)).append("]\n");
         }
-        builder.append("Key to watch:  ").append(watchingKey.serializePubB58(params)).append('\n');
-        formatAddresses(includePrivateKeys, params, builder);
+        builder.append("Ouput script type: ").append(outputScriptType).append('\n');
+        builder.append("Key to watch:      ").append(watchingKey.serializePubB58(params, outputScriptType))
+                .append('\n');
+        builder.append("Lookahead siz/thr: ").append(lookaheadSize).append('/').append(lookaheadThreshold).append('\n');
+        formatAddresses(includeLookahead, includePrivateKeys, aesKey, params, builder);
         return builder.toString();
     }
 
-    protected void formatAddresses(boolean includePrivateKeys, NetworkParameters params, StringBuilder builder2) {
-        for (ECKey key : getKeys(false))
-            key.formatKeyWithAddress(includePrivateKeys, builder2, params);
+    protected void formatAddresses(boolean includeLookahead, boolean includePrivateKeys, @Nullable KeyParameter aesKey,
+            NetworkParameters params, StringBuilder builder) {
+        for (DeterministicKey key : getKeys(includeLookahead, true)) {
+            String comment = null;
+            if (key.equals(rootKey))
+                comment = "root";
+            else if (key.equals(getWatchingKey()))
+                comment = "account";
+            else if (key.equals(internalParentKey))
+                comment = "internal";
+            else if (key.equals(externalParentKey))
+                comment = "external";
+            else if (internalParentKey.equals(key.getParent()) && key.getChildNumber().i() >= issuedInternalKeys)
+                comment = "*";
+            else if (externalParentKey.equals(key.getParent()) && key.getChildNumber().i() >= issuedExternalKeys)
+                comment = "*";
+            key.formatKeyWithAddress(includePrivateKeys, aesKey, builder, params, outputScriptType, comment);
+        }
     }
 
     /** The number of signatures required to spend coins received by this keychain. */
diff --git a/core/src/main/java/org/bitcoinj/wallet/DeterministicSeed.java b/core/src/main/java/org/bitcoinj/wallet/DeterministicSeed.java
index b5dea84caca..38a7ac84aa5 100644
--- a/core/src/main/java/org/bitcoinj/wallet/DeterministicSeed.java
+++ b/core/src/main/java/org/bitcoinj/wallet/DeterministicSeed.java
@@ -20,12 +20,14 @@
 import org.bitcoinj.core.Utils;
 import org.bitcoinj.crypto.*;
 
-import com.google.common.base.Charsets;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.base.Splitter;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import javax.annotation.Nullable;
+
+import java.nio.charset.StandardCharsets;
 import java.security.SecureRandom;
 import java.util.List;
 
@@ -47,7 +49,7 @@ public class DeterministicSeed implements EncryptableItem {
     @Nullable private final byte[] seed;
     @Nullable private final List<String> mnemonicCode; // only one of mnemonicCode/encryptedMnemonicCode will be set
     @Nullable private final EncryptedData encryptedMnemonicCode;
-    @Nullable private EncryptedData encryptedSeed;
+    @Nullable private final EncryptedData encryptedSeed;
     private long creationTimeSeconds;
 
     public DeterministicSeed(String mnemonicCode, byte[] seed, String passphrase, long creationTimeSeconds) throws UnreadableWalletException {
@@ -58,6 +60,7 @@ public DeterministicSeed(byte[] seed, List<String> mnemonic, long creationTimeSe
         this.seed = checkNotNull(seed);
         this.mnemonicCode = checkNotNull(mnemonic);
         this.encryptedMnemonicCode = null;
+        this.encryptedSeed = null;
         this.creationTimeSeconds = creationTimeSeconds;
     }
 
@@ -70,7 +73,7 @@ public DeterministicSeed(EncryptedData encryptedMnemonic, @Nullable EncryptedDat
     }
 
     /**
-     * Constructs a seed from a BIP 39 mnemonic code. See {@link org.bitcoinj.crypto.MnemonicCode} for more
+     * Constructs a seed from a BIP 39 mnemonic code. See {@link MnemonicCode} for more
      * details on this scheme.
      * @param mnemonicCode A list of words.
      * @param seed The derived seed, or pass null to derive it from mnemonicCode (slow)
@@ -82,19 +85,18 @@ public DeterministicSeed(List<String> mnemonicCode, @Nullable byte[] seed, Strin
     }
 
     /**
-     * Constructs a seed from a BIP 39 mnemonic code. See {@link org.bitcoinj.crypto.MnemonicCode} for more
+     * Constructs a seed from a BIP 39 mnemonic code. See {@link MnemonicCode} for more
      * details on this scheme.
      * @param random Entropy source
      * @param bits number of bits, must be divisible by 32
      * @param passphrase A user supplied passphrase, or an empty string if there is no passphrase
-     * @param creationTimeSeconds When the seed was originally created, UNIX time.
      */
-    public DeterministicSeed(SecureRandom random, int bits, String passphrase, long creationTimeSeconds) {
-        this(getEntropy(random, bits), checkNotNull(passphrase), creationTimeSeconds);
+    public DeterministicSeed(SecureRandom random, int bits, String passphrase) {
+        this(getEntropy(random, bits), checkNotNull(passphrase), Utils.currentTimeSeconds());
     }
 
     /**
-     * Constructs a seed from a BIP 39 mnemonic code. See {@link org.bitcoinj.crypto.MnemonicCode} for more
+     * Constructs a seed from a BIP 39 mnemonic code. See {@link MnemonicCode} for more
      * details on this scheme.
      * @param entropy entropy bits, length must be divisible by 32
      * @param passphrase A user supplied passphrase, or an empty string if there is no passphrase
@@ -113,6 +115,7 @@ public DeterministicSeed(byte[] entropy, String passphrase, long creationTimeSec
         }
         this.seed = MnemonicCode.toSeed(mnemonicCode, passphrase);
         this.encryptedMnemonicCode = null;
+        this.encryptedSeed = null;
         this.creationTimeSeconds = creationTimeSeconds;
     }
 
@@ -132,9 +135,18 @@ public boolean isEncrypted() {
 
     @Override
     public String toString() {
-        return isEncrypted()
-            ? "DeterministicSeed [encrypted]"
-            : "DeterministicSeed " + toHexString() + " " + Utils.join(mnemonicCode);
+        return toString(false);
+    }
+
+    public String toString(boolean includePrivate) {
+        MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(this);
+        if (isEncrypted())
+            helper.addValue("encrypted");
+        else if (includePrivate)
+            helper.addValue(toHexString()).add("mnemonicCode", Utils.SPACE_JOINER.join(mnemonicCode));
+        else
+            helper.addValue("unencrypted");
+        return helper.toString();
     }
 
     /** Returns the seed as hex or null if encrypted. */
@@ -188,7 +200,7 @@ public DeterministicSeed encrypt(KeyCrypter keyCrypter, KeyParameter aesKey) {
     }
 
     private byte[] getMnemonicAsBytes() {
-        return Utils.join(mnemonicCode).getBytes(Charsets.UTF_8);
+        return Utils.SPACE_JOINER.join(mnemonicCode).getBytes(StandardCharsets.UTF_8);
     }
 
     public DeterministicSeed decrypt(KeyCrypter crypter, String passphrase, KeyParameter aesKey) {
@@ -236,7 +248,7 @@ public List<String> getMnemonicCode() {
     }
 
     private static List<String> decodeMnemonicCode(byte[] mnemonicCode) {
-        return decodeMnemonicCode(Utils.toString(mnemonicCode, "UTF-8"));
+        return decodeMnemonicCode(new String(mnemonicCode, StandardCharsets.UTF_8));
     }
 
     private static List<String> decodeMnemonicCode(String mnemonicCode) {
diff --git a/core/src/main/java/org/bitcoinj/wallet/DeterministicUpgradeRequiredException.java b/core/src/main/java/org/bitcoinj/wallet/DeterministicUpgradeRequiredException.java
index dcd5e75e66c..b76b5eb9b96 100644
--- a/core/src/main/java/org/bitcoinj/wallet/DeterministicUpgradeRequiredException.java
+++ b/core/src/main/java/org/bitcoinj/wallet/DeterministicUpgradeRequiredException.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/wallet/DeterministicUpgradeRequiresPassword.java b/core/src/main/java/org/bitcoinj/wallet/DeterministicUpgradeRequiresPassword.java
index 4210e6b8337..5cbb46f5c74 100644
--- a/core/src/main/java/org/bitcoinj/wallet/DeterministicUpgradeRequiresPassword.java
+++ b/core/src/main/java/org/bitcoinj/wallet/DeterministicUpgradeRequiresPassword.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/wallet/EncryptableKeyChain.java b/core/src/main/java/org/bitcoinj/wallet/EncryptableKeyChain.java
index 4ad8e1171c2..fe7d917916d 100644
--- a/core/src/main/java/org/bitcoinj/wallet/EncryptableKeyChain.java
+++ b/core/src/main/java/org/bitcoinj/wallet/EncryptableKeyChain.java
@@ -18,7 +18,8 @@
 
 import org.bitcoinj.crypto.KeyCrypter;
 import org.bitcoinj.crypto.KeyCrypterException;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bitcoinj.crypto.KeyCrypterScrypt;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import javax.annotation.Nullable;
 
@@ -28,8 +29,8 @@
 public interface EncryptableKeyChain extends KeyChain {
     /**
      * Takes the given password, which should be strong, derives a key from it and then invokes
-     * {@link #toEncrypted(org.bitcoinj.crypto.KeyCrypter, org.spongycastle.crypto.params.KeyParameter)} with
-     * {@link org.bitcoinj.crypto.KeyCrypterScrypt} as the crypter.
+     * {@link #toEncrypted(KeyCrypter, KeyParameter)} with
+     * {@link KeyCrypterScrypt} as the crypter.
      *
      * @return The derived key, in case you wish to cache it for future use.
      */
@@ -42,7 +43,7 @@ public interface EncryptableKeyChain extends KeyChain {
     EncryptableKeyChain toEncrypted(KeyCrypter keyCrypter, KeyParameter aesKey);
 
     /**
-     * Decrypts the key chain with the given password. See {@link #toDecrypted(org.spongycastle.crypto.params.KeyParameter)}
+     * Decrypts the key chain with the given password. See {@link #toDecrypted(KeyParameter)}
      * for details.
      */
     EncryptableKeyChain toDecrypted(CharSequence password);
@@ -50,7 +51,7 @@ public interface EncryptableKeyChain extends KeyChain {
     /**
      * Decrypt the key chain with the given AES key and whatever {@link KeyCrypter} is already set. Note that if you
      * just want to spend money from an encrypted wallet, don't decrypt the whole thing first. Instead, set the
-     * {@link org.bitcoinj.wallet.SendRequest#aesKey} field before asking the wallet to build the send.
+     * {@link SendRequest#aesKey} field before asking the wallet to build the send.
      *
      * @param aesKey AES key to use (normally created using KeyCrypter#deriveKey and cached as it is time consuming to
      *               create from a password)
diff --git a/core/src/main/java/org/bitcoinj/wallet/FilteringCoinSelector.java b/core/src/main/java/org/bitcoinj/wallet/FilteringCoinSelector.java
index fb142dbee50..10d15f8c185 100644
--- a/core/src/main/java/org/bitcoinj/wallet/FilteringCoinSelector.java
+++ b/core/src/main/java/org/bitcoinj/wallet/FilteringCoinSelector.java
@@ -27,7 +27,7 @@
  */
 public class FilteringCoinSelector implements CoinSelector {
     protected CoinSelector delegate;
-    protected HashSet<TransactionOutPoint> spent = new HashSet<TransactionOutPoint>();
+    protected HashSet<TransactionOutPoint> spent = new HashSet<>();
 
     public FilteringCoinSelector(CoinSelector delegate) {
         this.delegate = delegate;
diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyBag.java b/core/src/main/java/org/bitcoinj/wallet/KeyBag.java
index 684f133085c..599741ef508 100644
--- a/core/src/main/java/org/bitcoinj/wallet/KeyBag.java
+++ b/core/src/main/java/org/bitcoinj/wallet/KeyBag.java
@@ -17,6 +17,7 @@
 package org.bitcoinj.wallet;
 
 import org.bitcoinj.core.ECKey;
+import org.bitcoinj.script.Script;
 
 import javax.annotation.Nullable;
 
@@ -26,13 +27,18 @@
  */
 public interface KeyBag {
     /**
-     * Locates a keypair from the keychain given the hash of the public key. This is needed when finding out which
-     * key we need to use to redeem a transaction output.
+     * Locates a keypair from the keychain given the hash of the public key, and (optionally) by usage for a specific
+     * script type. This is needed when finding out which key we need to use to redeem a transaction output.
      *
-     * @return ECKey object or null if no such key was found.
+     * @param pubKeyHash
+     *            hash of the keypair to look for
+     * @param scriptType
+     *            only look for given usage (currently {@link Script.ScriptType#P2PKH} or
+     *            {@link Script.ScriptType#P2WPKH}) or {@code null} if we don't care
+     * @return found key or null if no such key was found.
      */
     @Nullable
-    ECKey findKeyFromPubHash(byte[] pubkeyHash);
+    ECKey findKeyFromPubKeyHash(byte[] pubKeyHash, @Nullable Script.ScriptType scriptType);
 
     /**
      * Locates a keypair from the keychain given the raw public key bytes.
@@ -40,7 +46,7 @@ public interface KeyBag {
      * @return ECKey or null if no such key was found.
      */
     @Nullable
-    ECKey findKeyFromPubKey(byte[] pubkey);
+    ECKey findKeyFromPubKey(byte[] pubKey);
 
     /**
      * Locates a redeem data (redeem script and keys) from the keychain given the hash of the script.
diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyChain.java b/core/src/main/java/org/bitcoinj/wallet/KeyChain.java
index 3d2dcc60b63..aa1ba9e55bf 100644
--- a/core/src/main/java/org/bitcoinj/wallet/KeyChain.java
+++ b/core/src/main/java/org/bitcoinj/wallet/KeyChain.java
@@ -24,7 +24,7 @@
 import java.util.concurrent.Executor;
 
 /**
- * <p>A KeyChain is a class that stores a collection of keys for a {@link org.bitcoinj.wallet.Wallet}. Key chains
+ * <p>A KeyChain is a class that stores a collection of keys for a {@link Wallet}. Key chains
  * are expected to be able to look up keys given a hash (i.e. address) or pubkey bytes, and provide keys on request
  * for a given purpose. They can inform event listeners about new keys being added.</p>
  *
@@ -88,7 +88,7 @@ enum KeyPurpose {
      * <p>This is used to generate a {@link BloomFilter} which can be {@link BloomFilter#merge(BloomFilter)}d with
      * another. It could also be used if you have a specific target for the filter's size.</p>
      *
-     * <p>See the docs for {@link org.bitcoinj.core.BloomFilter#BloomFilter(int, double, long)} for a brief
+     * <p>See the docs for {@link BloomFilter#BloomFilter(int, double, long)} for a brief
      * explanation of anonymity when using bloom filters, and for the meaning of these parameters.</p>
      */
     BloomFilter getFilter(int size, double falsePositiveRate, long tweak);
diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyChainFactory.java b/core/src/main/java/org/bitcoinj/wallet/KeyChainFactory.java
index 0c9364f1d65..4d415946bf4 100644
--- a/core/src/main/java/org/bitcoinj/wallet/KeyChainFactory.java
+++ b/core/src/main/java/org/bitcoinj/wallet/KeyChainFactory.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014 devrandom
+ * Copyright 2019 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,23 +17,30 @@
 
 package org.bitcoinj.wallet;
 
+import com.google.common.collect.ImmutableList;
+import org.bitcoinj.crypto.ChildNumber;
 import org.bitcoinj.crypto.DeterministicKey;
 import org.bitcoinj.crypto.KeyCrypter;
+import org.bitcoinj.script.Script;
 
 /**
  * Factory interface for creation keychains while de-serializing a wallet.
  */
 public interface KeyChainFactory {
     /**
-     * Make a keychain (but not a watching one).
+     * Make a keychain (but not a watching one) with the specified account path
      *
      * @param key the protobuf for the root key
      * @param firstSubKey the protobuf for the first child key (normally the parent of the external subchain)
      * @param seed the seed
      * @param crypter the encrypted/decrypter
      * @param isMarried whether the keychain is leading in a marriage
+     * @param outputScriptType type of addresses (aka output scripts) to generate for receiving
+     * @param accountPath account path to generate receiving addresses on
      */
-    DeterministicKeyChain makeKeyChain(Protos.Key key, Protos.Key firstSubKey, DeterministicSeed seed, KeyCrypter crypter, boolean isMarried);
+    DeterministicKeyChain makeKeyChain(Protos.Key key, Protos.Key firstSubKey, DeterministicSeed seed,
+            KeyCrypter crypter, boolean isMarried, Script.ScriptType outputScriptType,
+            ImmutableList<ChildNumber> accountPath);
 
     /**
      * Make a watching keychain.
@@ -44,6 +52,23 @@ public interface KeyChainFactory {
      * @param accountKey the account extended public key
      * @param isFollowingKey whether the keychain is following in a marriage
      * @param isMarried whether the keychain is leading in a marriage
+     * @param outputScriptType type of addresses (aka output scripts) to generate for watching
      */
-    DeterministicKeyChain makeWatchingKeyChain(Protos.Key key, Protos.Key firstSubKey, DeterministicKey accountKey, boolean isFollowingKey, boolean isMarried) throws UnreadableWalletException;
+    DeterministicKeyChain makeWatchingKeyChain(Protos.Key key, Protos.Key firstSubKey, DeterministicKey accountKey,
+            boolean isFollowingKey, boolean isMarried, Script.ScriptType outputScriptType)
+            throws UnreadableWalletException;
+
+    /**
+     * Make a spending keychain.
+     *
+     * <p>isMarried and isFollowingKey must not be true at the same time.
+     *
+     * @param key the protobuf for the account key
+     * @param firstSubKey the protobuf for the first child key (normally the parent of the external subchain)
+     * @param accountKey the account extended public key
+     * @param isMarried whether the keychain is leading in a marriage
+     * @param outputScriptType type of addresses (aka output scripts) to generate for spending
+     */
+    DeterministicKeyChain makeSpendingKeyChain(Protos.Key key, Protos.Key firstSubKey, DeterministicKey accountKey,
+            boolean isMarried, Script.ScriptType outputScriptType) throws UnreadableWalletException;
 }
diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java b/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java
index 6aba8d79d79..bfd09d9a6b7 100644
--- a/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java
+++ b/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java
@@ -19,13 +19,20 @@
 
 import com.google.common.collect.*;
 import com.google.protobuf.*;
-import org.bitcoinj.core.*;
+
+import org.bitcoinj.core.Address;
+import org.bitcoinj.core.BloomFilter;
+import org.bitcoinj.core.ECKey;
+import org.bitcoinj.core.LegacyAddress;
+import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.core.Utils;
 import org.bitcoinj.crypto.*;
 import org.bitcoinj.script.*;
+import org.bitcoinj.script.Script.ScriptType;
 import org.bitcoinj.utils.*;
 import org.bitcoinj.wallet.listeners.KeyChainEventListener;
 import org.slf4j.*;
-import org.spongycastle.crypto.params.*;
+import org.bouncycastle.crypto.params.*;
 
 import javax.annotation.*;
 import java.security.*;
@@ -35,11 +42,18 @@
 import static com.google.common.base.Preconditions.*;
 
 /**
- * <p>A KeyChainGroup is used by the {@link org.bitcoinj.wallet.Wallet} and
- * manages: a {@link BasicKeyChain} object (which will normally be empty), and zero or more
- * {@link DeterministicKeyChain}s. A deterministic key chain will be created lazily/on demand
- * when a fresh or current key is requested, possibly being initialized from the private key bytes of the earliest non
- * rotating key in the basic key chain if one is available, or from a fresh random seed if not.</p>
+ * <p>A KeyChainGroup is used by the {@link Wallet} and manages: a {@link BasicKeyChain} object
+ * (which will normally be empty), and zero or more {@link DeterministicKeyChain}s. The last added
+ * deterministic keychain is always the default active keychain, that's the one we normally derive keys and
+ * addresses from.</p>
+ *
+ * <p>There can be active keychains for each output script type. However this class almost entirely only works on
+ * the default active keychain (see {@link #getActiveKeyChain()}). The other active keychains
+ * (see {@link #getActiveKeyChain(ScriptType, long)}) are meant as fallback for if a sender doesn't understand a
+ * certain new script type (e.g. P2WPKH which comes with the new Bech32 address format). Active keychains
+ * share the same seed, so that upgrading the wallet
+ * (see {@link #upgradeToDeterministic(ScriptType, KeyChainGroupStructure, long, KeyParameter)}) to understand
+ * a new script type doesn't require a fresh backup.</p>
  *
  * <p>If a key rotation time is set, it may be necessary to add a new DeterministicKeyChain with a fresh seed
  * and also preserve the old one, so funds can be swept from the rotating keys. In this case, there may be
@@ -55,6 +69,145 @@
  */
 public class KeyChainGroup implements KeyBag {
 
+    /**
+     * Builder for {@link KeyChainGroup}. Use {@link KeyChainGroup#builder(NetworkParameters)} to acquire an instance.
+     */
+    public static class Builder {
+        private final NetworkParameters params;
+        private final KeyChainGroupStructure structure;
+        private final List<DeterministicKeyChain> chains = new LinkedList<>();
+        private int lookaheadSize = -1, lookaheadThreshold = -1;
+
+        private Builder(NetworkParameters params, KeyChainGroupStructure structure) {
+            this.params = params;
+            this.structure = structure;
+        }
+
+        /**
+         * <p>Add chain from a random source.</p>
+         * <p>In the case of P2PKH, just a P2PKH chain is created and activated which is then the default chain for fresh
+         * addresses. It can be upgraded to P2WPKH later.</p>
+         * <p>In the case of P2WPKH, both a P2PKH and a P2WPKH chain are created and activated, the latter being the default
+         * chain. This behaviour will likely be changed with bitcoinj 0.16 such that only a P2WPKH chain is created and
+         * activated.</p>
+         * @param outputScriptType type of addresses (aka output scripts) to generate for receiving
+         */
+        public Builder fromRandom(Script.ScriptType outputScriptType) {
+            DeterministicSeed seed = new DeterministicSeed(new SecureRandom(),
+                    DeterministicSeed.DEFAULT_SEED_ENTROPY_BITS, "");
+            fromSeed(seed, outputScriptType);
+            return this;
+        }
+
+        /**
+         * <p>Add chain from a given seed.</p>
+         * <p>In the case of P2PKH, just a P2PKH chain is created and activated which is then the default chain for fresh
+         * addresses. It can be upgraded to P2WPKH later.</p>
+         * <p>In the case of P2WPKH, both a P2PKH and a P2WPKH chain are created and activated, the latter being the default
+         * chain. This behaviour will likely be changed with bitcoinj 0.16 such that only a P2WPKH chain is created and
+         * activated.</p>
+         * @param seed deterministic seed to derive all keys from
+         * @param outputScriptType type of addresses (aka output scripts) to generate for receiving
+         */
+        public Builder fromSeed(DeterministicSeed seed, Script.ScriptType outputScriptType) {
+            if (outputScriptType == Script.ScriptType.P2PKH) {
+                DeterministicKeyChain chain = DeterministicKeyChain.builder().seed(seed)
+                        .outputScriptType(Script.ScriptType.P2PKH)
+                        .accountPath(structure.accountPathFor(Script.ScriptType.P2PKH)).build();
+                this.chains.clear();
+                this.chains.add(chain);
+            } else if (outputScriptType == Script.ScriptType.P2WPKH) {
+                DeterministicKeyChain fallbackChain = DeterministicKeyChain.builder().seed(seed)
+                        .outputScriptType(Script.ScriptType.P2PKH)
+                        .accountPath(structure.accountPathFor(Script.ScriptType.P2PKH)).build();
+                DeterministicKeyChain defaultChain = DeterministicKeyChain.builder().seed(seed)
+                        .outputScriptType(Script.ScriptType.P2WPKH)
+                        .accountPath(structure.accountPathFor(Script.ScriptType.P2WPKH)).build();
+                this.chains.clear();
+                this.chains.add(fallbackChain);
+                this.chains.add(defaultChain);
+            } else {
+                throw new IllegalArgumentException(outputScriptType.toString());
+            }
+            return this;
+        }
+
+        /**
+         * <p>Add chain from a given key.</p>
+         * <p>In the case of P2PKH, just a P2PKH chain is created and activated which is then the default chain for fresh
+         * addresses. It can be upgraded to P2WPKH later.</p>
+         * <p>In the case of P2WPKH, both a P2PKH and a P2WPKH chain are created and activated, the latter being the default
+         * chain. This behaviour will likely be changed with bitcoinj 0.16 such that only a P2WPKH chain is created and
+         * activated.</p>
+         * @param key deterministic key to derive all keys from
+         * @param outputScriptType type of addresses (aka output scripts) to generate for receiving
+         */
+        public Builder fromKey(DeterministicKey key, Script.ScriptType outputScriptType) {
+            if (outputScriptType == Script.ScriptType.P2PKH) {
+                DeterministicKeyChain chain = DeterministicKeyChain.builder().spend(key)
+                        .outputScriptType(Script.ScriptType.P2PKH)
+                        .accountPath(structure.accountPathFor(Script.ScriptType.P2PKH)).build();
+                this.chains.clear();
+                this.chains.add(chain);
+            } else if (outputScriptType == Script.ScriptType.P2WPKH) {
+                DeterministicKeyChain fallbackChain = DeterministicKeyChain.builder().spend(key)
+                        .outputScriptType(Script.ScriptType.P2PKH)
+                        .accountPath(structure.accountPathFor(Script.ScriptType.P2PKH)).build();
+                DeterministicKeyChain defaultChain = DeterministicKeyChain.builder().spend(key)
+                        .outputScriptType(Script.ScriptType.P2WPKH)
+                        .accountPath(structure.accountPathFor(Script.ScriptType.P2WPKH)).build();
+                this.chains.clear();
+                this.chains.add(fallbackChain);
+                this.chains.add(defaultChain);
+            } else {
+                throw new IllegalArgumentException(outputScriptType.toString());
+            }
+            return this;
+        }
+
+
+        /**
+         * Add a single chain.
+         * @param chain to add
+         */
+        public Builder addChain(DeterministicKeyChain chain) {
+            this.chains.add(chain);
+            return this;
+        }
+
+        /**
+         * Add multiple chains.
+         * @param chains to add
+         */
+        public Builder chains(List<DeterministicKeyChain> chains) {
+            this.chains.clear();
+            this.chains.addAll(chains);
+            return this;
+        }
+
+        /**
+         * Set a custom lookahead size for all deterministic chains
+         * @param lookaheadSize lookahead size
+         */
+        public Builder lookaheadSize(int lookaheadSize) {
+            this.lookaheadSize = lookaheadSize;
+            return this;
+        }
+
+        /**
+         * Set a custom lookahead threshold for all deterministic chains
+         * @param lookaheadThreshold lookahead threshold
+         */
+        public Builder lookaheadThreshold(int lookaheadThreshold) {
+            this.lookaheadThreshold = lookaheadThreshold;
+            return this;
+        }
+
+        public KeyChainGroup build() {
+            return new KeyChainGroup(params, null, chains, lookaheadSize, lookaheadThreshold, null, null);
+        }
+    }
+
     static {
         // Init proper random number generator, as some old Android installations have bugs that make it unsecure.
         if (Utils.isAndroidRuntime())
@@ -64,8 +217,9 @@ public class KeyChainGroup implements KeyBag {
     private static final Logger log = LoggerFactory.getLogger(KeyChainGroup.class);
 
     private BasicKeyChain basic;
-    private NetworkParameters params;
-    protected final LinkedList<DeterministicKeyChain> chains;
+    private final NetworkParameters params;
+    // Keychains for deterministically derived keys. If this is null, no chains should be created automatically.
+    protected final @Nullable LinkedList<DeterministicKeyChain> chains;
     // currentKeys is used for normal, non-multisig/married wallets. currentAddresses is used when we're handing out
     // P2SH addresses. They're mutually exclusive.
     private final EnumMap<KeyChain.KeyPurpose, DeterministicKey> currentKeys;
@@ -74,45 +228,63 @@ public class KeyChainGroup implements KeyBag {
     private int lookaheadSize = -1;
     private int lookaheadThreshold = -1;
 
-    /** Creates a keychain group with no basic chain, and a single, lazily created HD chain. */
-    public KeyChainGroup(NetworkParameters params) {
-        this(params, null, new ArrayList<DeterministicKeyChain>(1), null, null);
+    /** Creates a keychain group with just a basic chain. No deterministic chains will be created automatically. */
+    public static KeyChainGroup createBasic(NetworkParameters params) {
+        return new KeyChainGroup(params, new BasicKeyChain(), null, -1, -1, null, null);
     }
 
-    /** Creates a keychain group with no basic chain, and an HD chain initialized from the given seed. */
-    public KeyChainGroup(NetworkParameters params, DeterministicSeed seed) {
-        this(params, null, ImmutableList.of(new DeterministicKeyChain(seed)), null, null);
+    public static KeyChainGroup.Builder builder(NetworkParameters params) {
+        return new Builder(params, KeyChainGroupStructure.DEFAULT);
     }
 
-    /**
-     * Creates a keychain group with no basic chain, and an HD chain that is watching the given watching key.
-     * This HAS to be an account key as returned by {@link DeterministicKeyChain#getWatchingKey()}.
-     */
-    public KeyChainGroup(NetworkParameters params, DeterministicKey watchKey) {
-        this(params, null, ImmutableList.of(DeterministicKeyChain.watch(watchKey)), null, null);
+    public static KeyChainGroup.Builder builder(NetworkParameters params, KeyChainGroupStructure structure) {
+        return new Builder(params, structure);
     }
 
-    // Used for deserialization.
-    private KeyChainGroup(NetworkParameters params, @Nullable BasicKeyChain basicKeyChain, List<DeterministicKeyChain> chains,
-                          @Nullable EnumMap<KeyChain.KeyPurpose, DeterministicKey> currentKeys, @Nullable KeyCrypter crypter) {
+    private KeyChainGroup(NetworkParameters params, @Nullable BasicKeyChain basicKeyChain,
+            @Nullable List<DeterministicKeyChain> chains, int lookaheadSize, int lookaheadThreshold,
+            @Nullable EnumMap<KeyChain.KeyPurpose, DeterministicKey> currentKeys, @Nullable KeyCrypter crypter) {
         this.params = params;
         this.basic = basicKeyChain == null ? new BasicKeyChain() : basicKeyChain;
-        this.chains = new LinkedList<DeterministicKeyChain>(checkNotNull(chains));
+        if (chains != null) {
+            if (lookaheadSize > -1)
+                this.lookaheadSize = lookaheadSize;
+            else if (params.getId().equals(NetworkParameters.ID_UNITTESTNET))
+                this.lookaheadSize = 5; // Cut down excess computation for unit tests.
+            if (lookaheadThreshold > -1)
+                this.lookaheadThreshold = lookaheadThreshold;
+            this.chains = new LinkedList<>(chains);
+            for (DeterministicKeyChain chain : this.chains) {
+                if (this.lookaheadSize > -1)
+                    chain.setLookaheadSize(this.lookaheadSize);
+                if (this.lookaheadThreshold > -1)
+                    chain.setLookaheadThreshold(this.lookaheadThreshold);
+            }
+        } else {
+            this.chains = null;
+        }
         this.keyCrypter = crypter;
         this.currentKeys = currentKeys == null
                 ? new EnumMap<KeyChain.KeyPurpose, DeterministicKey>(KeyChain.KeyPurpose.class)
                 : currentKeys;
-        this.currentAddresses = new EnumMap<KeyChain.KeyPurpose, Address>(KeyChain.KeyPurpose.class);
-        maybeLookaheadScripts();
+        this.currentAddresses = new EnumMap<>(KeyChain.KeyPurpose.class);
 
         if (isMarried()) {
+            maybeLookaheadScripts();
             for (Map.Entry<KeyChain.KeyPurpose, DeterministicKey> entry : this.currentKeys.entrySet()) {
-                Address address = makeP2SHOutputScript(entry.getValue(), getActiveKeyChain()).getToAddress(params);
+                Address address = ScriptBuilder
+                        .createP2SHOutputScript(getActiveKeyChain().getRedeemData(entry.getValue()).redeemScript)
+                        .getToAddress(params);
                 currentAddresses.put(entry.getKey(), address);
             }
         }
     }
 
+    /** Returns true if it contains any deterministic keychain or one could be created. */
+    public boolean isSupportsDeterministicChains() {
+        return chains != null;
+    }
+
     // This keeps married redeem data in sync with the number of keys issued
     private void maybeLookaheadScripts() {
         for (DeterministicKeyChain chain : chains) {
@@ -120,19 +292,13 @@ private void maybeLookaheadScripts() {
         }
     }
 
-    /** Adds a new HD chain to the chains list, and make it the default chain (from which keys are issued). */
-    public void createAndActivateNewHDChain() {
-        // We can't do auto upgrade here because we don't know the rotation time, if any.
-        final DeterministicKeyChain chain = new DeterministicKeyChain(new SecureRandom());
-        addAndActivateHDChain(chain);
-    }
-
     /**
      * Adds an HD chain to the chains list, and make it the default chain (from which keys are issued).
      * Useful for adding a complex pre-configured keychain, such as a married wallet.
      */
     public void addAndActivateHDChain(DeterministicKeyChain chain) {
-        log.info("Creating and activating a new HD chain: {}", chain);
+        checkState(isSupportsDeterministicChains(), "doesn't support deterministic chains");
+        log.info("Activating a new HD chain: {}", chain);
         for (ListenerRegistration<KeyChainEventListener> registration : basic.getListeners())
             chain.addEventListener(registration.listener, registration.executor);
         if (lookaheadSize >= 0)
@@ -140,6 +306,8 @@ public void addAndActivateHDChain(DeterministicKeyChain chain) {
         if (lookaheadThreshold >= 0)
             chain.setLookaheadThreshold(lookaheadThreshold);
         chains.add(chain);
+        currentKeys.clear();
+        currentAddresses.clear();
     }
 
     /**
@@ -172,6 +340,7 @@ public DeterministicKey currentKey(KeyChain.KeyPurpose purpose) {
      */
     public Address currentAddress(KeyChain.KeyPurpose purpose) {
         DeterministicKeyChain chain = getActiveKeyChain();
+        Script.ScriptType outputScriptType = chain.getOutputScriptType();
         if (chain.isMarried()) {
             Address current = currentAddresses.get(purpose);
             if (current == null) {
@@ -179,8 +348,10 @@ public Address currentAddress(KeyChain.KeyPurpose purpose) {
                 currentAddresses.put(purpose, current);
             }
             return current;
+        } else if (outputScriptType == Script.ScriptType.P2PKH || outputScriptType == Script.ScriptType.P2WPKH) {
+            return Address.fromKey(params, currentKey(purpose), outputScriptType);
         } else {
-            return currentKey(purpose).toAddress(params);
+            throw new IllegalStateException(chain.getOutputScriptType().toString());
         }
     }
 
@@ -221,48 +392,84 @@ public List<DeterministicKey> freshKeys(KeyChain.KeyPurpose purpose, int numberO
         return chain.getKeys(purpose, numberOfKeys);   // Always returns the next key along the key chain.
     }
 
+    /**
+     * <p>Returns a fresh address for a given {@link KeyChain.KeyPurpose} and of a given
+     * {@link Script.ScriptType}.</p>
+     * <p>This method is meant for when you really need a fallback address. Normally, you should be
+     * using {@link #freshAddress(KeyChain.KeyPurpose)} or
+     * {@link #currentAddress(KeyChain.KeyPurpose)}.</p>
+     */
+    public Address freshAddress(KeyChain.KeyPurpose purpose, Script.ScriptType outputScriptType, long keyRotationTimeSecs) {
+        DeterministicKeyChain chain = getActiveKeyChain(outputScriptType, keyRotationTimeSecs);
+        return Address.fromKey(params, chain.getKey(purpose), outputScriptType);
+    }
+
     /**
      * Returns address for a {@link #freshKey(KeyChain.KeyPurpose)}
      */
     public Address freshAddress(KeyChain.KeyPurpose purpose) {
         DeterministicKeyChain chain = getActiveKeyChain();
+        Script.ScriptType outputScriptType = chain.getOutputScriptType();
         if (chain.isMarried()) {
             Script outputScript = chain.freshOutputScript(purpose);
-            checkState(outputScript.isPayToScriptHash()); // Only handle P2SH for now
-            Address freshAddress = Address.fromP2SHScript(params, outputScript);
+            checkState(ScriptPattern.isP2SH(outputScript)); // Only handle P2SH for now
+            Address freshAddress = LegacyAddress.fromScriptHash(params,
+                    ScriptPattern.extractHashFromP2SH(outputScript));
             maybeLookaheadScripts();
             currentAddresses.put(purpose, freshAddress);
             return freshAddress;
+        } else if (outputScriptType == Script.ScriptType.P2PKH || outputScriptType == Script.ScriptType.P2WPKH) {
+            return Address.fromKey(params, freshKey(purpose), outputScriptType);
         } else {
-            return freshKey(purpose).toAddress(params);
+            throw new IllegalStateException(chain.getOutputScriptType().toString());
         }
     }
 
-    /** Returns the key chain that's used for generation of fresh/current keys. This is always the newest HD chain. */
+    /**
+     * Returns the key chains that are used for generation of fresh/current keys, in the order of how they
+     * were added. The default active chain will come last in the list.
+     */
+    public List<DeterministicKeyChain> getActiveKeyChains(long keyRotationTimeSecs) {
+        checkState(isSupportsDeterministicChains(), "doesn't support deterministic chains");
+        List<DeterministicKeyChain> activeChains = new LinkedList<>();
+        for (DeterministicKeyChain chain : chains)
+            if (chain.getEarliestKeyCreationTime() >= keyRotationTimeSecs)
+                activeChains.add(chain);
+        return activeChains;
+    }
+
+    /**
+     * Returns the key chain that's used for generation of fresh/current keys of the given type. If it's not the default
+     * type and no active chain for this type exists, {@code null} is returned. No upgrade or downgrade is tried.
+     */
+    public final DeterministicKeyChain getActiveKeyChain(Script.ScriptType outputScriptType, long keyRotationTimeSecs) {
+        checkState(isSupportsDeterministicChains(), "doesn't support deterministic chains");
+        for (DeterministicKeyChain chain : ImmutableList.copyOf(chains).reverse())
+            if (chain.getOutputScriptType() == outputScriptType
+                    && chain.getEarliestKeyCreationTime() >= keyRotationTimeSecs)
+                return chain;
+        return null;
+    }
+
+    /**
+     * Returns the key chain that's used for generation of default fresh/current keys. This is always the newest
+     * deterministic chain. If no deterministic chain is present but imported keys instead, a deterministic upgrate is
+     * tried.
+     */
     public final DeterministicKeyChain getActiveKeyChain() {
-        if (chains.isEmpty()) {
-            if (basic.numKeys() > 0) {
-                log.warn("No HD chain present but random keys are: you probably deserialized an old wallet.");
-                // If called from the wallet (most likely) it'll try to upgrade us, as it knows the rotation time
-                // but not the password.
-                throw new DeterministicUpgradeRequiredException();
-            }
-            // Otherwise we have no HD chains and no random keys: we are a new born! So a random seed is fine.
-            createAndActivateNewHDChain();
-        }
+        checkState(isSupportsDeterministicChains(), "doesn't support deterministic chains");
+        if (chains.isEmpty())
+            throw new DeterministicUpgradeRequiredException();
         return chains.get(chains.size() - 1);
     }
 
     /**
-     * Sets the lookahead buffer size for ALL deterministic key chains as well as for following key chains if any exist,
-     * see {@link DeterministicKeyChain#setLookaheadSize(int)}
-     * for more information.
+     * Merge all active chains from the given keychain group into this keychain group.
      */
-    public void setLookaheadSize(int lookaheadSize) {
-        this.lookaheadSize = lookaheadSize;
-        for (DeterministicKeyChain chain : chains) {
-            chain.setLookaheadSize(lookaheadSize);
-        }
+    public final void mergeActiveKeyChains(KeyChainGroup from, long keyRotationTimeSecs) {
+        checkArgument(isEncrypted() == from.isEncrypted(), "encrypted and non-encrypted keychains cannot be mixed");
+        for (DeterministicKeyChain chain : from.getActiveKeyChains(keyRotationTimeSecs))
+            addAndActivateHDChain(chain);
     }
 
     /**
@@ -271,29 +478,20 @@ public void setLookaheadSize(int lookaheadSize) {
      * for more information.
      */
     public int getLookaheadSize() {
+        checkState(isSupportsDeterministicChains(), "doesn't support deterministic chains");
         if (lookaheadSize == -1)
             return getActiveKeyChain().getLookaheadSize();
         else
             return lookaheadSize;
     }
 
-    /**
-     * Sets the lookahead buffer threshold for ALL deterministic key chains, see
-     * {@link DeterministicKeyChain#setLookaheadThreshold(int)}
-     * for more information.
-     */
-    public void setLookaheadThreshold(int num) {
-        for (DeterministicKeyChain chain : chains) {
-            chain.setLookaheadThreshold(num);
-        }
-    }
-
     /**
      * Gets the current lookahead threshold being used for ALL deterministic key chains. See
      * {@link DeterministicKeyChain#setLookaheadThreshold(int)}
      * for more information.
      */
     public int getLookaheadThreshold() {
+        checkState(isSupportsDeterministicChains(), "doesn't support deterministic chains");
         if (lookaheadThreshold == -1)
             return getActiveKeyChain().getLookaheadThreshold();
         else
@@ -338,19 +536,21 @@ public int importKeysAndEncrypt(final List<ECKey> keys, KeyParameter aesKey) {
     @Override
     @Nullable
     public RedeemData findRedeemDataFromScriptHash(byte[] scriptHash) {
-        // Iterate in reverse order, since the active keychain is the one most likely to have the hit
-        for (Iterator<DeterministicKeyChain> iter = chains.descendingIterator() ; iter.hasNext() ; ) {
-            DeterministicKeyChain chain = iter.next();
-            RedeemData redeemData = chain.findRedeemDataByScriptHash(ByteString.copyFrom(scriptHash));
-            if (redeemData != null)
-                return redeemData;
+        if (chains != null) {
+            // Iterate in reverse order, since the active keychain is the one most likely to have the hit
+            for (Iterator<DeterministicKeyChain> iter = chains.descendingIterator(); iter.hasNext();) {
+                DeterministicKeyChain chain = iter.next();
+                RedeemData redeemData = chain.findRedeemDataByScriptHash(ByteString.copyFrom(scriptHash));
+                if (redeemData != null)
+                    return redeemData;
+            }
         }
         return null;
     }
 
-    public void markP2SHAddressAsUsed(Address address) {
-        checkArgument(address.isP2SHAddress());
-        RedeemData data = findRedeemDataFromScriptHash(address.getHash160());
+    public void markP2SHAddressAsUsed(LegacyAddress address) {
+        checkArgument(address.getOutputScriptType() == ScriptType.P2SH);
+        RedeemData data = findRedeemDataFromScriptHash(address.getHash());
         if (data == null)
             return;   // Not our P2SH address.
         for (ECKey key : data.keys) {
@@ -365,34 +565,42 @@ public void markP2SHAddressAsUsed(Address address) {
 
     @Nullable
     @Override
-    public ECKey findKeyFromPubHash(byte[] pubkeyHash) {
+    public ECKey findKeyFromPubKeyHash(byte[] pubKeyHash, @Nullable Script.ScriptType scriptType) {
         ECKey result;
-        if ((result = basic.findKeyFromPubHash(pubkeyHash)) != null)
+        // BasicKeyChain can mix output script types.
+        if ((result = basic.findKeyFromPubHash(pubKeyHash)) != null)
             return result;
-        for (DeterministicKeyChain chain : chains) {
-            if ((result = chain.findKeyFromPubHash(pubkeyHash)) != null)
-                return result;
+        if (chains != null) {
+            for (DeterministicKeyChain chain : chains) {
+                // This check limits DeterministicKeyChain to specific output script usage.
+                if (scriptType != null && scriptType != chain.getOutputScriptType())
+                    continue;
+                if ((result = chain.findKeyFromPubHash(pubKeyHash)) != null)
+                    return result;
+            }
         }
         return null;
     }
 
     /**
-     * Mark the DeterministicKeys as used, if they match the pubkeyHash
+     * Mark the DeterministicKeys as used, if they match the pubKeyHash
      * See {@link DeterministicKeyChain#markKeyAsUsed(DeterministicKey)} for more info on this.
      */
-    public void markPubKeyHashAsUsed(byte[] pubkeyHash) {
-        for (DeterministicKeyChain chain : chains) {
-            DeterministicKey key;
-            if ((key = chain.markPubHashAsUsed(pubkeyHash)) != null) {
-                maybeMarkCurrentKeyAsUsed(key);
-                return;
+    public void markPubKeyHashAsUsed(byte[] pubKeyHash) {
+        if (chains != null) {
+            for (DeterministicKeyChain chain : chains) {
+                DeterministicKey key;
+                if ((key = chain.markPubHashAsUsed(pubKeyHash)) != null) {
+                    maybeMarkCurrentKeyAsUsed(key);
+                    return;
+                }
             }
         }
     }
 
     /** If the given P2SH address is "current", advance it to a new one. */
-    private void maybeMarkCurrentAddressAsUsed(Address address) {
-        checkArgument(address.isP2SHAddress());
+    private void maybeMarkCurrentAddressAsUsed(LegacyAddress address) {
+        checkArgument(address.getOutputScriptType() == ScriptType.P2SH);
         for (Map.Entry<KeyChain.KeyPurpose, Address> entry : currentAddresses.entrySet()) {
             if (entry.getValue() != null && entry.getValue().equals(address)) {
                 log.info("Marking P2SH address as used: {}", address);
@@ -418,22 +626,23 @@ private void maybeMarkCurrentKeyAsUsed(DeterministicKey key) {
     public boolean hasKey(ECKey key) {
         if (basic.hasKey(key))
             return true;
-        for (DeterministicKeyChain chain : chains)
-            if (chain.hasKey(key))
-                return true;
+        if (chains != null)
+            for (DeterministicKeyChain chain : chains)
+                if (chain.hasKey(key))
+                    return true;
         return false;
     }
 
     @Nullable
     @Override
-    public ECKey findKeyFromPubKey(byte[] pubkey) {
+    public ECKey findKeyFromPubKey(byte[] pubKey) {
         ECKey result;
-        if ((result = basic.findKeyFromPubKey(pubkey)) != null)
+        if ((result = basic.findKeyFromPubKey(pubKey)) != null)
             return result;
-        for (DeterministicKeyChain chain : chains) {
-            if ((result = chain.findKeyFromPubKey(pubkey)) != null)
-                return result;
-        }
+        if (chains != null)
+            for (DeterministicKeyChain chain : chains)
+                if ((result = chain.findKeyFromPubKey(pubKey)) != null)
+                    return result;
         return null;
     }
 
@@ -442,11 +651,13 @@ public ECKey findKeyFromPubKey(byte[] pubkey) {
      * See {@link DeterministicKeyChain#markKeyAsUsed(DeterministicKey)} for more info on this.
      */
     public void markPubKeyAsUsed(byte[] pubkey) {
-        for (DeterministicKeyChain chain : chains) {
-            DeterministicKey key;
-            if ((key = chain.markPubKeyAsUsed(pubkey)) != null) {
-                maybeMarkCurrentKeyAsUsed(key);
-                return;
+        if (chains != null) {
+            for (DeterministicKeyChain chain : chains) {
+                DeterministicKey key;
+                if ((key = chain.markPubKeyAsUsed(pubkey)) != null) {
+                    maybeMarkCurrentKeyAsUsed(key);
+                    return;
+                }
             }
         }
     }
@@ -454,8 +665,9 @@ public void markPubKeyAsUsed(byte[] pubkey) {
     /** Returns the number of keys managed by this group, including the lookahead buffers. */
     public int numKeys() {
         int result = basic.numKeys();
-        for (DeterministicKeyChain chain : chains)
-            result += chain.numKeys();
+        if (chains != null)
+            for (DeterministicKeyChain chain : chains)
+                result += chain.numKeys();
         return result;
     }
 
@@ -475,12 +687,12 @@ public boolean removeImportedKey(ECKey key) {
      * @see org.bitcoinj.wallet.MarriedKeyChain
      */
     public final boolean isMarried() {
-        return !chains.isEmpty() && getActiveKeyChain().isMarried();
+        return chains != null && !chains.isEmpty() && getActiveKeyChain().isMarried();
     }
 
     /**
      * Encrypt the keys in the group using the KeyCrypter and the AES key. A good default KeyCrypter to use is
-     * {@link org.bitcoinj.crypto.KeyCrypterScrypt}.
+     * {@link KeyCrypterScrypt}.
      *
      * @throws org.bitcoinj.crypto.KeyCrypterException Thrown if the wallet encryption fails for some reason,
      *         leaving the group unchanged.
@@ -489,40 +701,45 @@ public final boolean isMarried() {
     public void encrypt(KeyCrypter keyCrypter, KeyParameter aesKey) {
         checkNotNull(keyCrypter);
         checkNotNull(aesKey);
-        // This code must be exception safe.
+        checkState((chains != null && !chains.isEmpty()) || basic.numKeys() != 0, "can't encrypt entirely empty wallet");
+
         BasicKeyChain newBasic = basic.toEncrypted(keyCrypter, aesKey);
-        List<DeterministicKeyChain> newChains = new ArrayList<DeterministicKeyChain>(chains.size());
-        if (chains.isEmpty() && basic.numKeys() == 0) {
-            // No HD chains and no random keys: encrypting an entirely empty keychain group. But we can't do that, we
-            // must have something to encrypt: so instantiate a new HD chain here.
-            createAndActivateNewHDChain();
+        List<DeterministicKeyChain> newChains = new ArrayList<>();
+        if (chains != null) {
+            for (DeterministicKeyChain chain : chains)
+                newChains.add(chain.toEncrypted(keyCrypter, aesKey));
         }
-        for (DeterministicKeyChain chain : chains)
-            newChains.add(chain.toEncrypted(keyCrypter, aesKey));
+
+        // Code below this point must be exception safe.
         this.keyCrypter = keyCrypter;
-        basic = newBasic;
-        chains.clear();
-        chains.addAll(newChains);
+        this.basic = newBasic;
+        if (chains != null) {
+            this.chains.clear();
+            this.chains.addAll(newChains);
+        }
     }
 
     /**
      * Decrypt the keys in the group using the previously given key crypter and the AES key. A good default
-     * KeyCrypter to use is {@link org.bitcoinj.crypto.KeyCrypterScrypt}.
+     * KeyCrypter to use is {@link KeyCrypterScrypt}.
      *
      * @throws org.bitcoinj.crypto.KeyCrypterException Thrown if the wallet decryption fails for some reason, leaving the group unchanged.
      */
     public void decrypt(KeyParameter aesKey) {
-        // This code must be exception safe.
         checkNotNull(aesKey);
-        BasicKeyChain newBasic = basic.toDecrypted(aesKey);
-        List<DeterministicKeyChain> newChains = new ArrayList<DeterministicKeyChain>(chains.size());
-        for (DeterministicKeyChain chain : chains)
-            newChains.add(chain.toDecrypted(aesKey));
 
+        BasicKeyChain newBasic = basic.toDecrypted(aesKey);
+        if (chains != null) {
+            List<DeterministicKeyChain> newChains = new ArrayList<>(chains.size());
+            for (DeterministicKeyChain chain : chains)
+                newChains.add(chain.toDecrypted(aesKey));
+
+            // Code below this point must be exception safe.
+            this.chains.clear();
+            this.chains.addAll(newChains);
+        }
+        this.basic = newBasic;
         this.keyCrypter = null;
-        basic = newBasic;
-        chains.clear();
-        chains.addAll(newChains);
     }
 
     /** Returns true if the group is encrypted. */
@@ -539,7 +756,7 @@ public boolean isEncrypted() {
     public boolean isWatching() {
         BasicKeyChain.State basicState = basic.isWatching();
         BasicKeyChain.State activeState = BasicKeyChain.State.EMPTY;
-        if (!chains.isEmpty()) {
+        if (chains != null && !chains.isEmpty()) {
             if (getActiveKeyChain().isWatching())
                 activeState = BasicKeyChain.State.WATCHING;
             else
@@ -570,16 +787,17 @@ public List<ECKey> getImportedKeys() {
 
     public long getEarliestKeyCreationTime() {
         long time = basic.getEarliestKeyCreationTime();   // Long.MAX_VALUE if empty.
-        for (DeterministicKeyChain chain : chains)
-            time = Math.min(time, chain.getEarliestKeyCreationTime());
+        if (chains != null)
+            for (DeterministicKeyChain chain : chains)
+                time = Math.min(time, chain.getEarliestKeyCreationTime());
         return time;
     }
 
     public int getBloomFilterElementCount() {
         int result = basic.numBloomFilterEntries();
-        for (DeterministicKeyChain chain : chains) {
-            result += chain.numBloomFilterEntries();
-        }
+        if (chains != null)
+            for (DeterministicKeyChain chain : chains)
+                result += chain.numBloomFilterEntries();
         return result;
     }
 
@@ -587,22 +805,16 @@ public BloomFilter getBloomFilter(int size, double falsePositiveRate, long nTwea
         BloomFilter filter = new BloomFilter(size, falsePositiveRate, nTweak);
         if (basic.numKeys() > 0)
             filter.merge(basic.getFilter(size, falsePositiveRate, nTweak));
-
-        for (DeterministicKeyChain chain : chains) {
-            filter.merge(chain.getFilter(size, falsePositiveRate, nTweak));
-        }
+        if (chains != null)
+            for (DeterministicKeyChain chain : chains)
+                filter.merge(chain.getFilter(size, falsePositiveRate, nTweak));
         return filter;
     }
 
-    /** {@inheritDoc} */
     public boolean isRequiringUpdateAllBloomFilter() {
         throw new UnsupportedOperationException();   // Unused.
     }
 
-    private Script makeP2SHOutputScript(DeterministicKey followedKey, DeterministicKeyChain chain) {
-        return ScriptBuilder.createP2SHOutputScript(chain.getRedeemData(followedKey).redeemScript);
-    }
-
     /** Adds a listener for events that are run when keys are added, on the user thread. */
     public void addEventListener(KeyChainEventListener listener) {
         addEventListener(listener, Threading.USER_THREAD);
@@ -613,15 +825,17 @@ public void addEventListener(KeyChainEventListener listener, Executor executor)
         checkNotNull(listener);
         checkNotNull(executor);
         basic.addEventListener(listener, executor);
-        for (DeterministicKeyChain chain : chains)
-            chain.addEventListener(listener, executor);
+        if (chains != null)
+            for (DeterministicKeyChain chain : chains)
+                chain.addEventListener(listener, executor);
     }
 
     /** Removes a listener for events that are run when keys are added. */
     public boolean removeEventListener(KeyChainEventListener listener) {
         checkNotNull(listener);
-        for (DeterministicKeyChain chain : chains)
-            chain.removeEventListener(listener);
+        if (chains != null)
+            for (DeterministicKeyChain chain : chains)
+                chain.removeEventListener(listener);
         return basic.removeEventListener(listener);
     }
 
@@ -632,10 +846,9 @@ public List<Protos.Key> serializeToProtobuf() {
             result = basic.serializeToProtobuf();
         else
             result = Lists.newArrayList();
-        for (DeterministicKeyChain chain : chains) {
-            List<Protos.Key> protos = chain.serializeToProtobuf();
-            result.addAll(protos);
-        }
+        if (chains != null)
+            for (DeterministicKeyChain chain : chains)
+                result.addAll(chain.serializeToProtobuf());
         return result;
     }
 
@@ -646,11 +859,16 @@ static KeyChainGroup fromProtobufUnencrypted(NetworkParameters params, List<Prot
     public static KeyChainGroup fromProtobufUnencrypted(NetworkParameters params, List<Protos.Key> keys, KeyChainFactory factory) throws UnreadableWalletException {
         BasicKeyChain basicKeyChain = BasicKeyChain.fromProtobufUnencrypted(keys);
         List<DeterministicKeyChain> chains = DeterministicKeyChain.fromProtobuf(keys, null, factory);
+        int lookaheadSize = -1, lookaheadThreshold = -1;
         EnumMap<KeyChain.KeyPurpose, DeterministicKey> currentKeys = null;
-        if (!chains.isEmpty())
+        if (!chains.isEmpty()) {
+            DeterministicKeyChain activeChain = chains.get(chains.size() - 1);
+            lookaheadSize = activeChain.getLookaheadSize();
+            lookaheadThreshold = activeChain.getLookaheadThreshold();
             currentKeys = createCurrentKeysMap(chains);
+        }
         extractFollowingKeychains(chains);
-        return new KeyChainGroup(params, basicKeyChain, chains, currentKeys, null);
+        return new KeyChainGroup(params, basicKeyChain, chains, lookaheadSize, lookaheadThreshold, currentKeys, null);
     }
 
     static KeyChainGroup fromProtobufEncrypted(NetworkParameters params, List<Protos.Key> keys, KeyCrypter crypter) throws UnreadableWalletException {
@@ -661,17 +879,31 @@ public static KeyChainGroup fromProtobufEncrypted(NetworkParameters params, List
         checkNotNull(crypter);
         BasicKeyChain basicKeyChain = BasicKeyChain.fromProtobufEncrypted(keys, crypter);
         List<DeterministicKeyChain> chains = DeterministicKeyChain.fromProtobuf(keys, crypter, factory);
+        int lookaheadSize = -1, lookaheadThreshold = -1;
         EnumMap<KeyChain.KeyPurpose, DeterministicKey> currentKeys = null;
-        if (!chains.isEmpty())
+        if (!chains.isEmpty()) {
+            DeterministicKeyChain activeChain = chains.get(chains.size() - 1);
+            lookaheadSize = activeChain.getLookaheadSize();
+            lookaheadThreshold = activeChain.getLookaheadThreshold();
             currentKeys = createCurrentKeysMap(chains);
+        }
         extractFollowingKeychains(chains);
-        return new KeyChainGroup(params, basicKeyChain, chains, currentKeys, crypter);
+        return new KeyChainGroup(params, basicKeyChain, chains, lookaheadSize, lookaheadThreshold, currentKeys, crypter);
     }
 
     /**
-     * If the key chain contains only random keys and no deterministic key chains, this method will create a chain
-     * based on the oldest non-rotating private key (i.e. the seed is derived from the old wallet).
+     * <p>This method will upgrade the wallet along the following path: {@code Basic --> P2PKH --> P2WPKH}</p>
+     * <p>It won't skip any steps in that upgrade path because the user might be restoring from a backup and
+     * still expects money on the P2PKH chain.</p>
+     * <p>It will extract and reuse the seed from the current wallet, so that a fresh backup isn't required
+     * after upgrading. If coming from a basic chain containing only random keys this means it will pick the
+     * oldest non-rotating private key as a seed.</p>
+     * <p>Note that for upgrading an encrypted wallet, the decryption key is needed. In future, we could skip
+     * that requirement for a {@code P2PKH --> P2WPKH} upgrade and just clone the encryped seed, but currently
+     * the key is needed even for that.</p>
      *
+     * @param preferredScriptType desired script type for the active keychain
+     * @param structure keychain group structure to derive an account path from
      * @param keyRotationTimeSecs If non-zero, UNIX time for which keys created before this are assumed to be
      *                            compromised or weak, those keys will not be used for deterministic upgrade.
      * @param aesKey If non-null, the encryption key the keychain is encrypted under. If the keychain is encrypted
@@ -683,70 +915,101 @@ public static KeyChainGroup fromProtobufEncrypted(NetworkParameters params, List
      * @throws java.lang.IllegalArgumentException if the rotation time specified excludes all keys.
      * @throws DeterministicUpgradeRequiresPassword if the key chain group is encrypted
      *         and you should provide the users encryption key.
-     * @return the DeterministicKeyChain that was created by the upgrade.
      */
-    public DeterministicKeyChain upgradeToDeterministic(long keyRotationTimeSecs, @Nullable KeyParameter aesKey) throws DeterministicUpgradeRequiresPassword, AllRandomKeysRotating {
-        checkState(basic.numKeys() > 0);
+    public void upgradeToDeterministic(Script.ScriptType preferredScriptType, KeyChainGroupStructure structure,
+            long keyRotationTimeSecs, @Nullable KeyParameter aesKey)
+            throws DeterministicUpgradeRequiresPassword, AllRandomKeysRotating {
+        checkState(isSupportsDeterministicChains(), "doesn't support deterministic chains");
+        checkNotNull(structure);
         checkArgument(keyRotationTimeSecs >= 0);
-        // Subtract one because the key rotation time might have been set to the creation time of the first known good
-        // key, in which case, that's the one we want to find.
-        ECKey keyToUse = basic.findOldestKeyAfter(keyRotationTimeSecs - 1);
-        if (keyToUse == null)
-            throw new AllRandomKeysRotating();
-
-        if (keyToUse.isEncrypted()) {
-            if (aesKey == null) {
-                // We can't auto upgrade because we don't know the users password at this point. We throw an
-                // exception so the calling code knows to abort the load and ask the user for their password, they can
-                // then try loading the wallet again passing in the AES key.
-                //
-                // There are a few different approaches we could have used here, but they all suck. The most obvious
-                // is to try and be as lazy as possible, running in the old random-wallet mode until the user enters
-                // their password for some other reason and doing the upgrade then. But this could result in strange
-                // and unexpected UI flows for the user, as well as complicating the job of wallet developers who then
-                // have to support both "old" and "new" UI modes simultaneously, switching them on the fly. Given that
-                // this is a one-off transition, it seems more reasonable to just ask the user for their password
-                // on startup, and then the wallet app can have all the widgets for accessing seed words etc active
-                // all the time.
-                throw new DeterministicUpgradeRequiresPassword();
+        if (!isDeterministicUpgradeRequired(preferredScriptType, keyRotationTimeSecs))
+            return; // Nothing to do.
+
+        // Basic --> P2PKH upgrade
+        if (basic.numKeys() > 0 && getActiveKeyChain(Script.ScriptType.P2PKH, keyRotationTimeSecs) == null) {
+            // Subtract one because the key rotation time might have been set to the creation time of the first known good
+            // key, in which case, that's the one we want to find.
+            ECKey keyToUse = basic.findOldestKeyAfter(keyRotationTimeSecs - 1);
+            if (keyToUse == null)
+                throw new AllRandomKeysRotating();
+            boolean keyWasEncrypted = keyToUse.isEncrypted();
+            if (keyWasEncrypted) {
+                if (aesKey == null) {
+                    // We can't auto upgrade because we don't know the users password at this point. We throw an
+                    // exception so the calling code knows to abort the load and ask the user for their password, they can
+                    // then try loading the wallet again passing in the AES key.
+                    //
+                    // There are a few different approaches we could have used here, but they all suck. The most obvious
+                    // is to try and be as lazy as possible, running in the old random-wallet mode until the user enters
+                    // their password for some other reason and doing the upgrade then. But this could result in strange
+                    // and unexpected UI flows for the user, as well as complicating the job of wallet developers who then
+                    // have to support both "old" and "new" UI modes simultaneously, switching them on the fly. Given that
+                    // this is a one-off transition, it seems more reasonable to just ask the user for their password
+                    // on startup, and then the wallet app can have all the widgets for accessing seed words etc active
+                    // all the time.
+                    throw new DeterministicUpgradeRequiresPassword();
+                }
+                keyToUse = keyToUse.decrypt(aesKey);
+            } else if (aesKey != null) {
+                throw new IllegalStateException("AES Key was provided but wallet is not encrypted.");
             }
-            keyToUse = keyToUse.decrypt(aesKey);
-        } else if (aesKey != null) {
-            throw new IllegalStateException("AES Key was provided but wallet is not encrypted.");
+
+            log.info(
+                    "Upgrading from basic keychain to P2PKH deterministic keychain. Using oldest non-rotating private key (address: {})",
+                    LegacyAddress.fromKey(params, keyToUse));
+            byte[] entropy = checkNotNull(keyToUse.getSecretBytes());
+            // Private keys should be at least 128 bits long.
+            checkState(entropy.length >= DeterministicSeed.DEFAULT_SEED_ENTROPY_BITS / 8);
+            // We reduce the entropy here to 128 bits because people like to write their seeds down on paper, and 128
+            // bits should be sufficient forever unless the laws of the universe change or ECC is broken; in either case
+            // we all have bigger problems.
+            entropy = Arrays.copyOfRange(entropy, 0, DeterministicSeed.DEFAULT_SEED_ENTROPY_BITS / 8);    // final argument is exclusive range.
+            checkState(entropy.length == DeterministicSeed.DEFAULT_SEED_ENTROPY_BITS / 8);
+            DeterministicKeyChain chain = DeterministicKeyChain.builder()
+                    .entropy(entropy, keyToUse.getCreationTimeSeconds())
+                    .outputScriptType(Script.ScriptType.P2PKH)
+                    .accountPath(structure.accountPathFor(Script.ScriptType.P2PKH)).build();
+            if (keyWasEncrypted)
+                chain = chain.toEncrypted(checkNotNull(keyCrypter), aesKey);
+            addAndActivateHDChain(chain);
         }
 
-        if (chains.isEmpty()) {
-            log.info("Auto-upgrading pre-HD wallet to HD!");
-        } else {
-            log.info("Wallet with existing HD chain is being re-upgraded due to change in key rotation time.");
-        }
-        log.info("Instantiating new HD chain using oldest non-rotating private key (address: {})", keyToUse.toAddress(params));
-        byte[] entropy = checkNotNull(keyToUse.getSecretBytes());
-        // Private keys should be at least 128 bits long.
-        checkState(entropy.length >= DeterministicSeed.DEFAULT_SEED_ENTROPY_BITS / 8);
-        // We reduce the entropy here to 128 bits because people like to write their seeds down on paper, and 128
-        // bits should be sufficient forever unless the laws of the universe change or ECC is broken; in either case
-        // we all have bigger problems.
-        entropy = Arrays.copyOfRange(entropy, 0, DeterministicSeed.DEFAULT_SEED_ENTROPY_BITS / 8);    // final argument is exclusive range.
-        checkState(entropy.length == DeterministicSeed.DEFAULT_SEED_ENTROPY_BITS / 8);
-        String passphrase = ""; // FIXME allow non-empty passphrase
-        DeterministicKeyChain chain = new DeterministicKeyChain(entropy, passphrase, keyToUse.getCreationTimeSeconds());
-        if (aesKey != null) {
-            chain = chain.toEncrypted(checkNotNull(basic.getKeyCrypter()), aesKey);
+        // P2PKH --> P2WPKH upgrade
+        if (preferredScriptType == Script.ScriptType.P2WPKH
+                && getActiveKeyChain(Script.ScriptType.P2WPKH, keyRotationTimeSecs) == null) {
+            DeterministicSeed seed = getActiveKeyChain(Script.ScriptType.P2PKH, keyRotationTimeSecs).getSeed();
+            boolean seedWasEncrypted = seed.isEncrypted();
+            if (seedWasEncrypted) {
+                if (aesKey == null)
+                    throw new DeterministicUpgradeRequiresPassword();
+                seed = seed.decrypt(keyCrypter, "", aesKey);
+            }
+            log.info("Upgrading from P2PKH to P2WPKH deterministic keychain. Using seed: {}", seed);
+            DeterministicKeyChain chain = DeterministicKeyChain.builder().seed(seed)
+                    .outputScriptType(Script.ScriptType.P2WPKH)
+                    .accountPath(structure.accountPathFor(Script.ScriptType.P2WPKH)).build();
+            if (seedWasEncrypted)
+                chain = chain.toEncrypted(checkNotNull(keyCrypter), aesKey);
+            addAndActivateHDChain(chain);
         }
-        chains.add(chain);
-        return chain;
     }
 
-    /** Returns true if the group contains random keys but no HD chains. */
-    public boolean isDeterministicUpgradeRequired() {
-        return basic.numKeys() > 0 && chains.isEmpty();
+    /**
+     * Returns true if a call to {@link #upgradeToDeterministic(ScriptType, KeyChainGroupStructure, long, KeyParameter)} is required
+     * in order to have an active deterministic keychain of the desired script type.
+     */
+    public boolean isDeterministicUpgradeRequired(Script.ScriptType preferredScriptType, long keyRotationTimeSecs) {
+        if (!isSupportsDeterministicChains())
+            return false;
+        if (getActiveKeyChain(preferredScriptType, keyRotationTimeSecs) == null)
+            return true;
+        return false;
     }
 
     private static EnumMap<KeyChain.KeyPurpose, DeterministicKey> createCurrentKeysMap(List<DeterministicKeyChain> chains) {
         DeterministicKeyChain activeChain = chains.get(chains.size() - 1);
 
-        EnumMap<KeyChain.KeyPurpose, DeterministicKey> currentKeys = new EnumMap<KeyChain.KeyPurpose, DeterministicKey>(KeyChain.KeyPurpose.class);
+        EnumMap<KeyChain.KeyPurpose, DeterministicKey> currentKeys = new EnumMap<>(KeyChain.KeyPurpose.class);
 
         // assuming that only RECEIVE and CHANGE keys are being used at the moment, we will treat latest issued external key
         // as current RECEIVE key and latest issued internal key as CHANGE key. This should be changed as soon as other
@@ -786,28 +1049,40 @@ private static void extractFollowingKeychains(List<DeterministicKeyChain> chains
         }
     }
 
-    public String toString(boolean includePrivateKeys) {
-        final StringBuilder builder = new StringBuilder();
+    public String printAllPubKeysAsHex() {
+        StringBuilder stringBuilder = new StringBuilder();
         if (basic != null) {
             List<ECKey> keys = basic.getKeys();
             Collections.sort(keys, ECKey.AGE_COMPARATOR);
             for (ECKey key : keys)
-                key.formatKeyWithAddress(includePrivateKeys, builder, params);
+                stringBuilder.append('"').append(Utils.HEX.encode(key.getPubKey())).append('"').append(",\n");
         }
         for (DeterministicKeyChain chain : chains)
-            builder.append(chain.toString(includePrivateKeys, params)).append('\n');
+            chain.printAllPubKeysAsHex(stringBuilder);
+        return stringBuilder.toString();
+    }
+
+    public String toString(boolean includeLookahead, boolean includePrivateKeys, @Nullable KeyParameter aesKey) {
+        final StringBuilder builder = new StringBuilder();
+        if (basic != null)
+            builder.append(basic.toString(includePrivateKeys, aesKey, params));
+        if (chains != null)
+            for (DeterministicKeyChain chain : chains)
+                builder.append(chain.toString(includeLookahead, includePrivateKeys, aesKey, params)).append('\n');
         return builder.toString();
     }
 
     /** Returns a copy of the current list of chains. */
     public List<DeterministicKeyChain> getDeterministicKeyChains() {
-        return new ArrayList<DeterministicKeyChain>(chains);
+        checkState(isSupportsDeterministicChains(), "doesn't support deterministic chains");
+        return new ArrayList<>(chains);
     }
     /**
      * Returns a counter that increases (by an arbitrary amount) each time new keys have been calculated due to
      * lookahead and thus the Bloom filter that was previously calculated has become stale.
      */
     public int getCombinedKeyLookaheadEpochs() {
+        checkState(isSupportsDeterministicChains(), "doesn't support deterministic chains");
         int epoch = 0;
         for (DeterministicKeyChain chain : chains)
             epoch += chain.getKeyLookaheadEpoch();
diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyChainGroupStructure.java b/core/src/main/java/org/bitcoinj/wallet/KeyChainGroupStructure.java
new file mode 100644
index 00000000000..5b6be5cbb40
--- /dev/null
+++ b/core/src/main/java/org/bitcoinj/wallet/KeyChainGroupStructure.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright by the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bitcoinj.wallet;
+
+import org.bitcoinj.crypto.ChildNumber;
+import org.bitcoinj.script.Script;
+
+import com.google.common.collect.ImmutableList;
+
+/** Defines a structure for hierarchical deterministic wallets. */
+public interface KeyChainGroupStructure {
+    /** Map desired output script type to an account path */
+    ImmutableList<ChildNumber> accountPathFor(Script.ScriptType outputScriptType);
+
+    /** Default {@link KeyChainGroupStructure} implementation. Based on BIP32 "Wallet structure". */
+    public static final KeyChainGroupStructure DEFAULT = new KeyChainGroupStructure() {
+        @Override
+        public ImmutableList<ChildNumber> accountPathFor(Script.ScriptType outputScriptType) {
+            if (outputScriptType == null || outputScriptType == Script.ScriptType.P2PKH)
+                return DeterministicKeyChain.ACCOUNT_ZERO_PATH;
+            else if (outputScriptType == Script.ScriptType.P2WPKH)
+                return DeterministicKeyChain.ACCOUNT_ONE_PATH;
+            else
+                throw new IllegalArgumentException(outputScriptType.toString());
+        }
+    };
+}
diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyTimeCoinSelector.java b/core/src/main/java/org/bitcoinj/wallet/KeyTimeCoinSelector.java
index 210ec71b7ad..e996cbee9b5 100644
--- a/core/src/main/java/org/bitcoinj/wallet/KeyTimeCoinSelector.java
+++ b/core/src/main/java/org/bitcoinj/wallet/KeyTimeCoinSelector.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2013 Google Inc.
+ * Copyright 2019 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +19,9 @@
 
 import org.bitcoinj.core.*;
 import org.bitcoinj.script.Script;
+import org.bitcoinj.script.ScriptException;
+import org.bitcoinj.script.ScriptPattern;
+
 import com.google.common.collect.Lists;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,7 +38,7 @@
 public class KeyTimeCoinSelector implements CoinSelector {
     private static final Logger log = LoggerFactory.getLogger(KeyTimeCoinSelector.class);
 
-    /** A number of inputs chosen to avoid hitting {@link org.bitcoinj.core.Transaction#MAX_STANDARD_TX_SIZE} */
+    /** A number of inputs chosen to avoid hitting {@link Transaction#MAX_STANDARD_TX_SIZE} */
     public static final int MAX_SIMULTANEOUS_INPUTS = 600;
 
     private final long unixTimeSeconds;
@@ -55,14 +59,16 @@ public CoinSelection select(Coin target, List<TransactionOutput> candidates) {
             for (TransactionOutput output : candidates) {
                 if (ignorePending && !isConfirmed(output))
                     continue;
-                // Find the key that controls output, assuming it's a regular pay-to-pubkey or pay-to-address output.
+                // Find the key that controls output, assuming it's a regular P2PK or P2PKH output.
                 // We ignore any other kind of exotic output on the assumption we can't spend it ourselves.
                 final Script scriptPubKey = output.getScriptPubKey();
                 ECKey controllingKey;
-                if (scriptPubKey.isSentToRawPubKey()) {
-                    controllingKey = wallet.findKeyFromPubKey(scriptPubKey.getPubKey());
-                } else if (scriptPubKey.isSentToAddress()) {
-                    controllingKey = wallet.findKeyFromPubHash(scriptPubKey.getPubKeyHash());
+                if (ScriptPattern.isP2PK(scriptPubKey)) {
+                    controllingKey = wallet.findKeyFromPubKey(ScriptPattern.extractKeyFromP2PK(scriptPubKey));
+                } else if (ScriptPattern.isP2PKH(scriptPubKey)) {
+                    controllingKey = wallet.findKeyFromPubKeyHash(ScriptPattern.extractHashFromP2PKH(scriptPubKey), Script.ScriptType.P2PKH);
+                } else if (ScriptPattern.isP2WPKH(scriptPubKey)) {
+                    controllingKey = wallet.findKeyFromPubKeyHash(ScriptPattern.extractHashFromP2WH(scriptPubKey), Script.ScriptType.P2WPKH);
                 } else {
                     log.info("Skipping tx output {} because it's not of simple form.", output);
                     continue;
diff --git a/core/src/main/java/org/bitcoinj/wallet/MarriedKeyChain.java b/core/src/main/java/org/bitcoinj/wallet/MarriedKeyChain.java
index 5499b938162..c8e7aadcdfd 100644
--- a/core/src/main/java/org/bitcoinj/wallet/MarriedKeyChain.java
+++ b/core/src/main/java/org/bitcoinj/wallet/MarriedKeyChain.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2013 The bitcoinj developers.
- *
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -24,12 +24,13 @@
 import org.bitcoinj.core.ECKey;
 import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.core.Utils;
+import org.bitcoinj.crypto.ChildNumber;
 import org.bitcoinj.crypto.DeterministicKey;
 import org.bitcoinj.crypto.KeyCrypter;
 import org.bitcoinj.script.Script;
 import org.bitcoinj.script.ScriptBuilder;
+import org.bouncycastle.crypto.params.KeyParameter;
 
-import java.security.SecureRandom;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -48,7 +49,7 @@
  * specifies how many signatures required to spend transactions for this married keychain. This value should not exceed
  * total number of keys involved (one followed key plus number of following keys), otherwise IllegalArgumentException
  * will be thrown.</p>
- * <p>IMPORTANT: As of Bitcoin Core 0.9 all multisig transactions which require more than 3 public keys are non-standard
+ * <p>IMPORTANT: As of Bitcoin Core 0.9 all bare (non-P2SH) multisig transactions which require more than 3 public keys are non-standard
  * and such spends won't be processed by peers with default settings, essentially making such transactions almost
  * nonspendable</p>
  * <p>This method will throw an IllegalStateException, if the keychain is already married or already has leaf keys
@@ -57,7 +58,7 @@
 public class MarriedKeyChain extends DeterministicKeyChain {
     // The map holds P2SH redeem script and corresponding ECKeys issued by this KeyChainGroup (including lookahead)
     // mapped to redeem script hashes.
-    private LinkedHashMap<ByteString, RedeemData> marriedKeysRedeemData = new LinkedHashMap<ByteString, RedeemData>();
+    private LinkedHashMap<ByteString, RedeemData> marriedKeysRedeemData = new LinkedHashMap<>();
 
     private List<DeterministicKeyChain> followingKeyChains;
 
@@ -80,7 +81,7 @@ public T followingKeys(DeterministicKey followingKey, DeterministicKey ...follow
         }
 
         /**
-         * Threshold, or <code>(followingKeys.size() + 1) / 2 + 1)</code> (majority) if unspecified.</p>
+         * <p>Threshold, or {@code (followingKeys.size() + 1) / 2 + 1)} (majority) if unspecified.</p>
          * <p>IMPORTANT: As of Bitcoin Core 0.9 all multisig transactions which require more than 3 public keys are non-standard
          * and such spends won't be processed by peers with default settings, essentially making such transactions almost
          * nonspendable</p>
@@ -92,22 +93,25 @@ public T threshold(int threshold) {
 
         @Override
         public MarriedKeyChain build() {
-            checkState(random != null || entropy != null || seed != null || watchingKey!= null, "Must provide either entropy or random or seed or watchingKey");
             checkNotNull(followingKeys, "followingKeys must be provided");
-            MarriedKeyChain chain;
+
             if (threshold == 0)
                 threshold = (followingKeys.size() + 1) / 2 + 1;
-            if (random != null) {
-                chain = new MarriedKeyChain(random, bits, getPassphrase(), seedCreationTimeSecs);
-            } else if (entropy != null) {
-                chain = new MarriedKeyChain(entropy, getPassphrase(), seedCreationTimeSecs);
-            } else if (seed != null) {
-                seed.setCreationTimeSeconds(seedCreationTimeSecs);
-                chain = new MarriedKeyChain(seed);
-            } else {
-                watchingKey.setCreationTimeSeconds(seedCreationTimeSecs);
-                chain = new MarriedKeyChain(watchingKey);
-            }
+            if (accountPath == null)
+                accountPath = ACCOUNT_ZERO_PATH;
+
+            MarriedKeyChain chain;
+            if (random != null)
+                chain = new MarriedKeyChain(new DeterministicSeed(random, bits, getPassphrase()), null, outputScriptType, accountPath);
+            else if (entropy != null)
+                chain = new MarriedKeyChain(new DeterministicSeed(entropy, getPassphrase(), creationTimeSecs), null,
+                        outputScriptType, accountPath);
+            else if (seed != null)
+                chain = new MarriedKeyChain(seed, null, outputScriptType, accountPath);
+            else if (watchingKey != null)
+                chain = new MarriedKeyChain(watchingKey, outputScriptType);
+            else
+                throw new IllegalStateException();
             chain.addFollowingAccountKeys(followingKeys, threshold);
             return chain;
         }
@@ -117,26 +121,20 @@ public static Builder<?> builder() {
         return new Builder();
     }
 
-    // Protobuf deserialization constructors
-    MarriedKeyChain(DeterministicKey accountKey) {
-        super(accountKey, false);
+    /**
+     * This constructor is not stable across releases! If you need a stable API, use {@link #builder()} to use a
+     * {@link Builder}.
+     */
+    protected MarriedKeyChain(DeterministicKey accountKey, Script.ScriptType outputScriptType) {
+        super(accountKey, false, true, outputScriptType);
     }
 
-    MarriedKeyChain(DeterministicSeed seed, KeyCrypter crypter) {
-        super(seed, crypter);
-    }
-
-    // Builder constructors
-    private MarriedKeyChain(SecureRandom random, int bits, String passphrase, long seedCreationTimeSecs) {
-        super(random, bits, passphrase, seedCreationTimeSecs);
-    }
-
-    private MarriedKeyChain(byte[] entropy, String passphrase, long seedCreationTimeSecs) {
-        super(entropy, passphrase, seedCreationTimeSecs);
-    }
-
-    private MarriedKeyChain(DeterministicSeed seed) {
-        super(seed);
+    /**
+     * This constructor is not stable across releases! If you need a stable API, use {@link #builder()} to use a
+     * {@link Builder}.
+     */
+    protected MarriedKeyChain(DeterministicSeed seed, KeyCrypter crypter, Script.ScriptType outputScriptType, ImmutableList<ChildNumber> accountPath) {
+        super(seed, crypter, outputScriptType, accountPath);
     }
 
     void setFollowingKeyChains(List<DeterministicKeyChain> followingKeyChains) {
@@ -191,7 +189,8 @@ private void addFollowingAccountKeys(List<DeterministicKey> followingAccountKeys
 
         for (DeterministicKey key : followingAccountKeys) {
             checkArgument(key.getPath().size() == getAccountPath().size(), "Following keys have to be account keys");
-            DeterministicKeyChain chain = DeterministicKeyChain.watchAndFollow(key);
+            DeterministicKeyChain chain = DeterministicKeyChain.builder().watchAndFollow(key)
+                    .outputScriptType(getOutputScriptType()).build();
             if (lookaheadSize >= 0)
                 chain.setLookaheadSize(lookaheadSize);
             if (lookaheadThreshold >= 0)
@@ -234,13 +233,14 @@ public List<Protos.Key> serializeToProtobuf() {
     }
 
     @Override
-    protected void formatAddresses(boolean includePrivateKeys, NetworkParameters params, StringBuilder builder2) {
+    protected void formatAddresses(boolean includeLookahead, boolean includePrivateKeys, @Nullable KeyParameter aesKey,
+            NetworkParameters params, StringBuilder builder) {
         for (DeterministicKeyChain followingChain : followingKeyChains)
-            builder2.append("Following chain:  ").append(followingChain.getWatchingKey().serializePubB58(params))
+            builder.append("Following chain:  ").append(followingChain.getWatchingKey().serializePubB58(params))
                     .append('\n');
-        builder2.append('\n');
+        builder.append('\n');
         for (RedeemData redeemData : marriedKeysRedeemData.values())
-            formatScript(ScriptBuilder.createP2SHOutputScript(redeemData.redeemScript), builder2, params);
+            formatScript(ScriptBuilder.createP2SHOutputScript(redeemData.redeemScript), builder, params);
     }
 
     private void formatScript(Script script, StringBuilder builder, NetworkParameters params) {
diff --git a/core/src/main/java/org/bitcoinj/wallet/Protos.java b/core/src/main/java/org/bitcoinj/wallet/Protos.java
index 227183cb2cf..5beb427682e 100644
--- a/core/src/main/java/org/bitcoinj/wallet/Protos.java
+++ b/core/src/main/java/org/bitcoinj/wallet/Protos.java
@@ -5,8 +5,14 @@
 
 public final class Protos {
   private Protos() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   public interface PeerAddressOrBuilder extends
       // @@protoc_insertion_point(interface_extends:wallet.PeerAddress)
@@ -38,41 +44,53 @@ public interface PeerAddressOrBuilder extends
      * <code>required uint64 services = 3;</code>
      */
     long getServices();
+
+    /**
+     * <code>optional string hostname = 99;</code>
+     */
+    boolean hasHostname();
+    /**
+     * <code>optional string hostname = 99;</code>
+     */
+    java.lang.String getHostname();
+    /**
+     * <code>optional string hostname = 99;</code>
+     */
+    com.google.protobuf.ByteString
+        getHostnameBytes();
   }
   /**
    * Protobuf type {@code wallet.PeerAddress}
    */
-  public static final class PeerAddress extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class PeerAddress extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:wallet.PeerAddress)
       PeerAddressOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use PeerAddress.newBuilder() to construct.
-    private PeerAddress(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private PeerAddress(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private PeerAddress(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final PeerAddress defaultInstance;
-    public static PeerAddress getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public PeerAddress getDefaultInstanceForType() {
-      return defaultInstance;
+    private PeerAddress() {
+      ipAddress_ = com.google.protobuf.ByteString.EMPTY;
+      port_ = 0;
+      services_ = 0L;
+      hostname_ = "";
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private PeerAddress(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -84,13 +102,6 @@ private PeerAddress(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               bitField0_ |= 0x00000001;
               ipAddress_ = input.readBytes();
@@ -106,13 +117,26 @@ private PeerAddress(
               services_ = input.readUInt64();
               break;
             }
+            case 794: {
+              com.google.protobuf.ByteString bs = input.readBytes();
+              bitField0_ |= 0x00000008;
+              hostname_ = bs;
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -123,28 +147,14 @@ private PeerAddress(
       return org.bitcoinj.wallet.Protos.internal_static_wallet_PeerAddress_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoinj.wallet.Protos.internal_static_wallet_PeerAddress_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoinj.wallet.Protos.PeerAddress.class, org.bitcoinj.wallet.Protos.PeerAddress.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<PeerAddress> PARSER =
-        new com.google.protobuf.AbstractParser<PeerAddress>() {
-      public PeerAddress parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new PeerAddress(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<PeerAddress> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int IP_ADDRESS_FIELD_NUMBER = 1;
     private com.google.protobuf.ByteString ipAddress_;
@@ -191,12 +201,50 @@ public long getServices() {
       return services_;
     }
 
-    private void initFields() {
-      ipAddress_ = com.google.protobuf.ByteString.EMPTY;
-      port_ = 0;
-      services_ = 0L;
+    public static final int HOSTNAME_FIELD_NUMBER = 99;
+    private volatile java.lang.Object hostname_;
+    /**
+     * <code>optional string hostname = 99;</code>
+     */
+    public boolean hasHostname() {
+      return ((bitField0_ & 0x00000008) == 0x00000008);
+    }
+    /**
+     * <code>optional string hostname = 99;</code>
+     */
+    public java.lang.String getHostname() {
+      java.lang.Object ref = hostname_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          hostname_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>optional string hostname = 99;</code>
+     */
+    public com.google.protobuf.ByteString
+        getHostnameBytes() {
+      java.lang.Object ref = hostname_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        hostname_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
     }
+
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -218,9 +266,9 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeBytes(1, ipAddress_);
       }
@@ -230,12 +278,15 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         output.writeUInt64(3, services_);
       }
-      getUnknownFields().writeTo(output);
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 99, hostname_);
+      }
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -251,18 +302,89 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(3, services_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(99, hostname_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoinj.wallet.Protos.PeerAddress)) {
+        return super.equals(obj);
+      }
+      org.bitcoinj.wallet.Protos.PeerAddress other = (org.bitcoinj.wallet.Protos.PeerAddress) obj;
+
+      boolean result = true;
+      result = result && (hasIpAddress() == other.hasIpAddress());
+      if (hasIpAddress()) {
+        result = result && getIpAddress()
+            .equals(other.getIpAddress());
+      }
+      result = result && (hasPort() == other.hasPort());
+      if (hasPort()) {
+        result = result && (getPort()
+            == other.getPort());
+      }
+      result = result && (hasServices() == other.hasServices());
+      if (hasServices()) {
+        result = result && (getServices()
+            == other.getServices());
+      }
+      result = result && (hasHostname() == other.hasHostname());
+      if (hasHostname()) {
+        result = result && getHostname()
+            .equals(other.getHostname());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasIpAddress()) {
+        hash = (37 * hash) + IP_ADDRESS_FIELD_NUMBER;
+        hash = (53 * hash) + getIpAddress().hashCode();
+      }
+      if (hasPort()) {
+        hash = (37 * hash) + PORT_FIELD_NUMBER;
+        hash = (53 * hash) + getPort();
+      }
+      if (hasServices()) {
+        hash = (37 * hash) + SERVICES_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getServices());
+      }
+      if (hasHostname()) {
+        hash = (37 * hash) + HOSTNAME_FIELD_NUMBER;
+        hash = (53 * hash) + getHostname().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoinj.wallet.Protos.PeerAddress parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.wallet.Protos.PeerAddress parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoinj.wallet.Protos.PeerAddress parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -286,46 +408,59 @@ public static org.bitcoinj.wallet.Protos.PeerAddress parseFrom(
     }
     public static org.bitcoinj.wallet.Protos.PeerAddress parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoinj.wallet.Protos.PeerAddress parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoinj.wallet.Protos.PeerAddress parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoinj.wallet.Protos.PeerAddress parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoinj.wallet.Protos.PeerAddress parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoinj.wallet.Protos.PeerAddress parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoinj.wallet.Protos.PeerAddress prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -333,7 +468,7 @@ protected Builder newBuilderForType(
      * Protobuf type {@code wallet.PeerAddress}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:wallet.PeerAddress)
         org.bitcoinj.wallet.Protos.PeerAddressOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -341,7 +476,8 @@ public static final class Builder extends
         return org.bitcoinj.wallet.Protos.internal_static_wallet_PeerAddress_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoinj.wallet.Protos.internal_static_wallet_PeerAddress_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -354,18 +490,16 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         ipAddress_ = com.google.protobuf.ByteString.EMPTY;
@@ -374,22 +508,23 @@ public Builder clear() {
         bitField0_ = (bitField0_ & ~0x00000002);
         services_ = 0L;
         bitField0_ = (bitField0_ & ~0x00000004);
+        hostname_ = "";
+        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoinj.wallet.Protos.internal_static_wallet_PeerAddress_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoinj.wallet.Protos.PeerAddress getDefaultInstanceForType() {
         return org.bitcoinj.wallet.Protos.PeerAddress.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoinj.wallet.Protos.PeerAddress build() {
         org.bitcoinj.wallet.Protos.PeerAddress result = buildPartial();
         if (!result.isInitialized()) {
@@ -398,6 +533,7 @@ public org.bitcoinj.wallet.Protos.PeerAddress build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoinj.wallet.Protos.PeerAddress buildPartial() {
         org.bitcoinj.wallet.Protos.PeerAddress result = new org.bitcoinj.wallet.Protos.PeerAddress(this);
         int from_bitField0_ = bitField0_;
@@ -414,11 +550,48 @@ public org.bitcoinj.wallet.Protos.PeerAddress buildPartial() {
           to_bitField0_ |= 0x00000004;
         }
         result.services_ = services_;
+        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+          to_bitField0_ |= 0x00000008;
+        }
+        result.hostname_ = hostname_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoinj.wallet.Protos.PeerAddress) {
           return mergeFrom((org.bitcoinj.wallet.Protos.PeerAddress)other);
@@ -439,26 +612,31 @@ public Builder mergeFrom(org.bitcoinj.wallet.Protos.PeerAddress other) {
         if (other.hasServices()) {
           setServices(other.getServices());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        if (other.hasHostname()) {
+          bitField0_ |= 0x00000008;
+          hostname_ = other.hostname_;
+          onChanged();
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasIpAddress()) {
-          
           return false;
         }
         if (!hasPort()) {
-          
           return false;
         }
         if (!hasServices()) {
-          
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -468,7 +646,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoinj.wallet.Protos.PeerAddress) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -577,15 +755,132 @@ public Builder clearServices() {
         return this;
       }
 
+      private java.lang.Object hostname_ = "";
+      /**
+       * <code>optional string hostname = 99;</code>
+       */
+      public boolean hasHostname() {
+        return ((bitField0_ & 0x00000008) == 0x00000008);
+      }
+      /**
+       * <code>optional string hostname = 99;</code>
+       */
+      public java.lang.String getHostname() {
+        java.lang.Object ref = hostname_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            hostname_ = s;
+          }
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>optional string hostname = 99;</code>
+       */
+      public com.google.protobuf.ByteString
+          getHostnameBytes() {
+        java.lang.Object ref = hostname_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          hostname_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>optional string hostname = 99;</code>
+       */
+      public Builder setHostname(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000008;
+        hostname_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string hostname = 99;</code>
+       */
+      public Builder clearHostname() {
+        bitField0_ = (bitField0_ & ~0x00000008);
+        hostname_ = getDefaultInstance().getHostname();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string hostname = 99;</code>
+       */
+      public Builder setHostnameBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000008;
+        hostname_ = value;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
       // @@protoc_insertion_point(builder_scope:wallet.PeerAddress)
     }
 
+    // @@protoc_insertion_point(class_scope:wallet.PeerAddress)
+    private static final org.bitcoinj.wallet.Protos.PeerAddress DEFAULT_INSTANCE;
     static {
-      defaultInstance = new PeerAddress(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoinj.wallet.Protos.PeerAddress();
+    }
+
+    public static org.bitcoinj.wallet.Protos.PeerAddress getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<PeerAddress>
+        PARSER = new com.google.protobuf.AbstractParser<PeerAddress>() {
+      @java.lang.Override
+      public PeerAddress parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new PeerAddress(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<PeerAddress> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<PeerAddress> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoinj.wallet.Protos.PeerAddress getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:wallet.PeerAddress)
   }
 
   public interface EncryptedDataOrBuilder extends
@@ -593,73 +888,69 @@ public interface EncryptedDataOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>required bytes initialisation_vector = 1;</code>
-     *
      * <pre>
      * The initialisation vector for the AES encryption (16 bytes)
      * </pre>
+     *
+     * <code>required bytes initialisation_vector = 1;</code>
      */
     boolean hasInitialisationVector();
     /**
-     * <code>required bytes initialisation_vector = 1;</code>
-     *
      * <pre>
      * The initialisation vector for the AES encryption (16 bytes)
      * </pre>
+     *
+     * <code>required bytes initialisation_vector = 1;</code>
      */
     com.google.protobuf.ByteString getInitialisationVector();
 
     /**
-     * <code>required bytes encrypted_private_key = 2;</code>
-     *
      * <pre>
      * The encrypted private key
      * </pre>
+     *
+     * <code>required bytes encrypted_private_key = 2;</code>
      */
     boolean hasEncryptedPrivateKey();
     /**
-     * <code>required bytes encrypted_private_key = 2;</code>
-     *
      * <pre>
      * The encrypted private key
      * </pre>
+     *
+     * <code>required bytes encrypted_private_key = 2;</code>
      */
     com.google.protobuf.ByteString getEncryptedPrivateKey();
   }
   /**
    * Protobuf type {@code wallet.EncryptedData}
    */
-  public static final class EncryptedData extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class EncryptedData extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:wallet.EncryptedData)
       EncryptedDataOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use EncryptedData.newBuilder() to construct.
-    private EncryptedData(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private EncryptedData(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private EncryptedData(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final EncryptedData defaultInstance;
-    public static EncryptedData getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public EncryptedData getDefaultInstanceForType() {
-      return defaultInstance;
+    private EncryptedData() {
+      initialisationVector_ = com.google.protobuf.ByteString.EMPTY;
+      encryptedPrivateKey_ = com.google.protobuf.ByteString.EMPTY;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private EncryptedData(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -671,13 +962,6 @@ private EncryptedData(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               bitField0_ |= 0x00000001;
               initialisationVector_ = input.readBytes();
@@ -688,13 +972,20 @@ private EncryptedData(
               encryptedPrivateKey_ = input.readBytes();
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -705,47 +996,33 @@ private EncryptedData(
       return org.bitcoinj.wallet.Protos.internal_static_wallet_EncryptedData_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoinj.wallet.Protos.internal_static_wallet_EncryptedData_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoinj.wallet.Protos.EncryptedData.class, org.bitcoinj.wallet.Protos.EncryptedData.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<EncryptedData> PARSER =
-        new com.google.protobuf.AbstractParser<EncryptedData>() {
-      public EncryptedData parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new EncryptedData(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<EncryptedData> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int INITIALISATION_VECTOR_FIELD_NUMBER = 1;
     private com.google.protobuf.ByteString initialisationVector_;
     /**
-     * <code>required bytes initialisation_vector = 1;</code>
-     *
      * <pre>
      * The initialisation vector for the AES encryption (16 bytes)
      * </pre>
+     *
+     * <code>required bytes initialisation_vector = 1;</code>
      */
     public boolean hasInitialisationVector() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required bytes initialisation_vector = 1;</code>
-     *
      * <pre>
      * The initialisation vector for the AES encryption (16 bytes)
      * </pre>
+     *
+     * <code>required bytes initialisation_vector = 1;</code>
      */
     public com.google.protobuf.ByteString getInitialisationVector() {
       return initialisationVector_;
@@ -754,31 +1031,28 @@ public com.google.protobuf.ByteString getInitialisationVector() {
     public static final int ENCRYPTED_PRIVATE_KEY_FIELD_NUMBER = 2;
     private com.google.protobuf.ByteString encryptedPrivateKey_;
     /**
-     * <code>required bytes encrypted_private_key = 2;</code>
-     *
      * <pre>
      * The encrypted private key
      * </pre>
+     *
+     * <code>required bytes encrypted_private_key = 2;</code>
      */
     public boolean hasEncryptedPrivateKey() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>required bytes encrypted_private_key = 2;</code>
-     *
      * <pre>
      * The encrypted private key
      * </pre>
+     *
+     * <code>required bytes encrypted_private_key = 2;</code>
      */
     public com.google.protobuf.ByteString getEncryptedPrivateKey() {
       return encryptedPrivateKey_;
     }
 
-    private void initFields() {
-      initialisationVector_ = com.google.protobuf.ByteString.EMPTY;
-      encryptedPrivateKey_ = com.google.protobuf.ByteString.EMPTY;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -796,21 +1070,21 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeBytes(1, initialisationVector_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeBytes(2, encryptedPrivateKey_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -822,18 +1096,67 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(2, encryptedPrivateKey_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoinj.wallet.Protos.EncryptedData)) {
+        return super.equals(obj);
+      }
+      org.bitcoinj.wallet.Protos.EncryptedData other = (org.bitcoinj.wallet.Protos.EncryptedData) obj;
+
+      boolean result = true;
+      result = result && (hasInitialisationVector() == other.hasInitialisationVector());
+      if (hasInitialisationVector()) {
+        result = result && getInitialisationVector()
+            .equals(other.getInitialisationVector());
+      }
+      result = result && (hasEncryptedPrivateKey() == other.hasEncryptedPrivateKey());
+      if (hasEncryptedPrivateKey()) {
+        result = result && getEncryptedPrivateKey()
+            .equals(other.getEncryptedPrivateKey());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasInitialisationVector()) {
+        hash = (37 * hash) + INITIALISATION_VECTOR_FIELD_NUMBER;
+        hash = (53 * hash) + getInitialisationVector().hashCode();
+      }
+      if (hasEncryptedPrivateKey()) {
+        hash = (37 * hash) + ENCRYPTED_PRIVATE_KEY_FIELD_NUMBER;
+        hash = (53 * hash) + getEncryptedPrivateKey().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoinj.wallet.Protos.EncryptedData parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.wallet.Protos.EncryptedData parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoinj.wallet.Protos.EncryptedData parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -857,46 +1180,59 @@ public static org.bitcoinj.wallet.Protos.EncryptedData parseFrom(
     }
     public static org.bitcoinj.wallet.Protos.EncryptedData parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoinj.wallet.Protos.EncryptedData parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoinj.wallet.Protos.EncryptedData parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoinj.wallet.Protos.EncryptedData parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoinj.wallet.Protos.EncryptedData parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoinj.wallet.Protos.EncryptedData parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoinj.wallet.Protos.EncryptedData prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -904,7 +1240,7 @@ protected Builder newBuilderForType(
      * Protobuf type {@code wallet.EncryptedData}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:wallet.EncryptedData)
         org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -912,7 +1248,8 @@ public static final class Builder extends
         return org.bitcoinj.wallet.Protos.internal_static_wallet_EncryptedData_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoinj.wallet.Protos.internal_static_wallet_EncryptedData_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -925,18 +1262,16 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         initialisationVector_ = com.google.protobuf.ByteString.EMPTY;
@@ -946,19 +1281,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoinj.wallet.Protos.internal_static_wallet_EncryptedData_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoinj.wallet.Protos.EncryptedData getDefaultInstanceForType() {
         return org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoinj.wallet.Protos.EncryptedData build() {
         org.bitcoinj.wallet.Protos.EncryptedData result = buildPartial();
         if (!result.isInitialized()) {
@@ -967,6 +1301,7 @@ public org.bitcoinj.wallet.Protos.EncryptedData build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoinj.wallet.Protos.EncryptedData buildPartial() {
         org.bitcoinj.wallet.Protos.EncryptedData result = new org.bitcoinj.wallet.Protos.EncryptedData(this);
         int from_bitField0_ = bitField0_;
@@ -984,6 +1319,39 @@ public org.bitcoinj.wallet.Protos.EncryptedData buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoinj.wallet.Protos.EncryptedData) {
           return mergeFrom((org.bitcoinj.wallet.Protos.EncryptedData)other);
@@ -1001,22 +1369,23 @@ public Builder mergeFrom(org.bitcoinj.wallet.Protos.EncryptedData other) {
         if (other.hasEncryptedPrivateKey()) {
           setEncryptedPrivateKey(other.getEncryptedPrivateKey());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasInitialisationVector()) {
-          
           return false;
         }
         if (!hasEncryptedPrivateKey()) {
-          
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1026,7 +1395,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoinj.wallet.Protos.EncryptedData) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -1038,31 +1407,31 @@ public Builder mergeFrom(
 
       private com.google.protobuf.ByteString initialisationVector_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>required bytes initialisation_vector = 1;</code>
-       *
        * <pre>
        * The initialisation vector for the AES encryption (16 bytes)
        * </pre>
+       *
+       * <code>required bytes initialisation_vector = 1;</code>
        */
       public boolean hasInitialisationVector() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>required bytes initialisation_vector = 1;</code>
-       *
        * <pre>
        * The initialisation vector for the AES encryption (16 bytes)
        * </pre>
+       *
+       * <code>required bytes initialisation_vector = 1;</code>
        */
       public com.google.protobuf.ByteString getInitialisationVector() {
         return initialisationVector_;
       }
       /**
-       * <code>required bytes initialisation_vector = 1;</code>
-       *
        * <pre>
        * The initialisation vector for the AES encryption (16 bytes)
        * </pre>
+       *
+       * <code>required bytes initialisation_vector = 1;</code>
        */
       public Builder setInitialisationVector(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -1074,11 +1443,11 @@ public Builder setInitialisationVector(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>required bytes initialisation_vector = 1;</code>
-       *
        * <pre>
        * The initialisation vector for the AES encryption (16 bytes)
        * </pre>
+       *
+       * <code>required bytes initialisation_vector = 1;</code>
        */
       public Builder clearInitialisationVector() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -1089,31 +1458,31 @@ public Builder clearInitialisationVector() {
 
       private com.google.protobuf.ByteString encryptedPrivateKey_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>required bytes encrypted_private_key = 2;</code>
-       *
        * <pre>
        * The encrypted private key
        * </pre>
+       *
+       * <code>required bytes encrypted_private_key = 2;</code>
        */
       public boolean hasEncryptedPrivateKey() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>required bytes encrypted_private_key = 2;</code>
-       *
        * <pre>
        * The encrypted private key
        * </pre>
+       *
+       * <code>required bytes encrypted_private_key = 2;</code>
        */
       public com.google.protobuf.ByteString getEncryptedPrivateKey() {
         return encryptedPrivateKey_;
       }
       /**
-       * <code>required bytes encrypted_private_key = 2;</code>
-       *
        * <pre>
        * The encrypted private key
        * </pre>
+       *
+       * <code>required bytes encrypted_private_key = 2;</code>
        */
       public Builder setEncryptedPrivateKey(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -1125,11 +1494,11 @@ public Builder setEncryptedPrivateKey(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>required bytes encrypted_private_key = 2;</code>
-       *
        * <pre>
        * The encrypted private key
        * </pre>
+       *
+       * <code>required bytes encrypted_private_key = 2;</code>
        */
       public Builder clearEncryptedPrivateKey() {
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -1137,16 +1506,57 @@ public Builder clearEncryptedPrivateKey() {
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:wallet.EncryptedData)
     }
 
+    // @@protoc_insertion_point(class_scope:wallet.EncryptedData)
+    private static final org.bitcoinj.wallet.Protos.EncryptedData DEFAULT_INSTANCE;
     static {
-      defaultInstance = new EncryptedData(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoinj.wallet.Protos.EncryptedData();
+    }
+
+    public static org.bitcoinj.wallet.Protos.EncryptedData getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<EncryptedData>
+        PARSER = new com.google.protobuf.AbstractParser<EncryptedData>() {
+      @java.lang.Override
+      public EncryptedData parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new EncryptedData(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<EncryptedData> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<EncryptedData> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoinj.wallet.Protos.EncryptedData getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:wallet.EncryptedData)
   }
 
   public interface DeterministicKeyOrBuilder extends
@@ -1154,55 +1564,53 @@ public interface DeterministicKeyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>required bytes chain_code = 1;</code>
-     *
      * <pre>
      * Random data that allows us to extend a key. Without this, we can't figure out the next key in the chain and
      * should just treat it as a regular ORIGINAL type key.
      * </pre>
+     *
+     * <code>required bytes chain_code = 1;</code>
      */
     boolean hasChainCode();
     /**
-     * <code>required bytes chain_code = 1;</code>
-     *
      * <pre>
      * Random data that allows us to extend a key. Without this, we can't figure out the next key in the chain and
      * should just treat it as a regular ORIGINAL type key.
      * </pre>
+     *
+     * <code>required bytes chain_code = 1;</code>
      */
     com.google.protobuf.ByteString getChainCode();
 
     /**
-     * <code>repeated uint32 path = 2;</code>
-     *
      * <pre>
      * The path through the key tree. Each number is encoded in the standard form: high bit set for private derivation
      * and high bit unset for public derivation.
      * </pre>
+     *
+     * <code>repeated uint32 path = 2;</code>
      */
     java.util.List<java.lang.Integer> getPathList();
     /**
-     * <code>repeated uint32 path = 2;</code>
-     *
      * <pre>
      * The path through the key tree. Each number is encoded in the standard form: high bit set for private derivation
      * and high bit unset for public derivation.
      * </pre>
+     *
+     * <code>repeated uint32 path = 2;</code>
      */
     int getPathCount();
     /**
-     * <code>repeated uint32 path = 2;</code>
-     *
      * <pre>
      * The path through the key tree. Each number is encoded in the standard form: high bit set for private derivation
      * and high bit unset for public derivation.
      * </pre>
+     *
+     * <code>repeated uint32 path = 2;</code>
      */
     int getPath(int index);
 
     /**
-     * <code>optional uint32 issued_subkeys = 3;</code>
-     *
      * <pre>
      * How many children of this key have been issued, that is, given to the user when they requested a fresh key?
      * For the parents of keys being handed out, this is always less than the true number of children: the difference is
@@ -1210,11 +1618,11 @@ public interface DeterministicKeyOrBuilder extends
      * this wallet - for instance when restoring from backup or if the seed was shared between devices.
      * If this field is missing it means we're not issuing subkeys of this key to users.
      * </pre>
+     *
+     * <code>optional uint32 issued_subkeys = 3;</code>
      */
     boolean hasIssuedSubkeys();
     /**
-     * <code>optional uint32 issued_subkeys = 3;</code>
-     *
      * <pre>
      * How many children of this key have been issued, that is, given to the user when they requested a fresh key?
      * For the parents of keys being handed out, this is always less than the true number of children: the difference is
@@ -1222,6 +1630,8 @@ public interface DeterministicKeyOrBuilder extends
      * this wallet - for instance when restoring from backup or if the seed was shared between devices.
      * If this field is missing it means we're not issuing subkeys of this key to users.
      * </pre>
+     *
+     * <code>optional uint32 issued_subkeys = 3;</code>
      */
     int getIssuedSubkeys();
 
@@ -1235,86 +1645,86 @@ public interface DeterministicKeyOrBuilder extends
     int getLookaheadSize();
 
     /**
-     * <code>optional bool isFollowing = 5;</code>
-     *
      * <pre>
      **
      * Flag indicating that this key is a root of a following chain. This chain is following the next non-following chain.
      * Following/followed chains concept is used for married keychains, where the set of keys combined together to produce
      * a single P2SH multisignature address
      * </pre>
+     *
+     * <code>optional bool isFollowing = 5;</code>
      */
     boolean hasIsFollowing();
     /**
-     * <code>optional bool isFollowing = 5;</code>
-     *
      * <pre>
      **
      * Flag indicating that this key is a root of a following chain. This chain is following the next non-following chain.
      * Following/followed chains concept is used for married keychains, where the set of keys combined together to produce
      * a single P2SH multisignature address
      * </pre>
+     *
+     * <code>optional bool isFollowing = 5;</code>
      */
     boolean getIsFollowing();
 
     /**
-     * <code>optional uint32 sigsRequiredToSpend = 6 [default = 1];</code>
-     *
      * <pre>
      * Number of signatures required to spend. This field is needed only for married keychains to reconstruct KeyChain
      * and represents the N value from N-of-M CHECKMULTISIG script. For regular single keychains it will always be 1.
      * </pre>
+     *
+     * <code>optional uint32 sigsRequiredToSpend = 6 [default = 1];</code>
      */
     boolean hasSigsRequiredToSpend();
     /**
-     * <code>optional uint32 sigsRequiredToSpend = 6 [default = 1];</code>
-     *
      * <pre>
      * Number of signatures required to spend. This field is needed only for married keychains to reconstruct KeyChain
      * and represents the N value from N-of-M CHECKMULTISIG script. For regular single keychains it will always be 1.
      * </pre>
+     *
+     * <code>optional uint32 sigsRequiredToSpend = 6 [default = 1];</code>
      */
     int getSigsRequiredToSpend();
   }
   /**
-   * Protobuf type {@code wallet.DeterministicKey}
-   *
    * <pre>
    **
    * Data attached to a Key message that defines the data needed by the BIP32 deterministic key hierarchy algorithm.
    * </pre>
+   *
+   * Protobuf type {@code wallet.DeterministicKey}
    */
-  public static final class DeterministicKey extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class DeterministicKey extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:wallet.DeterministicKey)
       DeterministicKeyOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use DeterministicKey.newBuilder() to construct.
-    private DeterministicKey(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private DeterministicKey(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private DeterministicKey(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final DeterministicKey defaultInstance;
-    public static DeterministicKey getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public DeterministicKey getDefaultInstanceForType() {
-      return defaultInstance;
+    private DeterministicKey() {
+      chainCode_ = com.google.protobuf.ByteString.EMPTY;
+      path_ = java.util.Collections.emptyList();
+      issuedSubkeys_ = 0;
+      lookaheadSize_ = 0;
+      isFollowing_ = false;
+      sigsRequiredToSpend_ = 1;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private DeterministicKey(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1326,13 +1736,6 @@ private DeterministicKey(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               bitField0_ |= 0x00000001;
               chainCode_ = input.readBytes();
@@ -1379,13 +1782,20 @@ private DeterministicKey(
               sigsRequiredToSpend_ = input.readUInt32();
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
           path_ = java.util.Collections.unmodifiableList(path_);
@@ -1399,49 +1809,35 @@ private DeterministicKey(
       return org.bitcoinj.wallet.Protos.internal_static_wallet_DeterministicKey_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoinj.wallet.Protos.internal_static_wallet_DeterministicKey_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoinj.wallet.Protos.DeterministicKey.class, org.bitcoinj.wallet.Protos.DeterministicKey.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<DeterministicKey> PARSER =
-        new com.google.protobuf.AbstractParser<DeterministicKey>() {
-      public DeterministicKey parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DeterministicKey(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<DeterministicKey> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int CHAIN_CODE_FIELD_NUMBER = 1;
     private com.google.protobuf.ByteString chainCode_;
     /**
-     * <code>required bytes chain_code = 1;</code>
-     *
      * <pre>
      * Random data that allows us to extend a key. Without this, we can't figure out the next key in the chain and
      * should just treat it as a regular ORIGINAL type key.
      * </pre>
+     *
+     * <code>required bytes chain_code = 1;</code>
      */
     public boolean hasChainCode() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required bytes chain_code = 1;</code>
-     *
      * <pre>
      * Random data that allows us to extend a key. Without this, we can't figure out the next key in the chain and
      * should just treat it as a regular ORIGINAL type key.
      * </pre>
+     *
+     * <code>required bytes chain_code = 1;</code>
      */
     public com.google.protobuf.ByteString getChainCode() {
       return chainCode_;
@@ -1450,35 +1846,35 @@ public com.google.protobuf.ByteString getChainCode() {
     public static final int PATH_FIELD_NUMBER = 2;
     private java.util.List<java.lang.Integer> path_;
     /**
-     * <code>repeated uint32 path = 2;</code>
-     *
      * <pre>
      * The path through the key tree. Each number is encoded in the standard form: high bit set for private derivation
      * and high bit unset for public derivation.
      * </pre>
+     *
+     * <code>repeated uint32 path = 2;</code>
      */
     public java.util.List<java.lang.Integer>
         getPathList() {
       return path_;
     }
     /**
-     * <code>repeated uint32 path = 2;</code>
-     *
      * <pre>
      * The path through the key tree. Each number is encoded in the standard form: high bit set for private derivation
      * and high bit unset for public derivation.
      * </pre>
+     *
+     * <code>repeated uint32 path = 2;</code>
      */
     public int getPathCount() {
       return path_.size();
     }
     /**
-     * <code>repeated uint32 path = 2;</code>
-     *
      * <pre>
      * The path through the key tree. Each number is encoded in the standard form: high bit set for private derivation
      * and high bit unset for public derivation.
      * </pre>
+     *
+     * <code>repeated uint32 path = 2;</code>
      */
     public int getPath(int index) {
       return path_.get(index);
@@ -1487,8 +1883,6 @@ public int getPath(int index) {
     public static final int ISSUED_SUBKEYS_FIELD_NUMBER = 3;
     private int issuedSubkeys_;
     /**
-     * <code>optional uint32 issued_subkeys = 3;</code>
-     *
      * <pre>
      * How many children of this key have been issued, that is, given to the user when they requested a fresh key?
      * For the parents of keys being handed out, this is always less than the true number of children: the difference is
@@ -1496,13 +1890,13 @@ public int getPath(int index) {
      * this wallet - for instance when restoring from backup or if the seed was shared between devices.
      * If this field is missing it means we're not issuing subkeys of this key to users.
      * </pre>
+     *
+     * <code>optional uint32 issued_subkeys = 3;</code>
      */
     public boolean hasIssuedSubkeys() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>optional uint32 issued_subkeys = 3;</code>
-     *
      * <pre>
      * How many children of this key have been issued, that is, given to the user when they requested a fresh key?
      * For the parents of keys being handed out, this is always less than the true number of children: the difference is
@@ -1510,6 +1904,8 @@ public boolean hasIssuedSubkeys() {
      * this wallet - for instance when restoring from backup or if the seed was shared between devices.
      * If this field is missing it means we're not issuing subkeys of this key to users.
      * </pre>
+     *
+     * <code>optional uint32 issued_subkeys = 3;</code>
      */
     public int getIssuedSubkeys() {
       return issuedSubkeys_;
@@ -1533,27 +1929,27 @@ public int getLookaheadSize() {
     public static final int ISFOLLOWING_FIELD_NUMBER = 5;
     private boolean isFollowing_;
     /**
-     * <code>optional bool isFollowing = 5;</code>
-     *
      * <pre>
      **
      * Flag indicating that this key is a root of a following chain. This chain is following the next non-following chain.
      * Following/followed chains concept is used for married keychains, where the set of keys combined together to produce
      * a single P2SH multisignature address
      * </pre>
+     *
+     * <code>optional bool isFollowing = 5;</code>
      */
     public boolean hasIsFollowing() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * <code>optional bool isFollowing = 5;</code>
-     *
      * <pre>
      **
      * Flag indicating that this key is a root of a following chain. This chain is following the next non-following chain.
      * Following/followed chains concept is used for married keychains, where the set of keys combined together to produce
      * a single P2SH multisignature address
      * </pre>
+     *
+     * <code>optional bool isFollowing = 5;</code>
      */
     public boolean getIsFollowing() {
       return isFollowing_;
@@ -1562,37 +1958,30 @@ public boolean getIsFollowing() {
     public static final int SIGSREQUIREDTOSPEND_FIELD_NUMBER = 6;
     private int sigsRequiredToSpend_;
     /**
-     * <code>optional uint32 sigsRequiredToSpend = 6 [default = 1];</code>
-     *
      * <pre>
      * Number of signatures required to spend. This field is needed only for married keychains to reconstruct KeyChain
      * and represents the N value from N-of-M CHECKMULTISIG script. For regular single keychains it will always be 1.
      * </pre>
+     *
+     * <code>optional uint32 sigsRequiredToSpend = 6 [default = 1];</code>
      */
     public boolean hasSigsRequiredToSpend() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * <code>optional uint32 sigsRequiredToSpend = 6 [default = 1];</code>
-     *
      * <pre>
      * Number of signatures required to spend. This field is needed only for married keychains to reconstruct KeyChain
      * and represents the N value from N-of-M CHECKMULTISIG script. For regular single keychains it will always be 1.
      * </pre>
+     *
+     * <code>optional uint32 sigsRequiredToSpend = 6 [default = 1];</code>
      */
     public int getSigsRequiredToSpend() {
       return sigsRequiredToSpend_;
     }
 
-    private void initFields() {
-      chainCode_ = com.google.protobuf.ByteString.EMPTY;
-      path_ = java.util.Collections.emptyList();
-      issuedSubkeys_ = 0;
-      lookaheadSize_ = 0;
-      isFollowing_ = false;
-      sigsRequiredToSpend_ = 1;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1606,9 +1995,9 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeBytes(1, chainCode_);
       }
@@ -1627,12 +2016,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
         output.writeUInt32(6, sigsRequiredToSpend_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -1665,21 +2054,104 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(6, sigsRequiredToSpend_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoinj.wallet.Protos.DeterministicKey)) {
+        return super.equals(obj);
+      }
+      org.bitcoinj.wallet.Protos.DeterministicKey other = (org.bitcoinj.wallet.Protos.DeterministicKey) obj;
 
-    public static org.bitcoinj.wallet.Protos.DeterministicKey parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
+      boolean result = true;
+      result = result && (hasChainCode() == other.hasChainCode());
+      if (hasChainCode()) {
+        result = result && getChainCode()
+            .equals(other.getChainCode());
+      }
+      result = result && getPathList()
+          .equals(other.getPathList());
+      result = result && (hasIssuedSubkeys() == other.hasIssuedSubkeys());
+      if (hasIssuedSubkeys()) {
+        result = result && (getIssuedSubkeys()
+            == other.getIssuedSubkeys());
+      }
+      result = result && (hasLookaheadSize() == other.hasLookaheadSize());
+      if (hasLookaheadSize()) {
+        result = result && (getLookaheadSize()
+            == other.getLookaheadSize());
+      }
+      result = result && (hasIsFollowing() == other.hasIsFollowing());
+      if (hasIsFollowing()) {
+        result = result && (getIsFollowing()
+            == other.getIsFollowing());
+      }
+      result = result && (hasSigsRequiredToSpend() == other.hasSigsRequiredToSpend());
+      if (hasSigsRequiredToSpend()) {
+        result = result && (getSigsRequiredToSpend()
+            == other.getSigsRequiredToSpend());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasChainCode()) {
+        hash = (37 * hash) + CHAIN_CODE_FIELD_NUMBER;
+        hash = (53 * hash) + getChainCode().hashCode();
+      }
+      if (getPathCount() > 0) {
+        hash = (37 * hash) + PATH_FIELD_NUMBER;
+        hash = (53 * hash) + getPathList().hashCode();
+      }
+      if (hasIssuedSubkeys()) {
+        hash = (37 * hash) + ISSUED_SUBKEYS_FIELD_NUMBER;
+        hash = (53 * hash) + getIssuedSubkeys();
+      }
+      if (hasLookaheadSize()) {
+        hash = (37 * hash) + LOOKAHEAD_SIZE_FIELD_NUMBER;
+        hash = (53 * hash) + getLookaheadSize();
+      }
+      if (hasIsFollowing()) {
+        hash = (37 * hash) + ISFOLLOWING_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+            getIsFollowing());
+      }
+      if (hasSigsRequiredToSpend()) {
+        hash = (37 * hash) + SIGSREQUIREDTOSPEND_FIELD_NUMBER;
+        hash = (53 * hash) + getSigsRequiredToSpend();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static org.bitcoinj.wallet.Protos.DeterministicKey parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.wallet.Protos.DeterministicKey parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.bitcoinj.wallet.Protos.DeterministicKey parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
     public static org.bitcoinj.wallet.Protos.DeterministicKey parseFrom(
@@ -1700,59 +2172,72 @@ public static org.bitcoinj.wallet.Protos.DeterministicKey parseFrom(
     }
     public static org.bitcoinj.wallet.Protos.DeterministicKey parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoinj.wallet.Protos.DeterministicKey parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoinj.wallet.Protos.DeterministicKey parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoinj.wallet.Protos.DeterministicKey parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoinj.wallet.Protos.DeterministicKey parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoinj.wallet.Protos.DeterministicKey parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoinj.wallet.Protos.DeterministicKey prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code wallet.DeterministicKey}
-     *
      * <pre>
      **
      * Data attached to a Key message that defines the data needed by the BIP32 deterministic key hierarchy algorithm.
      * </pre>
+     *
+     * Protobuf type {@code wallet.DeterministicKey}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:wallet.DeterministicKey)
         org.bitcoinj.wallet.Protos.DeterministicKeyOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -1760,7 +2245,8 @@ public static final class Builder extends
         return org.bitcoinj.wallet.Protos.internal_static_wallet_DeterministicKey_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoinj.wallet.Protos.internal_static_wallet_DeterministicKey_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -1773,18 +2259,16 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         chainCode_ = com.google.protobuf.ByteString.EMPTY;
@@ -1802,19 +2286,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoinj.wallet.Protos.internal_static_wallet_DeterministicKey_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoinj.wallet.Protos.DeterministicKey getDefaultInstanceForType() {
         return org.bitcoinj.wallet.Protos.DeterministicKey.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoinj.wallet.Protos.DeterministicKey build() {
         org.bitcoinj.wallet.Protos.DeterministicKey result = buildPartial();
         if (!result.isInitialized()) {
@@ -1823,6 +2306,7 @@ public org.bitcoinj.wallet.Protos.DeterministicKey build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoinj.wallet.Protos.DeterministicKey buildPartial() {
         org.bitcoinj.wallet.Protos.DeterministicKey result = new org.bitcoinj.wallet.Protos.DeterministicKey(this);
         int from_bitField0_ = bitField0_;
@@ -1857,6 +2341,39 @@ public org.bitcoinj.wallet.Protos.DeterministicKey buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoinj.wallet.Protos.DeterministicKey) {
           return mergeFrom((org.bitcoinj.wallet.Protos.DeterministicKey)other);
@@ -1893,18 +2410,20 @@ public Builder mergeFrom(org.bitcoinj.wallet.Protos.DeterministicKey other) {
         if (other.hasSigsRequiredToSpend()) {
           setSigsRequiredToSpend(other.getSigsRequiredToSpend());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasChainCode()) {
-          
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1914,7 +2433,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoinj.wallet.Protos.DeterministicKey) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -1926,34 +2445,34 @@ public Builder mergeFrom(
 
       private com.google.protobuf.ByteString chainCode_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>required bytes chain_code = 1;</code>
-       *
        * <pre>
        * Random data that allows us to extend a key. Without this, we can't figure out the next key in the chain and
        * should just treat it as a regular ORIGINAL type key.
        * </pre>
+       *
+       * <code>required bytes chain_code = 1;</code>
        */
       public boolean hasChainCode() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>required bytes chain_code = 1;</code>
-       *
        * <pre>
        * Random data that allows us to extend a key. Without this, we can't figure out the next key in the chain and
        * should just treat it as a regular ORIGINAL type key.
        * </pre>
+       *
+       * <code>required bytes chain_code = 1;</code>
        */
       public com.google.protobuf.ByteString getChainCode() {
         return chainCode_;
       }
       /**
-       * <code>required bytes chain_code = 1;</code>
-       *
        * <pre>
        * Random data that allows us to extend a key. Without this, we can't figure out the next key in the chain and
        * should just treat it as a regular ORIGINAL type key.
        * </pre>
+       *
+       * <code>required bytes chain_code = 1;</code>
        */
       public Builder setChainCode(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -1965,12 +2484,12 @@ public Builder setChainCode(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>required bytes chain_code = 1;</code>
-       *
        * <pre>
        * Random data that allows us to extend a key. Without this, we can't figure out the next key in the chain and
        * should just treat it as a regular ORIGINAL type key.
        * </pre>
+       *
+       * <code>required bytes chain_code = 1;</code>
        */
       public Builder clearChainCode() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -1987,46 +2506,46 @@ private void ensurePathIsMutable() {
          }
       }
       /**
-       * <code>repeated uint32 path = 2;</code>
-       *
        * <pre>
        * The path through the key tree. Each number is encoded in the standard form: high bit set for private derivation
        * and high bit unset for public derivation.
        * </pre>
+       *
+       * <code>repeated uint32 path = 2;</code>
        */
       public java.util.List<java.lang.Integer>
           getPathList() {
         return java.util.Collections.unmodifiableList(path_);
       }
       /**
-       * <code>repeated uint32 path = 2;</code>
-       *
        * <pre>
        * The path through the key tree. Each number is encoded in the standard form: high bit set for private derivation
        * and high bit unset for public derivation.
        * </pre>
+       *
+       * <code>repeated uint32 path = 2;</code>
        */
       public int getPathCount() {
         return path_.size();
       }
       /**
-       * <code>repeated uint32 path = 2;</code>
-       *
        * <pre>
        * The path through the key tree. Each number is encoded in the standard form: high bit set for private derivation
        * and high bit unset for public derivation.
        * </pre>
+       *
+       * <code>repeated uint32 path = 2;</code>
        */
       public int getPath(int index) {
         return path_.get(index);
       }
       /**
-       * <code>repeated uint32 path = 2;</code>
-       *
        * <pre>
        * The path through the key tree. Each number is encoded in the standard form: high bit set for private derivation
        * and high bit unset for public derivation.
        * </pre>
+       *
+       * <code>repeated uint32 path = 2;</code>
        */
       public Builder setPath(
           int index, int value) {
@@ -2036,12 +2555,12 @@ public Builder setPath(
         return this;
       }
       /**
-       * <code>repeated uint32 path = 2;</code>
-       *
        * <pre>
        * The path through the key tree. Each number is encoded in the standard form: high bit set for private derivation
        * and high bit unset for public derivation.
        * </pre>
+       *
+       * <code>repeated uint32 path = 2;</code>
        */
       public Builder addPath(int value) {
         ensurePathIsMutable();
@@ -2050,12 +2569,12 @@ public Builder addPath(int value) {
         return this;
       }
       /**
-       * <code>repeated uint32 path = 2;</code>
-       *
        * <pre>
        * The path through the key tree. Each number is encoded in the standard form: high bit set for private derivation
        * and high bit unset for public derivation.
        * </pre>
+       *
+       * <code>repeated uint32 path = 2;</code>
        */
       public Builder addAllPath(
           java.lang.Iterable<? extends java.lang.Integer> values) {
@@ -2066,12 +2585,12 @@ public Builder addAllPath(
         return this;
       }
       /**
-       * <code>repeated uint32 path = 2;</code>
-       *
        * <pre>
        * The path through the key tree. Each number is encoded in the standard form: high bit set for private derivation
        * and high bit unset for public derivation.
        * </pre>
+       *
+       * <code>repeated uint32 path = 2;</code>
        */
       public Builder clearPath() {
         path_ = java.util.Collections.emptyList();
@@ -2082,8 +2601,6 @@ public Builder clearPath() {
 
       private int issuedSubkeys_ ;
       /**
-       * <code>optional uint32 issued_subkeys = 3;</code>
-       *
        * <pre>
        * How many children of this key have been issued, that is, given to the user when they requested a fresh key?
        * For the parents of keys being handed out, this is always less than the true number of children: the difference is
@@ -2091,13 +2608,13 @@ public Builder clearPath() {
        * this wallet - for instance when restoring from backup or if the seed was shared between devices.
        * If this field is missing it means we're not issuing subkeys of this key to users.
        * </pre>
+       *
+       * <code>optional uint32 issued_subkeys = 3;</code>
        */
       public boolean hasIssuedSubkeys() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>optional uint32 issued_subkeys = 3;</code>
-       *
        * <pre>
        * How many children of this key have been issued, that is, given to the user when they requested a fresh key?
        * For the parents of keys being handed out, this is always less than the true number of children: the difference is
@@ -2105,13 +2622,13 @@ public boolean hasIssuedSubkeys() {
        * this wallet - for instance when restoring from backup or if the seed was shared between devices.
        * If this field is missing it means we're not issuing subkeys of this key to users.
        * </pre>
+       *
+       * <code>optional uint32 issued_subkeys = 3;</code>
        */
       public int getIssuedSubkeys() {
         return issuedSubkeys_;
       }
       /**
-       * <code>optional uint32 issued_subkeys = 3;</code>
-       *
        * <pre>
        * How many children of this key have been issued, that is, given to the user when they requested a fresh key?
        * For the parents of keys being handed out, this is always less than the true number of children: the difference is
@@ -2119,6 +2636,8 @@ public int getIssuedSubkeys() {
        * this wallet - for instance when restoring from backup or if the seed was shared between devices.
        * If this field is missing it means we're not issuing subkeys of this key to users.
        * </pre>
+       *
+       * <code>optional uint32 issued_subkeys = 3;</code>
        */
       public Builder setIssuedSubkeys(int value) {
         bitField0_ |= 0x00000004;
@@ -2127,8 +2646,6 @@ public Builder setIssuedSubkeys(int value) {
         return this;
       }
       /**
-       * <code>optional uint32 issued_subkeys = 3;</code>
-       *
        * <pre>
        * How many children of this key have been issued, that is, given to the user when they requested a fresh key?
        * For the parents of keys being handed out, this is always less than the true number of children: the difference is
@@ -2136,6 +2653,8 @@ public Builder setIssuedSubkeys(int value) {
        * this wallet - for instance when restoring from backup or if the seed was shared between devices.
        * If this field is missing it means we're not issuing subkeys of this key to users.
        * </pre>
+       *
+       * <code>optional uint32 issued_subkeys = 3;</code>
        */
       public Builder clearIssuedSubkeys() {
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -2178,40 +2697,40 @@ public Builder clearLookaheadSize() {
 
       private boolean isFollowing_ ;
       /**
-       * <code>optional bool isFollowing = 5;</code>
-       *
        * <pre>
        **
        * Flag indicating that this key is a root of a following chain. This chain is following the next non-following chain.
        * Following/followed chains concept is used for married keychains, where the set of keys combined together to produce
        * a single P2SH multisignature address
        * </pre>
+       *
+       * <code>optional bool isFollowing = 5;</code>
        */
       public boolean hasIsFollowing() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * <code>optional bool isFollowing = 5;</code>
-       *
        * <pre>
        **
        * Flag indicating that this key is a root of a following chain. This chain is following the next non-following chain.
        * Following/followed chains concept is used for married keychains, where the set of keys combined together to produce
        * a single P2SH multisignature address
        * </pre>
+       *
+       * <code>optional bool isFollowing = 5;</code>
        */
       public boolean getIsFollowing() {
         return isFollowing_;
       }
       /**
-       * <code>optional bool isFollowing = 5;</code>
-       *
        * <pre>
        **
        * Flag indicating that this key is a root of a following chain. This chain is following the next non-following chain.
        * Following/followed chains concept is used for married keychains, where the set of keys combined together to produce
        * a single P2SH multisignature address
        * </pre>
+       *
+       * <code>optional bool isFollowing = 5;</code>
        */
       public Builder setIsFollowing(boolean value) {
         bitField0_ |= 0x00000010;
@@ -2220,14 +2739,14 @@ public Builder setIsFollowing(boolean value) {
         return this;
       }
       /**
-       * <code>optional bool isFollowing = 5;</code>
-       *
        * <pre>
        **
        * Flag indicating that this key is a root of a following chain. This chain is following the next non-following chain.
        * Following/followed chains concept is used for married keychains, where the set of keys combined together to produce
        * a single P2SH multisignature address
        * </pre>
+       *
+       * <code>optional bool isFollowing = 5;</code>
        */
       public Builder clearIsFollowing() {
         bitField0_ = (bitField0_ & ~0x00000010);
@@ -2238,34 +2757,34 @@ public Builder clearIsFollowing() {
 
       private int sigsRequiredToSpend_ = 1;
       /**
-       * <code>optional uint32 sigsRequiredToSpend = 6 [default = 1];</code>
-       *
        * <pre>
        * Number of signatures required to spend. This field is needed only for married keychains to reconstruct KeyChain
        * and represents the N value from N-of-M CHECKMULTISIG script. For regular single keychains it will always be 1.
        * </pre>
+       *
+       * <code>optional uint32 sigsRequiredToSpend = 6 [default = 1];</code>
        */
       public boolean hasSigsRequiredToSpend() {
         return ((bitField0_ & 0x00000020) == 0x00000020);
       }
       /**
-       * <code>optional uint32 sigsRequiredToSpend = 6 [default = 1];</code>
-       *
        * <pre>
        * Number of signatures required to spend. This field is needed only for married keychains to reconstruct KeyChain
        * and represents the N value from N-of-M CHECKMULTISIG script. For regular single keychains it will always be 1.
        * </pre>
+       *
+       * <code>optional uint32 sigsRequiredToSpend = 6 [default = 1];</code>
        */
       public int getSigsRequiredToSpend() {
         return sigsRequiredToSpend_;
       }
       /**
-       * <code>optional uint32 sigsRequiredToSpend = 6 [default = 1];</code>
-       *
        * <pre>
        * Number of signatures required to spend. This field is needed only for married keychains to reconstruct KeyChain
        * and represents the N value from N-of-M CHECKMULTISIG script. For regular single keychains it will always be 1.
        * </pre>
+       *
+       * <code>optional uint32 sigsRequiredToSpend = 6 [default = 1];</code>
        */
       public Builder setSigsRequiredToSpend(int value) {
         bitField0_ |= 0x00000020;
@@ -2274,12 +2793,12 @@ public Builder setSigsRequiredToSpend(int value) {
         return this;
       }
       /**
-       * <code>optional uint32 sigsRequiredToSpend = 6 [default = 1];</code>
-       *
        * <pre>
        * Number of signatures required to spend. This field is needed only for married keychains to reconstruct KeyChain
        * and represents the N value from N-of-M CHECKMULTISIG script. For regular single keychains it will always be 1.
        * </pre>
+       *
+       * <code>optional uint32 sigsRequiredToSpend = 6 [default = 1];</code>
        */
       public Builder clearSigsRequiredToSpend() {
         bitField0_ = (bitField0_ & ~0x00000020);
@@ -2287,16 +2806,57 @@ public Builder clearSigsRequiredToSpend() {
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:wallet.DeterministicKey)
     }
 
+    // @@protoc_insertion_point(class_scope:wallet.DeterministicKey)
+    private static final org.bitcoinj.wallet.Protos.DeterministicKey DEFAULT_INSTANCE;
     static {
-      defaultInstance = new DeterministicKey(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoinj.wallet.Protos.DeterministicKey();
+    }
+
+    public static org.bitcoinj.wallet.Protos.DeterministicKey getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<DeterministicKey>
+        PARSER = new com.google.protobuf.AbstractParser<DeterministicKey>() {
+      @java.lang.Override
+      public DeterministicKey parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new DeterministicKey(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<DeterministicKey> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<DeterministicKey> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoinj.wallet.Protos.DeterministicKey getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:wallet.DeterministicKey)
   }
 
   public interface KeyOrBuilder extends
@@ -2313,110 +2873,110 @@ public interface KeyOrBuilder extends
     org.bitcoinj.wallet.Protos.Key.Type getType();
 
     /**
-     * <code>optional bytes secret_bytes = 2;</code>
-     *
      * <pre>
      * Either the private EC key bytes (without any ASN.1 wrapping), or the deterministic root seed.
      * If the secret is encrypted, or this is a "watching entry" then this is missing.
      * </pre>
+     *
+     * <code>optional bytes secret_bytes = 2;</code>
      */
     boolean hasSecretBytes();
     /**
-     * <code>optional bytes secret_bytes = 2;</code>
-     *
      * <pre>
      * Either the private EC key bytes (without any ASN.1 wrapping), or the deterministic root seed.
      * If the secret is encrypted, or this is a "watching entry" then this is missing.
      * </pre>
+     *
+     * <code>optional bytes secret_bytes = 2;</code>
      */
     com.google.protobuf.ByteString getSecretBytes();
 
     /**
-     * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
-     *
      * <pre>
      * If the secret data is encrypted, then secret_bytes is missing and this field is set.
      * </pre>
+     *
+     * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
      */
     boolean hasEncryptedData();
     /**
-     * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
-     *
      * <pre>
      * If the secret data is encrypted, then secret_bytes is missing and this field is set.
      * </pre>
+     *
+     * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
      */
     org.bitcoinj.wallet.Protos.EncryptedData getEncryptedData();
     /**
-     * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
-     *
      * <pre>
      * If the secret data is encrypted, then secret_bytes is missing and this field is set.
      * </pre>
+     *
+     * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
      */
     org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder getEncryptedDataOrBuilder();
 
     /**
-     * <code>optional bytes public_key = 3;</code>
-     *
      * <pre>
      * The public EC key derived from the private key. We allow both to be stored to avoid mobile clients having to
      * do lots of slow EC math on startup. For DETERMINISTIC_MNEMONIC entries this is missing.
      * </pre>
+     *
+     * <code>optional bytes public_key = 3;</code>
      */
     boolean hasPublicKey();
     /**
-     * <code>optional bytes public_key = 3;</code>
-     *
      * <pre>
      * The public EC key derived from the private key. We allow both to be stored to avoid mobile clients having to
      * do lots of slow EC math on startup. For DETERMINISTIC_MNEMONIC entries this is missing.
      * </pre>
+     *
+     * <code>optional bytes public_key = 3;</code>
      */
     com.google.protobuf.ByteString getPublicKey();
 
     /**
-     * <code>optional string label = 4;</code>
-     *
      * <pre>
      * User-provided label associated with the key.
      * </pre>
+     *
+     * <code>optional string label = 4;</code>
      */
     boolean hasLabel();
     /**
-     * <code>optional string label = 4;</code>
-     *
      * <pre>
      * User-provided label associated with the key.
      * </pre>
+     *
+     * <code>optional string label = 4;</code>
      */
     java.lang.String getLabel();
     /**
-     * <code>optional string label = 4;</code>
-     *
      * <pre>
      * User-provided label associated with the key.
      * </pre>
+     *
+     * <code>optional string label = 4;</code>
      */
     com.google.protobuf.ByteString
         getLabelBytes();
 
     /**
-     * <code>optional int64 creation_timestamp = 5;</code>
-     *
      * <pre>
      * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. The reason it's
      * optional is that keys derived from a parent don't have this data.
      * </pre>
+     *
+     * <code>optional int64 creation_timestamp = 5;</code>
      */
     boolean hasCreationTimestamp();
     /**
-     * <code>optional int64 creation_timestamp = 5;</code>
-     *
      * <pre>
      * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. The reason it's
      * optional is that keys derived from a parent don't have this data.
      * </pre>
+     *
+     * <code>optional int64 creation_timestamp = 5;</code>
      */
     long getCreationTimestamp();
 
@@ -2434,92 +2994,136 @@ public interface KeyOrBuilder extends
     org.bitcoinj.wallet.Protos.DeterministicKeyOrBuilder getDeterministicKeyOrBuilder();
 
     /**
-     * <code>optional bytes deterministic_seed = 8;</code>
-     *
      * <pre>
      * The seed for a deterministic key hierarchy.  Derived from the mnemonic,
      * but cached here for quick startup.  Only applicable to a DETERMINISTIC_MNEMONIC key entry.
      * </pre>
+     *
+     * <code>optional bytes deterministic_seed = 8;</code>
      */
     boolean hasDeterministicSeed();
     /**
-     * <code>optional bytes deterministic_seed = 8;</code>
-     *
      * <pre>
      * The seed for a deterministic key hierarchy.  Derived from the mnemonic,
      * but cached here for quick startup.  Only applicable to a DETERMINISTIC_MNEMONIC key entry.
      * </pre>
+     *
+     * <code>optional bytes deterministic_seed = 8;</code>
      */
     com.google.protobuf.ByteString getDeterministicSeed();
 
     /**
-     * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
-     *
      * <pre>
      * Encrypted version of the seed
      * </pre>
+     *
+     * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
      */
     boolean hasEncryptedDeterministicSeed();
     /**
-     * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
-     *
      * <pre>
      * Encrypted version of the seed
      * </pre>
+     *
+     * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
      */
     org.bitcoinj.wallet.Protos.EncryptedData getEncryptedDeterministicSeed();
     /**
-     * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
-     *
      * <pre>
      * Encrypted version of the seed
      * </pre>
+     *
+     * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
      */
     org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder getEncryptedDeterministicSeedOrBuilder();
-  }
-  /**
-   * Protobuf type {@code wallet.Key}
-   *
-   * <pre>
-   **
-   * A key used to control Bitcoin spending.
-   * Either the private key, the public key or both may be present.  It is recommended that
-   * if the private key is provided that the public key is provided too because deriving it is slow.
-   * If only the public key is provided, the key can only be used to watch the blockchain and verify
-   * transactions, and not for spending.
-   * </pre>
-   */
-  public static final class Key extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:wallet.Key)
-      KeyOrBuilder {
-    // Use Key.newBuilder() to construct.
-    private Key(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
-      super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private Key(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Key defaultInstance;
-    public static Key getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public Key getDefaultInstanceForType() {
-      return defaultInstance;
-    }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
-      return this.unknownFields;
+    /**
+     * <pre>
+     * The path to the root. Only applicable to a DETERMINISTIC_MNEMONIC key entry.
+     * </pre>
+     *
+     * <code>repeated uint32 account_path = 10 [packed = true];</code>
+     */
+    java.util.List<java.lang.Integer> getAccountPathList();
+    /**
+     * <pre>
+     * The path to the root. Only applicable to a DETERMINISTIC_MNEMONIC key entry.
+     * </pre>
+     *
+     * <code>repeated uint32 account_path = 10 [packed = true];</code>
+     */
+    int getAccountPathCount();
+    /**
+     * <pre>
+     * The path to the root. Only applicable to a DETERMINISTIC_MNEMONIC key entry.
+     * </pre>
+     *
+     * <code>repeated uint32 account_path = 10 [packed = true];</code>
+     */
+    int getAccountPath(int index);
+
+    /**
+     * <pre>
+     * Type of addresses (aka output scripts) to generate for receiving.
+     * </pre>
+     *
+     * <code>optional .wallet.Key.OutputScriptType output_script_type = 11;</code>
+     */
+    boolean hasOutputScriptType();
+    /**
+     * <pre>
+     * Type of addresses (aka output scripts) to generate for receiving.
+     * </pre>
+     *
+     * <code>optional .wallet.Key.OutputScriptType output_script_type = 11;</code>
+     */
+    org.bitcoinj.wallet.Protos.Key.OutputScriptType getOutputScriptType();
+  }
+  /**
+   * <pre>
+   **
+   * A key used to control Bitcoin spending.
+   * Either the private key, the public key or both may be present.  It is recommended that
+   * if the private key is provided that the public key is provided too because deriving it is slow.
+   * If only the public key is provided, the key can only be used to watch the blockchain and verify
+   * transactions, and not for spending.
+   * </pre>
+   *
+   * Protobuf type {@code wallet.Key}
+   */
+  public  static final class Key extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:wallet.Key)
+      KeyOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use Key.newBuilder() to construct.
+    private Key(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private Key() {
+      type_ = 1;
+      secretBytes_ = com.google.protobuf.ByteString.EMPTY;
+      publicKey_ = com.google.protobuf.ByteString.EMPTY;
+      label_ = "";
+      creationTimestamp_ = 0L;
+      deterministicSeed_ = com.google.protobuf.ByteString.EMPTY;
+      accountPath_ = java.util.Collections.emptyList();
+      outputScriptType_ = 1;
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
     }
     private Key(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2531,21 +3135,15 @@ private Key(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 8: {
               int rawValue = input.readEnum();
+                @SuppressWarnings("deprecation")
               org.bitcoinj.wallet.Protos.Key.Type value = org.bitcoinj.wallet.Protos.Key.Type.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(1, rawValue);
               } else {
                 bitField0_ |= 0x00000001;
-                type_ = value;
+                type_ = rawValue;
               }
               break;
             }
@@ -2614,14 +3212,57 @@ private Key(
               bitField0_ |= 0x00000100;
               break;
             }
+            case 80: {
+              if (!((mutable_bitField0_ & 0x00000200) == 0x00000200)) {
+                accountPath_ = new java.util.ArrayList<java.lang.Integer>();
+                mutable_bitField0_ |= 0x00000200;
+              }
+              accountPath_.add(input.readUInt32());
+              break;
+            }
+            case 82: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000200) == 0x00000200) && input.getBytesUntilLimit() > 0) {
+                accountPath_ = new java.util.ArrayList<java.lang.Integer>();
+                mutable_bitField0_ |= 0x00000200;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                accountPath_.add(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 88: {
+              int rawValue = input.readEnum();
+                @SuppressWarnings("deprecation")
+              org.bitcoinj.wallet.Protos.Key.OutputScriptType value = org.bitcoinj.wallet.Protos.Key.OutputScriptType.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(11, rawValue);
+              } else {
+                bitField0_ |= 0x00000200;
+                outputScriptType_ = rawValue;
+              }
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
+        if (((mutable_bitField0_ & 0x00000200) == 0x00000200)) {
+          accountPath_ = java.util.Collections.unmodifiableList(accountPath_);
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -2631,62 +3272,46 @@ private Key(
       return org.bitcoinj.wallet.Protos.internal_static_wallet_Key_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoinj.wallet.Protos.internal_static_wallet_Key_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoinj.wallet.Protos.Key.class, org.bitcoinj.wallet.Protos.Key.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<Key> PARSER =
-        new com.google.protobuf.AbstractParser<Key>() {
-      public Key parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Key(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Key> getParserForType() {
-      return PARSER;
-    }
-
     /**
      * Protobuf enum {@code wallet.Key.Type}
      */
     public enum Type
         implements com.google.protobuf.ProtocolMessageEnum {
       /**
-       * <code>ORIGINAL = 1;</code>
-       *
        * <pre>
        ** Unencrypted - Original bitcoin secp256k1 curve 
        * </pre>
+       *
+       * <code>ORIGINAL = 1;</code>
        */
-      ORIGINAL(0, 1),
+      ORIGINAL(1),
       /**
-       * <code>ENCRYPTED_SCRYPT_AES = 2;</code>
-       *
        * <pre>
        ** Encrypted with Scrypt and AES - Original bitcoin secp256k1 curve 
        * </pre>
+       *
+       * <code>ENCRYPTED_SCRYPT_AES = 2;</code>
        */
-      ENCRYPTED_SCRYPT_AES(1, 2),
+      ENCRYPTED_SCRYPT_AES(2),
       /**
-       * <code>DETERMINISTIC_MNEMONIC = 3;</code>
-       *
        * <pre>
        **
        * Not really a key, but rather contains the mnemonic phrase for a deterministic key hierarchy in the private_key field.
        * The label and public_key fields are missing. Creation timestamp will exist.
        * </pre>
+       *
+       * <code>DETERMINISTIC_MNEMONIC = 3;</code>
        */
-      DETERMINISTIC_MNEMONIC(2, 3),
+      DETERMINISTIC_MNEMONIC(3),
       /**
-       * <code>DETERMINISTIC_KEY = 4;</code>
-       *
        * <pre>
        **
        * A key that was derived deterministically. Note that the root seed that created it may NOT be present in the
@@ -2695,39 +3320,39 @@ public enum Type
        * is a path from this key up to a key that has (possibly encrypted) private bytes, it's expected that the private
        * key can be rederived on the fly.
        * </pre>
+       *
+       * <code>DETERMINISTIC_KEY = 4;</code>
        */
-      DETERMINISTIC_KEY(3, 4),
+      DETERMINISTIC_KEY(4),
       ;
 
       /**
-       * <code>ORIGINAL = 1;</code>
-       *
        * <pre>
        ** Unencrypted - Original bitcoin secp256k1 curve 
        * </pre>
+       *
+       * <code>ORIGINAL = 1;</code>
        */
       public static final int ORIGINAL_VALUE = 1;
       /**
-       * <code>ENCRYPTED_SCRYPT_AES = 2;</code>
-       *
        * <pre>
        ** Encrypted with Scrypt and AES - Original bitcoin secp256k1 curve 
        * </pre>
+       *
+       * <code>ENCRYPTED_SCRYPT_AES = 2;</code>
        */
       public static final int ENCRYPTED_SCRYPT_AES_VALUE = 2;
       /**
-       * <code>DETERMINISTIC_MNEMONIC = 3;</code>
-       *
        * <pre>
        **
        * Not really a key, but rather contains the mnemonic phrase for a deterministic key hierarchy in the private_key field.
        * The label and public_key fields are missing. Creation timestamp will exist.
        * </pre>
+       *
+       * <code>DETERMINISTIC_MNEMONIC = 3;</code>
        */
       public static final int DETERMINISTIC_MNEMONIC_VALUE = 3;
       /**
-       * <code>DETERMINISTIC_KEY = 4;</code>
-       *
        * <pre>
        **
        * A key that was derived deterministically. Note that the root seed that created it may NOT be present in the
@@ -2736,13 +3361,25 @@ public enum Type
        * is a path from this key up to a key that has (possibly encrypted) private bytes, it's expected that the private
        * key can be rederived on the fly.
        * </pre>
+       *
+       * <code>DETERMINISTIC_KEY = 4;</code>
        */
       public static final int DETERMINISTIC_KEY_VALUE = 4;
 
 
-      public final int getNumber() { return value; }
+      public final int getNumber() {
+        return value;
+      }
 
+      /**
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
       public static Type valueOf(int value) {
+        return forNumber(value);
+      }
+
+      public static Type forNumber(int value) {
         switch (value) {
           case 1: return ORIGINAL;
           case 2: return ENCRYPTED_SCRYPT_AES;
@@ -2756,17 +3393,17 @@ public static Type valueOf(int value) {
           internalGetValueMap() {
         return internalValueMap;
       }
-      private static com.google.protobuf.Internal.EnumLiteMap<Type>
-          internalValueMap =
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          Type> internalValueMap =
             new com.google.protobuf.Internal.EnumLiteMap<Type>() {
               public Type findValueByNumber(int number) {
-                return Type.valueOf(number);
+                return Type.forNumber(number);
               }
             };
 
       public final com.google.protobuf.Descriptors.EnumValueDescriptor
           getValueDescriptor() {
-        return getDescriptor().getValues().get(index);
+        return getDescriptor().getValues().get(ordinal());
       }
       public final com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptorForType() {
@@ -2788,20 +3425,108 @@ public static Type valueOf(
         return VALUES[desc.getIndex()];
       }
 
-      private final int index;
       private final int value;
 
-      private Type(int index, int value) {
-        this.index = index;
+      private Type(int value) {
         this.value = value;
       }
 
       // @@protoc_insertion_point(enum_scope:wallet.Key.Type)
     }
 
+    /**
+     * Protobuf enum {@code wallet.Key.OutputScriptType}
+     */
+    public enum OutputScriptType
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <code>P2PKH = 1;</code>
+       */
+      P2PKH(1),
+      /**
+       * <code>P2WPKH = 2;</code>
+       */
+      P2WPKH(2),
+      ;
+
+      /**
+       * <code>P2PKH = 1;</code>
+       */
+      public static final int P2PKH_VALUE = 1;
+      /**
+       * <code>P2WPKH = 2;</code>
+       */
+      public static final int P2WPKH_VALUE = 2;
+
+
+      public final int getNumber() {
+        return value;
+      }
+
+      /**
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
+      public static OutputScriptType valueOf(int value) {
+        return forNumber(value);
+      }
+
+      public static OutputScriptType forNumber(int value) {
+        switch (value) {
+          case 1: return P2PKH;
+          case 2: return P2WPKH;
+          default: return null;
+        }
+      }
+
+      public static com.google.protobuf.Internal.EnumLiteMap<OutputScriptType>
+          internalGetValueMap() {
+        return internalValueMap;
+      }
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          OutputScriptType> internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<OutputScriptType>() {
+              public OutputScriptType findValueByNumber(int number) {
+                return OutputScriptType.forNumber(number);
+              }
+            };
+
+      public final com.google.protobuf.Descriptors.EnumValueDescriptor
+          getValueDescriptor() {
+        return getDescriptor().getValues().get(ordinal());
+      }
+      public final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptorForType() {
+        return getDescriptor();
+      }
+      public static final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptor() {
+        return org.bitcoinj.wallet.Protos.Key.getDescriptor().getEnumTypes().get(1);
+      }
+
+      private static final OutputScriptType[] VALUES = values();
+
+      public static OutputScriptType valueOf(
+          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+        if (desc.getType() != getDescriptor()) {
+          throw new java.lang.IllegalArgumentException(
+            "EnumValueDescriptor is not for this type.");
+        }
+        return VALUES[desc.getIndex()];
+      }
+
+      private final int value;
+
+      private OutputScriptType(int value) {
+        this.value = value;
+      }
+
+      // @@protoc_insertion_point(enum_scope:wallet.Key.OutputScriptType)
+    }
+
     private int bitField0_;
     public static final int TYPE_FIELD_NUMBER = 1;
-    private org.bitcoinj.wallet.Protos.Key.Type type_;
+    private int type_;
     /**
      * <code>required .wallet.Key.Type type = 1;</code>
      */
@@ -2812,29 +3537,31 @@ public boolean hasType() {
      * <code>required .wallet.Key.Type type = 1;</code>
      */
     public org.bitcoinj.wallet.Protos.Key.Type getType() {
-      return type_;
+      @SuppressWarnings("deprecation")
+      org.bitcoinj.wallet.Protos.Key.Type result = org.bitcoinj.wallet.Protos.Key.Type.valueOf(type_);
+      return result == null ? org.bitcoinj.wallet.Protos.Key.Type.ORIGINAL : result;
     }
 
     public static final int SECRET_BYTES_FIELD_NUMBER = 2;
     private com.google.protobuf.ByteString secretBytes_;
     /**
-     * <code>optional bytes secret_bytes = 2;</code>
-     *
      * <pre>
      * Either the private EC key bytes (without any ASN.1 wrapping), or the deterministic root seed.
      * If the secret is encrypted, or this is a "watching entry" then this is missing.
      * </pre>
+     *
+     * <code>optional bytes secret_bytes = 2;</code>
      */
     public boolean hasSecretBytes() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>optional bytes secret_bytes = 2;</code>
-     *
      * <pre>
      * Either the private EC key bytes (without any ASN.1 wrapping), or the deterministic root seed.
      * If the secret is encrypted, or this is a "watching entry" then this is missing.
      * </pre>
+     *
+     * <code>optional bytes secret_bytes = 2;</code>
      */
     public com.google.protobuf.ByteString getSecretBytes() {
       return secretBytes_;
@@ -2843,79 +3570,79 @@ public com.google.protobuf.ByteString getSecretBytes() {
     public static final int ENCRYPTED_DATA_FIELD_NUMBER = 6;
     private org.bitcoinj.wallet.Protos.EncryptedData encryptedData_;
     /**
-     * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
-     *
      * <pre>
      * If the secret data is encrypted, then secret_bytes is missing and this field is set.
      * </pre>
+     *
+     * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
      */
     public boolean hasEncryptedData() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
-     *
      * <pre>
      * If the secret data is encrypted, then secret_bytes is missing and this field is set.
      * </pre>
+     *
+     * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
      */
     public org.bitcoinj.wallet.Protos.EncryptedData getEncryptedData() {
-      return encryptedData_;
+      return encryptedData_ == null ? org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance() : encryptedData_;
     }
     /**
-     * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
-     *
      * <pre>
      * If the secret data is encrypted, then secret_bytes is missing and this field is set.
      * </pre>
+     *
+     * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
      */
     public org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder getEncryptedDataOrBuilder() {
-      return encryptedData_;
+      return encryptedData_ == null ? org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance() : encryptedData_;
     }
 
     public static final int PUBLIC_KEY_FIELD_NUMBER = 3;
     private com.google.protobuf.ByteString publicKey_;
     /**
-     * <code>optional bytes public_key = 3;</code>
-     *
      * <pre>
      * The public EC key derived from the private key. We allow both to be stored to avoid mobile clients having to
      * do lots of slow EC math on startup. For DETERMINISTIC_MNEMONIC entries this is missing.
      * </pre>
+     *
+     * <code>optional bytes public_key = 3;</code>
      */
     public boolean hasPublicKey() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * <code>optional bytes public_key = 3;</code>
-     *
      * <pre>
      * The public EC key derived from the private key. We allow both to be stored to avoid mobile clients having to
      * do lots of slow EC math on startup. For DETERMINISTIC_MNEMONIC entries this is missing.
      * </pre>
+     *
+     * <code>optional bytes public_key = 3;</code>
      */
     public com.google.protobuf.ByteString getPublicKey() {
       return publicKey_;
     }
 
     public static final int LABEL_FIELD_NUMBER = 4;
-    private java.lang.Object label_;
+    private volatile java.lang.Object label_;
     /**
-     * <code>optional string label = 4;</code>
-     *
      * <pre>
      * User-provided label associated with the key.
      * </pre>
+     *
+     * <code>optional string label = 4;</code>
      */
     public boolean hasLabel() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * <code>optional string label = 4;</code>
-     *
      * <pre>
      * User-provided label associated with the key.
      * </pre>
+     *
+     * <code>optional string label = 4;</code>
      */
     public java.lang.String getLabel() {
       java.lang.Object ref = label_;
@@ -2932,11 +3659,11 @@ public java.lang.String getLabel() {
       }
     }
     /**
-     * <code>optional string label = 4;</code>
-     *
      * <pre>
      * User-provided label associated with the key.
      * </pre>
+     *
+     * <code>optional string label = 4;</code>
      */
     public com.google.protobuf.ByteString
         getLabelBytes() {
@@ -2955,23 +3682,23 @@ public java.lang.String getLabel() {
     public static final int CREATION_TIMESTAMP_FIELD_NUMBER = 5;
     private long creationTimestamp_;
     /**
-     * <code>optional int64 creation_timestamp = 5;</code>
-     *
      * <pre>
      * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. The reason it's
      * optional is that keys derived from a parent don't have this data.
      * </pre>
+     *
+     * <code>optional int64 creation_timestamp = 5;</code>
      */
     public boolean hasCreationTimestamp() {
       return ((bitField0_ & 0x00000020) == 0x00000020);
     }
     /**
-     * <code>optional int64 creation_timestamp = 5;</code>
-     *
      * <pre>
      * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. The reason it's
      * optional is that keys derived from a parent don't have this data.
      * </pre>
+     *
+     * <code>optional int64 creation_timestamp = 5;</code>
      */
     public long getCreationTimestamp() {
       return creationTimestamp_;
@@ -2989,35 +3716,35 @@ public boolean hasDeterministicKey() {
      * <code>optional .wallet.DeterministicKey deterministic_key = 7;</code>
      */
     public org.bitcoinj.wallet.Protos.DeterministicKey getDeterministicKey() {
-      return deterministicKey_;
+      return deterministicKey_ == null ? org.bitcoinj.wallet.Protos.DeterministicKey.getDefaultInstance() : deterministicKey_;
     }
     /**
      * <code>optional .wallet.DeterministicKey deterministic_key = 7;</code>
      */
     public org.bitcoinj.wallet.Protos.DeterministicKeyOrBuilder getDeterministicKeyOrBuilder() {
-      return deterministicKey_;
+      return deterministicKey_ == null ? org.bitcoinj.wallet.Protos.DeterministicKey.getDefaultInstance() : deterministicKey_;
     }
 
     public static final int DETERMINISTIC_SEED_FIELD_NUMBER = 8;
     private com.google.protobuf.ByteString deterministicSeed_;
     /**
-     * <code>optional bytes deterministic_seed = 8;</code>
-     *
      * <pre>
      * The seed for a deterministic key hierarchy.  Derived from the mnemonic,
      * but cached here for quick startup.  Only applicable to a DETERMINISTIC_MNEMONIC key entry.
      * </pre>
+     *
+     * <code>optional bytes deterministic_seed = 8;</code>
      */
     public boolean hasDeterministicSeed() {
       return ((bitField0_ & 0x00000080) == 0x00000080);
     }
     /**
-     * <code>optional bytes deterministic_seed = 8;</code>
-     *
      * <pre>
      * The seed for a deterministic key hierarchy.  Derived from the mnemonic,
      * but cached here for quick startup.  Only applicable to a DETERMINISTIC_MNEMONIC key entry.
      * </pre>
+     *
+     * <code>optional bytes deterministic_seed = 8;</code>
      */
     public com.google.protobuf.ByteString getDeterministicSeed() {
       return deterministicSeed_;
@@ -3026,48 +3753,98 @@ public com.google.protobuf.ByteString getDeterministicSeed() {
     public static final int ENCRYPTED_DETERMINISTIC_SEED_FIELD_NUMBER = 9;
     private org.bitcoinj.wallet.Protos.EncryptedData encryptedDeterministicSeed_;
     /**
-     * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
-     *
      * <pre>
      * Encrypted version of the seed
      * </pre>
+     *
+     * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
      */
     public boolean hasEncryptedDeterministicSeed() {
       return ((bitField0_ & 0x00000100) == 0x00000100);
     }
     /**
-     * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
-     *
      * <pre>
      * Encrypted version of the seed
      * </pre>
+     *
+     * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
      */
     public org.bitcoinj.wallet.Protos.EncryptedData getEncryptedDeterministicSeed() {
-      return encryptedDeterministicSeed_;
+      return encryptedDeterministicSeed_ == null ? org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance() : encryptedDeterministicSeed_;
     }
     /**
-     * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
-     *
      * <pre>
      * Encrypted version of the seed
      * </pre>
+     *
+     * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
      */
     public org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder getEncryptedDeterministicSeedOrBuilder() {
-      return encryptedDeterministicSeed_;
+      return encryptedDeterministicSeed_ == null ? org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance() : encryptedDeterministicSeed_;
     }
 
-    private void initFields() {
-      type_ = org.bitcoinj.wallet.Protos.Key.Type.ORIGINAL;
-      secretBytes_ = com.google.protobuf.ByteString.EMPTY;
-      encryptedData_ = org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance();
-      publicKey_ = com.google.protobuf.ByteString.EMPTY;
-      label_ = "";
-      creationTimestamp_ = 0L;
-      deterministicKey_ = org.bitcoinj.wallet.Protos.DeterministicKey.getDefaultInstance();
-      deterministicSeed_ = com.google.protobuf.ByteString.EMPTY;
-      encryptedDeterministicSeed_ = org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance();
+    public static final int ACCOUNT_PATH_FIELD_NUMBER = 10;
+    private java.util.List<java.lang.Integer> accountPath_;
+    /**
+     * <pre>
+     * The path to the root. Only applicable to a DETERMINISTIC_MNEMONIC key entry.
+     * </pre>
+     *
+     * <code>repeated uint32 account_path = 10 [packed = true];</code>
+     */
+    public java.util.List<java.lang.Integer>
+        getAccountPathList() {
+      return accountPath_;
+    }
+    /**
+     * <pre>
+     * The path to the root. Only applicable to a DETERMINISTIC_MNEMONIC key entry.
+     * </pre>
+     *
+     * <code>repeated uint32 account_path = 10 [packed = true];</code>
+     */
+    public int getAccountPathCount() {
+      return accountPath_.size();
+    }
+    /**
+     * <pre>
+     * The path to the root. Only applicable to a DETERMINISTIC_MNEMONIC key entry.
+     * </pre>
+     *
+     * <code>repeated uint32 account_path = 10 [packed = true];</code>
+     */
+    public int getAccountPath(int index) {
+      return accountPath_.get(index);
+    }
+    private int accountPathMemoizedSerializedSize = -1;
+
+    public static final int OUTPUT_SCRIPT_TYPE_FIELD_NUMBER = 11;
+    private int outputScriptType_;
+    /**
+     * <pre>
+     * Type of addresses (aka output scripts) to generate for receiving.
+     * </pre>
+     *
+     * <code>optional .wallet.Key.OutputScriptType output_script_type = 11;</code>
+     */
+    public boolean hasOutputScriptType() {
+      return ((bitField0_ & 0x00000200) == 0x00000200);
+    }
+    /**
+     * <pre>
+     * Type of addresses (aka output scripts) to generate for receiving.
+     * </pre>
+     *
+     * <code>optional .wallet.Key.OutputScriptType output_script_type = 11;</code>
+     */
+    public org.bitcoinj.wallet.Protos.Key.OutputScriptType getOutputScriptType() {
+      @SuppressWarnings("deprecation")
+      org.bitcoinj.wallet.Protos.Key.OutputScriptType result = org.bitcoinj.wallet.Protos.Key.OutputScriptType.valueOf(outputScriptType_);
+      return result == null ? org.bitcoinj.wallet.Protos.Key.OutputScriptType.P2PKH : result;
     }
+
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -3099,11 +3876,12 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeEnum(1, type_.getNumber());
+        output.writeEnum(1, type_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeBytes(2, secretBytes_);
@@ -3112,35 +3890,45 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         output.writeBytes(3, publicKey_);
       }
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        output.writeBytes(4, getLabelBytes());
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 4, label_);
       }
       if (((bitField0_ & 0x00000020) == 0x00000020)) {
         output.writeInt64(5, creationTimestamp_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeMessage(6, encryptedData_);
+        output.writeMessage(6, getEncryptedData());
       }
       if (((bitField0_ & 0x00000040) == 0x00000040)) {
-        output.writeMessage(7, deterministicKey_);
+        output.writeMessage(7, getDeterministicKey());
       }
       if (((bitField0_ & 0x00000080) == 0x00000080)) {
         output.writeBytes(8, deterministicSeed_);
       }
       if (((bitField0_ & 0x00000100) == 0x00000100)) {
-        output.writeMessage(9, encryptedDeterministicSeed_);
+        output.writeMessage(9, getEncryptedDeterministicSeed());
+      }
+      if (getAccountPathList().size() > 0) {
+        output.writeUInt32NoTag(82);
+        output.writeUInt32NoTag(accountPathMemoizedSerializedSize);
       }
-      getUnknownFields().writeTo(output);
+      for (int i = 0; i < accountPath_.size(); i++) {
+        output.writeUInt32NoTag(accountPath_.get(i));
+      }
+      if (((bitField0_ & 0x00000200) == 0x00000200)) {
+        output.writeEnum(11, outputScriptType_);
+      }
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(1, type_.getNumber());
+          .computeEnumSize(1, type_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
@@ -3151,8 +3939,7 @@ public int getSerializedSize() {
           .computeBytesSize(3, publicKey_);
       }
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(4, getLabelBytes());
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, label_);
       }
       if (((bitField0_ & 0x00000020) == 0x00000020)) {
         size += com.google.protobuf.CodedOutputStream
@@ -3160,11 +3947,11 @@ public int getSerializedSize() {
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, encryptedData_);
+          .computeMessageSize(6, getEncryptedData());
       }
       if (((bitField0_ & 0x00000040) == 0x00000040)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, deterministicKey_);
+          .computeMessageSize(7, getDeterministicKey());
       }
       if (((bitField0_ & 0x00000080) == 0x00000080)) {
         size += com.google.protobuf.CodedOutputStream
@@ -3172,20 +3959,164 @@ public int getSerializedSize() {
       }
       if (((bitField0_ & 0x00000100) == 0x00000100)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, encryptedDeterministicSeed_);
+          .computeMessageSize(9, getEncryptedDeterministicSeed());
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < accountPath_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(accountPath_.get(i));
+        }
+        size += dataSize;
+        if (!getAccountPathList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        accountPathMemoizedSerializedSize = dataSize;
+      }
+      if (((bitField0_ & 0x00000200) == 0x00000200)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(11, outputScriptType_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoinj.wallet.Protos.Key)) {
+        return super.equals(obj);
+      }
+      org.bitcoinj.wallet.Protos.Key other = (org.bitcoinj.wallet.Protos.Key) obj;
+
+      boolean result = true;
+      result = result && (hasType() == other.hasType());
+      if (hasType()) {
+        result = result && type_ == other.type_;
+      }
+      result = result && (hasSecretBytes() == other.hasSecretBytes());
+      if (hasSecretBytes()) {
+        result = result && getSecretBytes()
+            .equals(other.getSecretBytes());
+      }
+      result = result && (hasEncryptedData() == other.hasEncryptedData());
+      if (hasEncryptedData()) {
+        result = result && getEncryptedData()
+            .equals(other.getEncryptedData());
+      }
+      result = result && (hasPublicKey() == other.hasPublicKey());
+      if (hasPublicKey()) {
+        result = result && getPublicKey()
+            .equals(other.getPublicKey());
+      }
+      result = result && (hasLabel() == other.hasLabel());
+      if (hasLabel()) {
+        result = result && getLabel()
+            .equals(other.getLabel());
+      }
+      result = result && (hasCreationTimestamp() == other.hasCreationTimestamp());
+      if (hasCreationTimestamp()) {
+        result = result && (getCreationTimestamp()
+            == other.getCreationTimestamp());
+      }
+      result = result && (hasDeterministicKey() == other.hasDeterministicKey());
+      if (hasDeterministicKey()) {
+        result = result && getDeterministicKey()
+            .equals(other.getDeterministicKey());
+      }
+      result = result && (hasDeterministicSeed() == other.hasDeterministicSeed());
+      if (hasDeterministicSeed()) {
+        result = result && getDeterministicSeed()
+            .equals(other.getDeterministicSeed());
+      }
+      result = result && (hasEncryptedDeterministicSeed() == other.hasEncryptedDeterministicSeed());
+      if (hasEncryptedDeterministicSeed()) {
+        result = result && getEncryptedDeterministicSeed()
+            .equals(other.getEncryptedDeterministicSeed());
+      }
+      result = result && getAccountPathList()
+          .equals(other.getAccountPathList());
+      result = result && (hasOutputScriptType() == other.hasOutputScriptType());
+      if (hasOutputScriptType()) {
+        result = result && outputScriptType_ == other.outputScriptType_;
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasType()) {
+        hash = (37 * hash) + TYPE_FIELD_NUMBER;
+        hash = (53 * hash) + type_;
+      }
+      if (hasSecretBytes()) {
+        hash = (37 * hash) + SECRET_BYTES_FIELD_NUMBER;
+        hash = (53 * hash) + getSecretBytes().hashCode();
+      }
+      if (hasEncryptedData()) {
+        hash = (37 * hash) + ENCRYPTED_DATA_FIELD_NUMBER;
+        hash = (53 * hash) + getEncryptedData().hashCode();
+      }
+      if (hasPublicKey()) {
+        hash = (37 * hash) + PUBLIC_KEY_FIELD_NUMBER;
+        hash = (53 * hash) + getPublicKey().hashCode();
+      }
+      if (hasLabel()) {
+        hash = (37 * hash) + LABEL_FIELD_NUMBER;
+        hash = (53 * hash) + getLabel().hashCode();
+      }
+      if (hasCreationTimestamp()) {
+        hash = (37 * hash) + CREATION_TIMESTAMP_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getCreationTimestamp());
+      }
+      if (hasDeterministicKey()) {
+        hash = (37 * hash) + DETERMINISTIC_KEY_FIELD_NUMBER;
+        hash = (53 * hash) + getDeterministicKey().hashCode();
+      }
+      if (hasDeterministicSeed()) {
+        hash = (37 * hash) + DETERMINISTIC_SEED_FIELD_NUMBER;
+        hash = (53 * hash) + getDeterministicSeed().hashCode();
+      }
+      if (hasEncryptedDeterministicSeed()) {
+        hash = (37 * hash) + ENCRYPTED_DETERMINISTIC_SEED_FIELD_NUMBER;
+        hash = (53 * hash) + getEncryptedDeterministicSeed().hashCode();
+      }
+      if (getAccountPathCount() > 0) {
+        hash = (37 * hash) + ACCOUNT_PATH_FIELD_NUMBER;
+        hash = (53 * hash) + getAccountPathList().hashCode();
+      }
+      if (hasOutputScriptType()) {
+        hash = (37 * hash) + OUTPUT_SCRIPT_TYPE_FIELD_NUMBER;
+        hash = (53 * hash) + outputScriptType_;
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoinj.wallet.Protos.Key parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.wallet.Protos.Key parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoinj.wallet.Protos.Key parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -3209,52 +4140,63 @@ public static org.bitcoinj.wallet.Protos.Key parseFrom(
     }
     public static org.bitcoinj.wallet.Protos.Key parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoinj.wallet.Protos.Key parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoinj.wallet.Protos.Key parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoinj.wallet.Protos.Key parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoinj.wallet.Protos.Key parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoinj.wallet.Protos.Key parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoinj.wallet.Protos.Key prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code wallet.Key}
-     *
      * <pre>
      **
      * A key used to control Bitcoin spending.
@@ -3263,9 +4205,11 @@ protected Builder newBuilderForType(
      * If only the public key is provided, the key can only be used to watch the blockchain and verify
      * transactions, and not for spending.
      * </pre>
+     *
+     * Protobuf type {@code wallet.Key}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:wallet.Key)
         org.bitcoinj.wallet.Protos.KeyOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -3273,7 +4217,8 @@ public static final class Builder extends
         return org.bitcoinj.wallet.Protos.internal_static_wallet_Key_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoinj.wallet.Protos.internal_static_wallet_Key_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -3286,29 +4231,27 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
           getEncryptedDataFieldBuilder();
           getDeterministicKeyFieldBuilder();
           getEncryptedDeterministicSeedFieldBuilder();
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
-        type_ = org.bitcoinj.wallet.Protos.Key.Type.ORIGINAL;
+        type_ = 1;
         bitField0_ = (bitField0_ & ~0x00000001);
         secretBytes_ = com.google.protobuf.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         if (encryptedDataBuilder_ == null) {
-          encryptedData_ = org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance();
+          encryptedData_ = null;
         } else {
           encryptedDataBuilder_.clear();
         }
@@ -3320,7 +4263,7 @@ public Builder clear() {
         creationTimestamp_ = 0L;
         bitField0_ = (bitField0_ & ~0x00000020);
         if (deterministicKeyBuilder_ == null) {
-          deterministicKey_ = org.bitcoinj.wallet.Protos.DeterministicKey.getDefaultInstance();
+          deterministicKey_ = null;
         } else {
           deterministicKeyBuilder_.clear();
         }
@@ -3328,27 +4271,30 @@ public Builder clear() {
         deterministicSeed_ = com.google.protobuf.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000080);
         if (encryptedDeterministicSeedBuilder_ == null) {
-          encryptedDeterministicSeed_ = org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance();
+          encryptedDeterministicSeed_ = null;
         } else {
           encryptedDeterministicSeedBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000100);
+        accountPath_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000200);
+        outputScriptType_ = 1;
+        bitField0_ = (bitField0_ & ~0x00000400);
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoinj.wallet.Protos.internal_static_wallet_Key_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoinj.wallet.Protos.Key getDefaultInstanceForType() {
         return org.bitcoinj.wallet.Protos.Key.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoinj.wallet.Protos.Key build() {
         org.bitcoinj.wallet.Protos.Key result = buildPartial();
         if (!result.isInitialized()) {
@@ -3357,6 +4303,7 @@ public org.bitcoinj.wallet.Protos.Key build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoinj.wallet.Protos.Key buildPartial() {
         org.bitcoinj.wallet.Protos.Key result = new org.bitcoinj.wallet.Protos.Key(this);
         int from_bitField0_ = bitField0_;
@@ -3409,11 +4356,53 @@ public org.bitcoinj.wallet.Protos.Key buildPartial() {
         } else {
           result.encryptedDeterministicSeed_ = encryptedDeterministicSeedBuilder_.build();
         }
+        if (((bitField0_ & 0x00000200) == 0x00000200)) {
+          accountPath_ = java.util.Collections.unmodifiableList(accountPath_);
+          bitField0_ = (bitField0_ & ~0x00000200);
+        }
+        result.accountPath_ = accountPath_;
+        if (((from_bitField0_ & 0x00000400) == 0x00000400)) {
+          to_bitField0_ |= 0x00000200;
+        }
+        result.outputScriptType_ = outputScriptType_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoinj.wallet.Protos.Key) {
           return mergeFrom((org.bitcoinj.wallet.Protos.Key)other);
@@ -3454,36 +4443,48 @@ public Builder mergeFrom(org.bitcoinj.wallet.Protos.Key other) {
         if (other.hasEncryptedDeterministicSeed()) {
           mergeEncryptedDeterministicSeed(other.getEncryptedDeterministicSeed());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        if (!other.accountPath_.isEmpty()) {
+          if (accountPath_.isEmpty()) {
+            accountPath_ = other.accountPath_;
+            bitField0_ = (bitField0_ & ~0x00000200);
+          } else {
+            ensureAccountPathIsMutable();
+            accountPath_.addAll(other.accountPath_);
+          }
+          onChanged();
+        }
+        if (other.hasOutputScriptType()) {
+          setOutputScriptType(other.getOutputScriptType());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasType()) {
-          
           return false;
         }
         if (hasEncryptedData()) {
           if (!getEncryptedData().isInitialized()) {
-            
             return false;
           }
         }
         if (hasDeterministicKey()) {
           if (!getDeterministicKey().isInitialized()) {
-            
             return false;
           }
         }
         if (hasEncryptedDeterministicSeed()) {
           if (!getEncryptedDeterministicSeed().isInitialized()) {
-            
             return false;
           }
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3493,7 +4494,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoinj.wallet.Protos.Key) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -3503,7 +4504,7 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private org.bitcoinj.wallet.Protos.Key.Type type_ = org.bitcoinj.wallet.Protos.Key.Type.ORIGINAL;
+      private int type_ = 1;
       /**
        * <code>required .wallet.Key.Type type = 1;</code>
        */
@@ -3514,7 +4515,9 @@ public boolean hasType() {
        * <code>required .wallet.Key.Type type = 1;</code>
        */
       public org.bitcoinj.wallet.Protos.Key.Type getType() {
-        return type_;
+        @SuppressWarnings("deprecation")
+        org.bitcoinj.wallet.Protos.Key.Type result = org.bitcoinj.wallet.Protos.Key.Type.valueOf(type_);
+        return result == null ? org.bitcoinj.wallet.Protos.Key.Type.ORIGINAL : result;
       }
       /**
        * <code>required .wallet.Key.Type type = 1;</code>
@@ -3524,7 +4527,7 @@ public Builder setType(org.bitcoinj.wallet.Protos.Key.Type value) {
           throw new NullPointerException();
         }
         bitField0_ |= 0x00000001;
-        type_ = value;
+        type_ = value.getNumber();
         onChanged();
         return this;
       }
@@ -3533,41 +4536,41 @@ public Builder setType(org.bitcoinj.wallet.Protos.Key.Type value) {
        */
       public Builder clearType() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        type_ = org.bitcoinj.wallet.Protos.Key.Type.ORIGINAL;
+        type_ = 1;
         onChanged();
         return this;
       }
 
       private com.google.protobuf.ByteString secretBytes_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>optional bytes secret_bytes = 2;</code>
-       *
        * <pre>
        * Either the private EC key bytes (without any ASN.1 wrapping), or the deterministic root seed.
        * If the secret is encrypted, or this is a "watching entry" then this is missing.
        * </pre>
+       *
+       * <code>optional bytes secret_bytes = 2;</code>
        */
       public boolean hasSecretBytes() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>optional bytes secret_bytes = 2;</code>
-       *
        * <pre>
        * Either the private EC key bytes (without any ASN.1 wrapping), or the deterministic root seed.
        * If the secret is encrypted, or this is a "watching entry" then this is missing.
        * </pre>
+       *
+       * <code>optional bytes secret_bytes = 2;</code>
        */
       public com.google.protobuf.ByteString getSecretBytes() {
         return secretBytes_;
       }
       /**
-       * <code>optional bytes secret_bytes = 2;</code>
-       *
        * <pre>
        * Either the private EC key bytes (without any ASN.1 wrapping), or the deterministic root seed.
        * If the secret is encrypted, or this is a "watching entry" then this is missing.
        * </pre>
+       *
+       * <code>optional bytes secret_bytes = 2;</code>
        */
       public Builder setSecretBytes(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -3579,12 +4582,12 @@ public Builder setSecretBytes(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>optional bytes secret_bytes = 2;</code>
-       *
        * <pre>
        * Either the private EC key bytes (without any ASN.1 wrapping), or the deterministic root seed.
        * If the secret is encrypted, or this is a "watching entry" then this is missing.
        * </pre>
+       *
+       * <code>optional bytes secret_bytes = 2;</code>
        */
       public Builder clearSecretBytes() {
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -3593,39 +4596,39 @@ public Builder clearSecretBytes() {
         return this;
       }
 
-      private org.bitcoinj.wallet.Protos.EncryptedData encryptedData_ = org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
+      private org.bitcoinj.wallet.Protos.EncryptedData encryptedData_ = null;
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoinj.wallet.Protos.EncryptedData, org.bitcoinj.wallet.Protos.EncryptedData.Builder, org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder> encryptedDataBuilder_;
       /**
-       * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
-       *
        * <pre>
        * If the secret data is encrypted, then secret_bytes is missing and this field is set.
        * </pre>
+       *
+       * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
        */
       public boolean hasEncryptedData() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
-       *
        * <pre>
        * If the secret data is encrypted, then secret_bytes is missing and this field is set.
        * </pre>
+       *
+       * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
        */
       public org.bitcoinj.wallet.Protos.EncryptedData getEncryptedData() {
         if (encryptedDataBuilder_ == null) {
-          return encryptedData_;
+          return encryptedData_ == null ? org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance() : encryptedData_;
         } else {
           return encryptedDataBuilder_.getMessage();
         }
       }
       /**
-       * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
-       *
        * <pre>
        * If the secret data is encrypted, then secret_bytes is missing and this field is set.
        * </pre>
+       *
+       * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
        */
       public Builder setEncryptedData(org.bitcoinj.wallet.Protos.EncryptedData value) {
         if (encryptedDataBuilder_ == null) {
@@ -3641,11 +4644,11 @@ public Builder setEncryptedData(org.bitcoinj.wallet.Protos.EncryptedData value)
         return this;
       }
       /**
-       * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
-       *
        * <pre>
        * If the secret data is encrypted, then secret_bytes is missing and this field is set.
        * </pre>
+       *
+       * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
        */
       public Builder setEncryptedData(
           org.bitcoinj.wallet.Protos.EncryptedData.Builder builderForValue) {
@@ -3659,15 +4662,16 @@ public Builder setEncryptedData(
         return this;
       }
       /**
-       * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
-       *
        * <pre>
        * If the secret data is encrypted, then secret_bytes is missing and this field is set.
        * </pre>
+       *
+       * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
        */
       public Builder mergeEncryptedData(org.bitcoinj.wallet.Protos.EncryptedData value) {
         if (encryptedDataBuilder_ == null) {
           if (((bitField0_ & 0x00000004) == 0x00000004) &&
+              encryptedData_ != null &&
               encryptedData_ != org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance()) {
             encryptedData_ =
               org.bitcoinj.wallet.Protos.EncryptedData.newBuilder(encryptedData_).mergeFrom(value).buildPartial();
@@ -3682,15 +4686,15 @@ public Builder mergeEncryptedData(org.bitcoinj.wallet.Protos.EncryptedData value
         return this;
       }
       /**
-       * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
-       *
        * <pre>
        * If the secret data is encrypted, then secret_bytes is missing and this field is set.
        * </pre>
+       *
+       * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
        */
       public Builder clearEncryptedData() {
         if (encryptedDataBuilder_ == null) {
-          encryptedData_ = org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance();
+          encryptedData_ = null;
           onChanged();
         } else {
           encryptedDataBuilder_.clear();
@@ -3699,11 +4703,11 @@ public Builder clearEncryptedData() {
         return this;
       }
       /**
-       * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
-       *
        * <pre>
        * If the secret data is encrypted, then secret_bytes is missing and this field is set.
        * </pre>
+       *
+       * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
        */
       public org.bitcoinj.wallet.Protos.EncryptedData.Builder getEncryptedDataBuilder() {
         bitField0_ |= 0x00000004;
@@ -3711,31 +4715,32 @@ public org.bitcoinj.wallet.Protos.EncryptedData.Builder getEncryptedDataBuilder(
         return getEncryptedDataFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
-       *
        * <pre>
        * If the secret data is encrypted, then secret_bytes is missing and this field is set.
        * </pre>
+       *
+       * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
        */
       public org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder getEncryptedDataOrBuilder() {
         if (encryptedDataBuilder_ != null) {
           return encryptedDataBuilder_.getMessageOrBuilder();
         } else {
-          return encryptedData_;
+          return encryptedData_ == null ?
+              org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance() : encryptedData_;
         }
       }
       /**
-       * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
-       *
        * <pre>
        * If the secret data is encrypted, then secret_bytes is missing and this field is set.
        * </pre>
+       *
+       * <code>optional .wallet.EncryptedData encrypted_data = 6;</code>
        */
-      private com.google.protobuf.SingleFieldBuilder<
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoinj.wallet.Protos.EncryptedData, org.bitcoinj.wallet.Protos.EncryptedData.Builder, org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder> 
           getEncryptedDataFieldBuilder() {
         if (encryptedDataBuilder_ == null) {
-          encryptedDataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+          encryptedDataBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               org.bitcoinj.wallet.Protos.EncryptedData, org.bitcoinj.wallet.Protos.EncryptedData.Builder, org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder>(
                   getEncryptedData(),
                   getParentForChildren(),
@@ -3747,34 +4752,34 @@ public org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder getEncryptedDataOrBuild
 
       private com.google.protobuf.ByteString publicKey_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>optional bytes public_key = 3;</code>
-       *
        * <pre>
        * The public EC key derived from the private key. We allow both to be stored to avoid mobile clients having to
        * do lots of slow EC math on startup. For DETERMINISTIC_MNEMONIC entries this is missing.
        * </pre>
+       *
+       * <code>optional bytes public_key = 3;</code>
        */
       public boolean hasPublicKey() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * <code>optional bytes public_key = 3;</code>
-       *
        * <pre>
        * The public EC key derived from the private key. We allow both to be stored to avoid mobile clients having to
        * do lots of slow EC math on startup. For DETERMINISTIC_MNEMONIC entries this is missing.
        * </pre>
+       *
+       * <code>optional bytes public_key = 3;</code>
        */
       public com.google.protobuf.ByteString getPublicKey() {
         return publicKey_;
       }
       /**
-       * <code>optional bytes public_key = 3;</code>
-       *
        * <pre>
        * The public EC key derived from the private key. We allow both to be stored to avoid mobile clients having to
        * do lots of slow EC math on startup. For DETERMINISTIC_MNEMONIC entries this is missing.
        * </pre>
+       *
+       * <code>optional bytes public_key = 3;</code>
        */
       public Builder setPublicKey(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -3786,12 +4791,12 @@ public Builder setPublicKey(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>optional bytes public_key = 3;</code>
-       *
        * <pre>
        * The public EC key derived from the private key. We allow both to be stored to avoid mobile clients having to
        * do lots of slow EC math on startup. For DETERMINISTIC_MNEMONIC entries this is missing.
        * </pre>
+       *
+       * <code>optional bytes public_key = 3;</code>
        */
       public Builder clearPublicKey() {
         bitField0_ = (bitField0_ & ~0x00000008);
@@ -3802,21 +4807,21 @@ public Builder clearPublicKey() {
 
       private java.lang.Object label_ = "";
       /**
-       * <code>optional string label = 4;</code>
-       *
        * <pre>
        * User-provided label associated with the key.
        * </pre>
+       *
+       * <code>optional string label = 4;</code>
        */
       public boolean hasLabel() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * <code>optional string label = 4;</code>
-       *
        * <pre>
        * User-provided label associated with the key.
        * </pre>
+       *
+       * <code>optional string label = 4;</code>
        */
       public java.lang.String getLabel() {
         java.lang.Object ref = label_;
@@ -3833,11 +4838,11 @@ public java.lang.String getLabel() {
         }
       }
       /**
-       * <code>optional string label = 4;</code>
-       *
        * <pre>
        * User-provided label associated with the key.
        * </pre>
+       *
+       * <code>optional string label = 4;</code>
        */
       public com.google.protobuf.ByteString
           getLabelBytes() {
@@ -3853,11 +4858,11 @@ public java.lang.String getLabel() {
         }
       }
       /**
-       * <code>optional string label = 4;</code>
-       *
        * <pre>
        * User-provided label associated with the key.
        * </pre>
+       *
+       * <code>optional string label = 4;</code>
        */
       public Builder setLabel(
           java.lang.String value) {
@@ -3870,11 +4875,11 @@ public Builder setLabel(
         return this;
       }
       /**
-       * <code>optional string label = 4;</code>
-       *
        * <pre>
        * User-provided label associated with the key.
        * </pre>
+       *
+       * <code>optional string label = 4;</code>
        */
       public Builder clearLabel() {
         bitField0_ = (bitField0_ & ~0x00000010);
@@ -3883,11 +4888,11 @@ public Builder clearLabel() {
         return this;
       }
       /**
-       * <code>optional string label = 4;</code>
-       *
        * <pre>
        * User-provided label associated with the key.
        * </pre>
+       *
+       * <code>optional string label = 4;</code>
        */
       public Builder setLabelBytes(
           com.google.protobuf.ByteString value) {
@@ -3902,34 +4907,34 @@ public Builder setLabelBytes(
 
       private long creationTimestamp_ ;
       /**
-       * <code>optional int64 creation_timestamp = 5;</code>
-       *
        * <pre>
        * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. The reason it's
        * optional is that keys derived from a parent don't have this data.
        * </pre>
+       *
+       * <code>optional int64 creation_timestamp = 5;</code>
        */
       public boolean hasCreationTimestamp() {
         return ((bitField0_ & 0x00000020) == 0x00000020);
       }
       /**
-       * <code>optional int64 creation_timestamp = 5;</code>
-       *
        * <pre>
        * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. The reason it's
        * optional is that keys derived from a parent don't have this data.
        * </pre>
+       *
+       * <code>optional int64 creation_timestamp = 5;</code>
        */
       public long getCreationTimestamp() {
         return creationTimestamp_;
       }
       /**
-       * <code>optional int64 creation_timestamp = 5;</code>
-       *
        * <pre>
        * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. The reason it's
        * optional is that keys derived from a parent don't have this data.
        * </pre>
+       *
+       * <code>optional int64 creation_timestamp = 5;</code>
        */
       public Builder setCreationTimestamp(long value) {
         bitField0_ |= 0x00000020;
@@ -3938,12 +4943,12 @@ public Builder setCreationTimestamp(long value) {
         return this;
       }
       /**
-       * <code>optional int64 creation_timestamp = 5;</code>
-       *
        * <pre>
        * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point. The reason it's
        * optional is that keys derived from a parent don't have this data.
        * </pre>
+       *
+       * <code>optional int64 creation_timestamp = 5;</code>
        */
       public Builder clearCreationTimestamp() {
         bitField0_ = (bitField0_ & ~0x00000020);
@@ -3952,8 +4957,8 @@ public Builder clearCreationTimestamp() {
         return this;
       }
 
-      private org.bitcoinj.wallet.Protos.DeterministicKey deterministicKey_ = org.bitcoinj.wallet.Protos.DeterministicKey.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
+      private org.bitcoinj.wallet.Protos.DeterministicKey deterministicKey_ = null;
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoinj.wallet.Protos.DeterministicKey, org.bitcoinj.wallet.Protos.DeterministicKey.Builder, org.bitcoinj.wallet.Protos.DeterministicKeyOrBuilder> deterministicKeyBuilder_;
       /**
        * <code>optional .wallet.DeterministicKey deterministic_key = 7;</code>
@@ -3966,7 +4971,7 @@ public boolean hasDeterministicKey() {
        */
       public org.bitcoinj.wallet.Protos.DeterministicKey getDeterministicKey() {
         if (deterministicKeyBuilder_ == null) {
-          return deterministicKey_;
+          return deterministicKey_ == null ? org.bitcoinj.wallet.Protos.DeterministicKey.getDefaultInstance() : deterministicKey_;
         } else {
           return deterministicKeyBuilder_.getMessage();
         }
@@ -4007,6 +5012,7 @@ public Builder setDeterministicKey(
       public Builder mergeDeterministicKey(org.bitcoinj.wallet.Protos.DeterministicKey value) {
         if (deterministicKeyBuilder_ == null) {
           if (((bitField0_ & 0x00000040) == 0x00000040) &&
+              deterministicKey_ != null &&
               deterministicKey_ != org.bitcoinj.wallet.Protos.DeterministicKey.getDefaultInstance()) {
             deterministicKey_ =
               org.bitcoinj.wallet.Protos.DeterministicKey.newBuilder(deterministicKey_).mergeFrom(value).buildPartial();
@@ -4025,7 +5031,7 @@ public Builder mergeDeterministicKey(org.bitcoinj.wallet.Protos.DeterministicKey
        */
       public Builder clearDeterministicKey() {
         if (deterministicKeyBuilder_ == null) {
-          deterministicKey_ = org.bitcoinj.wallet.Protos.DeterministicKey.getDefaultInstance();
+          deterministicKey_ = null;
           onChanged();
         } else {
           deterministicKeyBuilder_.clear();
@@ -4048,17 +5054,18 @@ public org.bitcoinj.wallet.Protos.DeterministicKeyOrBuilder getDeterministicKeyO
         if (deterministicKeyBuilder_ != null) {
           return deterministicKeyBuilder_.getMessageOrBuilder();
         } else {
-          return deterministicKey_;
+          return deterministicKey_ == null ?
+              org.bitcoinj.wallet.Protos.DeterministicKey.getDefaultInstance() : deterministicKey_;
         }
       }
       /**
        * <code>optional .wallet.DeterministicKey deterministic_key = 7;</code>
        */
-      private com.google.protobuf.SingleFieldBuilder<
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoinj.wallet.Protos.DeterministicKey, org.bitcoinj.wallet.Protos.DeterministicKey.Builder, org.bitcoinj.wallet.Protos.DeterministicKeyOrBuilder> 
           getDeterministicKeyFieldBuilder() {
         if (deterministicKeyBuilder_ == null) {
-          deterministicKeyBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+          deterministicKeyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               org.bitcoinj.wallet.Protos.DeterministicKey, org.bitcoinj.wallet.Protos.DeterministicKey.Builder, org.bitcoinj.wallet.Protos.DeterministicKeyOrBuilder>(
                   getDeterministicKey(),
                   getParentForChildren(),
@@ -4070,34 +5077,34 @@ public org.bitcoinj.wallet.Protos.DeterministicKeyOrBuilder getDeterministicKeyO
 
       private com.google.protobuf.ByteString deterministicSeed_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>optional bytes deterministic_seed = 8;</code>
-       *
        * <pre>
        * The seed for a deterministic key hierarchy.  Derived from the mnemonic,
        * but cached here for quick startup.  Only applicable to a DETERMINISTIC_MNEMONIC key entry.
        * </pre>
+       *
+       * <code>optional bytes deterministic_seed = 8;</code>
        */
       public boolean hasDeterministicSeed() {
         return ((bitField0_ & 0x00000080) == 0x00000080);
       }
       /**
-       * <code>optional bytes deterministic_seed = 8;</code>
-       *
        * <pre>
        * The seed for a deterministic key hierarchy.  Derived from the mnemonic,
        * but cached here for quick startup.  Only applicable to a DETERMINISTIC_MNEMONIC key entry.
        * </pre>
+       *
+       * <code>optional bytes deterministic_seed = 8;</code>
        */
       public com.google.protobuf.ByteString getDeterministicSeed() {
         return deterministicSeed_;
       }
       /**
-       * <code>optional bytes deterministic_seed = 8;</code>
-       *
        * <pre>
        * The seed for a deterministic key hierarchy.  Derived from the mnemonic,
        * but cached here for quick startup.  Only applicable to a DETERMINISTIC_MNEMONIC key entry.
        * </pre>
+       *
+       * <code>optional bytes deterministic_seed = 8;</code>
        */
       public Builder setDeterministicSeed(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -4109,12 +5116,12 @@ public Builder setDeterministicSeed(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>optional bytes deterministic_seed = 8;</code>
-       *
        * <pre>
        * The seed for a deterministic key hierarchy.  Derived from the mnemonic,
        * but cached here for quick startup.  Only applicable to a DETERMINISTIC_MNEMONIC key entry.
        * </pre>
+       *
+       * <code>optional bytes deterministic_seed = 8;</code>
        */
       public Builder clearDeterministicSeed() {
         bitField0_ = (bitField0_ & ~0x00000080);
@@ -4123,39 +5130,39 @@ public Builder clearDeterministicSeed() {
         return this;
       }
 
-      private org.bitcoinj.wallet.Protos.EncryptedData encryptedDeterministicSeed_ = org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
+      private org.bitcoinj.wallet.Protos.EncryptedData encryptedDeterministicSeed_ = null;
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoinj.wallet.Protos.EncryptedData, org.bitcoinj.wallet.Protos.EncryptedData.Builder, org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder> encryptedDeterministicSeedBuilder_;
       /**
-       * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
-       *
        * <pre>
        * Encrypted version of the seed
        * </pre>
+       *
+       * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
        */
       public boolean hasEncryptedDeterministicSeed() {
         return ((bitField0_ & 0x00000100) == 0x00000100);
       }
       /**
-       * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
-       *
        * <pre>
        * Encrypted version of the seed
        * </pre>
+       *
+       * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
        */
       public org.bitcoinj.wallet.Protos.EncryptedData getEncryptedDeterministicSeed() {
         if (encryptedDeterministicSeedBuilder_ == null) {
-          return encryptedDeterministicSeed_;
+          return encryptedDeterministicSeed_ == null ? org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance() : encryptedDeterministicSeed_;
         } else {
           return encryptedDeterministicSeedBuilder_.getMessage();
         }
       }
       /**
-       * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
-       *
        * <pre>
        * Encrypted version of the seed
        * </pre>
+       *
+       * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
        */
       public Builder setEncryptedDeterministicSeed(org.bitcoinj.wallet.Protos.EncryptedData value) {
         if (encryptedDeterministicSeedBuilder_ == null) {
@@ -4171,11 +5178,11 @@ public Builder setEncryptedDeterministicSeed(org.bitcoinj.wallet.Protos.Encrypte
         return this;
       }
       /**
-       * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
-       *
        * <pre>
        * Encrypted version of the seed
        * </pre>
+       *
+       * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
        */
       public Builder setEncryptedDeterministicSeed(
           org.bitcoinj.wallet.Protos.EncryptedData.Builder builderForValue) {
@@ -4189,15 +5196,16 @@ public Builder setEncryptedDeterministicSeed(
         return this;
       }
       /**
-       * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
-       *
        * <pre>
        * Encrypted version of the seed
        * </pre>
+       *
+       * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
        */
       public Builder mergeEncryptedDeterministicSeed(org.bitcoinj.wallet.Protos.EncryptedData value) {
         if (encryptedDeterministicSeedBuilder_ == null) {
           if (((bitField0_ & 0x00000100) == 0x00000100) &&
+              encryptedDeterministicSeed_ != null &&
               encryptedDeterministicSeed_ != org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance()) {
             encryptedDeterministicSeed_ =
               org.bitcoinj.wallet.Protos.EncryptedData.newBuilder(encryptedDeterministicSeed_).mergeFrom(value).buildPartial();
@@ -4212,15 +5220,15 @@ public Builder mergeEncryptedDeterministicSeed(org.bitcoinj.wallet.Protos.Encryp
         return this;
       }
       /**
-       * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
-       *
        * <pre>
        * Encrypted version of the seed
        * </pre>
+       *
+       * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
        */
       public Builder clearEncryptedDeterministicSeed() {
         if (encryptedDeterministicSeedBuilder_ == null) {
-          encryptedDeterministicSeed_ = org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance();
+          encryptedDeterministicSeed_ = null;
           onChanged();
         } else {
           encryptedDeterministicSeedBuilder_.clear();
@@ -4229,11 +5237,11 @@ public Builder clearEncryptedDeterministicSeed() {
         return this;
       }
       /**
-       * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
-       *
        * <pre>
        * Encrypted version of the seed
        * </pre>
+       *
+       * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
        */
       public org.bitcoinj.wallet.Protos.EncryptedData.Builder getEncryptedDeterministicSeedBuilder() {
         bitField0_ |= 0x00000100;
@@ -4241,31 +5249,32 @@ public org.bitcoinj.wallet.Protos.EncryptedData.Builder getEncryptedDeterministi
         return getEncryptedDeterministicSeedFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
-       *
        * <pre>
        * Encrypted version of the seed
        * </pre>
+       *
+       * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
        */
       public org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder getEncryptedDeterministicSeedOrBuilder() {
         if (encryptedDeterministicSeedBuilder_ != null) {
           return encryptedDeterministicSeedBuilder_.getMessageOrBuilder();
         } else {
-          return encryptedDeterministicSeed_;
+          return encryptedDeterministicSeed_ == null ?
+              org.bitcoinj.wallet.Protos.EncryptedData.getDefaultInstance() : encryptedDeterministicSeed_;
         }
       }
       /**
-       * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
-       *
        * <pre>
        * Encrypted version of the seed
        * </pre>
+       *
+       * <code>optional .wallet.EncryptedData encrypted_deterministic_seed = 9;</code>
        */
-      private com.google.protobuf.SingleFieldBuilder<
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoinj.wallet.Protos.EncryptedData, org.bitcoinj.wallet.Protos.EncryptedData.Builder, org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder> 
           getEncryptedDeterministicSeedFieldBuilder() {
         if (encryptedDeterministicSeedBuilder_ == null) {
-          encryptedDeterministicSeedBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+          encryptedDeterministicSeedBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               org.bitcoinj.wallet.Protos.EncryptedData, org.bitcoinj.wallet.Protos.EncryptedData.Builder, org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder>(
                   getEncryptedDeterministicSeed(),
                   getParentForChildren(),
@@ -4275,15 +5284,203 @@ public org.bitcoinj.wallet.Protos.EncryptedDataOrBuilder getEncryptedDeterminist
         return encryptedDeterministicSeedBuilder_;
       }
 
+      private java.util.List<java.lang.Integer> accountPath_ = java.util.Collections.emptyList();
+      private void ensureAccountPathIsMutable() {
+        if (!((bitField0_ & 0x00000200) == 0x00000200)) {
+          accountPath_ = new java.util.ArrayList<java.lang.Integer>(accountPath_);
+          bitField0_ |= 0x00000200;
+         }
+      }
+      /**
+       * <pre>
+       * The path to the root. Only applicable to a DETERMINISTIC_MNEMONIC key entry.
+       * </pre>
+       *
+       * <code>repeated uint32 account_path = 10 [packed = true];</code>
+       */
+      public java.util.List<java.lang.Integer>
+          getAccountPathList() {
+        return java.util.Collections.unmodifiableList(accountPath_);
+      }
+      /**
+       * <pre>
+       * The path to the root. Only applicable to a DETERMINISTIC_MNEMONIC key entry.
+       * </pre>
+       *
+       * <code>repeated uint32 account_path = 10 [packed = true];</code>
+       */
+      public int getAccountPathCount() {
+        return accountPath_.size();
+      }
+      /**
+       * <pre>
+       * The path to the root. Only applicable to a DETERMINISTIC_MNEMONIC key entry.
+       * </pre>
+       *
+       * <code>repeated uint32 account_path = 10 [packed = true];</code>
+       */
+      public int getAccountPath(int index) {
+        return accountPath_.get(index);
+      }
+      /**
+       * <pre>
+       * The path to the root. Only applicable to a DETERMINISTIC_MNEMONIC key entry.
+       * </pre>
+       *
+       * <code>repeated uint32 account_path = 10 [packed = true];</code>
+       */
+      public Builder setAccountPath(
+          int index, int value) {
+        ensureAccountPathIsMutable();
+        accountPath_.set(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * The path to the root. Only applicable to a DETERMINISTIC_MNEMONIC key entry.
+       * </pre>
+       *
+       * <code>repeated uint32 account_path = 10 [packed = true];</code>
+       */
+      public Builder addAccountPath(int value) {
+        ensureAccountPathIsMutable();
+        accountPath_.add(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * The path to the root. Only applicable to a DETERMINISTIC_MNEMONIC key entry.
+       * </pre>
+       *
+       * <code>repeated uint32 account_path = 10 [packed = true];</code>
+       */
+      public Builder addAllAccountPath(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureAccountPathIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, accountPath_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * The path to the root. Only applicable to a DETERMINISTIC_MNEMONIC key entry.
+       * </pre>
+       *
+       * <code>repeated uint32 account_path = 10 [packed = true];</code>
+       */
+      public Builder clearAccountPath() {
+        accountPath_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000200);
+        onChanged();
+        return this;
+      }
+
+      private int outputScriptType_ = 1;
+      /**
+       * <pre>
+       * Type of addresses (aka output scripts) to generate for receiving.
+       * </pre>
+       *
+       * <code>optional .wallet.Key.OutputScriptType output_script_type = 11;</code>
+       */
+      public boolean hasOutputScriptType() {
+        return ((bitField0_ & 0x00000400) == 0x00000400);
+      }
+      /**
+       * <pre>
+       * Type of addresses (aka output scripts) to generate for receiving.
+       * </pre>
+       *
+       * <code>optional .wallet.Key.OutputScriptType output_script_type = 11;</code>
+       */
+      public org.bitcoinj.wallet.Protos.Key.OutputScriptType getOutputScriptType() {
+        @SuppressWarnings("deprecation")
+        org.bitcoinj.wallet.Protos.Key.OutputScriptType result = org.bitcoinj.wallet.Protos.Key.OutputScriptType.valueOf(outputScriptType_);
+        return result == null ? org.bitcoinj.wallet.Protos.Key.OutputScriptType.P2PKH : result;
+      }
+      /**
+       * <pre>
+       * Type of addresses (aka output scripts) to generate for receiving.
+       * </pre>
+       *
+       * <code>optional .wallet.Key.OutputScriptType output_script_type = 11;</code>
+       */
+      public Builder setOutputScriptType(org.bitcoinj.wallet.Protos.Key.OutputScriptType value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000400;
+        outputScriptType_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Type of addresses (aka output scripts) to generate for receiving.
+       * </pre>
+       *
+       * <code>optional .wallet.Key.OutputScriptType output_script_type = 11;</code>
+       */
+      public Builder clearOutputScriptType() {
+        bitField0_ = (bitField0_ & ~0x00000400);
+        outputScriptType_ = 1;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
       // @@protoc_insertion_point(builder_scope:wallet.Key)
     }
 
+    // @@protoc_insertion_point(class_scope:wallet.Key)
+    private static final org.bitcoinj.wallet.Protos.Key DEFAULT_INSTANCE;
     static {
-      defaultInstance = new Key(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoinj.wallet.Protos.Key();
+    }
+
+    public static org.bitcoinj.wallet.Protos.Key getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<Key>
+        PARSER = new com.google.protobuf.AbstractParser<Key>() {
+      @java.lang.Override
+      public Key parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new Key(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<Key> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Key> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoinj.wallet.Protos.Key getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:wallet.Key)
   }
 
   public interface ScriptOrBuilder extends
@@ -4300,58 +5497,54 @@ public interface ScriptOrBuilder extends
     com.google.protobuf.ByteString getProgram();
 
     /**
-     * <code>required int64 creation_timestamp = 2;</code>
-     *
      * <pre>
      * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point
      * when watching for scripts on the blockchain.
      * </pre>
+     *
+     * <code>required int64 creation_timestamp = 2;</code>
      */
     boolean hasCreationTimestamp();
     /**
-     * <code>required int64 creation_timestamp = 2;</code>
-     *
      * <pre>
      * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point
      * when watching for scripts on the blockchain.
      * </pre>
+     *
+     * <code>required int64 creation_timestamp = 2;</code>
      */
     long getCreationTimestamp();
   }
   /**
    * Protobuf type {@code wallet.Script}
    */
-  public static final class Script extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class Script extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:wallet.Script)
       ScriptOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Script.newBuilder() to construct.
-    private Script(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private Script(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private Script(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Script defaultInstance;
-    public static Script getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public Script getDefaultInstanceForType() {
-      return defaultInstance;
+    private Script() {
+      program_ = com.google.protobuf.ByteString.EMPTY;
+      creationTimestamp_ = 0L;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private Script(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4363,13 +5556,6 @@ private Script(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               bitField0_ |= 0x00000001;
               program_ = input.readBytes();
@@ -4380,13 +5566,20 @@ private Script(
               creationTimestamp_ = input.readInt64();
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -4397,28 +5590,14 @@ private Script(
       return org.bitcoinj.wallet.Protos.internal_static_wallet_Script_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoinj.wallet.Protos.internal_static_wallet_Script_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoinj.wallet.Protos.Script.class, org.bitcoinj.wallet.Protos.Script.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<Script> PARSER =
-        new com.google.protobuf.AbstractParser<Script>() {
-      public Script parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Script(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Script> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int PROGRAM_FIELD_NUMBER = 1;
     private com.google.protobuf.ByteString program_;
@@ -4438,33 +5617,30 @@ public com.google.protobuf.ByteString getProgram() {
     public static final int CREATION_TIMESTAMP_FIELD_NUMBER = 2;
     private long creationTimestamp_;
     /**
-     * <code>required int64 creation_timestamp = 2;</code>
-     *
      * <pre>
      * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point
      * when watching for scripts on the blockchain.
      * </pre>
+     *
+     * <code>required int64 creation_timestamp = 2;</code>
      */
     public boolean hasCreationTimestamp() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>required int64 creation_timestamp = 2;</code>
-     *
      * <pre>
      * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point
      * when watching for scripts on the blockchain.
      * </pre>
+     *
+     * <code>required int64 creation_timestamp = 2;</code>
      */
     public long getCreationTimestamp() {
       return creationTimestamp_;
     }
 
-    private void initFields() {
-      program_ = com.google.protobuf.ByteString.EMPTY;
-      creationTimestamp_ = 0L;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -4482,21 +5658,21 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeBytes(1, program_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeInt64(2, creationTimestamp_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -4508,18 +5684,68 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeInt64Size(2, creationTimestamp_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoinj.wallet.Protos.Script)) {
+        return super.equals(obj);
+      }
+      org.bitcoinj.wallet.Protos.Script other = (org.bitcoinj.wallet.Protos.Script) obj;
+
+      boolean result = true;
+      result = result && (hasProgram() == other.hasProgram());
+      if (hasProgram()) {
+        result = result && getProgram()
+            .equals(other.getProgram());
+      }
+      result = result && (hasCreationTimestamp() == other.hasCreationTimestamp());
+      if (hasCreationTimestamp()) {
+        result = result && (getCreationTimestamp()
+            == other.getCreationTimestamp());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasProgram()) {
+        hash = (37 * hash) + PROGRAM_FIELD_NUMBER;
+        hash = (53 * hash) + getProgram().hashCode();
+      }
+      if (hasCreationTimestamp()) {
+        hash = (37 * hash) + CREATION_TIMESTAMP_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getCreationTimestamp());
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoinj.wallet.Protos.Script parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.wallet.Protos.Script parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoinj.wallet.Protos.Script parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -4543,46 +5769,59 @@ public static org.bitcoinj.wallet.Protos.Script parseFrom(
     }
     public static org.bitcoinj.wallet.Protos.Script parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoinj.wallet.Protos.Script parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoinj.wallet.Protos.Script parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoinj.wallet.Protos.Script parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoinj.wallet.Protos.Script parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoinj.wallet.Protos.Script parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoinj.wallet.Protos.Script prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -4590,7 +5829,7 @@ protected Builder newBuilderForType(
      * Protobuf type {@code wallet.Script}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:wallet.Script)
         org.bitcoinj.wallet.Protos.ScriptOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -4598,7 +5837,8 @@ public static final class Builder extends
         return org.bitcoinj.wallet.Protos.internal_static_wallet_Script_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoinj.wallet.Protos.internal_static_wallet_Script_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -4611,18 +5851,16 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         program_ = com.google.protobuf.ByteString.EMPTY;
@@ -4632,19 +5870,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoinj.wallet.Protos.internal_static_wallet_Script_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoinj.wallet.Protos.Script getDefaultInstanceForType() {
         return org.bitcoinj.wallet.Protos.Script.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoinj.wallet.Protos.Script build() {
         org.bitcoinj.wallet.Protos.Script result = buildPartial();
         if (!result.isInitialized()) {
@@ -4653,6 +5890,7 @@ public org.bitcoinj.wallet.Protos.Script build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoinj.wallet.Protos.Script buildPartial() {
         org.bitcoinj.wallet.Protos.Script result = new org.bitcoinj.wallet.Protos.Script(this);
         int from_bitField0_ = bitField0_;
@@ -4670,6 +5908,39 @@ public org.bitcoinj.wallet.Protos.Script buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoinj.wallet.Protos.Script) {
           return mergeFrom((org.bitcoinj.wallet.Protos.Script)other);
@@ -4687,22 +5958,23 @@ public Builder mergeFrom(org.bitcoinj.wallet.Protos.Script other) {
         if (other.hasCreationTimestamp()) {
           setCreationTimestamp(other.getCreationTimestamp());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasProgram()) {
-          
           return false;
         }
         if (!hasCreationTimestamp()) {
-          
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4712,7 +5984,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoinj.wallet.Protos.Script) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -4759,34 +6031,34 @@ public Builder clearProgram() {
 
       private long creationTimestamp_ ;
       /**
-       * <code>required int64 creation_timestamp = 2;</code>
-       *
        * <pre>
        * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point
        * when watching for scripts on the blockchain.
        * </pre>
+       *
+       * <code>required int64 creation_timestamp = 2;</code>
        */
       public boolean hasCreationTimestamp() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>required int64 creation_timestamp = 2;</code>
-       *
        * <pre>
        * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point
        * when watching for scripts on the blockchain.
        * </pre>
+       *
+       * <code>required int64 creation_timestamp = 2;</code>
        */
       public long getCreationTimestamp() {
         return creationTimestamp_;
       }
       /**
-       * <code>required int64 creation_timestamp = 2;</code>
-       *
        * <pre>
        * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point
        * when watching for scripts on the blockchain.
        * </pre>
+       *
+       * <code>required int64 creation_timestamp = 2;</code>
        */
       public Builder setCreationTimestamp(long value) {
         bitField0_ |= 0x00000002;
@@ -4795,12 +6067,12 @@ public Builder setCreationTimestamp(long value) {
         return this;
       }
       /**
-       * <code>required int64 creation_timestamp = 2;</code>
-       *
        * <pre>
        * Timestamp stored as millis since epoch. Useful for skipping block bodies before this point
        * when watching for scripts on the blockchain.
        * </pre>
+       *
+       * <code>required int64 creation_timestamp = 2;</code>
        */
       public Builder clearCreationTimestamp() {
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -4808,141 +6080,105 @@ public Builder clearCreationTimestamp() {
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:wallet.Script)
     }
 
+    // @@protoc_insertion_point(class_scope:wallet.Script)
+    private static final org.bitcoinj.wallet.Protos.Script DEFAULT_INSTANCE;
     static {
-      defaultInstance = new Script(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoinj.wallet.Protos.Script();
     }
 
-    // @@protoc_insertion_point(class_scope:wallet.Script)
-  }
+    public static org.bitcoinj.wallet.Protos.Script getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
 
-  public interface TransactionInputOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:wallet.TransactionInput)
-      com.google.protobuf.MessageOrBuilder {
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<Script>
+        PARSER = new com.google.protobuf.AbstractParser<Script>() {
+      @java.lang.Override
+      public Script parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new Script(input, extensionRegistry);
+      }
+    };
 
-    /**
-     * <code>required bytes transaction_out_point_hash = 1;</code>
-     *
-     * <pre>
-     * Hash of the transaction this input is using.
-     * </pre>
-     */
-    boolean hasTransactionOutPointHash();
-    /**
-     * <code>required bytes transaction_out_point_hash = 1;</code>
-     *
-     * <pre>
-     * Hash of the transaction this input is using.
-     * </pre>
-     */
-    com.google.protobuf.ByteString getTransactionOutPointHash();
+    public static com.google.protobuf.Parser<Script> parser() {
+      return PARSER;
+    }
 
-    /**
-     * <code>required uint32 transaction_out_point_index = 2;</code>
-     *
-     * <pre>
-     * Index of transaction output used by this input.
-     * </pre>
-     */
-    boolean hasTransactionOutPointIndex();
-    /**
-     * <code>required uint32 transaction_out_point_index = 2;</code>
-     *
-     * <pre>
-     * Index of transaction output used by this input.
-     * </pre>
-     */
-    int getTransactionOutPointIndex();
+    @java.lang.Override
+    public com.google.protobuf.Parser<Script> getParserForType() {
+      return PARSER;
+    }
 
-    /**
-     * <code>required bytes script_bytes = 3;</code>
-     *
-     * <pre>
-     * Script that contains the signatures/pubkeys.
-     * </pre>
-     */
-    boolean hasScriptBytes();
-    /**
-     * <code>required bytes script_bytes = 3;</code>
-     *
-     * <pre>
-     * Script that contains the signatures/pubkeys.
-     * </pre>
-     */
-    com.google.protobuf.ByteString getScriptBytes();
+    @java.lang.Override
+    public org.bitcoinj.wallet.Protos.Script getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public interface ScriptWitnessOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:wallet.ScriptWitness)
+      com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>optional uint32 sequence = 4;</code>
-     *
-     * <pre>
-     * Sequence number.
-     * </pre>
-     */
-    boolean hasSequence();
-    /**
-     * <code>optional uint32 sequence = 4;</code>
-     *
-     * <pre>
-     * Sequence number.
-     * </pre>
+     * <code>repeated bytes data = 1;</code>
      */
-    int getSequence();
-
+    java.util.List<com.google.protobuf.ByteString> getDataList();
     /**
-     * <code>optional int64 value = 5;</code>
-     *
-     * <pre>
-     * Value of connected output, if known
-     * </pre>
+     * <code>repeated bytes data = 1;</code>
      */
-    boolean hasValue();
+    int getDataCount();
     /**
-     * <code>optional int64 value = 5;</code>
-     *
-     * <pre>
-     * Value of connected output, if known
-     * </pre>
+     * <code>repeated bytes data = 1;</code>
      */
-    long getValue();
+    com.google.protobuf.ByteString getData(int index);
   }
   /**
-   * Protobuf type {@code wallet.TransactionInput}
+   * Protobuf type {@code wallet.ScriptWitness}
    */
-  public static final class TransactionInput extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:wallet.TransactionInput)
-      TransactionInputOrBuilder {
-    // Use TransactionInput.newBuilder() to construct.
-    private TransactionInput(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+  public  static final class ScriptWitness extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:wallet.ScriptWitness)
+      ScriptWitnessOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use ScriptWitness.newBuilder() to construct.
+    private ScriptWitness(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private TransactionInput(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final TransactionInput defaultInstance;
-    public static TransactionInput getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public TransactionInput getDefaultInstanceForType() {
-      return defaultInstance;
+    private ScriptWitness() {
+      data_ = java.util.Collections.emptyList();
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
-    private TransactionInput(
+    private ScriptWitness(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4954,36 +6190,19 @@ private TransactionInput(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
-              bitField0_ |= 0x00000001;
-              transactionOutPointHash_ = input.readBytes();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              transactionOutPointIndex_ = input.readUInt32();
-              break;
-            }
-            case 26: {
-              bitField0_ |= 0x00000004;
-              scriptBytes_ = input.readBytes();
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              sequence_ = input.readUInt32();
+              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+                data_ = new java.util.ArrayList<com.google.protobuf.ByteString>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              data_.add(input.readBytes());
               break;
             }
-            case 40: {
-              bitField0_ |= 0x00000010;
-              value_ = input.readInt64();
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
               break;
             }
           }
@@ -4992,467 +6211,364 @@ private TransactionInput(
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
+        if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+          data_ = java.util.Collections.unmodifiableList(data_);
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionInput_descriptor;
+      return org.bitcoinj.wallet.Protos.internal_static_wallet_ScriptWitness_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionInput_fieldAccessorTable
+      return org.bitcoinj.wallet.Protos.internal_static_wallet_ScriptWitness_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bitcoinj.wallet.Protos.TransactionInput.class, org.bitcoinj.wallet.Protos.TransactionInput.Builder.class);
-    }
-
-    public static com.google.protobuf.Parser<TransactionInput> PARSER =
-        new com.google.protobuf.AbstractParser<TransactionInput>() {
-      public TransactionInput parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TransactionInput(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<TransactionInput> getParserForType() {
-      return PARSER;
+              org.bitcoinj.wallet.Protos.ScriptWitness.class, org.bitcoinj.wallet.Protos.ScriptWitness.Builder.class);
     }
 
-    private int bitField0_;
-    public static final int TRANSACTION_OUT_POINT_HASH_FIELD_NUMBER = 1;
-    private com.google.protobuf.ByteString transactionOutPointHash_;
+    public static final int DATA_FIELD_NUMBER = 1;
+    private java.util.List<com.google.protobuf.ByteString> data_;
     /**
-     * <code>required bytes transaction_out_point_hash = 1;</code>
-     *
-     * <pre>
-     * Hash of the transaction this input is using.
-     * </pre>
+     * <code>repeated bytes data = 1;</code>
      */
-    public boolean hasTransactionOutPointHash() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
+    public java.util.List<com.google.protobuf.ByteString>
+        getDataList() {
+      return data_;
     }
     /**
-     * <code>required bytes transaction_out_point_hash = 1;</code>
-     *
-     * <pre>
-     * Hash of the transaction this input is using.
-     * </pre>
+     * <code>repeated bytes data = 1;</code>
      */
-    public com.google.protobuf.ByteString getTransactionOutPointHash() {
-      return transactionOutPointHash_;
+    public int getDataCount() {
+      return data_.size();
     }
-
-    public static final int TRANSACTION_OUT_POINT_INDEX_FIELD_NUMBER = 2;
-    private int transactionOutPointIndex_;
     /**
-     * <code>required uint32 transaction_out_point_index = 2;</code>
-     *
-     * <pre>
-     * Index of transaction output used by this input.
-     * </pre>
+     * <code>repeated bytes data = 1;</code>
      */
-    public boolean hasTransactionOutPointIndex() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
+    public com.google.protobuf.ByteString getData(int index) {
+      return data_.get(index);
     }
-    /**
-     * <code>required uint32 transaction_out_point_index = 2;</code>
-     *
-     * <pre>
-     * Index of transaction output used by this input.
-     * </pre>
-     */
-    public int getTransactionOutPointIndex() {
-      return transactionOutPointIndex_;
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
     }
 
-    public static final int SCRIPT_BYTES_FIELD_NUMBER = 3;
-    private com.google.protobuf.ByteString scriptBytes_;
-    /**
-     * <code>required bytes script_bytes = 3;</code>
-     *
-     * <pre>
-     * Script that contains the signatures/pubkeys.
-     * </pre>
-     */
-    public boolean hasScriptBytes() {
-      return ((bitField0_ & 0x00000004) == 0x00000004);
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      for (int i = 0; i < data_.size(); i++) {
+        output.writeBytes(1, data_.get(i));
+      }
+      unknownFields.writeTo(output);
     }
-    /**
-     * <code>required bytes script_bytes = 3;</code>
-     *
-     * <pre>
-     * Script that contains the signatures/pubkeys.
-     * </pre>
-     */
-    public com.google.protobuf.ByteString getScriptBytes() {
-      return scriptBytes_;
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      {
+        int dataSize = 0;
+        for (int i = 0; i < data_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeBytesSizeNoTag(data_.get(i));
+        }
+        size += dataSize;
+        size += 1 * getDataList().size();
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
     }
 
-    public static final int SEQUENCE_FIELD_NUMBER = 4;
-    private int sequence_;
-    /**
-     * <code>optional uint32 sequence = 4;</code>
-     *
-     * <pre>
-     * Sequence number.
-     * </pre>
-     */
-    public boolean hasSequence() {
-      return ((bitField0_ & 0x00000008) == 0x00000008);
-    }
-    /**
-     * <code>optional uint32 sequence = 4;</code>
-     *
-     * <pre>
-     * Sequence number.
-     * </pre>
-     */
-    public int getSequence() {
-      return sequence_;
-    }
-
-    public static final int VALUE_FIELD_NUMBER = 5;
-    private long value_;
-    /**
-     * <code>optional int64 value = 5;</code>
-     *
-     * <pre>
-     * Value of connected output, if known
-     * </pre>
-     */
-    public boolean hasValue() {
-      return ((bitField0_ & 0x00000010) == 0x00000010);
-    }
-    /**
-     * <code>optional int64 value = 5;</code>
-     *
-     * <pre>
-     * Value of connected output, if known
-     * </pre>
-     */
-    public long getValue() {
-      return value_;
-    }
-
-    private void initFields() {
-      transactionOutPointHash_ = com.google.protobuf.ByteString.EMPTY;
-      transactionOutPointIndex_ = 0;
-      scriptBytes_ = com.google.protobuf.ByteString.EMPTY;
-      sequence_ = 0;
-      value_ = 0L;
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      if (!hasTransactionOutPointHash()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasTransactionOutPointIndex()) {
-        memoizedIsInitialized = 0;
-        return false;
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
       }
-      if (!hasScriptBytes()) {
-        memoizedIsInitialized = 0;
-        return false;
+      if (!(obj instanceof org.bitcoinj.wallet.Protos.ScriptWitness)) {
+        return super.equals(obj);
       }
-      memoizedIsInitialized = 1;
-      return true;
-    }
+      org.bitcoinj.wallet.Protos.ScriptWitness other = (org.bitcoinj.wallet.Protos.ScriptWitness) obj;
 
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeBytes(1, transactionOutPointHash_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeUInt32(2, transactionOutPointIndex_);
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeBytes(3, scriptBytes_);
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeUInt32(4, sequence_);
-      }
-      if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        output.writeInt64(5, value_);
-      }
-      getUnknownFields().writeTo(output);
+      boolean result = true;
+      result = result && getDataList()
+          .equals(other.getDataList());
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
     }
 
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(1, transactionOutPointHash_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, transactionOutPointIndex_);
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(3, scriptBytes_);
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, sequence_);
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
       }
-      if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt64Size(5, value_);
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (getDataCount() > 0) {
+        hash = (37 * hash) + DATA_FIELD_NUMBER;
+        hash = (53 * hash) + getDataList().hashCode();
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public static org.bitcoinj.wallet.Protos.ScriptWitness parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
     }
-
-    public static org.bitcoinj.wallet.Protos.TransactionInput parseFrom(
+    public static org.bitcoinj.wallet.Protos.ScriptWitness parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.bitcoinj.wallet.Protos.ScriptWitness parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionInput parseFrom(
+    public static org.bitcoinj.wallet.Protos.ScriptWitness parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionInput parseFrom(byte[] data)
+    public static org.bitcoinj.wallet.Protos.ScriptWitness parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionInput parseFrom(
+    public static org.bitcoinj.wallet.Protos.ScriptWitness parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionInput parseFrom(java.io.InputStream input)
+    public static org.bitcoinj.wallet.Protos.ScriptWitness parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionInput parseFrom(
+    public static org.bitcoinj.wallet.Protos.ScriptWitness parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionInput parseDelimitedFrom(java.io.InputStream input)
+    public static org.bitcoinj.wallet.Protos.ScriptWitness parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionInput parseDelimitedFrom(
+    public static org.bitcoinj.wallet.Protos.ScriptWitness parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionInput parseFrom(
+    public static org.bitcoinj.wallet.Protos.ScriptWitness parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionInput parseFrom(
+    public static org.bitcoinj.wallet.Protos.ScriptWitness parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.bitcoinj.wallet.Protos.TransactionInput prototype) {
-      return newBuilder().mergeFrom(prototype);
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(org.bitcoinj.wallet.Protos.ScriptWitness prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code wallet.TransactionInput}
+     * Protobuf type {@code wallet.ScriptWitness}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:wallet.TransactionInput)
-        org.bitcoinj.wallet.Protos.TransactionInputOrBuilder {
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:wallet.ScriptWitness)
+        org.bitcoinj.wallet.Protos.ScriptWitnessOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionInput_descriptor;
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_ScriptWitness_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionInput_fieldAccessorTable
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_ScriptWitness_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bitcoinj.wallet.Protos.TransactionInput.class, org.bitcoinj.wallet.Protos.TransactionInput.Builder.class);
+                org.bitcoinj.wallet.Protos.ScriptWitness.class, org.bitcoinj.wallet.Protos.ScriptWitness.Builder.class);
       }
 
-      // Construct using org.bitcoinj.wallet.Protos.TransactionInput.newBuilder()
+      // Construct using org.bitcoinj.wallet.Protos.ScriptWitness.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
-        transactionOutPointHash_ = com.google.protobuf.ByteString.EMPTY;
+        data_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
-        transactionOutPointIndex_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
-        scriptBytes_ = com.google.protobuf.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000004);
-        sequence_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000008);
-        value_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionInput_descriptor;
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_ScriptWitness_descriptor;
       }
 
-      public org.bitcoinj.wallet.Protos.TransactionInput getDefaultInstanceForType() {
-        return org.bitcoinj.wallet.Protos.TransactionInput.getDefaultInstance();
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.ScriptWitness getDefaultInstanceForType() {
+        return org.bitcoinj.wallet.Protos.ScriptWitness.getDefaultInstance();
       }
 
-      public org.bitcoinj.wallet.Protos.TransactionInput build() {
-        org.bitcoinj.wallet.Protos.TransactionInput result = buildPartial();
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.ScriptWitness build() {
+        org.bitcoinj.wallet.Protos.ScriptWitness result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.bitcoinj.wallet.Protos.TransactionInput buildPartial() {
-        org.bitcoinj.wallet.Protos.TransactionInput result = new org.bitcoinj.wallet.Protos.TransactionInput(this);
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.ScriptWitness buildPartial() {
+        org.bitcoinj.wallet.Protos.ScriptWitness result = new org.bitcoinj.wallet.Protos.ScriptWitness(this);
         int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        result.transactionOutPointHash_ = transactionOutPointHash_;
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        result.transactionOutPointIndex_ = transactionOutPointIndex_;
-        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
-          to_bitField0_ |= 0x00000004;
-        }
-        result.scriptBytes_ = scriptBytes_;
-        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
-          to_bitField0_ |= 0x00000008;
-        }
-        result.sequence_ = sequence_;
-        if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
-          to_bitField0_ |= 0x00000010;
+        if (((bitField0_ & 0x00000001) == 0x00000001)) {
+          data_ = java.util.Collections.unmodifiableList(data_);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.value_ = value_;
-        result.bitField0_ = to_bitField0_;
+        result.data_ = data_;
         onBuilt();
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bitcoinj.wallet.Protos.TransactionInput) {
-          return mergeFrom((org.bitcoinj.wallet.Protos.TransactionInput)other);
+        if (other instanceof org.bitcoinj.wallet.Protos.ScriptWitness) {
+          return mergeFrom((org.bitcoinj.wallet.Protos.ScriptWitness)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bitcoinj.wallet.Protos.TransactionInput other) {
-        if (other == org.bitcoinj.wallet.Protos.TransactionInput.getDefaultInstance()) return this;
-        if (other.hasTransactionOutPointHash()) {
-          setTransactionOutPointHash(other.getTransactionOutPointHash());
-        }
-        if (other.hasTransactionOutPointIndex()) {
-          setTransactionOutPointIndex(other.getTransactionOutPointIndex());
-        }
-        if (other.hasScriptBytes()) {
-          setScriptBytes(other.getScriptBytes());
-        }
-        if (other.hasSequence()) {
-          setSequence(other.getSequence());
-        }
-        if (other.hasValue()) {
-          setValue(other.getValue());
+      public Builder mergeFrom(org.bitcoinj.wallet.Protos.ScriptWitness other) {
+        if (other == org.bitcoinj.wallet.Protos.ScriptWitness.getDefaultInstance()) return this;
+        if (!other.data_.isEmpty()) {
+          if (data_.isEmpty()) {
+            data_ = other.data_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureDataIsMutable();
+            data_.addAll(other.data_);
+          }
+          onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
-        if (!hasTransactionOutPointHash()) {
-          
-          return false;
-        }
-        if (!hasTransactionOutPointIndex()) {
-          
-          return false;
-        }
-        if (!hasScriptBytes()) {
-          
-          return false;
-        }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bitcoinj.wallet.Protos.TransactionInput parsedMessage = null;
+        org.bitcoinj.wallet.Protos.ScriptWitness parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bitcoinj.wallet.Protos.TransactionInput) e.getUnfinishedMessage();
-          throw e;
+          parsedMessage = (org.bitcoinj.wallet.Protos.ScriptWitness) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -5462,361 +6578,277 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private com.google.protobuf.ByteString transactionOutPointHash_ = com.google.protobuf.ByteString.EMPTY;
+      private java.util.List<com.google.protobuf.ByteString> data_ = java.util.Collections.emptyList();
+      private void ensureDataIsMutable() {
+        if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+          data_ = new java.util.ArrayList<com.google.protobuf.ByteString>(data_);
+          bitField0_ |= 0x00000001;
+         }
+      }
       /**
-       * <code>required bytes transaction_out_point_hash = 1;</code>
-       *
-       * <pre>
-       * Hash of the transaction this input is using.
-       * </pre>
+       * <code>repeated bytes data = 1;</code>
        */
-      public boolean hasTransactionOutPointHash() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
+      public java.util.List<com.google.protobuf.ByteString>
+          getDataList() {
+        return java.util.Collections.unmodifiableList(data_);
       }
       /**
-       * <code>required bytes transaction_out_point_hash = 1;</code>
-       *
-       * <pre>
-       * Hash of the transaction this input is using.
-       * </pre>
+       * <code>repeated bytes data = 1;</code>
        */
-      public com.google.protobuf.ByteString getTransactionOutPointHash() {
-        return transactionOutPointHash_;
+      public int getDataCount() {
+        return data_.size();
       }
       /**
-       * <code>required bytes transaction_out_point_hash = 1;</code>
-       *
-       * <pre>
-       * Hash of the transaction this input is using.
-       * </pre>
+       * <code>repeated bytes data = 1;</code>
        */
-      public Builder setTransactionOutPointHash(com.google.protobuf.ByteString value) {
+      public com.google.protobuf.ByteString getData(int index) {
+        return data_.get(index);
+      }
+      /**
+       * <code>repeated bytes data = 1;</code>
+       */
+      public Builder setData(
+          int index, com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000001;
-        transactionOutPointHash_ = value;
+  ensureDataIsMutable();
+        data_.set(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>required bytes transaction_out_point_hash = 1;</code>
-       *
-       * <pre>
-       * Hash of the transaction this input is using.
-       * </pre>
+       * <code>repeated bytes data = 1;</code>
        */
-      public Builder clearTransactionOutPointHash() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        transactionOutPointHash_ = getDefaultInstance().getTransactionOutPointHash();
-        onChanged();
-        return this;
-      }
-
-      private int transactionOutPointIndex_ ;
-      /**
-       * <code>required uint32 transaction_out_point_index = 2;</code>
-       *
-       * <pre>
-       * Index of transaction output used by this input.
-       * </pre>
-       */
-      public boolean hasTransactionOutPointIndex() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
-      }
-      /**
-       * <code>required uint32 transaction_out_point_index = 2;</code>
-       *
-       * <pre>
-       * Index of transaction output used by this input.
-       * </pre>
-       */
-      public int getTransactionOutPointIndex() {
-        return transactionOutPointIndex_;
-      }
-      /**
-       * <code>required uint32 transaction_out_point_index = 2;</code>
-       *
-       * <pre>
-       * Index of transaction output used by this input.
-       * </pre>
-       */
-      public Builder setTransactionOutPointIndex(int value) {
-        bitField0_ |= 0x00000002;
-        transactionOutPointIndex_ = value;
+      public Builder addData(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureDataIsMutable();
+        data_.add(value);
         onChanged();
         return this;
       }
       /**
-       * <code>required uint32 transaction_out_point_index = 2;</code>
-       *
-       * <pre>
-       * Index of transaction output used by this input.
-       * </pre>
+       * <code>repeated bytes data = 1;</code>
        */
-      public Builder clearTransactionOutPointIndex() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        transactionOutPointIndex_ = 0;
+      public Builder addAllData(
+          java.lang.Iterable<? extends com.google.protobuf.ByteString> values) {
+        ensureDataIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, data_);
         onChanged();
         return this;
       }
-
-      private com.google.protobuf.ByteString scriptBytes_ = com.google.protobuf.ByteString.EMPTY;
-      /**
-       * <code>required bytes script_bytes = 3;</code>
-       *
-       * <pre>
-       * Script that contains the signatures/pubkeys.
-       * </pre>
-       */
-      public boolean hasScriptBytes() {
-        return ((bitField0_ & 0x00000004) == 0x00000004);
-      }
-      /**
-       * <code>required bytes script_bytes = 3;</code>
-       *
-       * <pre>
-       * Script that contains the signatures/pubkeys.
-       * </pre>
-       */
-      public com.google.protobuf.ByteString getScriptBytes() {
-        return scriptBytes_;
-      }
       /**
-       * <code>required bytes script_bytes = 3;</code>
-       *
-       * <pre>
-       * Script that contains the signatures/pubkeys.
-       * </pre>
+       * <code>repeated bytes data = 1;</code>
        */
-      public Builder setScriptBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
-        scriptBytes_ = value;
+      public Builder clearData() {
+        data_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
-      /**
-       * <code>required bytes script_bytes = 3;</code>
-       *
-       * <pre>
-       * Script that contains the signatures/pubkeys.
-       * </pre>
-       */
-      public Builder clearScriptBytes() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        scriptBytes_ = getDefaultInstance().getScriptBytes();
-        onChanged();
-        return this;
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
       }
 
-      private int sequence_ ;
-      /**
-       * <code>optional uint32 sequence = 4;</code>
-       *
-       * <pre>
-       * Sequence number.
-       * </pre>
-       */
-      public boolean hasSequence() {
-        return ((bitField0_ & 0x00000008) == 0x00000008);
-      }
-      /**
-       * <code>optional uint32 sequence = 4;</code>
-       *
-       * <pre>
-       * Sequence number.
-       * </pre>
-       */
-      public int getSequence() {
-        return sequence_;
-      }
-      /**
-       * <code>optional uint32 sequence = 4;</code>
-       *
-       * <pre>
-       * Sequence number.
-       * </pre>
-       */
-      public Builder setSequence(int value) {
-        bitField0_ |= 0x00000008;
-        sequence_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>optional uint32 sequence = 4;</code>
-       *
-       * <pre>
-       * Sequence number.
-       * </pre>
-       */
-      public Builder clearSequence() {
-        bitField0_ = (bitField0_ & ~0x00000008);
-        sequence_ = 0;
-        onChanged();
-        return this;
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
       }
 
-      private long value_ ;
-      /**
-       * <code>optional int64 value = 5;</code>
-       *
-       * <pre>
-       * Value of connected output, if known
-       * </pre>
-       */
-      public boolean hasValue() {
-        return ((bitField0_ & 0x00000010) == 0x00000010);
-      }
-      /**
-       * <code>optional int64 value = 5;</code>
-       *
-       * <pre>
-       * Value of connected output, if known
-       * </pre>
-       */
-      public long getValue() {
-        return value_;
-      }
-      /**
-       * <code>optional int64 value = 5;</code>
-       *
-       * <pre>
-       * Value of connected output, if known
-       * </pre>
-       */
-      public Builder setValue(long value) {
-        bitField0_ |= 0x00000010;
-        value_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>optional int64 value = 5;</code>
-       *
-       * <pre>
-       * Value of connected output, if known
-       * </pre>
-       */
-      public Builder clearValue() {
-        bitField0_ = (bitField0_ & ~0x00000010);
-        value_ = 0L;
-        onChanged();
-        return this;
-      }
 
-      // @@protoc_insertion_point(builder_scope:wallet.TransactionInput)
+      // @@protoc_insertion_point(builder_scope:wallet.ScriptWitness)
     }
 
+    // @@protoc_insertion_point(class_scope:wallet.ScriptWitness)
+    private static final org.bitcoinj.wallet.Protos.ScriptWitness DEFAULT_INSTANCE;
     static {
-      defaultInstance = new TransactionInput(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoinj.wallet.Protos.ScriptWitness();
+    }
+
+    public static org.bitcoinj.wallet.Protos.ScriptWitness getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<ScriptWitness>
+        PARSER = new com.google.protobuf.AbstractParser<ScriptWitness>() {
+      @java.lang.Override
+      public ScriptWitness parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new ScriptWitness(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<ScriptWitness> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<ScriptWitness> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoinj.wallet.Protos.ScriptWitness getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:wallet.TransactionInput)
   }
 
-  public interface TransactionOutputOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:wallet.TransactionOutput)
+  public interface TransactionInputOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:wallet.TransactionInput)
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>required int64 value = 1;</code>
-     */
-    boolean hasValue();
-    /**
-     * <code>required int64 value = 1;</code>
-     */
-    long getValue();
-
-    /**
-     * <code>required bytes script_bytes = 2;</code>
-     *
      * <pre>
-     * script of transaction output
+     * Hash of the transaction this input is using.
      * </pre>
+     *
+     * <code>required bytes transaction_out_point_hash = 1;</code>
      */
-    boolean hasScriptBytes();
+    boolean hasTransactionOutPointHash();
     /**
-     * <code>required bytes script_bytes = 2;</code>
-     *
      * <pre>
-     * script of transaction output
+     * Hash of the transaction this input is using.
      * </pre>
+     *
+     * <code>required bytes transaction_out_point_hash = 1;</code>
      */
-    com.google.protobuf.ByteString getScriptBytes();
+    com.google.protobuf.ByteString getTransactionOutPointHash();
 
     /**
-     * <code>optional bytes spent_by_transaction_hash = 3;</code>
-     *
      * <pre>
-     * If spent, the hash of the transaction doing the spend.
+     * Index of transaction output used by this input.
      * </pre>
+     *
+     * <code>required uint32 transaction_out_point_index = 2;</code>
      */
-    boolean hasSpentByTransactionHash();
+    boolean hasTransactionOutPointIndex();
     /**
-     * <code>optional bytes spent_by_transaction_hash = 3;</code>
-     *
      * <pre>
-     * If spent, the hash of the transaction doing the spend.
+     * Index of transaction output used by this input.
      * </pre>
+     *
+     * <code>required uint32 transaction_out_point_index = 2;</code>
      */
-    com.google.protobuf.ByteString getSpentByTransactionHash();
+    int getTransactionOutPointIndex();
 
     /**
-     * <code>optional int32 spent_by_transaction_index = 4;</code>
-     *
      * <pre>
-     * If spent, the index of the transaction input of the transaction doing the spend.
+     * Script that contains the signatures/pubkeys.
      * </pre>
+     *
+     * <code>required bytes script_bytes = 3;</code>
      */
-    boolean hasSpentByTransactionIndex();
+    boolean hasScriptBytes();
     /**
-     * <code>optional int32 spent_by_transaction_index = 4;</code>
+     * <pre>
+     * Script that contains the signatures/pubkeys.
+     * </pre>
      *
+     * <code>required bytes script_bytes = 3;</code>
+     */
+    com.google.protobuf.ByteString getScriptBytes();
+
+    /**
      * <pre>
-     * If spent, the index of the transaction input of the transaction doing the spend.
+     * Sequence number.
      * </pre>
+     *
+     * <code>optional uint32 sequence = 4;</code>
      */
-    int getSpentByTransactionIndex();
+    boolean hasSequence();
+    /**
+     * <pre>
+     * Sequence number.
+     * </pre>
+     *
+     * <code>optional uint32 sequence = 4;</code>
+     */
+    int getSequence();
+
+    /**
+     * <pre>
+     * Value of connected output, if known
+     * </pre>
+     *
+     * <code>optional int64 value = 5;</code>
+     */
+    boolean hasValue();
+    /**
+     * <pre>
+     * Value of connected output, if known
+     * </pre>
+     *
+     * <code>optional int64 value = 5;</code>
+     */
+    long getValue();
+
+    /**
+     * <pre>
+     * script witness
+     * </pre>
+     *
+     * <code>optional .wallet.ScriptWitness witness = 6;</code>
+     */
+    boolean hasWitness();
+    /**
+     * <pre>
+     * script witness
+     * </pre>
+     *
+     * <code>optional .wallet.ScriptWitness witness = 6;</code>
+     */
+    org.bitcoinj.wallet.Protos.ScriptWitness getWitness();
+    /**
+     * <pre>
+     * script witness
+     * </pre>
+     *
+     * <code>optional .wallet.ScriptWitness witness = 6;</code>
+     */
+    org.bitcoinj.wallet.Protos.ScriptWitnessOrBuilder getWitnessOrBuilder();
   }
   /**
-   * Protobuf type {@code wallet.TransactionOutput}
+   * Protobuf type {@code wallet.TransactionInput}
    */
-  public static final class TransactionOutput extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:wallet.TransactionOutput)
-      TransactionOutputOrBuilder {
-    // Use TransactionOutput.newBuilder() to construct.
-    private TransactionOutput(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+  public  static final class TransactionInput extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:wallet.TransactionInput)
+      TransactionInputOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use TransactionInput.newBuilder() to construct.
+    private TransactionInput(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private TransactionOutput(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final TransactionOutput defaultInstance;
-    public static TransactionOutput getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public TransactionOutput getDefaultInstanceForType() {
-      return defaultInstance;
+    private TransactionInput() {
+      transactionOutPointHash_ = com.google.protobuf.ByteString.EMPTY;
+      transactionOutPointIndex_ = 0;
+      scriptBytes_ = com.google.protobuf.ByteString.EMPTY;
+      sequence_ = 0;
+      value_ = 0L;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
-    private TransactionOutput(
+    private TransactionInput(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -5828,31 +6860,49 @@ private TransactionOutput(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 8: {
+            case 10: {
               bitField0_ |= 0x00000001;
-              value_ = input.readInt64();
+              transactionOutPointHash_ = input.readBytes();
               break;
             }
-            case 18: {
+            case 16: {
               bitField0_ |= 0x00000002;
-              scriptBytes_ = input.readBytes();
+              transactionOutPointIndex_ = input.readUInt32();
               break;
             }
             case 26: {
               bitField0_ |= 0x00000004;
-              spentByTransactionHash_ = input.readBytes();
+              scriptBytes_ = input.readBytes();
               break;
             }
             case 32: {
               bitField0_ |= 0x00000008;
-              spentByTransactionIndex_ = input.readInt32();
+              sequence_ = input.readUInt32();
+              break;
+            }
+            case 40: {
+              bitField0_ |= 0x00000010;
+              value_ = input.readInt64();
+              break;
+            }
+            case 50: {
+              org.bitcoinj.wallet.Protos.ScriptWitness.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000020) == 0x00000020)) {
+                subBuilder = witness_.toBuilder();
+              }
+              witness_ = input.readMessage(org.bitcoinj.wallet.Protos.ScriptWitness.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(witness_);
+                witness_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000020;
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
               break;
             }
           }
@@ -5861,7 +6911,7 @@ private TransactionOutput(
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -5869,129 +6919,178 @@ private TransactionOutput(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionOutput_descriptor;
+      return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionInput_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionOutput_fieldAccessorTable
+      return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionInput_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bitcoinj.wallet.Protos.TransactionOutput.class, org.bitcoinj.wallet.Protos.TransactionOutput.Builder.class);
-    }
-
-    public static com.google.protobuf.Parser<TransactionOutput> PARSER =
-        new com.google.protobuf.AbstractParser<TransactionOutput>() {
-      public TransactionOutput parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TransactionOutput(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<TransactionOutput> getParserForType() {
-      return PARSER;
+              org.bitcoinj.wallet.Protos.TransactionInput.class, org.bitcoinj.wallet.Protos.TransactionInput.Builder.class);
     }
 
     private int bitField0_;
-    public static final int VALUE_FIELD_NUMBER = 1;
-    private long value_;
+    public static final int TRANSACTION_OUT_POINT_HASH_FIELD_NUMBER = 1;
+    private com.google.protobuf.ByteString transactionOutPointHash_;
     /**
-     * <code>required int64 value = 1;</code>
+     * <pre>
+     * Hash of the transaction this input is using.
+     * </pre>
+     *
+     * <code>required bytes transaction_out_point_hash = 1;</code>
      */
-    public boolean hasValue() {
+    public boolean hasTransactionOutPointHash() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required int64 value = 1;</code>
+     * <pre>
+     * Hash of the transaction this input is using.
+     * </pre>
+     *
+     * <code>required bytes transaction_out_point_hash = 1;</code>
      */
-    public long getValue() {
-      return value_;
+    public com.google.protobuf.ByteString getTransactionOutPointHash() {
+      return transactionOutPointHash_;
     }
 
-    public static final int SCRIPT_BYTES_FIELD_NUMBER = 2;
-    private com.google.protobuf.ByteString scriptBytes_;
+    public static final int TRANSACTION_OUT_POINT_INDEX_FIELD_NUMBER = 2;
+    private int transactionOutPointIndex_;
     /**
-     * <code>required bytes script_bytes = 2;</code>
-     *
      * <pre>
-     * script of transaction output
+     * Index of transaction output used by this input.
      * </pre>
+     *
+     * <code>required uint32 transaction_out_point_index = 2;</code>
      */
-    public boolean hasScriptBytes() {
+    public boolean hasTransactionOutPointIndex() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>required bytes script_bytes = 2;</code>
+     * <pre>
+     * Index of transaction output used by this input.
+     * </pre>
+     *
+     * <code>required uint32 transaction_out_point_index = 2;</code>
+     */
+    public int getTransactionOutPointIndex() {
+      return transactionOutPointIndex_;
+    }
+
+    public static final int SCRIPT_BYTES_FIELD_NUMBER = 3;
+    private com.google.protobuf.ByteString scriptBytes_;
+    /**
+     * <pre>
+     * Script that contains the signatures/pubkeys.
+     * </pre>
      *
+     * <code>required bytes script_bytes = 3;</code>
+     */
+    public boolean hasScriptBytes() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
+    }
+    /**
      * <pre>
-     * script of transaction output
+     * Script that contains the signatures/pubkeys.
      * </pre>
+     *
+     * <code>required bytes script_bytes = 3;</code>
      */
     public com.google.protobuf.ByteString getScriptBytes() {
       return scriptBytes_;
     }
 
-    public static final int SPENT_BY_TRANSACTION_HASH_FIELD_NUMBER = 3;
-    private com.google.protobuf.ByteString spentByTransactionHash_;
+    public static final int SEQUENCE_FIELD_NUMBER = 4;
+    private int sequence_;
     /**
-     * <code>optional bytes spent_by_transaction_hash = 3;</code>
+     * <pre>
+     * Sequence number.
+     * </pre>
      *
+     * <code>optional uint32 sequence = 4;</code>
+     */
+    public boolean hasSequence() {
+      return ((bitField0_ & 0x00000008) == 0x00000008);
+    }
+    /**
      * <pre>
-     * If spent, the hash of the transaction doing the spend.
+     * Sequence number.
      * </pre>
+     *
+     * <code>optional uint32 sequence = 4;</code>
      */
-    public boolean hasSpentByTransactionHash() {
-      return ((bitField0_ & 0x00000004) == 0x00000004);
+    public int getSequence() {
+      return sequence_;
     }
+
+    public static final int VALUE_FIELD_NUMBER = 5;
+    private long value_;
     /**
-     * <code>optional bytes spent_by_transaction_hash = 3;</code>
+     * <pre>
+     * Value of connected output, if known
+     * </pre>
      *
+     * <code>optional int64 value = 5;</code>
+     */
+    public boolean hasValue() {
+      return ((bitField0_ & 0x00000010) == 0x00000010);
+    }
+    /**
      * <pre>
-     * If spent, the hash of the transaction doing the spend.
+     * Value of connected output, if known
      * </pre>
+     *
+     * <code>optional int64 value = 5;</code>
      */
-    public com.google.protobuf.ByteString getSpentByTransactionHash() {
-      return spentByTransactionHash_;
+    public long getValue() {
+      return value_;
     }
 
-    public static final int SPENT_BY_TRANSACTION_INDEX_FIELD_NUMBER = 4;
-    private int spentByTransactionIndex_;
+    public static final int WITNESS_FIELD_NUMBER = 6;
+    private org.bitcoinj.wallet.Protos.ScriptWitness witness_;
     /**
-     * <code>optional int32 spent_by_transaction_index = 4;</code>
-     *
      * <pre>
-     * If spent, the index of the transaction input of the transaction doing the spend.
+     * script witness
      * </pre>
+     *
+     * <code>optional .wallet.ScriptWitness witness = 6;</code>
      */
-    public boolean hasSpentByTransactionIndex() {
-      return ((bitField0_ & 0x00000008) == 0x00000008);
+    public boolean hasWitness() {
+      return ((bitField0_ & 0x00000020) == 0x00000020);
     }
     /**
-     * <code>optional int32 spent_by_transaction_index = 4;</code>
+     * <pre>
+     * script witness
+     * </pre>
      *
+     * <code>optional .wallet.ScriptWitness witness = 6;</code>
+     */
+    public org.bitcoinj.wallet.Protos.ScriptWitness getWitness() {
+      return witness_ == null ? org.bitcoinj.wallet.Protos.ScriptWitness.getDefaultInstance() : witness_;
+    }
+    /**
      * <pre>
-     * If spent, the index of the transaction input of the transaction doing the spend.
+     * script witness
      * </pre>
+     *
+     * <code>optional .wallet.ScriptWitness witness = 6;</code>
      */
-    public int getSpentByTransactionIndex() {
-      return spentByTransactionIndex_;
+    public org.bitcoinj.wallet.Protos.ScriptWitnessOrBuilder getWitnessOrBuilder() {
+      return witness_ == null ? org.bitcoinj.wallet.Protos.ScriptWitness.getDefaultInstance() : witness_;
     }
 
-    private void initFields() {
-      value_ = 0L;
-      scriptBytes_ = com.google.protobuf.ByteString.EMPTY;
-      spentByTransactionHash_ = com.google.protobuf.ByteString.EMPTY;
-      spentByTransactionIndex_ = 0;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
       if (isInitialized == 0) return false;
 
-      if (!hasValue()) {
+      if (!hasTransactionOutPointHash()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      if (!hasTransactionOutPointIndex()) {
         memoizedIsInitialized = 0;
         return false;
       }
@@ -6003,269 +7102,445 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeInt64(1, value_);
+        output.writeBytes(1, transactionOutPointHash_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeBytes(2, scriptBytes_);
+        output.writeUInt32(2, transactionOutPointIndex_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeBytes(3, spentByTransactionHash_);
+        output.writeBytes(3, scriptBytes_);
       }
       if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeInt32(4, spentByTransactionIndex_);
+        output.writeUInt32(4, sequence_);
+      }
+      if (((bitField0_ & 0x00000010) == 0x00000010)) {
+        output.writeInt64(5, value_);
       }
-      getUnknownFields().writeTo(output);
+      if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        output.writeMessage(6, getWitness());
+      }
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt64Size(1, value_);
+          .computeBytesSize(1, transactionOutPointHash_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(2, scriptBytes_);
+          .computeUInt32Size(2, transactionOutPointIndex_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(3, spentByTransactionHash_);
+          .computeBytesSize(3, scriptBytes_);
       }
       if (((bitField0_ & 0x00000008) == 0x00000008)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, spentByTransactionIndex_);
+          .computeUInt32Size(4, sequence_);
+      }
+      if (((bitField0_ & 0x00000010) == 0x00000010)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt64Size(5, value_);
+      }
+      if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(6, getWitness());
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoinj.wallet.Protos.TransactionInput)) {
+        return super.equals(obj);
+      }
+      org.bitcoinj.wallet.Protos.TransactionInput other = (org.bitcoinj.wallet.Protos.TransactionInput) obj;
+
+      boolean result = true;
+      result = result && (hasTransactionOutPointHash() == other.hasTransactionOutPointHash());
+      if (hasTransactionOutPointHash()) {
+        result = result && getTransactionOutPointHash()
+            .equals(other.getTransactionOutPointHash());
+      }
+      result = result && (hasTransactionOutPointIndex() == other.hasTransactionOutPointIndex());
+      if (hasTransactionOutPointIndex()) {
+        result = result && (getTransactionOutPointIndex()
+            == other.getTransactionOutPointIndex());
+      }
+      result = result && (hasScriptBytes() == other.hasScriptBytes());
+      if (hasScriptBytes()) {
+        result = result && getScriptBytes()
+            .equals(other.getScriptBytes());
+      }
+      result = result && (hasSequence() == other.hasSequence());
+      if (hasSequence()) {
+        result = result && (getSequence()
+            == other.getSequence());
+      }
+      result = result && (hasValue() == other.hasValue());
+      if (hasValue()) {
+        result = result && (getValue()
+            == other.getValue());
+      }
+      result = result && (hasWitness() == other.hasWitness());
+      if (hasWitness()) {
+        result = result && getWitness()
+            .equals(other.getWitness());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasTransactionOutPointHash()) {
+        hash = (37 * hash) + TRANSACTION_OUT_POINT_HASH_FIELD_NUMBER;
+        hash = (53 * hash) + getTransactionOutPointHash().hashCode();
+      }
+      if (hasTransactionOutPointIndex()) {
+        hash = (37 * hash) + TRANSACTION_OUT_POINT_INDEX_FIELD_NUMBER;
+        hash = (53 * hash) + getTransactionOutPointIndex();
+      }
+      if (hasScriptBytes()) {
+        hash = (37 * hash) + SCRIPT_BYTES_FIELD_NUMBER;
+        hash = (53 * hash) + getScriptBytes().hashCode();
+      }
+      if (hasSequence()) {
+        hash = (37 * hash) + SEQUENCE_FIELD_NUMBER;
+        hash = (53 * hash) + getSequence();
+      }
+      if (hasValue()) {
+        hash = (37 * hash) + VALUE_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getValue());
+      }
+      if (hasWitness()) {
+        hash = (37 * hash) + WITNESS_FIELD_NUMBER;
+        hash = (53 * hash) + getWitness().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
-    public static org.bitcoinj.wallet.Protos.TransactionOutput parseFrom(
+    public static org.bitcoinj.wallet.Protos.TransactionInput parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionInput parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionInput parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionOutput parseFrom(
+    public static org.bitcoinj.wallet.Protos.TransactionInput parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionOutput parseFrom(byte[] data)
+    public static org.bitcoinj.wallet.Protos.TransactionInput parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionOutput parseFrom(
+    public static org.bitcoinj.wallet.Protos.TransactionInput parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionOutput parseFrom(java.io.InputStream input)
+    public static org.bitcoinj.wallet.Protos.TransactionInput parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionOutput parseFrom(
+    public static org.bitcoinj.wallet.Protos.TransactionInput parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionOutput parseDelimitedFrom(java.io.InputStream input)
+    public static org.bitcoinj.wallet.Protos.TransactionInput parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionOutput parseDelimitedFrom(
+    public static org.bitcoinj.wallet.Protos.TransactionInput parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionOutput parseFrom(
+    public static org.bitcoinj.wallet.Protos.TransactionInput parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionOutput parseFrom(
+    public static org.bitcoinj.wallet.Protos.TransactionInput parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.bitcoinj.wallet.Protos.TransactionOutput prototype) {
-      return newBuilder().mergeFrom(prototype);
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(org.bitcoinj.wallet.Protos.TransactionInput prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code wallet.TransactionOutput}
+     * Protobuf type {@code wallet.TransactionInput}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:wallet.TransactionOutput)
-        org.bitcoinj.wallet.Protos.TransactionOutputOrBuilder {
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:wallet.TransactionInput)
+        org.bitcoinj.wallet.Protos.TransactionInputOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionOutput_descriptor;
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionInput_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionOutput_fieldAccessorTable
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionInput_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bitcoinj.wallet.Protos.TransactionOutput.class, org.bitcoinj.wallet.Protos.TransactionOutput.Builder.class);
+                org.bitcoinj.wallet.Protos.TransactionInput.class, org.bitcoinj.wallet.Protos.TransactionInput.Builder.class);
       }
 
-      // Construct using org.bitcoinj.wallet.Protos.TransactionOutput.newBuilder()
+      // Construct using org.bitcoinj.wallet.Protos.TransactionInput.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getWitnessFieldBuilder();
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
-        value_ = 0L;
+        transactionOutPointHash_ = com.google.protobuf.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
-        scriptBytes_ = com.google.protobuf.ByteString.EMPTY;
+        transactionOutPointIndex_ = 0;
         bitField0_ = (bitField0_ & ~0x00000002);
-        spentByTransactionHash_ = com.google.protobuf.ByteString.EMPTY;
+        scriptBytes_ = com.google.protobuf.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000004);
-        spentByTransactionIndex_ = 0;
+        sequence_ = 0;
         bitField0_ = (bitField0_ & ~0x00000008);
+        value_ = 0L;
+        bitField0_ = (bitField0_ & ~0x00000010);
+        if (witnessBuilder_ == null) {
+          witness_ = null;
+        } else {
+          witnessBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000020);
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionOutput_descriptor;
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionInput_descriptor;
       }
 
-      public org.bitcoinj.wallet.Protos.TransactionOutput getDefaultInstanceForType() {
-        return org.bitcoinj.wallet.Protos.TransactionOutput.getDefaultInstance();
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.TransactionInput getDefaultInstanceForType() {
+        return org.bitcoinj.wallet.Protos.TransactionInput.getDefaultInstance();
       }
 
-      public org.bitcoinj.wallet.Protos.TransactionOutput build() {
-        org.bitcoinj.wallet.Protos.TransactionOutput result = buildPartial();
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.TransactionInput build() {
+        org.bitcoinj.wallet.Protos.TransactionInput result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.bitcoinj.wallet.Protos.TransactionOutput buildPartial() {
-        org.bitcoinj.wallet.Protos.TransactionOutput result = new org.bitcoinj.wallet.Protos.TransactionOutput(this);
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.TransactionInput buildPartial() {
+        org.bitcoinj.wallet.Protos.TransactionInput result = new org.bitcoinj.wallet.Protos.TransactionInput(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
           to_bitField0_ |= 0x00000001;
         }
-        result.value_ = value_;
+        result.transactionOutPointHash_ = transactionOutPointHash_;
         if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
           to_bitField0_ |= 0x00000002;
         }
-        result.scriptBytes_ = scriptBytes_;
+        result.transactionOutPointIndex_ = transactionOutPointIndex_;
         if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
           to_bitField0_ |= 0x00000004;
         }
-        result.spentByTransactionHash_ = spentByTransactionHash_;
+        result.scriptBytes_ = scriptBytes_;
         if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
           to_bitField0_ |= 0x00000008;
         }
-        result.spentByTransactionIndex_ = spentByTransactionIndex_;
+        result.sequence_ = sequence_;
+        if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
+          to_bitField0_ |= 0x00000010;
+        }
+        result.value_ = value_;
+        if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
+          to_bitField0_ |= 0x00000020;
+        }
+        if (witnessBuilder_ == null) {
+          result.witness_ = witness_;
+        } else {
+          result.witness_ = witnessBuilder_.build();
+        }
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bitcoinj.wallet.Protos.TransactionOutput) {
-          return mergeFrom((org.bitcoinj.wallet.Protos.TransactionOutput)other);
+        if (other instanceof org.bitcoinj.wallet.Protos.TransactionInput) {
+          return mergeFrom((org.bitcoinj.wallet.Protos.TransactionInput)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bitcoinj.wallet.Protos.TransactionOutput other) {
-        if (other == org.bitcoinj.wallet.Protos.TransactionOutput.getDefaultInstance()) return this;
-        if (other.hasValue()) {
-          setValue(other.getValue());
+      public Builder mergeFrom(org.bitcoinj.wallet.Protos.TransactionInput other) {
+        if (other == org.bitcoinj.wallet.Protos.TransactionInput.getDefaultInstance()) return this;
+        if (other.hasTransactionOutPointHash()) {
+          setTransactionOutPointHash(other.getTransactionOutPointHash());
+        }
+        if (other.hasTransactionOutPointIndex()) {
+          setTransactionOutPointIndex(other.getTransactionOutPointIndex());
         }
         if (other.hasScriptBytes()) {
           setScriptBytes(other.getScriptBytes());
         }
-        if (other.hasSpentByTransactionHash()) {
-          setSpentByTransactionHash(other.getSpentByTransactionHash());
+        if (other.hasSequence()) {
+          setSequence(other.getSequence());
         }
-        if (other.hasSpentByTransactionIndex()) {
-          setSpentByTransactionIndex(other.getSpentByTransactionIndex());
+        if (other.hasValue()) {
+          setValue(other.getValue());
+        }
+        if (other.hasWitness()) {
+          mergeWitness(other.getWitness());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
-        if (!hasValue()) {
-          
+        if (!hasTransactionOutPointHash()) {
+          return false;
+        }
+        if (!hasTransactionOutPointIndex()) {
           return false;
         }
         if (!hasScriptBytes()) {
-          
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bitcoinj.wallet.Protos.TransactionOutput parsedMessage = null;
+        org.bitcoinj.wallet.Protos.TransactionInput parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bitcoinj.wallet.Protos.TransactionOutput) e.getUnfinishedMessage();
-          throw e;
+          parsedMessage = (org.bitcoinj.wallet.Protos.TransactionInput) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -6275,368 +7550,554 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private long value_ ;
+      private com.google.protobuf.ByteString transactionOutPointHash_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>required int64 value = 1;</code>
+       * <pre>
+       * Hash of the transaction this input is using.
+       * </pre>
+       *
+       * <code>required bytes transaction_out_point_hash = 1;</code>
        */
-      public boolean hasValue() {
+      public boolean hasTransactionOutPointHash() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>required int64 value = 1;</code>
+       * <pre>
+       * Hash of the transaction this input is using.
+       * </pre>
+       *
+       * <code>required bytes transaction_out_point_hash = 1;</code>
        */
-      public long getValue() {
-        return value_;
+      public com.google.protobuf.ByteString getTransactionOutPointHash() {
+        return transactionOutPointHash_;
       }
       /**
-       * <code>required int64 value = 1;</code>
+       * <pre>
+       * Hash of the transaction this input is using.
+       * </pre>
+       *
+       * <code>required bytes transaction_out_point_hash = 1;</code>
        */
-      public Builder setValue(long value) {
-        bitField0_ |= 0x00000001;
-        value_ = value;
+      public Builder setTransactionOutPointHash(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000001;
+        transactionOutPointHash_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>required int64 value = 1;</code>
+       * <pre>
+       * Hash of the transaction this input is using.
+       * </pre>
+       *
+       * <code>required bytes transaction_out_point_hash = 1;</code>
        */
-      public Builder clearValue() {
+      public Builder clearTransactionOutPointHash() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        value_ = 0L;
+        transactionOutPointHash_ = getDefaultInstance().getTransactionOutPointHash();
         onChanged();
         return this;
       }
 
-      private com.google.protobuf.ByteString scriptBytes_ = com.google.protobuf.ByteString.EMPTY;
+      private int transactionOutPointIndex_ ;
       /**
-       * <code>required bytes script_bytes = 2;</code>
-       *
        * <pre>
-       * script of transaction output
+       * Index of transaction output used by this input.
        * </pre>
+       *
+       * <code>required uint32 transaction_out_point_index = 2;</code>
        */
-      public boolean hasScriptBytes() {
+      public boolean hasTransactionOutPointIndex() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>required bytes script_bytes = 2;</code>
-       *
        * <pre>
-       * script of transaction output
+       * Index of transaction output used by this input.
        * </pre>
+       *
+       * <code>required uint32 transaction_out_point_index = 2;</code>
        */
-      public com.google.protobuf.ByteString getScriptBytes() {
-        return scriptBytes_;
+      public int getTransactionOutPointIndex() {
+        return transactionOutPointIndex_;
       }
       /**
-       * <code>required bytes script_bytes = 2;</code>
+       * <pre>
+       * Index of transaction output used by this input.
+       * </pre>
+       *
+       * <code>required uint32 transaction_out_point_index = 2;</code>
+       */
+      public Builder setTransactionOutPointIndex(int value) {
+        bitField0_ |= 0x00000002;
+        transactionOutPointIndex_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Index of transaction output used by this input.
+       * </pre>
        *
+       * <code>required uint32 transaction_out_point_index = 2;</code>
+       */
+      public Builder clearTransactionOutPointIndex() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        transactionOutPointIndex_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.ByteString scriptBytes_ = com.google.protobuf.ByteString.EMPTY;
+      /**
        * <pre>
-       * script of transaction output
+       * Script that contains the signatures/pubkeys.
+       * </pre>
+       *
+       * <code>required bytes script_bytes = 3;</code>
+       */
+      public boolean hasScriptBytes() {
+        return ((bitField0_ & 0x00000004) == 0x00000004);
+      }
+      /**
+       * <pre>
+       * Script that contains the signatures/pubkeys.
+       * </pre>
+       *
+       * <code>required bytes script_bytes = 3;</code>
+       */
+      public com.google.protobuf.ByteString getScriptBytes() {
+        return scriptBytes_;
+      }
+      /**
+       * <pre>
+       * Script that contains the signatures/pubkeys.
        * </pre>
+       *
+       * <code>required bytes script_bytes = 3;</code>
        */
       public Builder setScriptBytes(com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000002;
+  bitField0_ |= 0x00000004;
         scriptBytes_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>required bytes script_bytes = 2;</code>
-       *
        * <pre>
-       * script of transaction output
+       * Script that contains the signatures/pubkeys.
        * </pre>
+       *
+       * <code>required bytes script_bytes = 3;</code>
        */
       public Builder clearScriptBytes() {
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000004);
         scriptBytes_ = getDefaultInstance().getScriptBytes();
         onChanged();
         return this;
       }
 
-      private com.google.protobuf.ByteString spentByTransactionHash_ = com.google.protobuf.ByteString.EMPTY;
+      private int sequence_ ;
       /**
-       * <code>optional bytes spent_by_transaction_hash = 3;</code>
+       * <pre>
+       * Sequence number.
+       * </pre>
        *
+       * <code>optional uint32 sequence = 4;</code>
+       */
+      public boolean hasSequence() {
+        return ((bitField0_ & 0x00000008) == 0x00000008);
+      }
+      /**
        * <pre>
-       * If spent, the hash of the transaction doing the spend.
+       * Sequence number.
        * </pre>
+       *
+       * <code>optional uint32 sequence = 4;</code>
        */
-      public boolean hasSpentByTransactionHash() {
-        return ((bitField0_ & 0x00000004) == 0x00000004);
+      public int getSequence() {
+        return sequence_;
       }
       /**
-       * <code>optional bytes spent_by_transaction_hash = 3;</code>
+       * <pre>
+       * Sequence number.
+       * </pre>
        *
+       * <code>optional uint32 sequence = 4;</code>
+       */
+      public Builder setSequence(int value) {
+        bitField0_ |= 0x00000008;
+        sequence_ = value;
+        onChanged();
+        return this;
+      }
+      /**
        * <pre>
-       * If spent, the hash of the transaction doing the spend.
+       * Sequence number.
        * </pre>
+       *
+       * <code>optional uint32 sequence = 4;</code>
        */
-      public com.google.protobuf.ByteString getSpentByTransactionHash() {
-        return spentByTransactionHash_;
+      public Builder clearSequence() {
+        bitField0_ = (bitField0_ & ~0x00000008);
+        sequence_ = 0;
+        onChanged();
+        return this;
       }
+
+      private long value_ ;
       /**
-       * <code>optional bytes spent_by_transaction_hash = 3;</code>
+       * <pre>
+       * Value of connected output, if known
+       * </pre>
        *
+       * <code>optional int64 value = 5;</code>
+       */
+      public boolean hasValue() {
+        return ((bitField0_ & 0x00000010) == 0x00000010);
+      }
+      /**
        * <pre>
-       * If spent, the hash of the transaction doing the spend.
+       * Value of connected output, if known
        * </pre>
+       *
+       * <code>optional int64 value = 5;</code>
        */
-      public Builder setSpentByTransactionHash(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
-        spentByTransactionHash_ = value;
+      public long getValue() {
+        return value_;
+      }
+      /**
+       * <pre>
+       * Value of connected output, if known
+       * </pre>
+       *
+       * <code>optional int64 value = 5;</code>
+       */
+      public Builder setValue(long value) {
+        bitField0_ |= 0x00000010;
+        value_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional bytes spent_by_transaction_hash = 3;</code>
-       *
        * <pre>
-       * If spent, the hash of the transaction doing the spend.
+       * Value of connected output, if known
        * </pre>
+       *
+       * <code>optional int64 value = 5;</code>
        */
-      public Builder clearSpentByTransactionHash() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        spentByTransactionHash_ = getDefaultInstance().getSpentByTransactionHash();
+      public Builder clearValue() {
+        bitField0_ = (bitField0_ & ~0x00000010);
+        value_ = 0L;
         onChanged();
         return this;
       }
 
-      private int spentByTransactionIndex_ ;
+      private org.bitcoinj.wallet.Protos.ScriptWitness witness_ = null;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          org.bitcoinj.wallet.Protos.ScriptWitness, org.bitcoinj.wallet.Protos.ScriptWitness.Builder, org.bitcoinj.wallet.Protos.ScriptWitnessOrBuilder> witnessBuilder_;
       /**
-       * <code>optional int32 spent_by_transaction_index = 4;</code>
-       *
        * <pre>
-       * If spent, the index of the transaction input of the transaction doing the spend.
+       * script witness
        * </pre>
+       *
+       * <code>optional .wallet.ScriptWitness witness = 6;</code>
        */
-      public boolean hasSpentByTransactionIndex() {
-        return ((bitField0_ & 0x00000008) == 0x00000008);
+      public boolean hasWitness() {
+        return ((bitField0_ & 0x00000020) == 0x00000020);
       }
       /**
-       * <code>optional int32 spent_by_transaction_index = 4;</code>
+       * <pre>
+       * script witness
+       * </pre>
        *
+       * <code>optional .wallet.ScriptWitness witness = 6;</code>
+       */
+      public org.bitcoinj.wallet.Protos.ScriptWitness getWitness() {
+        if (witnessBuilder_ == null) {
+          return witness_ == null ? org.bitcoinj.wallet.Protos.ScriptWitness.getDefaultInstance() : witness_;
+        } else {
+          return witnessBuilder_.getMessage();
+        }
+      }
+      /**
        * <pre>
-       * If spent, the index of the transaction input of the transaction doing the spend.
+       * script witness
        * </pre>
+       *
+       * <code>optional .wallet.ScriptWitness witness = 6;</code>
        */
-      public int getSpentByTransactionIndex() {
-        return spentByTransactionIndex_;
+      public Builder setWitness(org.bitcoinj.wallet.Protos.ScriptWitness value) {
+        if (witnessBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          witness_ = value;
+          onChanged();
+        } else {
+          witnessBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000020;
+        return this;
       }
       /**
-       * <code>optional int32 spent_by_transaction_index = 4;</code>
+       * <pre>
+       * script witness
+       * </pre>
        *
+       * <code>optional .wallet.ScriptWitness witness = 6;</code>
+       */
+      public Builder setWitness(
+          org.bitcoinj.wallet.Protos.ScriptWitness.Builder builderForValue) {
+        if (witnessBuilder_ == null) {
+          witness_ = builderForValue.build();
+          onChanged();
+        } else {
+          witnessBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000020;
+        return this;
+      }
+      /**
        * <pre>
-       * If spent, the index of the transaction input of the transaction doing the spend.
+       * script witness
        * </pre>
+       *
+       * <code>optional .wallet.ScriptWitness witness = 6;</code>
        */
-      public Builder setSpentByTransactionIndex(int value) {
-        bitField0_ |= 0x00000008;
-        spentByTransactionIndex_ = value;
-        onChanged();
+      public Builder mergeWitness(org.bitcoinj.wallet.Protos.ScriptWitness value) {
+        if (witnessBuilder_ == null) {
+          if (((bitField0_ & 0x00000020) == 0x00000020) &&
+              witness_ != null &&
+              witness_ != org.bitcoinj.wallet.Protos.ScriptWitness.getDefaultInstance()) {
+            witness_ =
+              org.bitcoinj.wallet.Protos.ScriptWitness.newBuilder(witness_).mergeFrom(value).buildPartial();
+          } else {
+            witness_ = value;
+          }
+          onChanged();
+        } else {
+          witnessBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000020;
         return this;
       }
       /**
-       * <code>optional int32 spent_by_transaction_index = 4;</code>
+       * <pre>
+       * script witness
+       * </pre>
        *
+       * <code>optional .wallet.ScriptWitness witness = 6;</code>
+       */
+      public Builder clearWitness() {
+        if (witnessBuilder_ == null) {
+          witness_ = null;
+          onChanged();
+        } else {
+          witnessBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000020);
+        return this;
+      }
+      /**
        * <pre>
-       * If spent, the index of the transaction input of the transaction doing the spend.
+       * script witness
        * </pre>
+       *
+       * <code>optional .wallet.ScriptWitness witness = 6;</code>
        */
-      public Builder clearSpentByTransactionIndex() {
-        bitField0_ = (bitField0_ & ~0x00000008);
-        spentByTransactionIndex_ = 0;
+      public org.bitcoinj.wallet.Protos.ScriptWitness.Builder getWitnessBuilder() {
+        bitField0_ |= 0x00000020;
         onChanged();
-        return this;
+        return getWitnessFieldBuilder().getBuilder();
+      }
+      /**
+       * <pre>
+       * script witness
+       * </pre>
+       *
+       * <code>optional .wallet.ScriptWitness witness = 6;</code>
+       */
+      public org.bitcoinj.wallet.Protos.ScriptWitnessOrBuilder getWitnessOrBuilder() {
+        if (witnessBuilder_ != null) {
+          return witnessBuilder_.getMessageOrBuilder();
+        } else {
+          return witness_ == null ?
+              org.bitcoinj.wallet.Protos.ScriptWitness.getDefaultInstance() : witness_;
+        }
+      }
+      /**
+       * <pre>
+       * script witness
+       * </pre>
+       *
+       * <code>optional .wallet.ScriptWitness witness = 6;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          org.bitcoinj.wallet.Protos.ScriptWitness, org.bitcoinj.wallet.Protos.ScriptWitness.Builder, org.bitcoinj.wallet.Protos.ScriptWitnessOrBuilder> 
+          getWitnessFieldBuilder() {
+        if (witnessBuilder_ == null) {
+          witnessBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              org.bitcoinj.wallet.Protos.ScriptWitness, org.bitcoinj.wallet.Protos.ScriptWitness.Builder, org.bitcoinj.wallet.Protos.ScriptWitnessOrBuilder>(
+                  getWitness(),
+                  getParentForChildren(),
+                  isClean());
+          witness_ = null;
+        }
+        return witnessBuilder_;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
       }
 
-      // @@protoc_insertion_point(builder_scope:wallet.TransactionOutput)
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:wallet.TransactionInput)
     }
 
+    // @@protoc_insertion_point(class_scope:wallet.TransactionInput)
+    private static final org.bitcoinj.wallet.Protos.TransactionInput DEFAULT_INSTANCE;
     static {
-      defaultInstance = new TransactionOutput(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoinj.wallet.Protos.TransactionInput();
     }
 
-    // @@protoc_insertion_point(class_scope:wallet.TransactionOutput)
-  }
-
-  public interface TransactionConfidenceOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:wallet.TransactionConfidence)
-      com.google.protobuf.MessageOrBuilder {
+    public static org.bitcoinj.wallet.Protos.TransactionInput getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<TransactionInput>
+        PARSER = new com.google.protobuf.AbstractParser<TransactionInput>() {
+      @java.lang.Override
+      public TransactionInput parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new TransactionInput(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<TransactionInput> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<TransactionInput> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoinj.wallet.Protos.TransactionInput getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public interface TransactionOutputOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:wallet.TransactionOutput)
+      com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>optional .wallet.TransactionConfidence.Type type = 1;</code>
-     *
-     * <pre>
-     * This is optional in case we add confidence types to prevent parse errors - backwards compatible.
-     * </pre>
+     * <code>required int64 value = 1;</code>
      */
-    boolean hasType();
+    boolean hasValue();
     /**
-     * <code>optional .wallet.TransactionConfidence.Type type = 1;</code>
-     *
-     * <pre>
-     * This is optional in case we add confidence types to prevent parse errors - backwards compatible.
-     * </pre>
+     * <code>required int64 value = 1;</code>
      */
-    org.bitcoinj.wallet.Protos.TransactionConfidence.Type getType();
+    long getValue();
 
     /**
-     * <code>optional int32 appeared_at_height = 2;</code>
-     *
      * <pre>
-     * If type == BUILDING then this is the chain height at which the transaction was included.
+     * script of transaction output
      * </pre>
-     */
-    boolean hasAppearedAtHeight();
-    /**
-     * <code>optional int32 appeared_at_height = 2;</code>
      *
-     * <pre>
-     * If type == BUILDING then this is the chain height at which the transaction was included.
-     * </pre>
+     * <code>required bytes script_bytes = 2;</code>
      */
-    int getAppearedAtHeight();
-
+    boolean hasScriptBytes();
     /**
-     * <code>optional bytes overriding_transaction = 3;</code>
-     *
      * <pre>
-     * If set, hash of the transaction that double spent this one into oblivion. A transaction can be double spent by
-     * multiple transactions in the case of several inputs being re-spent by several transactions but we don't
-     * bother to track them all, just the first. This only makes sense if type = DEAD.
+     * script of transaction output
      * </pre>
-     */
-    boolean hasOverridingTransaction();
-    /**
-     * <code>optional bytes overriding_transaction = 3;</code>
      *
-     * <pre>
-     * If set, hash of the transaction that double spent this one into oblivion. A transaction can be double spent by
-     * multiple transactions in the case of several inputs being re-spent by several transactions but we don't
-     * bother to track them all, just the first. This only makes sense if type = DEAD.
-     * </pre>
+     * <code>required bytes script_bytes = 2;</code>
      */
-    com.google.protobuf.ByteString getOverridingTransaction();
+    com.google.protobuf.ByteString getScriptBytes();
 
     /**
-     * <code>optional int32 depth = 4;</code>
-     *
      * <pre>
-     * If type == BUILDING then this is the depth of the transaction in the blockchain.
-     * Zero confirmations: depth = 0, one confirmation: depth = 1 etc.
+     * If spent, the hash of the transaction doing the spend.
      * </pre>
+     *
+     * <code>optional bytes spent_by_transaction_hash = 3;</code>
      */
-    boolean hasDepth();
+    boolean hasSpentByTransactionHash();
     /**
-     * <code>optional int32 depth = 4;</code>
-     *
      * <pre>
-     * If type == BUILDING then this is the depth of the transaction in the blockchain.
-     * Zero confirmations: depth = 0, one confirmation: depth = 1 etc.
+     * If spent, the hash of the transaction doing the spend.
      * </pre>
+     *
+     * <code>optional bytes spent_by_transaction_hash = 3;</code>
      */
-    int getDepth();
-
-    /**
-     * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-     */
-    java.util.List<org.bitcoinj.wallet.Protos.PeerAddress> 
-        getBroadcastByList();
-    /**
-     * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-     */
-    org.bitcoinj.wallet.Protos.PeerAddress getBroadcastBy(int index);
-    /**
-     * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-     */
-    int getBroadcastByCount();
-    /**
-     * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-     */
-    java.util.List<? extends org.bitcoinj.wallet.Protos.PeerAddressOrBuilder> 
-        getBroadcastByOrBuilderList();
-    /**
-     * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-     */
-    org.bitcoinj.wallet.Protos.PeerAddressOrBuilder getBroadcastByOrBuilder(
-        int index);
+    com.google.protobuf.ByteString getSpentByTransactionHash();
 
     /**
-     * <code>optional int64 last_broadcasted_at = 8;</code>
-     *
      * <pre>
-     * Millis since epoch the transaction was last announced to us.
+     * If spent, the index of the transaction input of the transaction doing the spend.
      * </pre>
+     *
+     * <code>optional int32 spent_by_transaction_index = 4;</code>
      */
-    boolean hasLastBroadcastedAt();
+    boolean hasSpentByTransactionIndex();
     /**
-     * <code>optional int64 last_broadcasted_at = 8;</code>
-     *
      * <pre>
-     * Millis since epoch the transaction was last announced to us.
+     * If spent, the index of the transaction input of the transaction doing the spend.
      * </pre>
+     *
+     * <code>optional int32 spent_by_transaction_index = 4;</code>
      */
-    long getLastBroadcastedAt();
-
-    /**
-     * <code>optional .wallet.TransactionConfidence.Source source = 7;</code>
-     */
-    boolean hasSource();
-    /**
-     * <code>optional .wallet.TransactionConfidence.Source source = 7;</code>
-     */
-    org.bitcoinj.wallet.Protos.TransactionConfidence.Source getSource();
+    int getSpentByTransactionIndex();
   }
   /**
-   * Protobuf type {@code wallet.TransactionConfidence}
-   *
-   * <pre>
-   **
-   * A description of the confidence we have that a transaction cannot be reversed in the future.
-   * Parsing should be lenient, since this could change for different applications yet we should
-   * maintain backward compatibility.
-   * </pre>
+   * Protobuf type {@code wallet.TransactionOutput}
    */
-  public static final class TransactionConfidence extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:wallet.TransactionConfidence)
-      TransactionConfidenceOrBuilder {
-    // Use TransactionConfidence.newBuilder() to construct.
-    private TransactionConfidence(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+  public  static final class TransactionOutput extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:wallet.TransactionOutput)
+      TransactionOutputOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use TransactionOutput.newBuilder() to construct.
+    private TransactionOutput(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private TransactionConfidence(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final TransactionConfidence defaultInstance;
-    public static TransactionConfidence getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public TransactionConfidence getDefaultInstanceForType() {
-      return defaultInstance;
+    private TransactionOutput() {
+      value_ = 0L;
+      scriptBytes_ = com.google.protobuf.ByteString.EMPTY;
+      spentByTransactionHash_ = com.google.protobuf.ByteString.EMPTY;
+      spentByTransactionIndex_ = 0;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
-    private TransactionConfidence(
+    private TransactionOutput(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6648,2411 +8109,3587 @@ private TransactionConfidence(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 8: {
-              int rawValue = input.readEnum();
-              org.bitcoinj.wallet.Protos.TransactionConfidence.Type value = org.bitcoinj.wallet.Protos.TransactionConfidence.Type.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(1, rawValue);
-              } else {
-                bitField0_ |= 0x00000001;
-                type_ = value;
-              }
+              bitField0_ |= 0x00000001;
+              value_ = input.readInt64();
               break;
             }
-            case 16: {
+            case 18: {
               bitField0_ |= 0x00000002;
-              appearedAtHeight_ = input.readInt32();
+              scriptBytes_ = input.readBytes();
               break;
             }
             case 26: {
               bitField0_ |= 0x00000004;
-              overridingTransaction_ = input.readBytes();
+              spentByTransactionHash_ = input.readBytes();
               break;
             }
             case 32: {
               bitField0_ |= 0x00000008;
-              depth_ = input.readInt32();
-              break;
-            }
-            case 50: {
-              if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
-                broadcastBy_ = new java.util.ArrayList<org.bitcoinj.wallet.Protos.PeerAddress>();
-                mutable_bitField0_ |= 0x00000010;
-              }
-              broadcastBy_.add(input.readMessage(org.bitcoinj.wallet.Protos.PeerAddress.PARSER, extensionRegistry));
+              spentByTransactionIndex_ = input.readInt32();
               break;
             }
-            case 56: {
-              int rawValue = input.readEnum();
-              org.bitcoinj.wallet.Protos.TransactionConfidence.Source value = org.bitcoinj.wallet.Protos.TransactionConfidence.Source.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(7, rawValue);
-              } else {
-                bitField0_ |= 0x00000020;
-                source_ = value;
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
               }
               break;
             }
-            case 64: {
-              bitField0_ |= 0x00000010;
-              lastBroadcastedAt_ = input.readInt64();
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
-          broadcastBy_ = java.util.Collections.unmodifiableList(broadcastBy_);
-        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionConfidence_descriptor;
+      return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionOutput_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionConfidence_fieldAccessorTable
+      return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionOutput_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bitcoinj.wallet.Protos.TransactionConfidence.class, org.bitcoinj.wallet.Protos.TransactionConfidence.Builder.class);
+              org.bitcoinj.wallet.Protos.TransactionOutput.class, org.bitcoinj.wallet.Protos.TransactionOutput.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<TransactionConfidence> PARSER =
-        new com.google.protobuf.AbstractParser<TransactionConfidence>() {
-      public TransactionConfidence parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TransactionConfidence(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<TransactionConfidence> getParserForType() {
-      return PARSER;
+    private int bitField0_;
+    public static final int VALUE_FIELD_NUMBER = 1;
+    private long value_;
+    /**
+     * <code>required int64 value = 1;</code>
+     */
+    public boolean hasValue() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    /**
+     * <code>required int64 value = 1;</code>
+     */
+    public long getValue() {
+      return value_;
     }
 
+    public static final int SCRIPT_BYTES_FIELD_NUMBER = 2;
+    private com.google.protobuf.ByteString scriptBytes_;
     /**
-     * Protobuf enum {@code wallet.TransactionConfidence.Type}
+     * <pre>
+     * script of transaction output
+     * </pre>
+     *
+     * <code>required bytes script_bytes = 2;</code>
      */
-    public enum Type
-        implements com.google.protobuf.ProtocolMessageEnum {
-      /**
-       * <code>UNKNOWN = 0;</code>
-       *
-       * <pre>
-       * See TransactionConfidence.java for a more thorough explanation of these types.
-       * </pre>
-       */
-      UNKNOWN(0, 0),
-      /**
-       * <code>BUILDING = 1;</code>
-       *
-       * <pre>
-       * In best chain.  If and only if appeared_at_height is present.
-       * </pre>
-       */
-      BUILDING(1, 1),
-      /**
-       * <code>PENDING = 2;</code>
-       *
-       * <pre>
-       * Unconfirmed and sitting in the networks memory pools, waiting to be included in the chain.
-       * </pre>
-       */
-      PENDING(2, 2),
-      /**
-       * <code>NOT_IN_BEST_CHAIN = 3;</code>
-       *
-       * <pre>
-       * Deprecated: equivalent to PENDING.
-       * </pre>
-       */
-      NOT_IN_BEST_CHAIN(3, 3),
-      /**
-       * <code>DEAD = 4;</code>
-       *
-       * <pre>
-       * Either if overriding_transaction is present or transaction is dead coinbase.
-       * </pre>
-       */
-      DEAD(4, 4),
-      /**
-       * <code>IN_CONFLICT = 5;</code>
-       *
-       * <pre>
-       * There is another transaction spending one of this transaction inputs.
-       * </pre>
-       */
-      IN_CONFLICT(5, 5),
-      ;
+    public boolean hasScriptBytes() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
+     * <pre>
+     * script of transaction output
+     * </pre>
+     *
+     * <code>required bytes script_bytes = 2;</code>
+     */
+    public com.google.protobuf.ByteString getScriptBytes() {
+      return scriptBytes_;
+    }
 
-      /**
-       * <code>UNKNOWN = 0;</code>
-       *
-       * <pre>
-       * See TransactionConfidence.java for a more thorough explanation of these types.
-       * </pre>
-       */
-      public static final int UNKNOWN_VALUE = 0;
-      /**
-       * <code>BUILDING = 1;</code>
-       *
-       * <pre>
-       * In best chain.  If and only if appeared_at_height is present.
-       * </pre>
-       */
-      public static final int BUILDING_VALUE = 1;
-      /**
-       * <code>PENDING = 2;</code>
-       *
-       * <pre>
-       * Unconfirmed and sitting in the networks memory pools, waiting to be included in the chain.
-       * </pre>
-       */
-      public static final int PENDING_VALUE = 2;
-      /**
-       * <code>NOT_IN_BEST_CHAIN = 3;</code>
-       *
-       * <pre>
-       * Deprecated: equivalent to PENDING.
-       * </pre>
-       */
-      public static final int NOT_IN_BEST_CHAIN_VALUE = 3;
-      /**
-       * <code>DEAD = 4;</code>
-       *
-       * <pre>
-       * Either if overriding_transaction is present or transaction is dead coinbase.
-       * </pre>
-       */
-      public static final int DEAD_VALUE = 4;
-      /**
-       * <code>IN_CONFLICT = 5;</code>
-       *
-       * <pre>
-       * There is another transaction spending one of this transaction inputs.
-       * </pre>
-       */
-      public static final int IN_CONFLICT_VALUE = 5;
+    public static final int SPENT_BY_TRANSACTION_HASH_FIELD_NUMBER = 3;
+    private com.google.protobuf.ByteString spentByTransactionHash_;
+    /**
+     * <pre>
+     * If spent, the hash of the transaction doing the spend.
+     * </pre>
+     *
+     * <code>optional bytes spent_by_transaction_hash = 3;</code>
+     */
+    public boolean hasSpentByTransactionHash() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
+    }
+    /**
+     * <pre>
+     * If spent, the hash of the transaction doing the spend.
+     * </pre>
+     *
+     * <code>optional bytes spent_by_transaction_hash = 3;</code>
+     */
+    public com.google.protobuf.ByteString getSpentByTransactionHash() {
+      return spentByTransactionHash_;
+    }
 
+    public static final int SPENT_BY_TRANSACTION_INDEX_FIELD_NUMBER = 4;
+    private int spentByTransactionIndex_;
+    /**
+     * <pre>
+     * If spent, the index of the transaction input of the transaction doing the spend.
+     * </pre>
+     *
+     * <code>optional int32 spent_by_transaction_index = 4;</code>
+     */
+    public boolean hasSpentByTransactionIndex() {
+      return ((bitField0_ & 0x00000008) == 0x00000008);
+    }
+    /**
+     * <pre>
+     * If spent, the index of the transaction input of the transaction doing the spend.
+     * </pre>
+     *
+     * <code>optional int32 spent_by_transaction_index = 4;</code>
+     */
+    public int getSpentByTransactionIndex() {
+      return spentByTransactionIndex_;
+    }
 
-      public final int getNumber() { return value; }
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
-      public static Type valueOf(int value) {
-        switch (value) {
-          case 0: return UNKNOWN;
-          case 1: return BUILDING;
-          case 2: return PENDING;
-          case 3: return NOT_IN_BEST_CHAIN;
-          case 4: return DEAD;
-          case 5: return IN_CONFLICT;
-          default: return null;
-        }
+      if (!hasValue()) {
+        memoizedIsInitialized = 0;
+        return false;
       }
-
-      public static com.google.protobuf.Internal.EnumLiteMap<Type>
-          internalGetValueMap() {
-        return internalValueMap;
+      if (!hasScriptBytes()) {
+        memoizedIsInitialized = 0;
+        return false;
       }
-      private static com.google.protobuf.Internal.EnumLiteMap<Type>
-          internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap<Type>() {
-              public Type findValueByNumber(int number) {
-                return Type.valueOf(number);
-              }
-            };
+      memoizedIsInitialized = 1;
+      return true;
+    }
 
-      public final com.google.protobuf.Descriptors.EnumValueDescriptor
-          getValueDescriptor() {
-        return getDescriptor().getValues().get(index);
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        output.writeInt64(1, value_);
       }
-      public final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptorForType() {
-        return getDescriptor();
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        output.writeBytes(2, scriptBytes_);
       }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptor() {
-        return org.bitcoinj.wallet.Protos.TransactionConfidence.getDescriptor().getEnumTypes().get(0);
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        output.writeBytes(3, spentByTransactionHash_);
       }
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        output.writeInt32(4, spentByTransactionIndex_);
+      }
+      unknownFields.writeTo(output);
+    }
 
-      private static final Type[] VALUES = values();
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
 
-      public static Type valueOf(
-          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-        if (desc.getType() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException(
-            "EnumValueDescriptor is not for this type.");
-        }
-        return VALUES[desc.getIndex()];
+      size = 0;
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt64Size(1, value_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(2, scriptBytes_);
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(3, spentByTransactionHash_);
+      }
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(4, spentByTransactionIndex_);
       }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
 
-      private final int index;
-      private final int value;
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoinj.wallet.Protos.TransactionOutput)) {
+        return super.equals(obj);
+      }
+      org.bitcoinj.wallet.Protos.TransactionOutput other = (org.bitcoinj.wallet.Protos.TransactionOutput) obj;
 
-      private Type(int index, int value) {
-        this.index = index;
-        this.value = value;
+      boolean result = true;
+      result = result && (hasValue() == other.hasValue());
+      if (hasValue()) {
+        result = result && (getValue()
+            == other.getValue());
+      }
+      result = result && (hasScriptBytes() == other.hasScriptBytes());
+      if (hasScriptBytes()) {
+        result = result && getScriptBytes()
+            .equals(other.getScriptBytes());
+      }
+      result = result && (hasSpentByTransactionHash() == other.hasSpentByTransactionHash());
+      if (hasSpentByTransactionHash()) {
+        result = result && getSpentByTransactionHash()
+            .equals(other.getSpentByTransactionHash());
       }
+      result = result && (hasSpentByTransactionIndex() == other.hasSpentByTransactionIndex());
+      if (hasSpentByTransactionIndex()) {
+        result = result && (getSpentByTransactionIndex()
+            == other.getSpentByTransactionIndex());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
 
-      // @@protoc_insertion_point(enum_scope:wallet.TransactionConfidence.Type)
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasValue()) {
+        hash = (37 * hash) + VALUE_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getValue());
+      }
+      if (hasScriptBytes()) {
+        hash = (37 * hash) + SCRIPT_BYTES_FIELD_NUMBER;
+        hash = (53 * hash) + getScriptBytes().hashCode();
+      }
+      if (hasSpentByTransactionHash()) {
+        hash = (37 * hash) + SPENT_BY_TRANSACTION_HASH_FIELD_NUMBER;
+        hash = (53 * hash) + getSpentByTransactionHash().hashCode();
+      }
+      if (hasSpentByTransactionIndex()) {
+        hash = (37 * hash) + SPENT_BY_TRANSACTION_INDEX_FIELD_NUMBER;
+        hash = (53 * hash) + getSpentByTransactionIndex();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
-    /**
-     * Protobuf enum {@code wallet.TransactionConfidence.Source}
-     *
-     * <pre>
-     * Where did we get this transaction from? Knowing the source may help us to risk analyze pending transactions.
-     * </pre>
-     */
-    public enum Source
-        implements com.google.protobuf.ProtocolMessageEnum {
-      /**
-       * <code>SOURCE_UNKNOWN = 0;</code>
-       *
-       * <pre>
-       * We don't know where it came from, or this is a wallet from the future.
-       * </pre>
-       */
-      SOURCE_UNKNOWN(0, 0),
-      /**
-       * <code>SOURCE_NETWORK = 1;</code>
-       *
-       * <pre>
-       * We received it from a network broadcast. This is the normal way to get payments.
-       * </pre>
-       */
-      SOURCE_NETWORK(1, 1),
-      /**
-       * <code>SOURCE_SELF = 2;</code>
-       *
-       * <pre>
-       * We made it ourselves, so we know it should be valid.
-       * </pre>
-       */
-      SOURCE_SELF(2, 2),
-      ;
-
-      /**
-       * <code>SOURCE_UNKNOWN = 0;</code>
-       *
-       * <pre>
-       * We don't know where it came from, or this is a wallet from the future.
-       * </pre>
-       */
-      public static final int SOURCE_UNKNOWN_VALUE = 0;
-      /**
-       * <code>SOURCE_NETWORK = 1;</code>
-       *
-       * <pre>
-       * We received it from a network broadcast. This is the normal way to get payments.
-       * </pre>
-       */
-      public static final int SOURCE_NETWORK_VALUE = 1;
-      /**
-       * <code>SOURCE_SELF = 2;</code>
-       *
-       * <pre>
-       * We made it ourselves, so we know it should be valid.
-       * </pre>
-       */
-      public static final int SOURCE_SELF_VALUE = 2;
+    public static org.bitcoinj.wallet.Protos.TransactionOutput parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionOutput parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionOutput parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionOutput parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionOutput parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionOutput parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionOutput parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionOutput parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionOutput parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionOutput parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionOutput parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionOutput parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
 
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(org.bitcoinj.wallet.Protos.TransactionOutput prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
 
-      public final int getNumber() { return value; }
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code wallet.TransactionOutput}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:wallet.TransactionOutput)
+        org.bitcoinj.wallet.Protos.TransactionOutputOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionOutput_descriptor;
+      }
 
-      public static Source valueOf(int value) {
-        switch (value) {
-          case 0: return SOURCE_UNKNOWN;
-          case 1: return SOURCE_NETWORK;
-          case 2: return SOURCE_SELF;
-          default: return null;
-        }
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionOutput_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                org.bitcoinj.wallet.Protos.TransactionOutput.class, org.bitcoinj.wallet.Protos.TransactionOutput.Builder.class);
       }
 
-      public static com.google.protobuf.Internal.EnumLiteMap<Source>
-          internalGetValueMap() {
-        return internalValueMap;
+      // Construct using org.bitcoinj.wallet.Protos.TransactionOutput.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
       }
-      private static com.google.protobuf.Internal.EnumLiteMap<Source>
-          internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap<Source>() {
-              public Source findValueByNumber(int number) {
-                return Source.valueOf(number);
-              }
-            };
 
-      public final com.google.protobuf.Descriptors.EnumValueDescriptor
-          getValueDescriptor() {
-        return getDescriptor().getValues().get(index);
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
       }
-      public final com.google.protobuf.Descriptors.EnumDescriptor
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        value_ = 0L;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        scriptBytes_ = com.google.protobuf.ByteString.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        spentByTransactionHash_ = com.google.protobuf.ByteString.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000004);
+        spentByTransactionIndex_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000008);
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return getDescriptor();
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionOutput_descriptor;
       }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptor() {
-        return org.bitcoinj.wallet.Protos.TransactionConfidence.getDescriptor().getEnumTypes().get(1);
+
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.TransactionOutput getDefaultInstanceForType() {
+        return org.bitcoinj.wallet.Protos.TransactionOutput.getDefaultInstance();
       }
 
-      private static final Source[] VALUES = values();
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.TransactionOutput build() {
+        org.bitcoinj.wallet.Protos.TransactionOutput result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
 
-      public static Source valueOf(
-          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-        if (desc.getType() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException(
-            "EnumValueDescriptor is not for this type.");
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.TransactionOutput buildPartial() {
+        org.bitcoinj.wallet.Protos.TransactionOutput result = new org.bitcoinj.wallet.Protos.TransactionOutput(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
         }
-        return VALUES[desc.getIndex()];
+        result.value_ = value_;
+        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+          to_bitField0_ |= 0x00000002;
+        }
+        result.scriptBytes_ = scriptBytes_;
+        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+          to_bitField0_ |= 0x00000004;
+        }
+        result.spentByTransactionHash_ = spentByTransactionHash_;
+        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+          to_bitField0_ |= 0x00000008;
+        }
+        result.spentByTransactionIndex_ = spentByTransactionIndex_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
       }
 
-      private final int index;
-      private final int value;
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof org.bitcoinj.wallet.Protos.TransactionOutput) {
+          return mergeFrom((org.bitcoinj.wallet.Protos.TransactionOutput)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
 
-      private Source(int index, int value) {
-        this.index = index;
-        this.value = value;
+      public Builder mergeFrom(org.bitcoinj.wallet.Protos.TransactionOutput other) {
+        if (other == org.bitcoinj.wallet.Protos.TransactionOutput.getDefaultInstance()) return this;
+        if (other.hasValue()) {
+          setValue(other.getValue());
+        }
+        if (other.hasScriptBytes()) {
+          setScriptBytes(other.getScriptBytes());
+        }
+        if (other.hasSpentByTransactionHash()) {
+          setSpentByTransactionHash(other.getSpentByTransactionHash());
+        }
+        if (other.hasSpentByTransactionIndex()) {
+          setSpentByTransactionIndex(other.getSpentByTransactionIndex());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
       }
 
-      // @@protoc_insertion_point(enum_scope:wallet.TransactionConfidence.Source)
-    }
+      @java.lang.Override
+      public final boolean isInitialized() {
+        if (!hasValue()) {
+          return false;
+        }
+        if (!hasScriptBytes()) {
+          return false;
+        }
+        return true;
+      }
 
-    private int bitField0_;
-    public static final int TYPE_FIELD_NUMBER = 1;
-    private org.bitcoinj.wallet.Protos.TransactionConfidence.Type type_;
-    /**
-     * <code>optional .wallet.TransactionConfidence.Type type = 1;</code>
-     *
-     * <pre>
-     * This is optional in case we add confidence types to prevent parse errors - backwards compatible.
-     * </pre>
-     */
-    public boolean hasType() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        org.bitcoinj.wallet.Protos.TransactionOutput parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (org.bitcoinj.wallet.Protos.TransactionOutput) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private long value_ ;
+      /**
+       * <code>required int64 value = 1;</code>
+       */
+      public boolean hasValue() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      /**
+       * <code>required int64 value = 1;</code>
+       */
+      public long getValue() {
+        return value_;
+      }
+      /**
+       * <code>required int64 value = 1;</code>
+       */
+      public Builder setValue(long value) {
+        bitField0_ |= 0x00000001;
+        value_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>required int64 value = 1;</code>
+       */
+      public Builder clearValue() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        value_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.ByteString scriptBytes_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <pre>
+       * script of transaction output
+       * </pre>
+       *
+       * <code>required bytes script_bytes = 2;</code>
+       */
+      public boolean hasScriptBytes() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
+      }
+      /**
+       * <pre>
+       * script of transaction output
+       * </pre>
+       *
+       * <code>required bytes script_bytes = 2;</code>
+       */
+      public com.google.protobuf.ByteString getScriptBytes() {
+        return scriptBytes_;
+      }
+      /**
+       * <pre>
+       * script of transaction output
+       * </pre>
+       *
+       * <code>required bytes script_bytes = 2;</code>
+       */
+      public Builder setScriptBytes(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000002;
+        scriptBytes_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * script of transaction output
+       * </pre>
+       *
+       * <code>required bytes script_bytes = 2;</code>
+       */
+      public Builder clearScriptBytes() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        scriptBytes_ = getDefaultInstance().getScriptBytes();
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.ByteString spentByTransactionHash_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <pre>
+       * If spent, the hash of the transaction doing the spend.
+       * </pre>
+       *
+       * <code>optional bytes spent_by_transaction_hash = 3;</code>
+       */
+      public boolean hasSpentByTransactionHash() {
+        return ((bitField0_ & 0x00000004) == 0x00000004);
+      }
+      /**
+       * <pre>
+       * If spent, the hash of the transaction doing the spend.
+       * </pre>
+       *
+       * <code>optional bytes spent_by_transaction_hash = 3;</code>
+       */
+      public com.google.protobuf.ByteString getSpentByTransactionHash() {
+        return spentByTransactionHash_;
+      }
+      /**
+       * <pre>
+       * If spent, the hash of the transaction doing the spend.
+       * </pre>
+       *
+       * <code>optional bytes spent_by_transaction_hash = 3;</code>
+       */
+      public Builder setSpentByTransactionHash(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000004;
+        spentByTransactionHash_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * If spent, the hash of the transaction doing the spend.
+       * </pre>
+       *
+       * <code>optional bytes spent_by_transaction_hash = 3;</code>
+       */
+      public Builder clearSpentByTransactionHash() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        spentByTransactionHash_ = getDefaultInstance().getSpentByTransactionHash();
+        onChanged();
+        return this;
+      }
+
+      private int spentByTransactionIndex_ ;
+      /**
+       * <pre>
+       * If spent, the index of the transaction input of the transaction doing the spend.
+       * </pre>
+       *
+       * <code>optional int32 spent_by_transaction_index = 4;</code>
+       */
+      public boolean hasSpentByTransactionIndex() {
+        return ((bitField0_ & 0x00000008) == 0x00000008);
+      }
+      /**
+       * <pre>
+       * If spent, the index of the transaction input of the transaction doing the spend.
+       * </pre>
+       *
+       * <code>optional int32 spent_by_transaction_index = 4;</code>
+       */
+      public int getSpentByTransactionIndex() {
+        return spentByTransactionIndex_;
+      }
+      /**
+       * <pre>
+       * If spent, the index of the transaction input of the transaction doing the spend.
+       * </pre>
+       *
+       * <code>optional int32 spent_by_transaction_index = 4;</code>
+       */
+      public Builder setSpentByTransactionIndex(int value) {
+        bitField0_ |= 0x00000008;
+        spentByTransactionIndex_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * If spent, the index of the transaction input of the transaction doing the spend.
+       * </pre>
+       *
+       * <code>optional int32 spent_by_transaction_index = 4;</code>
+       */
+      public Builder clearSpentByTransactionIndex() {
+        bitField0_ = (bitField0_ & ~0x00000008);
+        spentByTransactionIndex_ = 0;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:wallet.TransactionOutput)
+    }
+
+    // @@protoc_insertion_point(class_scope:wallet.TransactionOutput)
+    private static final org.bitcoinj.wallet.Protos.TransactionOutput DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new org.bitcoinj.wallet.Protos.TransactionOutput();
+    }
+
+    public static org.bitcoinj.wallet.Protos.TransactionOutput getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<TransactionOutput>
+        PARSER = new com.google.protobuf.AbstractParser<TransactionOutput>() {
+      @java.lang.Override
+      public TransactionOutput parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new TransactionOutput(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<TransactionOutput> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<TransactionOutput> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoinj.wallet.Protos.TransactionOutput getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
+
+  }
+
+  public interface TransactionConfidenceOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:wallet.TransactionConfidence)
+      com.google.protobuf.MessageOrBuilder {
+
     /**
-     * <code>optional .wallet.TransactionConfidence.Type type = 1;</code>
-     *
      * <pre>
      * This is optional in case we add confidence types to prevent parse errors - backwards compatible.
      * </pre>
+     *
+     * <code>optional .wallet.TransactionConfidence.Type type = 1;</code>
      */
-    public org.bitcoinj.wallet.Protos.TransactionConfidence.Type getType() {
-      return type_;
-    }
-
-    public static final int APPEARED_AT_HEIGHT_FIELD_NUMBER = 2;
-    private int appearedAtHeight_;
+    boolean hasType();
     /**
-     * <code>optional int32 appeared_at_height = 2;</code>
-     *
      * <pre>
-     * If type == BUILDING then this is the chain height at which the transaction was included.
+     * This is optional in case we add confidence types to prevent parse errors - backwards compatible.
      * </pre>
+     *
+     * <code>optional .wallet.TransactionConfidence.Type type = 1;</code>
      */
-    public boolean hasAppearedAtHeight() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
+    org.bitcoinj.wallet.Protos.TransactionConfidence.Type getType();
+
     /**
-     * <code>optional int32 appeared_at_height = 2;</code>
+     * <pre>
+     * If type == BUILDING then this is the chain height at which the transaction was included.
+     * </pre>
      *
+     * <code>optional int32 appeared_at_height = 2;</code>
+     */
+    boolean hasAppearedAtHeight();
+    /**
      * <pre>
      * If type == BUILDING then this is the chain height at which the transaction was included.
      * </pre>
+     *
+     * <code>optional int32 appeared_at_height = 2;</code>
      */
-    public int getAppearedAtHeight() {
-      return appearedAtHeight_;
-    }
+    int getAppearedAtHeight();
 
-    public static final int OVERRIDING_TRANSACTION_FIELD_NUMBER = 3;
-    private com.google.protobuf.ByteString overridingTransaction_;
     /**
-     * <code>optional bytes overriding_transaction = 3;</code>
-     *
      * <pre>
      * If set, hash of the transaction that double spent this one into oblivion. A transaction can be double spent by
      * multiple transactions in the case of several inputs being re-spent by several transactions but we don't
      * bother to track them all, just the first. This only makes sense if type = DEAD.
      * </pre>
+     *
+     * <code>optional bytes overriding_transaction = 3;</code>
      */
-    public boolean hasOverridingTransaction() {
-      return ((bitField0_ & 0x00000004) == 0x00000004);
-    }
+    boolean hasOverridingTransaction();
     /**
-     * <code>optional bytes overriding_transaction = 3;</code>
-     *
      * <pre>
      * If set, hash of the transaction that double spent this one into oblivion. A transaction can be double spent by
      * multiple transactions in the case of several inputs being re-spent by several transactions but we don't
      * bother to track them all, just the first. This only makes sense if type = DEAD.
      * </pre>
+     *
+     * <code>optional bytes overriding_transaction = 3;</code>
      */
-    public com.google.protobuf.ByteString getOverridingTransaction() {
-      return overridingTransaction_;
-    }
+    com.google.protobuf.ByteString getOverridingTransaction();
 
-    public static final int DEPTH_FIELD_NUMBER = 4;
-    private int depth_;
     /**
-     * <code>optional int32 depth = 4;</code>
-     *
      * <pre>
      * If type == BUILDING then this is the depth of the transaction in the blockchain.
      * Zero confirmations: depth = 0, one confirmation: depth = 1 etc.
      * </pre>
+     *
+     * <code>optional int32 depth = 4;</code>
      */
-    public boolean hasDepth() {
-      return ((bitField0_ & 0x00000008) == 0x00000008);
-    }
+    boolean hasDepth();
     /**
-     * <code>optional int32 depth = 4;</code>
-     *
      * <pre>
      * If type == BUILDING then this is the depth of the transaction in the blockchain.
      * Zero confirmations: depth = 0, one confirmation: depth = 1 etc.
      * </pre>
+     *
+     * <code>optional int32 depth = 4;</code>
      */
-    public int getDepth() {
-      return depth_;
-    }
+    int getDepth();
 
-    public static final int BROADCAST_BY_FIELD_NUMBER = 6;
-    private java.util.List<org.bitcoinj.wallet.Protos.PeerAddress> broadcastBy_;
     /**
      * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
      */
-    public java.util.List<org.bitcoinj.wallet.Protos.PeerAddress> getBroadcastByList() {
-      return broadcastBy_;
-    }
+    java.util.List<org.bitcoinj.wallet.Protos.PeerAddress> 
+        getBroadcastByList();
     /**
      * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
      */
-    public java.util.List<? extends org.bitcoinj.wallet.Protos.PeerAddressOrBuilder> 
-        getBroadcastByOrBuilderList() {
-      return broadcastBy_;
-    }
+    org.bitcoinj.wallet.Protos.PeerAddress getBroadcastBy(int index);
     /**
      * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
      */
-    public int getBroadcastByCount() {
-      return broadcastBy_.size();
-    }
+    int getBroadcastByCount();
     /**
      * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
      */
-    public org.bitcoinj.wallet.Protos.PeerAddress getBroadcastBy(int index) {
-      return broadcastBy_.get(index);
-    }
+    java.util.List<? extends org.bitcoinj.wallet.Protos.PeerAddressOrBuilder> 
+        getBroadcastByOrBuilderList();
     /**
      * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
      */
-    public org.bitcoinj.wallet.Protos.PeerAddressOrBuilder getBroadcastByOrBuilder(
-        int index) {
-      return broadcastBy_.get(index);
-    }
+    org.bitcoinj.wallet.Protos.PeerAddressOrBuilder getBroadcastByOrBuilder(
+        int index);
 
-    public static final int LAST_BROADCASTED_AT_FIELD_NUMBER = 8;
-    private long lastBroadcastedAt_;
     /**
-     * <code>optional int64 last_broadcasted_at = 8;</code>
-     *
      * <pre>
      * Millis since epoch the transaction was last announced to us.
      * </pre>
+     *
+     * <code>optional int64 last_broadcasted_at = 8;</code>
      */
-    public boolean hasLastBroadcastedAt() {
-      return ((bitField0_ & 0x00000010) == 0x00000010);
-    }
+    boolean hasLastBroadcastedAt();
     /**
-     * <code>optional int64 last_broadcasted_at = 8;</code>
-     *
      * <pre>
      * Millis since epoch the transaction was last announced to us.
      * </pre>
+     *
+     * <code>optional int64 last_broadcasted_at = 8;</code>
      */
-    public long getLastBroadcastedAt() {
-      return lastBroadcastedAt_;
-    }
+    long getLastBroadcastedAt();
 
-    public static final int SOURCE_FIELD_NUMBER = 7;
-    private org.bitcoinj.wallet.Protos.TransactionConfidence.Source source_;
     /**
      * <code>optional .wallet.TransactionConfidence.Source source = 7;</code>
      */
-    public boolean hasSource() {
-      return ((bitField0_ & 0x00000020) == 0x00000020);
-    }
+    boolean hasSource();
     /**
      * <code>optional .wallet.TransactionConfidence.Source source = 7;</code>
      */
-    public org.bitcoinj.wallet.Protos.TransactionConfidence.Source getSource() {
-      return source_;
+    org.bitcoinj.wallet.Protos.TransactionConfidence.Source getSource();
+  }
+  /**
+   * <pre>
+   **
+   * A description of the confidence we have that a transaction cannot be reversed in the future.
+   * Parsing should be lenient, since this could change for different applications yet we should
+   * maintain backward compatibility.
+   * </pre>
+   *
+   * Protobuf type {@code wallet.TransactionConfidence}
+   */
+  public  static final class TransactionConfidence extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:wallet.TransactionConfidence)
+      TransactionConfidenceOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use TransactionConfidence.newBuilder() to construct.
+    private TransactionConfidence(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
     }
-
-    private void initFields() {
-      type_ = org.bitcoinj.wallet.Protos.TransactionConfidence.Type.UNKNOWN;
+    private TransactionConfidence() {
+      type_ = 0;
       appearedAtHeight_ = 0;
       overridingTransaction_ = com.google.protobuf.ByteString.EMPTY;
       depth_ = 0;
       broadcastBy_ = java.util.Collections.emptyList();
       lastBroadcastedAt_ = 0L;
-      source_ = org.bitcoinj.wallet.Protos.TransactionConfidence.Source.SOURCE_UNKNOWN;
+      source_ = 0;
     }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
 
-      for (int i = 0; i < getBroadcastByCount(); i++) {
-        if (!getBroadcastBy(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      memoizedIsInitialized = 1;
-      return true;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
     }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeEnum(1, type_.getNumber());
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeInt32(2, appearedAtHeight_);
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeBytes(3, overridingTransaction_);
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeInt32(4, depth_);
-      }
-      for (int i = 0; i < broadcastBy_.size(); i++) {
-        output.writeMessage(6, broadcastBy_.get(i));
-      }
-      if (((bitField0_ & 0x00000020) == 0x00000020)) {
-        output.writeEnum(7, source_.getNumber());
+    private TransactionConfidence(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
       }
-      if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        output.writeInt64(8, lastBroadcastedAt_);
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8: {
+              int rawValue = input.readEnum();
+                @SuppressWarnings("deprecation")
+              org.bitcoinj.wallet.Protos.TransactionConfidence.Type value = org.bitcoinj.wallet.Protos.TransactionConfidence.Type.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(1, rawValue);
+              } else {
+                bitField0_ |= 0x00000001;
+                type_ = rawValue;
+              }
+              break;
+            }
+            case 16: {
+              bitField0_ |= 0x00000002;
+              appearedAtHeight_ = input.readInt32();
+              break;
+            }
+            case 26: {
+              bitField0_ |= 0x00000004;
+              overridingTransaction_ = input.readBytes();
+              break;
+            }
+            case 32: {
+              bitField0_ |= 0x00000008;
+              depth_ = input.readInt32();
+              break;
+            }
+            case 50: {
+              if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
+                broadcastBy_ = new java.util.ArrayList<org.bitcoinj.wallet.Protos.PeerAddress>();
+                mutable_bitField0_ |= 0x00000010;
+              }
+              broadcastBy_.add(
+                  input.readMessage(org.bitcoinj.wallet.Protos.PeerAddress.PARSER, extensionRegistry));
+              break;
+            }
+            case 56: {
+              int rawValue = input.readEnum();
+                @SuppressWarnings("deprecation")
+              org.bitcoinj.wallet.Protos.TransactionConfidence.Source value = org.bitcoinj.wallet.Protos.TransactionConfidence.Source.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(7, rawValue);
+              } else {
+                bitField0_ |= 0x00000020;
+                source_ = rawValue;
+              }
+              break;
+            }
+            case 64: {
+              bitField0_ |= 0x00000010;
+              lastBroadcastedAt_ = input.readInt64();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
+          broadcastBy_ = java.util.Collections.unmodifiableList(broadcastBy_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
       }
-      getUnknownFields().writeTo(output);
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionConfidence_descriptor;
     }
 
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionConfidence_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.bitcoinj.wallet.Protos.TransactionConfidence.class, org.bitcoinj.wallet.Protos.TransactionConfidence.Builder.class);
+    }
 
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(1, type_.getNumber());
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(2, appearedAtHeight_);
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(3, overridingTransaction_);
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, depth_);
-      }
-      for (int i = 0; i < broadcastBy_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, broadcastBy_.get(i));
-      }
-      if (((bitField0_ & 0x00000020) == 0x00000020)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(7, source_.getNumber());
-      }
-      if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt64Size(8, lastBroadcastedAt_);
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
-    public static org.bitcoinj.wallet.Protos.TransactionConfidence parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static org.bitcoinj.wallet.Protos.TransactionConfidence parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static org.bitcoinj.wallet.Protos.TransactionConfidence parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static org.bitcoinj.wallet.Protos.TransactionConfidence parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static org.bitcoinj.wallet.Protos.TransactionConfidence parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-    public static org.bitcoinj.wallet.Protos.TransactionConfidence parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-    public static org.bitcoinj.wallet.Protos.TransactionConfidence parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
-    }
-    public static org.bitcoinj.wallet.Protos.TransactionConfidence parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
-    }
-    public static org.bitcoinj.wallet.Protos.TransactionConfidence parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-    public static org.bitcoinj.wallet.Protos.TransactionConfidence parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.bitcoinj.wallet.Protos.TransactionConfidence prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() { return newBuilder(this); }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
     /**
-     * Protobuf type {@code wallet.TransactionConfidence}
-     *
-     * <pre>
-     **
-     * A description of the confidence we have that a transaction cannot be reversed in the future.
-     * Parsing should be lenient, since this could change for different applications yet we should
-     * maintain backward compatibility.
-     * </pre>
+     * Protobuf enum {@code wallet.TransactionConfidence.Type}
      */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:wallet.TransactionConfidence)
-        org.bitcoinj.wallet.Protos.TransactionConfidenceOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionConfidence_descriptor;
-      }
+    public enum Type
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <pre>
+       * See TransactionConfidence.java for a more thorough explanation of these types.
+       * </pre>
+       *
+       * <code>UNKNOWN = 0;</code>
+       */
+      UNKNOWN(0),
+      /**
+       * <pre>
+       * In best chain.  If and only if appeared_at_height is present.
+       * </pre>
+       *
+       * <code>BUILDING = 1;</code>
+       */
+      BUILDING(1),
+      /**
+       * <pre>
+       * Unconfirmed and sitting in the networks memory pools, waiting to be included in the chain.
+       * </pre>
+       *
+       * <code>PENDING = 2;</code>
+       */
+      PENDING(2),
+      /**
+       * <pre>
+       * Deprecated: equivalent to PENDING.
+       * </pre>
+       *
+       * <code>NOT_IN_BEST_CHAIN = 3;</code>
+       */
+      NOT_IN_BEST_CHAIN(3),
+      /**
+       * <pre>
+       * Either if overriding_transaction is present or transaction is dead coinbase.
+       * </pre>
+       *
+       * <code>DEAD = 4;</code>
+       */
+      DEAD(4),
+      /**
+       * <pre>
+       * There is another transaction spending one of this transaction inputs.
+       * </pre>
+       *
+       * <code>IN_CONFLICT = 5;</code>
+       */
+      IN_CONFLICT(5),
+      ;
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionConfidence_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                org.bitcoinj.wallet.Protos.TransactionConfidence.class, org.bitcoinj.wallet.Protos.TransactionConfidence.Builder.class);
-      }
+      /**
+       * <pre>
+       * See TransactionConfidence.java for a more thorough explanation of these types.
+       * </pre>
+       *
+       * <code>UNKNOWN = 0;</code>
+       */
+      public static final int UNKNOWN_VALUE = 0;
+      /**
+       * <pre>
+       * In best chain.  If and only if appeared_at_height is present.
+       * </pre>
+       *
+       * <code>BUILDING = 1;</code>
+       */
+      public static final int BUILDING_VALUE = 1;
+      /**
+       * <pre>
+       * Unconfirmed and sitting in the networks memory pools, waiting to be included in the chain.
+       * </pre>
+       *
+       * <code>PENDING = 2;</code>
+       */
+      public static final int PENDING_VALUE = 2;
+      /**
+       * <pre>
+       * Deprecated: equivalent to PENDING.
+       * </pre>
+       *
+       * <code>NOT_IN_BEST_CHAIN = 3;</code>
+       */
+      public static final int NOT_IN_BEST_CHAIN_VALUE = 3;
+      /**
+       * <pre>
+       * Either if overriding_transaction is present or transaction is dead coinbase.
+       * </pre>
+       *
+       * <code>DEAD = 4;</code>
+       */
+      public static final int DEAD_VALUE = 4;
+      /**
+       * <pre>
+       * There is another transaction spending one of this transaction inputs.
+       * </pre>
+       *
+       * <code>IN_CONFLICT = 5;</code>
+       */
+      public static final int IN_CONFLICT_VALUE = 5;
 
-      // Construct using org.bitcoinj.wallet.Protos.TransactionConfidence.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
 
-      private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-          getBroadcastByFieldBuilder();
-        }
+      public final int getNumber() {
+        return value;
       }
-      private static Builder create() {
-        return new Builder();
+
+      /**
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
+      public static Type valueOf(int value) {
+        return forNumber(value);
       }
 
-      public Builder clear() {
-        super.clear();
-        type_ = org.bitcoinj.wallet.Protos.TransactionConfidence.Type.UNKNOWN;
-        bitField0_ = (bitField0_ & ~0x00000001);
-        appearedAtHeight_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
-        overridingTransaction_ = com.google.protobuf.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000004);
-        depth_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000008);
-        if (broadcastByBuilder_ == null) {
-          broadcastBy_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000010);
-        } else {
-          broadcastByBuilder_.clear();
+      public static Type forNumber(int value) {
+        switch (value) {
+          case 0: return UNKNOWN;
+          case 1: return BUILDING;
+          case 2: return PENDING;
+          case 3: return NOT_IN_BEST_CHAIN;
+          case 4: return DEAD;
+          case 5: return IN_CONFLICT;
+          default: return null;
         }
-        lastBroadcastedAt_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000020);
-        source_ = org.bitcoinj.wallet.Protos.TransactionConfidence.Source.SOURCE_UNKNOWN;
-        bitField0_ = (bitField0_ & ~0x00000040);
-        return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
+      public static com.google.protobuf.Internal.EnumLiteMap<Type>
+          internalGetValueMap() {
+        return internalValueMap;
       }
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          Type> internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<Type>() {
+              public Type findValueByNumber(int number) {
+                return Type.forNumber(number);
+              }
+            };
 
-      public com.google.protobuf.Descriptors.Descriptor
+      public final com.google.protobuf.Descriptors.EnumValueDescriptor
+          getValueDescriptor() {
+        return getDescriptor().getValues().get(ordinal());
+      }
+      public final com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptorForType() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionConfidence_descriptor;
+        return getDescriptor();
       }
-
-      public org.bitcoinj.wallet.Protos.TransactionConfidence getDefaultInstanceForType() {
-        return org.bitcoinj.wallet.Protos.TransactionConfidence.getDefaultInstance();
-      }
-
-      public org.bitcoinj.wallet.Protos.TransactionConfidence build() {
-        org.bitcoinj.wallet.Protos.TransactionConfidence result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
+      public static final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptor() {
+        return org.bitcoinj.wallet.Protos.TransactionConfidence.getDescriptor().getEnumTypes().get(0);
       }
 
-      public org.bitcoinj.wallet.Protos.TransactionConfidence buildPartial() {
-        org.bitcoinj.wallet.Protos.TransactionConfidence result = new org.bitcoinj.wallet.Protos.TransactionConfidence(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        result.type_ = type_;
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        result.appearedAtHeight_ = appearedAtHeight_;
-        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
-          to_bitField0_ |= 0x00000004;
-        }
-        result.overridingTransaction_ = overridingTransaction_;
-        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
-          to_bitField0_ |= 0x00000008;
-        }
-        result.depth_ = depth_;
-        if (broadcastByBuilder_ == null) {
-          if (((bitField0_ & 0x00000010) == 0x00000010)) {
-            broadcastBy_ = java.util.Collections.unmodifiableList(broadcastBy_);
-            bitField0_ = (bitField0_ & ~0x00000010);
-          }
-          result.broadcastBy_ = broadcastBy_;
-        } else {
-          result.broadcastBy_ = broadcastByBuilder_.build();
-        }
-        if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
-          to_bitField0_ |= 0x00000010;
-        }
-        result.lastBroadcastedAt_ = lastBroadcastedAt_;
-        if (((from_bitField0_ & 0x00000040) == 0x00000040)) {
-          to_bitField0_ |= 0x00000020;
-        }
-        result.source_ = source_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
+      private static final Type[] VALUES = values();
 
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bitcoinj.wallet.Protos.TransactionConfidence) {
-          return mergeFrom((org.bitcoinj.wallet.Protos.TransactionConfidence)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
+      public static Type valueOf(
+          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+        if (desc.getType() != getDescriptor()) {
+          throw new java.lang.IllegalArgumentException(
+            "EnumValueDescriptor is not for this type.");
         }
+        return VALUES[desc.getIndex()];
       }
 
-      public Builder mergeFrom(org.bitcoinj.wallet.Protos.TransactionConfidence other) {
-        if (other == org.bitcoinj.wallet.Protos.TransactionConfidence.getDefaultInstance()) return this;
-        if (other.hasType()) {
-          setType(other.getType());
-        }
-        if (other.hasAppearedAtHeight()) {
-          setAppearedAtHeight(other.getAppearedAtHeight());
-        }
-        if (other.hasOverridingTransaction()) {
-          setOverridingTransaction(other.getOverridingTransaction());
-        }
-        if (other.hasDepth()) {
-          setDepth(other.getDepth());
-        }
-        if (broadcastByBuilder_ == null) {
-          if (!other.broadcastBy_.isEmpty()) {
-            if (broadcastBy_.isEmpty()) {
-              broadcastBy_ = other.broadcastBy_;
-              bitField0_ = (bitField0_ & ~0x00000010);
-            } else {
-              ensureBroadcastByIsMutable();
-              broadcastBy_.addAll(other.broadcastBy_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.broadcastBy_.isEmpty()) {
-            if (broadcastByBuilder_.isEmpty()) {
-              broadcastByBuilder_.dispose();
-              broadcastByBuilder_ = null;
-              broadcastBy_ = other.broadcastBy_;
-              bitField0_ = (bitField0_ & ~0x00000010);
-              broadcastByBuilder_ = 
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getBroadcastByFieldBuilder() : null;
-            } else {
-              broadcastByBuilder_.addAllMessages(other.broadcastBy_);
-            }
-          }
-        }
-        if (other.hasLastBroadcastedAt()) {
-          setLastBroadcastedAt(other.getLastBroadcastedAt());
-        }
-        if (other.hasSource()) {
-          setSource(other.getSource());
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
-      }
+      private final int value;
 
-      public final boolean isInitialized() {
-        for (int i = 0; i < getBroadcastByCount(); i++) {
-          if (!getBroadcastBy(i).isInitialized()) {
-            
-            return false;
-          }
-        }
-        return true;
+      private Type(int value) {
+        this.value = value;
       }
 
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        org.bitcoinj.wallet.Protos.TransactionConfidence parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bitcoinj.wallet.Protos.TransactionConfidence) e.getUnfinishedMessage();
-          throw e;
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
+      // @@protoc_insertion_point(enum_scope:wallet.TransactionConfidence.Type)
+    }
 
-      private org.bitcoinj.wallet.Protos.TransactionConfidence.Type type_ = org.bitcoinj.wallet.Protos.TransactionConfidence.Type.UNKNOWN;
+    /**
+     * <pre>
+     * Where did we get this transaction from? Knowing the source may help us to risk analyze pending transactions.
+     * </pre>
+     *
+     * Protobuf enum {@code wallet.TransactionConfidence.Source}
+     */
+    public enum Source
+        implements com.google.protobuf.ProtocolMessageEnum {
       /**
-       * <code>optional .wallet.TransactionConfidence.Type type = 1;</code>
-       *
        * <pre>
-       * This is optional in case we add confidence types to prevent parse errors - backwards compatible.
+       * We don't know where it came from, or this is a wallet from the future.
        * </pre>
-       */
-      public boolean hasType() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      /**
-       * <code>optional .wallet.TransactionConfidence.Type type = 1;</code>
        *
-       * <pre>
-       * This is optional in case we add confidence types to prevent parse errors - backwards compatible.
-       * </pre>
+       * <code>SOURCE_UNKNOWN = 0;</code>
        */
-      public org.bitcoinj.wallet.Protos.TransactionConfidence.Type getType() {
-        return type_;
-      }
+      SOURCE_UNKNOWN(0),
       /**
-       * <code>optional .wallet.TransactionConfidence.Type type = 1;</code>
-       *
        * <pre>
-       * This is optional in case we add confidence types to prevent parse errors - backwards compatible.
+       * We received it from a network broadcast. This is the normal way to get payments.
        * </pre>
+       *
+       * <code>SOURCE_NETWORK = 1;</code>
        */
-      public Builder setType(org.bitcoinj.wallet.Protos.TransactionConfidence.Type value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        bitField0_ |= 0x00000001;
-        type_ = value;
-        onChanged();
-        return this;
-      }
+      SOURCE_NETWORK(1),
       /**
-       * <code>optional .wallet.TransactionConfidence.Type type = 1;</code>
-       *
        * <pre>
-       * This is optional in case we add confidence types to prevent parse errors - backwards compatible.
+       * We made it ourselves, so we know it should be valid.
        * </pre>
+       *
+       * <code>SOURCE_SELF = 2;</code>
        */
-      public Builder clearType() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        type_ = org.bitcoinj.wallet.Protos.TransactionConfidence.Type.UNKNOWN;
-        onChanged();
-        return this;
-      }
+      SOURCE_SELF(2),
+      ;
 
-      private int appearedAtHeight_ ;
       /**
-       * <code>optional int32 appeared_at_height = 2;</code>
-       *
        * <pre>
-       * If type == BUILDING then this is the chain height at which the transaction was included.
+       * We don't know where it came from, or this is a wallet from the future.
        * </pre>
-       */
-      public boolean hasAppearedAtHeight() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
-      }
-      /**
-       * <code>optional int32 appeared_at_height = 2;</code>
        *
-       * <pre>
-       * If type == BUILDING then this is the chain height at which the transaction was included.
-       * </pre>
+       * <code>SOURCE_UNKNOWN = 0;</code>
        */
-      public int getAppearedAtHeight() {
-        return appearedAtHeight_;
-      }
+      public static final int SOURCE_UNKNOWN_VALUE = 0;
       /**
-       * <code>optional int32 appeared_at_height = 2;</code>
-       *
        * <pre>
-       * If type == BUILDING then this is the chain height at which the transaction was included.
+       * We received it from a network broadcast. This is the normal way to get payments.
        * </pre>
+       *
+       * <code>SOURCE_NETWORK = 1;</code>
        */
-      public Builder setAppearedAtHeight(int value) {
-        bitField0_ |= 0x00000002;
-        appearedAtHeight_ = value;
-        onChanged();
-        return this;
-      }
+      public static final int SOURCE_NETWORK_VALUE = 1;
       /**
-       * <code>optional int32 appeared_at_height = 2;</code>
-       *
        * <pre>
-       * If type == BUILDING then this is the chain height at which the transaction was included.
+       * We made it ourselves, so we know it should be valid.
        * </pre>
+       *
+       * <code>SOURCE_SELF = 2;</code>
        */
-      public Builder clearAppearedAtHeight() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        appearedAtHeight_ = 0;
-        onChanged();
-        return this;
+      public static final int SOURCE_SELF_VALUE = 2;
+
+
+      public final int getNumber() {
+        return value;
       }
 
-      private com.google.protobuf.ByteString overridingTransaction_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>optional bytes overriding_transaction = 3;</code>
-       *
-       * <pre>
-       * If set, hash of the transaction that double spent this one into oblivion. A transaction can be double spent by
-       * multiple transactions in the case of several inputs being re-spent by several transactions but we don't
-       * bother to track them all, just the first. This only makes sense if type = DEAD.
-       * </pre>
+       * @deprecated Use {@link #forNumber(int)} instead.
        */
-      public boolean hasOverridingTransaction() {
-        return ((bitField0_ & 0x00000004) == 0x00000004);
-      }
-      /**
-       * <code>optional bytes overriding_transaction = 3;</code>
-       *
-       * <pre>
-       * If set, hash of the transaction that double spent this one into oblivion. A transaction can be double spent by
-       * multiple transactions in the case of several inputs being re-spent by several transactions but we don't
-       * bother to track them all, just the first. This only makes sense if type = DEAD.
-       * </pre>
-       */
-      public com.google.protobuf.ByteString getOverridingTransaction() {
-        return overridingTransaction_;
-      }
-      /**
-       * <code>optional bytes overriding_transaction = 3;</code>
-       *
-       * <pre>
-       * If set, hash of the transaction that double spent this one into oblivion. A transaction can be double spent by
-       * multiple transactions in the case of several inputs being re-spent by several transactions but we don't
-       * bother to track them all, just the first. This only makes sense if type = DEAD.
-       * </pre>
-       */
-      public Builder setOverridingTransaction(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
-        overridingTransaction_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>optional bytes overriding_transaction = 3;</code>
-       *
-       * <pre>
-       * If set, hash of the transaction that double spent this one into oblivion. A transaction can be double spent by
-       * multiple transactions in the case of several inputs being re-spent by several transactions but we don't
-       * bother to track them all, just the first. This only makes sense if type = DEAD.
-       * </pre>
-       */
-      public Builder clearOverridingTransaction() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        overridingTransaction_ = getDefaultInstance().getOverridingTransaction();
-        onChanged();
-        return this;
+      @java.lang.Deprecated
+      public static Source valueOf(int value) {
+        return forNumber(value);
       }
 
-      private int depth_ ;
-      /**
-       * <code>optional int32 depth = 4;</code>
-       *
-       * <pre>
-       * If type == BUILDING then this is the depth of the transaction in the blockchain.
-       * Zero confirmations: depth = 0, one confirmation: depth = 1 etc.
-       * </pre>
-       */
-      public boolean hasDepth() {
-        return ((bitField0_ & 0x00000008) == 0x00000008);
-      }
-      /**
-       * <code>optional int32 depth = 4;</code>
-       *
-       * <pre>
-       * If type == BUILDING then this is the depth of the transaction in the blockchain.
-       * Zero confirmations: depth = 0, one confirmation: depth = 1 etc.
-       * </pre>
-       */
-      public int getDepth() {
-        return depth_;
-      }
-      /**
-       * <code>optional int32 depth = 4;</code>
-       *
-       * <pre>
-       * If type == BUILDING then this is the depth of the transaction in the blockchain.
-       * Zero confirmations: depth = 0, one confirmation: depth = 1 etc.
-       * </pre>
-       */
-      public Builder setDepth(int value) {
-        bitField0_ |= 0x00000008;
-        depth_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>optional int32 depth = 4;</code>
-       *
-       * <pre>
-       * If type == BUILDING then this is the depth of the transaction in the blockchain.
-       * Zero confirmations: depth = 0, one confirmation: depth = 1 etc.
-       * </pre>
-       */
-      public Builder clearDepth() {
-        bitField0_ = (bitField0_ & ~0x00000008);
-        depth_ = 0;
-        onChanged();
-        return this;
+      public static Source forNumber(int value) {
+        switch (value) {
+          case 0: return SOURCE_UNKNOWN;
+          case 1: return SOURCE_NETWORK;
+          case 2: return SOURCE_SELF;
+          default: return null;
+        }
       }
 
-      private java.util.List<org.bitcoinj.wallet.Protos.PeerAddress> broadcastBy_ =
-        java.util.Collections.emptyList();
-      private void ensureBroadcastByIsMutable() {
-        if (!((bitField0_ & 0x00000010) == 0x00000010)) {
-          broadcastBy_ = new java.util.ArrayList<org.bitcoinj.wallet.Protos.PeerAddress>(broadcastBy_);
-          bitField0_ |= 0x00000010;
-         }
+      public static com.google.protobuf.Internal.EnumLiteMap<Source>
+          internalGetValueMap() {
+        return internalValueMap;
       }
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          Source> internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<Source>() {
+              public Source findValueByNumber(int number) {
+                return Source.forNumber(number);
+              }
+            };
 
-      private com.google.protobuf.RepeatedFieldBuilder<
-          org.bitcoinj.wallet.Protos.PeerAddress, org.bitcoinj.wallet.Protos.PeerAddress.Builder, org.bitcoinj.wallet.Protos.PeerAddressOrBuilder> broadcastByBuilder_;
-
-      /**
-       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-       */
-      public java.util.List<org.bitcoinj.wallet.Protos.PeerAddress> getBroadcastByList() {
-        if (broadcastByBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(broadcastBy_);
-        } else {
-          return broadcastByBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-       */
-      public int getBroadcastByCount() {
-        if (broadcastByBuilder_ == null) {
-          return broadcastBy_.size();
-        } else {
-          return broadcastByBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-       */
-      public org.bitcoinj.wallet.Protos.PeerAddress getBroadcastBy(int index) {
-        if (broadcastByBuilder_ == null) {
-          return broadcastBy_.get(index);
-        } else {
-          return broadcastByBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-       */
-      public Builder setBroadcastBy(
-          int index, org.bitcoinj.wallet.Protos.PeerAddress value) {
-        if (broadcastByBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureBroadcastByIsMutable();
-          broadcastBy_.set(index, value);
-          onChanged();
-        } else {
-          broadcastByBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-       */
-      public Builder setBroadcastBy(
-          int index, org.bitcoinj.wallet.Protos.PeerAddress.Builder builderForValue) {
-        if (broadcastByBuilder_ == null) {
-          ensureBroadcastByIsMutable();
-          broadcastBy_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          broadcastByBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
+      public final com.google.protobuf.Descriptors.EnumValueDescriptor
+          getValueDescriptor() {
+        return getDescriptor().getValues().get(ordinal());
       }
-      /**
-       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-       */
-      public Builder addBroadcastBy(org.bitcoinj.wallet.Protos.PeerAddress value) {
-        if (broadcastByBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureBroadcastByIsMutable();
-          broadcastBy_.add(value);
-          onChanged();
-        } else {
-          broadcastByBuilder_.addMessage(value);
-        }
-        return this;
+      public final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptorForType() {
+        return getDescriptor();
       }
-      /**
-       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-       */
-      public Builder addBroadcastBy(
-          int index, org.bitcoinj.wallet.Protos.PeerAddress value) {
-        if (broadcastByBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureBroadcastByIsMutable();
-          broadcastBy_.add(index, value);
-          onChanged();
-        } else {
-          broadcastByBuilder_.addMessage(index, value);
-        }
-        return this;
+      public static final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptor() {
+        return org.bitcoinj.wallet.Protos.TransactionConfidence.getDescriptor().getEnumTypes().get(1);
       }
-      /**
-       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-       */
-      public Builder addBroadcastBy(
-          org.bitcoinj.wallet.Protos.PeerAddress.Builder builderForValue) {
-        if (broadcastByBuilder_ == null) {
-          ensureBroadcastByIsMutable();
-          broadcastBy_.add(builderForValue.build());
-          onChanged();
-        } else {
-          broadcastByBuilder_.addMessage(builderForValue.build());
+
+      private static final Source[] VALUES = values();
+
+      public static Source valueOf(
+          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+        if (desc.getType() != getDescriptor()) {
+          throw new java.lang.IllegalArgumentException(
+            "EnumValueDescriptor is not for this type.");
         }
-        return this;
+        return VALUES[desc.getIndex()];
       }
-      /**
-       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-       */
-      public Builder addBroadcastBy(
-          int index, org.bitcoinj.wallet.Protos.PeerAddress.Builder builderForValue) {
-        if (broadcastByBuilder_ == null) {
-          ensureBroadcastByIsMutable();
-          broadcastBy_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          broadcastByBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
+
+      private final int value;
+
+      private Source(int value) {
+        this.value = value;
       }
-      /**
-       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-       */
-      public Builder addAllBroadcastBy(
-          java.lang.Iterable<? extends org.bitcoinj.wallet.Protos.PeerAddress> values) {
-        if (broadcastByBuilder_ == null) {
-          ensureBroadcastByIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, broadcastBy_);
-          onChanged();
-        } else {
-          broadcastByBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-       */
-      public Builder clearBroadcastBy() {
-        if (broadcastByBuilder_ == null) {
-          broadcastBy_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000010);
-          onChanged();
-        } else {
-          broadcastByBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-       */
-      public Builder removeBroadcastBy(int index) {
-        if (broadcastByBuilder_ == null) {
-          ensureBroadcastByIsMutable();
-          broadcastBy_.remove(index);
-          onChanged();
-        } else {
-          broadcastByBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-       */
-      public org.bitcoinj.wallet.Protos.PeerAddress.Builder getBroadcastByBuilder(
-          int index) {
-        return getBroadcastByFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-       */
-      public org.bitcoinj.wallet.Protos.PeerAddressOrBuilder getBroadcastByOrBuilder(
-          int index) {
-        if (broadcastByBuilder_ == null) {
-          return broadcastBy_.get(index);  } else {
-          return broadcastByBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-       */
-      public java.util.List<? extends org.bitcoinj.wallet.Protos.PeerAddressOrBuilder> 
-           getBroadcastByOrBuilderList() {
-        if (broadcastByBuilder_ != null) {
-          return broadcastByBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(broadcastBy_);
-        }
-      }
-      /**
-       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-       */
-      public org.bitcoinj.wallet.Protos.PeerAddress.Builder addBroadcastByBuilder() {
-        return getBroadcastByFieldBuilder().addBuilder(
-            org.bitcoinj.wallet.Protos.PeerAddress.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-       */
-      public org.bitcoinj.wallet.Protos.PeerAddress.Builder addBroadcastByBuilder(
-          int index) {
-        return getBroadcastByFieldBuilder().addBuilder(
-            index, org.bitcoinj.wallet.Protos.PeerAddress.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
-       */
-      public java.util.List<org.bitcoinj.wallet.Protos.PeerAddress.Builder> 
-           getBroadcastByBuilderList() {
-        return getBroadcastByFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilder<
-          org.bitcoinj.wallet.Protos.PeerAddress, org.bitcoinj.wallet.Protos.PeerAddress.Builder, org.bitcoinj.wallet.Protos.PeerAddressOrBuilder> 
-          getBroadcastByFieldBuilder() {
-        if (broadcastByBuilder_ == null) {
-          broadcastByBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.bitcoinj.wallet.Protos.PeerAddress, org.bitcoinj.wallet.Protos.PeerAddress.Builder, org.bitcoinj.wallet.Protos.PeerAddressOrBuilder>(
-                  broadcastBy_,
-                  ((bitField0_ & 0x00000010) == 0x00000010),
-                  getParentForChildren(),
-                  isClean());
-          broadcastBy_ = null;
-        }
-        return broadcastByBuilder_;
-      }
-
-      private long lastBroadcastedAt_ ;
-      /**
-       * <code>optional int64 last_broadcasted_at = 8;</code>
-       *
-       * <pre>
-       * Millis since epoch the transaction was last announced to us.
-       * </pre>
-       */
-      public boolean hasLastBroadcastedAt() {
-        return ((bitField0_ & 0x00000020) == 0x00000020);
-      }
-      /**
-       * <code>optional int64 last_broadcasted_at = 8;</code>
-       *
-       * <pre>
-       * Millis since epoch the transaction was last announced to us.
-       * </pre>
-       */
-      public long getLastBroadcastedAt() {
-        return lastBroadcastedAt_;
-      }
-      /**
-       * <code>optional int64 last_broadcasted_at = 8;</code>
-       *
-       * <pre>
-       * Millis since epoch the transaction was last announced to us.
-       * </pre>
-       */
-      public Builder setLastBroadcastedAt(long value) {
-        bitField0_ |= 0x00000020;
-        lastBroadcastedAt_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>optional int64 last_broadcasted_at = 8;</code>
-       *
-       * <pre>
-       * Millis since epoch the transaction was last announced to us.
-       * </pre>
-       */
-      public Builder clearLastBroadcastedAt() {
-        bitField0_ = (bitField0_ & ~0x00000020);
-        lastBroadcastedAt_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private org.bitcoinj.wallet.Protos.TransactionConfidence.Source source_ = org.bitcoinj.wallet.Protos.TransactionConfidence.Source.SOURCE_UNKNOWN;
-      /**
-       * <code>optional .wallet.TransactionConfidence.Source source = 7;</code>
-       */
-      public boolean hasSource() {
-        return ((bitField0_ & 0x00000040) == 0x00000040);
-      }
-      /**
-       * <code>optional .wallet.TransactionConfidence.Source source = 7;</code>
-       */
-      public org.bitcoinj.wallet.Protos.TransactionConfidence.Source getSource() {
-        return source_;
-      }
-      /**
-       * <code>optional .wallet.TransactionConfidence.Source source = 7;</code>
-       */
-      public Builder setSource(org.bitcoinj.wallet.Protos.TransactionConfidence.Source value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        bitField0_ |= 0x00000040;
-        source_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>optional .wallet.TransactionConfidence.Source source = 7;</code>
-       */
-      public Builder clearSource() {
-        bitField0_ = (bitField0_ & ~0x00000040);
-        source_ = org.bitcoinj.wallet.Protos.TransactionConfidence.Source.SOURCE_UNKNOWN;
-        onChanged();
-        return this;
-      }
-
-      // @@protoc_insertion_point(builder_scope:wallet.TransactionConfidence)
-    }
 
-    static {
-      defaultInstance = new TransactionConfidence(true);
-      defaultInstance.initFields();
+      // @@protoc_insertion_point(enum_scope:wallet.TransactionConfidence.Source)
     }
 
-    // @@protoc_insertion_point(class_scope:wallet.TransactionConfidence)
-  }
-
-  public interface TransactionOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:wallet.Transaction)
-      com.google.protobuf.MessageOrBuilder {
-
+    private int bitField0_;
+    public static final int TYPE_FIELD_NUMBER = 1;
+    private int type_;
     /**
-     * <code>required int32 version = 1;</code>
-     *
      * <pre>
-     * See Wallet.java for detailed description of pool semantics
+     * This is optional in case we add confidence types to prevent parse errors - backwards compatible.
      * </pre>
+     *
+     * <code>optional .wallet.TransactionConfidence.Type type = 1;</code>
      */
-    boolean hasVersion();
+    public boolean hasType() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
     /**
-     * <code>required int32 version = 1;</code>
-     *
      * <pre>
-     * See Wallet.java for detailed description of pool semantics
+     * This is optional in case we add confidence types to prevent parse errors - backwards compatible.
      * </pre>
+     *
+     * <code>optional .wallet.TransactionConfidence.Type type = 1;</code>
      */
-    int getVersion();
-
-    /**
-     * <code>required bytes hash = 2;</code>
-     */
-    boolean hasHash();
-    /**
-     * <code>required bytes hash = 2;</code>
-     */
-    com.google.protobuf.ByteString getHash();
+    public org.bitcoinj.wallet.Protos.TransactionConfidence.Type getType() {
+      @SuppressWarnings("deprecation")
+      org.bitcoinj.wallet.Protos.TransactionConfidence.Type result = org.bitcoinj.wallet.Protos.TransactionConfidence.Type.valueOf(type_);
+      return result == null ? org.bitcoinj.wallet.Protos.TransactionConfidence.Type.UNKNOWN : result;
+    }
 
+    public static final int APPEARED_AT_HEIGHT_FIELD_NUMBER = 2;
+    private int appearedAtHeight_;
     /**
-     * <code>optional .wallet.Transaction.Pool pool = 3;</code>
-     *
      * <pre>
-     * If pool is not present, that means either:
-     *  - This Transaction is either not in a wallet at all (the proto is re-used elsewhere)
-     *  - Or it is stored but for other purposes, for example, because it is the overriding transaction of a double spend.
-     *  - Or the Pool enum got a new value which your software is too old to parse.
+     * If type == BUILDING then this is the chain height at which the transaction was included.
      * </pre>
+     *
+     * <code>optional int32 appeared_at_height = 2;</code>
      */
-    boolean hasPool();
+    public boolean hasAppearedAtHeight() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
     /**
-     * <code>optional .wallet.Transaction.Pool pool = 3;</code>
-     *
      * <pre>
-     * If pool is not present, that means either:
-     *  - This Transaction is either not in a wallet at all (the proto is re-used elsewhere)
-     *  - Or it is stored but for other purposes, for example, because it is the overriding transaction of a double spend.
-     *  - Or the Pool enum got a new value which your software is too old to parse.
+     * If type == BUILDING then this is the chain height at which the transaction was included.
      * </pre>
+     *
+     * <code>optional int32 appeared_at_height = 2;</code>
      */
-    org.bitcoinj.wallet.Protos.Transaction.Pool getPool();
+    public int getAppearedAtHeight() {
+      return appearedAtHeight_;
+    }
 
+    public static final int OVERRIDING_TRANSACTION_FIELD_NUMBER = 3;
+    private com.google.protobuf.ByteString overridingTransaction_;
     /**
-     * <code>optional uint32 lock_time = 4;</code>
-     *
      * <pre>
-     * The nLockTime field is useful for contracts.
+     * If set, hash of the transaction that double spent this one into oblivion. A transaction can be double spent by
+     * multiple transactions in the case of several inputs being re-spent by several transactions but we don't
+     * bother to track them all, just the first. This only makes sense if type = DEAD.
      * </pre>
-     */
-    boolean hasLockTime();
-    /**
-     * <code>optional uint32 lock_time = 4;</code>
      *
-     * <pre>
-     * The nLockTime field is useful for contracts.
-     * </pre>
+     * <code>optional bytes overriding_transaction = 3;</code>
      */
-    int getLockTime();
-
+    public boolean hasOverridingTransaction() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
+    }
     /**
-     * <code>optional int64 updated_at = 5;</code>
-     *
      * <pre>
-     * millis since epoch the transaction was last updated
+     * If set, hash of the transaction that double spent this one into oblivion. A transaction can be double spent by
+     * multiple transactions in the case of several inputs being re-spent by several transactions but we don't
+     * bother to track them all, just the first. This only makes sense if type = DEAD.
      * </pre>
-     */
-    boolean hasUpdatedAt();
-    /**
-     * <code>optional int64 updated_at = 5;</code>
      *
-     * <pre>
-     * millis since epoch the transaction was last updated
-     * </pre>
-     */
-    long getUpdatedAt();
-
-    /**
-     * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-     */
-    java.util.List<org.bitcoinj.wallet.Protos.TransactionInput> 
-        getTransactionInputList();
-    /**
-     * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-     */
-    org.bitcoinj.wallet.Protos.TransactionInput getTransactionInput(int index);
-    /**
-     * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-     */
-    int getTransactionInputCount();
-    /**
-     * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-     */
-    java.util.List<? extends org.bitcoinj.wallet.Protos.TransactionInputOrBuilder> 
-        getTransactionInputOrBuilderList();
-    /**
-     * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-     */
-    org.bitcoinj.wallet.Protos.TransactionInputOrBuilder getTransactionInputOrBuilder(
-        int index);
-
-    /**
-     * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
-     */
-    java.util.List<org.bitcoinj.wallet.Protos.TransactionOutput> 
-        getTransactionOutputList();
-    /**
-     * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
-     */
-    org.bitcoinj.wallet.Protos.TransactionOutput getTransactionOutput(int index);
-    /**
-     * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
-     */
-    int getTransactionOutputCount();
-    /**
-     * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
-     */
-    java.util.List<? extends org.bitcoinj.wallet.Protos.TransactionOutputOrBuilder> 
-        getTransactionOutputOrBuilderList();
-    /**
-     * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+     * <code>optional bytes overriding_transaction = 3;</code>
      */
-    org.bitcoinj.wallet.Protos.TransactionOutputOrBuilder getTransactionOutputOrBuilder(
-        int index);
+    public com.google.protobuf.ByteString getOverridingTransaction() {
+      return overridingTransaction_;
+    }
 
+    public static final int DEPTH_FIELD_NUMBER = 4;
+    private int depth_;
     /**
-     * <code>repeated bytes block_hash = 8;</code>
-     *
      * <pre>
-     * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
-     * ordering within a block.
+     * If type == BUILDING then this is the depth of the transaction in the blockchain.
+     * Zero confirmations: depth = 0, one confirmation: depth = 1 etc.
      * </pre>
-     */
-    java.util.List<com.google.protobuf.ByteString> getBlockHashList();
-    /**
-     * <code>repeated bytes block_hash = 8;</code>
      *
-     * <pre>
-     * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
-     * ordering within a block.
-     * </pre>
+     * <code>optional int32 depth = 4;</code>
      */
-    int getBlockHashCount();
+    public boolean hasDepth() {
+      return ((bitField0_ & 0x00000008) == 0x00000008);
+    }
     /**
-     * <code>repeated bytes block_hash = 8;</code>
-     *
      * <pre>
-     * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
-     * ordering within a block.
+     * If type == BUILDING then this is the depth of the transaction in the blockchain.
+     * Zero confirmations: depth = 0, one confirmation: depth = 1 etc.
      * </pre>
+     *
+     * <code>optional int32 depth = 4;</code>
      */
-    com.google.protobuf.ByteString getBlockHash(int index);
-
-    /**
-     * <code>repeated int32 block_relativity_offsets = 11;</code>
-     */
-    java.util.List<java.lang.Integer> getBlockRelativityOffsetsList();
-    /**
-     * <code>repeated int32 block_relativity_offsets = 11;</code>
-     */
-    int getBlockRelativityOffsetsCount();
-    /**
-     * <code>repeated int32 block_relativity_offsets = 11;</code>
-     */
-    int getBlockRelativityOffsets(int index);
+    public int getDepth() {
+      return depth_;
+    }
 
+    public static final int BROADCAST_BY_FIELD_NUMBER = 6;
+    private java.util.List<org.bitcoinj.wallet.Protos.PeerAddress> broadcastBy_;
     /**
-     * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
-     *
-     * <pre>
-     * Data describing where the transaction is in the chain.
-     * </pre>
+     * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
      */
-    boolean hasConfidence();
+    public java.util.List<org.bitcoinj.wallet.Protos.PeerAddress> getBroadcastByList() {
+      return broadcastBy_;
+    }
     /**
-     * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
-     *
-     * <pre>
-     * Data describing where the transaction is in the chain.
-     * </pre>
+     * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
      */
-    org.bitcoinj.wallet.Protos.TransactionConfidence getConfidence();
+    public java.util.List<? extends org.bitcoinj.wallet.Protos.PeerAddressOrBuilder> 
+        getBroadcastByOrBuilderList() {
+      return broadcastBy_;
+    }
     /**
-     * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
-     *
-     * <pre>
-     * Data describing where the transaction is in the chain.
-     * </pre>
+     * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
      */
-    org.bitcoinj.wallet.Protos.TransactionConfidenceOrBuilder getConfidenceOrBuilder();
-
+    public int getBroadcastByCount() {
+      return broadcastBy_.size();
+    }
     /**
-     * <code>optional .wallet.Transaction.Purpose purpose = 10 [default = UNKNOWN];</code>
+     * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
      */
-    boolean hasPurpose();
+    public org.bitcoinj.wallet.Protos.PeerAddress getBroadcastBy(int index) {
+      return broadcastBy_.get(index);
+    }
     /**
-     * <code>optional .wallet.Transaction.Purpose purpose = 10 [default = UNKNOWN];</code>
+     * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
      */
-    org.bitcoinj.wallet.Protos.Transaction.Purpose getPurpose();
+    public org.bitcoinj.wallet.Protos.PeerAddressOrBuilder getBroadcastByOrBuilder(
+        int index) {
+      return broadcastBy_.get(index);
+    }
 
+    public static final int LAST_BROADCASTED_AT_FIELD_NUMBER = 8;
+    private long lastBroadcastedAt_;
     /**
-     * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
-     *
      * <pre>
-     * Exchange rate that was valid when the transaction was sent.
+     * Millis since epoch the transaction was last announced to us.
      * </pre>
-     */
-    boolean hasExchangeRate();
-    /**
-     * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
      *
-     * <pre>
-     * Exchange rate that was valid when the transaction was sent.
-     * </pre>
+     * <code>optional int64 last_broadcasted_at = 8;</code>
      */
-    org.bitcoinj.wallet.Protos.ExchangeRate getExchangeRate();
+    public boolean hasLastBroadcastedAt() {
+      return ((bitField0_ & 0x00000010) == 0x00000010);
+    }
     /**
-     * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
-     *
      * <pre>
-     * Exchange rate that was valid when the transaction was sent.
+     * Millis since epoch the transaction was last announced to us.
      * </pre>
-     */
-    org.bitcoinj.wallet.Protos.ExchangeRateOrBuilder getExchangeRateOrBuilder();
-
-    /**
-     * <code>optional string memo = 13;</code>
      *
-     * <pre>
-     * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
-     * transaction.
-     * </pre>
+     * <code>optional int64 last_broadcasted_at = 8;</code>
      */
-    boolean hasMemo();
+    public long getLastBroadcastedAt() {
+      return lastBroadcastedAt_;
+    }
+
+    public static final int SOURCE_FIELD_NUMBER = 7;
+    private int source_;
     /**
-     * <code>optional string memo = 13;</code>
-     *
-     * <pre>
-     * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
-     * transaction.
-     * </pre>
+     * <code>optional .wallet.TransactionConfidence.Source source = 7;</code>
      */
-    java.lang.String getMemo();
+    public boolean hasSource() {
+      return ((bitField0_ & 0x00000020) == 0x00000020);
+    }
     /**
-     * <code>optional string memo = 13;</code>
-     *
-     * <pre>
-     * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
-     * transaction.
-     * </pre>
+     * <code>optional .wallet.TransactionConfidence.Source source = 7;</code>
      */
-    com.google.protobuf.ByteString
-        getMemoBytes();
-  }
-  /**
-   * Protobuf type {@code wallet.Transaction}
-   */
-  public static final class Transaction extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:wallet.Transaction)
-      TransactionOrBuilder {
-    // Use Transaction.newBuilder() to construct.
-    private Transaction(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
-      super(builder);
-      this.unknownFields = builder.getUnknownFields();
+    public org.bitcoinj.wallet.Protos.TransactionConfidence.Source getSource() {
+      @SuppressWarnings("deprecation")
+      org.bitcoinj.wallet.Protos.TransactionConfidence.Source result = org.bitcoinj.wallet.Protos.TransactionConfidence.Source.valueOf(source_);
+      return result == null ? org.bitcoinj.wallet.Protos.TransactionConfidence.Source.SOURCE_UNKNOWN : result;
     }
-    private Transaction(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
-    private static final Transaction defaultInstance;
-    public static Transaction getDefaultInstance() {
-      return defaultInstance;
-    }
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
-    public Transaction getDefaultInstanceForType() {
-      return defaultInstance;
+      for (int i = 0; i < getBroadcastByCount(); i++) {
+        if (!getBroadcastBy(i).isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
+      memoizedIsInitialized = 1;
+      return true;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Transaction(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 8: {
-              bitField0_ |= 0x00000001;
-              version_ = input.readInt32();
-              break;
-            }
-            case 18: {
-              bitField0_ |= 0x00000002;
-              hash_ = input.readBytes();
-              break;
-            }
-            case 24: {
-              int rawValue = input.readEnum();
-              org.bitcoinj.wallet.Protos.Transaction.Pool value = org.bitcoinj.wallet.Protos.Transaction.Pool.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(3, rawValue);
-              } else {
-                bitField0_ |= 0x00000004;
-                pool_ = value;
-              }
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              lockTime_ = input.readUInt32();
-              break;
-            }
-            case 40: {
-              bitField0_ |= 0x00000010;
-              updatedAt_ = input.readInt64();
-              break;
-            }
-            case 50: {
-              if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-                transactionInput_ = new java.util.ArrayList<org.bitcoinj.wallet.Protos.TransactionInput>();
-                mutable_bitField0_ |= 0x00000020;
-              }
-              transactionInput_.add(input.readMessage(org.bitcoinj.wallet.Protos.TransactionInput.PARSER, extensionRegistry));
-              break;
-            }
-            case 58: {
-              if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
-                transactionOutput_ = new java.util.ArrayList<org.bitcoinj.wallet.Protos.TransactionOutput>();
-                mutable_bitField0_ |= 0x00000040;
-              }
-              transactionOutput_.add(input.readMessage(org.bitcoinj.wallet.Protos.TransactionOutput.PARSER, extensionRegistry));
-              break;
-            }
-            case 66: {
-              if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
-                blockHash_ = new java.util.ArrayList<com.google.protobuf.ByteString>();
-                mutable_bitField0_ |= 0x00000080;
-              }
-              blockHash_.add(input.readBytes());
-              break;
-            }
-            case 74: {
-              org.bitcoinj.wallet.Protos.TransactionConfidence.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000020) == 0x00000020)) {
-                subBuilder = confidence_.toBuilder();
-              }
-              confidence_ = input.readMessage(org.bitcoinj.wallet.Protos.TransactionConfidence.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(confidence_);
-                confidence_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000020;
-              break;
-            }
-            case 80: {
-              int rawValue = input.readEnum();
-              org.bitcoinj.wallet.Protos.Transaction.Purpose value = org.bitcoinj.wallet.Protos.Transaction.Purpose.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(10, rawValue);
-              } else {
-                bitField0_ |= 0x00000040;
-                purpose_ = value;
-              }
-              break;
-            }
-            case 88: {
-              if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
-                blockRelativityOffsets_ = new java.util.ArrayList<java.lang.Integer>();
-                mutable_bitField0_ |= 0x00000100;
-              }
-              blockRelativityOffsets_.add(input.readInt32());
-              break;
-            }
-            case 90: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000100) == 0x00000100) && input.getBytesUntilLimit() > 0) {
-                blockRelativityOffsets_ = new java.util.ArrayList<java.lang.Integer>();
-                mutable_bitField0_ |= 0x00000100;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                blockRelativityOffsets_.add(input.readInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 98: {
-              org.bitcoinj.wallet.Protos.ExchangeRate.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000080) == 0x00000080)) {
-                subBuilder = exchangeRate_.toBuilder();
-              }
-              exchangeRate_ = input.readMessage(org.bitcoinj.wallet.Protos.ExchangeRate.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(exchangeRate_);
-                exchangeRate_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000080;
-              break;
-            }
-            case 106: {
-              com.google.protobuf.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000100;
-              memo_ = bs;
-              break;
-            }
-          }
-        }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-          transactionInput_ = java.util.Collections.unmodifiableList(transactionInput_);
-        }
-        if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
-          transactionOutput_ = java.util.Collections.unmodifiableList(transactionOutput_);
-        }
-        if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
-          blockHash_ = java.util.Collections.unmodifiableList(blockHash_);
-        }
-        if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
-          blockRelativityOffsets_ = java.util.Collections.unmodifiableList(blockRelativityOffsets_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        output.writeEnum(1, type_);
       }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return org.bitcoinj.wallet.Protos.internal_static_wallet_Transaction_descriptor;
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        output.writeInt32(2, appearedAtHeight_);
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        output.writeBytes(3, overridingTransaction_);
+      }
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        output.writeInt32(4, depth_);
+      }
+      for (int i = 0; i < broadcastBy_.size(); i++) {
+        output.writeMessage(6, broadcastBy_.get(i));
+      }
+      if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        output.writeEnum(7, source_);
+      }
+      if (((bitField0_ & 0x00000010) == 0x00000010)) {
+        output.writeInt64(8, lastBroadcastedAt_);
+      }
+      unknownFields.writeTo(output);
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return org.bitcoinj.wallet.Protos.internal_static_wallet_Transaction_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              org.bitcoinj.wallet.Protos.Transaction.class, org.bitcoinj.wallet.Protos.Transaction.Builder.class);
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(1, type_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(2, appearedAtHeight_);
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(3, overridingTransaction_);
+      }
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(4, depth_);
+      }
+      for (int i = 0; i < broadcastBy_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(6, broadcastBy_.get(i));
+      }
+      if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(7, source_);
+      }
+      if (((bitField0_ & 0x00000010) == 0x00000010)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt64Size(8, lastBroadcastedAt_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
     }
 
-    public static com.google.protobuf.Parser<Transaction> PARSER =
-        new com.google.protobuf.AbstractParser<Transaction>() {
-      public Transaction parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Transaction(input, extensionRegistry);
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
       }
-    };
+      if (!(obj instanceof org.bitcoinj.wallet.Protos.TransactionConfidence)) {
+        return super.equals(obj);
+      }
+      org.bitcoinj.wallet.Protos.TransactionConfidence other = (org.bitcoinj.wallet.Protos.TransactionConfidence) obj;
+
+      boolean result = true;
+      result = result && (hasType() == other.hasType());
+      if (hasType()) {
+        result = result && type_ == other.type_;
+      }
+      result = result && (hasAppearedAtHeight() == other.hasAppearedAtHeight());
+      if (hasAppearedAtHeight()) {
+        result = result && (getAppearedAtHeight()
+            == other.getAppearedAtHeight());
+      }
+      result = result && (hasOverridingTransaction() == other.hasOverridingTransaction());
+      if (hasOverridingTransaction()) {
+        result = result && getOverridingTransaction()
+            .equals(other.getOverridingTransaction());
+      }
+      result = result && (hasDepth() == other.hasDepth());
+      if (hasDepth()) {
+        result = result && (getDepth()
+            == other.getDepth());
+      }
+      result = result && getBroadcastByList()
+          .equals(other.getBroadcastByList());
+      result = result && (hasLastBroadcastedAt() == other.hasLastBroadcastedAt());
+      if (hasLastBroadcastedAt()) {
+        result = result && (getLastBroadcastedAt()
+            == other.getLastBroadcastedAt());
+      }
+      result = result && (hasSource() == other.hasSource());
+      if (hasSource()) {
+        result = result && source_ == other.source_;
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
 
     @java.lang.Override
-    public com.google.protobuf.Parser<Transaction> getParserForType() {
-      return PARSER;
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasType()) {
+        hash = (37 * hash) + TYPE_FIELD_NUMBER;
+        hash = (53 * hash) + type_;
+      }
+      if (hasAppearedAtHeight()) {
+        hash = (37 * hash) + APPEARED_AT_HEIGHT_FIELD_NUMBER;
+        hash = (53 * hash) + getAppearedAtHeight();
+      }
+      if (hasOverridingTransaction()) {
+        hash = (37 * hash) + OVERRIDING_TRANSACTION_FIELD_NUMBER;
+        hash = (53 * hash) + getOverridingTransaction().hashCode();
+      }
+      if (hasDepth()) {
+        hash = (37 * hash) + DEPTH_FIELD_NUMBER;
+        hash = (53 * hash) + getDepth();
+      }
+      if (getBroadcastByCount() > 0) {
+        hash = (37 * hash) + BROADCAST_BY_FIELD_NUMBER;
+        hash = (53 * hash) + getBroadcastByList().hashCode();
+      }
+      if (hasLastBroadcastedAt()) {
+        hash = (37 * hash) + LAST_BROADCASTED_AT_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getLastBroadcastedAt());
+      }
+      if (hasSource()) {
+        hash = (37 * hash) + SOURCE_FIELD_NUMBER;
+        hash = (53 * hash) + source_;
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
-    /**
-     * Protobuf enum {@code wallet.Transaction.Pool}
-     *
-     * <pre>
-     **
-     * This is a bitfield oriented enum, with the following bits:
-     * 
-     * bit 0 - spent
-     * bit 1 - appears in alt chain
-     * bit 2 - appears in best chain
-     * bit 3 - double-spent
-     * bit 4 - pending (we would like the tx to go into the best chain)
-     * 
-     * Not all combinations are interesting, just the ones actually used in the enum.
-     * </pre>
-     */
-    public enum Pool
-        implements com.google.protobuf.ProtocolMessageEnum {
-      /**
-       * <code>UNSPENT = 4;</code>
-       *
-       * <pre>
-       * In best chain, not all outputs spent
-       * </pre>
-       */
-      UNSPENT(0, 4),
-      /**
-       * <code>SPENT = 5;</code>
-       *
-       * <pre>
-       * In best chain, all outputs spent
-       * </pre>
-       */
-      SPENT(1, 5),
-      /**
-       * <code>INACTIVE = 2;</code>
-       *
-       * <pre>
-       * In non-best chain, not our transaction
-       * </pre>
-       */
-      INACTIVE(2, 2),
-      /**
-       * <code>DEAD = 10;</code>
-       *
-       * <pre>
-       * Double-spent by a transaction in the best chain
-       * </pre>
-       */
-      DEAD(3, 10),
-      /**
-       * <code>PENDING = 16;</code>
-       *
-       * <pre>
-       * Our transaction, not in any chain
-       * </pre>
-       */
-      PENDING(4, 16),
-      /**
-       * <code>PENDING_INACTIVE = 18;</code>
-       *
-       * <pre>
-       * In non-best chain, our transaction
-       * </pre>
-       */
-      PENDING_INACTIVE(5, 18),
-      ;
-
-      /**
-       * <code>UNSPENT = 4;</code>
-       *
-       * <pre>
-       * In best chain, not all outputs spent
-       * </pre>
-       */
-      public static final int UNSPENT_VALUE = 4;
-      /**
-       * <code>SPENT = 5;</code>
-       *
-       * <pre>
-       * In best chain, all outputs spent
-       * </pre>
-       */
-      public static final int SPENT_VALUE = 5;
-      /**
-       * <code>INACTIVE = 2;</code>
-       *
-       * <pre>
-       * In non-best chain, not our transaction
-       * </pre>
-       */
-      public static final int INACTIVE_VALUE = 2;
-      /**
-       * <code>DEAD = 10;</code>
-       *
-       * <pre>
-       * Double-spent by a transaction in the best chain
-       * </pre>
-       */
-      public static final int DEAD_VALUE = 10;
-      /**
-       * <code>PENDING = 16;</code>
-       *
-       * <pre>
-       * Our transaction, not in any chain
-       * </pre>
-       */
-      public static final int PENDING_VALUE = 16;
-      /**
-       * <code>PENDING_INACTIVE = 18;</code>
-       *
-       * <pre>
-       * In non-best chain, our transaction
-       * </pre>
-       */
-      public static final int PENDING_INACTIVE_VALUE = 18;
-
+    public static org.bitcoinj.wallet.Protos.TransactionConfidence parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionConfidence parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionConfidence parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionConfidence parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionConfidence parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionConfidence parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionConfidence parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionConfidence parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionConfidence parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionConfidence parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionConfidence parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static org.bitcoinj.wallet.Protos.TransactionConfidence parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
 
-      public final int getNumber() { return value; }
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(org.bitcoinj.wallet.Protos.TransactionConfidence prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
 
-      public static Pool valueOf(int value) {
-        switch (value) {
-          case 4: return UNSPENT;
-          case 5: return SPENT;
-          case 2: return INACTIVE;
-          case 10: return DEAD;
-          case 16: return PENDING;
-          case 18: return PENDING_INACTIVE;
-          default: return null;
-        }
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * <pre>
+     **
+     * A description of the confidence we have that a transaction cannot be reversed in the future.
+     * Parsing should be lenient, since this could change for different applications yet we should
+     * maintain backward compatibility.
+     * </pre>
+     *
+     * Protobuf type {@code wallet.TransactionConfidence}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:wallet.TransactionConfidence)
+        org.bitcoinj.wallet.Protos.TransactionConfidenceOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionConfidence_descriptor;
       }
 
-      public static com.google.protobuf.Internal.EnumLiteMap<Pool>
-          internalGetValueMap() {
-        return internalValueMap;
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionConfidence_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                org.bitcoinj.wallet.Protos.TransactionConfidence.class, org.bitcoinj.wallet.Protos.TransactionConfidence.Builder.class);
       }
-      private static com.google.protobuf.Internal.EnumLiteMap<Pool>
-          internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap<Pool>() {
-              public Pool findValueByNumber(int number) {
-                return Pool.valueOf(number);
-              }
-            };
 
-      public final com.google.protobuf.Descriptors.EnumValueDescriptor
-          getValueDescriptor() {
-        return getDescriptor().getValues().get(index);
+      // Construct using org.bitcoinj.wallet.Protos.TransactionConfidence.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
       }
-      public final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptorForType() {
-        return getDescriptor();
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
       }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptor() {
-        return org.bitcoinj.wallet.Protos.Transaction.getDescriptor().getEnumTypes().get(0);
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getBroadcastByFieldBuilder();
+        }
       }
-
-      private static final Pool[] VALUES = values();
-
-      public static Pool valueOf(
-          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-        if (desc.getType() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException(
-            "EnumValueDescriptor is not for this type.");
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        type_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        appearedAtHeight_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        overridingTransaction_ = com.google.protobuf.ByteString.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000004);
+        depth_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000008);
+        if (broadcastByBuilder_ == null) {
+          broadcastBy_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000010);
+        } else {
+          broadcastByBuilder_.clear();
         }
-        return VALUES[desc.getIndex()];
+        lastBroadcastedAt_ = 0L;
+        bitField0_ = (bitField0_ & ~0x00000020);
+        source_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000040);
+        return this;
       }
 
-      private final int index;
-      private final int value;
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionConfidence_descriptor;
+      }
 
-      private Pool(int index, int value) {
-        this.index = index;
-        this.value = value;
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.TransactionConfidence getDefaultInstanceForType() {
+        return org.bitcoinj.wallet.Protos.TransactionConfidence.getDefaultInstance();
       }
 
-      // @@protoc_insertion_point(enum_scope:wallet.Transaction.Pool)
-    }
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.TransactionConfidence build() {
+        org.bitcoinj.wallet.Protos.TransactionConfidence result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
 
-    /**
-     * Protobuf enum {@code wallet.Transaction.Purpose}
-     *
-     * <pre>
-     * For what purpose the transaction was created.
-     * </pre>
-     */
-    public enum Purpose
-        implements com.google.protobuf.ProtocolMessageEnum {
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.TransactionConfidence buildPartial() {
+        org.bitcoinj.wallet.Protos.TransactionConfidence result = new org.bitcoinj.wallet.Protos.TransactionConfidence(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.type_ = type_;
+        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+          to_bitField0_ |= 0x00000002;
+        }
+        result.appearedAtHeight_ = appearedAtHeight_;
+        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+          to_bitField0_ |= 0x00000004;
+        }
+        result.overridingTransaction_ = overridingTransaction_;
+        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+          to_bitField0_ |= 0x00000008;
+        }
+        result.depth_ = depth_;
+        if (broadcastByBuilder_ == null) {
+          if (((bitField0_ & 0x00000010) == 0x00000010)) {
+            broadcastBy_ = java.util.Collections.unmodifiableList(broadcastBy_);
+            bitField0_ = (bitField0_ & ~0x00000010);
+          }
+          result.broadcastBy_ = broadcastBy_;
+        } else {
+          result.broadcastBy_ = broadcastByBuilder_.build();
+        }
+        if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
+          to_bitField0_ |= 0x00000010;
+        }
+        result.lastBroadcastedAt_ = lastBroadcastedAt_;
+        if (((from_bitField0_ & 0x00000040) == 0x00000040)) {
+          to_bitField0_ |= 0x00000020;
+        }
+        result.source_ = source_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof org.bitcoinj.wallet.Protos.TransactionConfidence) {
+          return mergeFrom((org.bitcoinj.wallet.Protos.TransactionConfidence)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(org.bitcoinj.wallet.Protos.TransactionConfidence other) {
+        if (other == org.bitcoinj.wallet.Protos.TransactionConfidence.getDefaultInstance()) return this;
+        if (other.hasType()) {
+          setType(other.getType());
+        }
+        if (other.hasAppearedAtHeight()) {
+          setAppearedAtHeight(other.getAppearedAtHeight());
+        }
+        if (other.hasOverridingTransaction()) {
+          setOverridingTransaction(other.getOverridingTransaction());
+        }
+        if (other.hasDepth()) {
+          setDepth(other.getDepth());
+        }
+        if (broadcastByBuilder_ == null) {
+          if (!other.broadcastBy_.isEmpty()) {
+            if (broadcastBy_.isEmpty()) {
+              broadcastBy_ = other.broadcastBy_;
+              bitField0_ = (bitField0_ & ~0x00000010);
+            } else {
+              ensureBroadcastByIsMutable();
+              broadcastBy_.addAll(other.broadcastBy_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.broadcastBy_.isEmpty()) {
+            if (broadcastByBuilder_.isEmpty()) {
+              broadcastByBuilder_.dispose();
+              broadcastByBuilder_ = null;
+              broadcastBy_ = other.broadcastBy_;
+              bitField0_ = (bitField0_ & ~0x00000010);
+              broadcastByBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getBroadcastByFieldBuilder() : null;
+            } else {
+              broadcastByBuilder_.addAllMessages(other.broadcastBy_);
+            }
+          }
+        }
+        if (other.hasLastBroadcastedAt()) {
+          setLastBroadcastedAt(other.getLastBroadcastedAt());
+        }
+        if (other.hasSource()) {
+          setSource(other.getSource());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
+        return this;
+      }
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        for (int i = 0; i < getBroadcastByCount(); i++) {
+          if (!getBroadcastBy(i).isInitialized()) {
+            return false;
+          }
+        }
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        org.bitcoinj.wallet.Protos.TransactionConfidence parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (org.bitcoinj.wallet.Protos.TransactionConfidence) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private int type_ = 0;
       /**
-       * <code>UNKNOWN = 0;</code>
-       *
        * <pre>
-       * Old wallets or the purpose genuinely is a mystery (e.g. imported from some external source).
+       * This is optional in case we add confidence types to prevent parse errors - backwards compatible.
        * </pre>
+       *
+       * <code>optional .wallet.TransactionConfidence.Type type = 1;</code>
        */
-      UNKNOWN(0, 0),
+      public boolean hasType() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
       /**
-       * <code>USER_PAYMENT = 1;</code>
-       *
        * <pre>
-       * Created in response to a user request for payment. This is the normal case.
+       * This is optional in case we add confidence types to prevent parse errors - backwards compatible.
        * </pre>
+       *
+       * <code>optional .wallet.TransactionConfidence.Type type = 1;</code>
        */
-      USER_PAYMENT(1, 1),
+      public org.bitcoinj.wallet.Protos.TransactionConfidence.Type getType() {
+        @SuppressWarnings("deprecation")
+        org.bitcoinj.wallet.Protos.TransactionConfidence.Type result = org.bitcoinj.wallet.Protos.TransactionConfidence.Type.valueOf(type_);
+        return result == null ? org.bitcoinj.wallet.Protos.TransactionConfidence.Type.UNKNOWN : result;
+      }
       /**
-       * <code>KEY_ROTATION = 2;</code>
-       *
        * <pre>
-       * Created automatically to move money from rotated keys.
+       * This is optional in case we add confidence types to prevent parse errors - backwards compatible.
        * </pre>
+       *
+       * <code>optional .wallet.TransactionConfidence.Type type = 1;</code>
        */
-      KEY_ROTATION(2, 2),
+      public Builder setType(org.bitcoinj.wallet.Protos.TransactionConfidence.Type value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000001;
+        type_ = value.getNumber();
+        onChanged();
+        return this;
+      }
       /**
-       * <code>ASSURANCE_CONTRACT_CLAIM = 3;</code>
-       *
        * <pre>
-       * Stuff used by Lighthouse.
+       * This is optional in case we add confidence types to prevent parse errors - backwards compatible.
        * </pre>
+       *
+       * <code>optional .wallet.TransactionConfidence.Type type = 1;</code>
        */
-      ASSURANCE_CONTRACT_CLAIM(3, 3),
-      /**
-       * <code>ASSURANCE_CONTRACT_PLEDGE = 4;</code>
-       */
-      ASSURANCE_CONTRACT_PLEDGE(4, 4),
+      public Builder clearType() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        type_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int appearedAtHeight_ ;
       /**
-       * <code>ASSURANCE_CONTRACT_STUB = 5;</code>
+       * <pre>
+       * If type == BUILDING then this is the chain height at which the transaction was included.
+       * </pre>
+       *
+       * <code>optional int32 appeared_at_height = 2;</code>
        */
-      ASSURANCE_CONTRACT_STUB(5, 5),
+      public boolean hasAppearedAtHeight() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
+      }
       /**
-       * <code>RAISE_FEE = 6;</code>
-       *
        * <pre>
-       * Raise fee, e.g. child-pays-for-parent.
+       * If type == BUILDING then this is the chain height at which the transaction was included.
        * </pre>
+       *
+       * <code>optional int32 appeared_at_height = 2;</code>
        */
-      RAISE_FEE(6, 6),
-      ;
-
+      public int getAppearedAtHeight() {
+        return appearedAtHeight_;
+      }
       /**
-       * <code>UNKNOWN = 0;</code>
-       *
        * <pre>
-       * Old wallets or the purpose genuinely is a mystery (e.g. imported from some external source).
+       * If type == BUILDING then this is the chain height at which the transaction was included.
        * </pre>
+       *
+       * <code>optional int32 appeared_at_height = 2;</code>
        */
-      public static final int UNKNOWN_VALUE = 0;
+      public Builder setAppearedAtHeight(int value) {
+        bitField0_ |= 0x00000002;
+        appearedAtHeight_ = value;
+        onChanged();
+        return this;
+      }
       /**
-       * <code>USER_PAYMENT = 1;</code>
-       *
        * <pre>
-       * Created in response to a user request for payment. This is the normal case.
+       * If type == BUILDING then this is the chain height at which the transaction was included.
        * </pre>
+       *
+       * <code>optional int32 appeared_at_height = 2;</code>
        */
-      public static final int USER_PAYMENT_VALUE = 1;
+      public Builder clearAppearedAtHeight() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        appearedAtHeight_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.ByteString overridingTransaction_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>KEY_ROTATION = 2;</code>
-       *
        * <pre>
-       * Created automatically to move money from rotated keys.
+       * If set, hash of the transaction that double spent this one into oblivion. A transaction can be double spent by
+       * multiple transactions in the case of several inputs being re-spent by several transactions but we don't
+       * bother to track them all, just the first. This only makes sense if type = DEAD.
        * </pre>
+       *
+       * <code>optional bytes overriding_transaction = 3;</code>
        */
-      public static final int KEY_ROTATION_VALUE = 2;
+      public boolean hasOverridingTransaction() {
+        return ((bitField0_ & 0x00000004) == 0x00000004);
+      }
       /**
-       * <code>ASSURANCE_CONTRACT_CLAIM = 3;</code>
-       *
        * <pre>
-       * Stuff used by Lighthouse.
+       * If set, hash of the transaction that double spent this one into oblivion. A transaction can be double spent by
+       * multiple transactions in the case of several inputs being re-spent by several transactions but we don't
+       * bother to track them all, just the first. This only makes sense if type = DEAD.
        * </pre>
+       *
+       * <code>optional bytes overriding_transaction = 3;</code>
        */
-      public static final int ASSURANCE_CONTRACT_CLAIM_VALUE = 3;
+      public com.google.protobuf.ByteString getOverridingTransaction() {
+        return overridingTransaction_;
+      }
       /**
-       * <code>ASSURANCE_CONTRACT_PLEDGE = 4;</code>
+       * <pre>
+       * If set, hash of the transaction that double spent this one into oblivion. A transaction can be double spent by
+       * multiple transactions in the case of several inputs being re-spent by several transactions but we don't
+       * bother to track them all, just the first. This only makes sense if type = DEAD.
+       * </pre>
+       *
+       * <code>optional bytes overriding_transaction = 3;</code>
        */
-      public static final int ASSURANCE_CONTRACT_PLEDGE_VALUE = 4;
+      public Builder setOverridingTransaction(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000004;
+        overridingTransaction_ = value;
+        onChanged();
+        return this;
+      }
       /**
-       * <code>ASSURANCE_CONTRACT_STUB = 5;</code>
+       * <pre>
+       * If set, hash of the transaction that double spent this one into oblivion. A transaction can be double spent by
+       * multiple transactions in the case of several inputs being re-spent by several transactions but we don't
+       * bother to track them all, just the first. This only makes sense if type = DEAD.
+       * </pre>
+       *
+       * <code>optional bytes overriding_transaction = 3;</code>
        */
-      public static final int ASSURANCE_CONTRACT_STUB_VALUE = 5;
+      public Builder clearOverridingTransaction() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        overridingTransaction_ = getDefaultInstance().getOverridingTransaction();
+        onChanged();
+        return this;
+      }
+
+      private int depth_ ;
       /**
-       * <code>RAISE_FEE = 6;</code>
+       * <pre>
+       * If type == BUILDING then this is the depth of the transaction in the blockchain.
+       * Zero confirmations: depth = 0, one confirmation: depth = 1 etc.
+       * </pre>
        *
+       * <code>optional int32 depth = 4;</code>
+       */
+      public boolean hasDepth() {
+        return ((bitField0_ & 0x00000008) == 0x00000008);
+      }
+      /**
        * <pre>
-       * Raise fee, e.g. child-pays-for-parent.
+       * If type == BUILDING then this is the depth of the transaction in the blockchain.
+       * Zero confirmations: depth = 0, one confirmation: depth = 1 etc.
        * </pre>
+       *
+       * <code>optional int32 depth = 4;</code>
        */
-      public static final int RAISE_FEE_VALUE = 6;
+      public int getDepth() {
+        return depth_;
+      }
+      /**
+       * <pre>
+       * If type == BUILDING then this is the depth of the transaction in the blockchain.
+       * Zero confirmations: depth = 0, one confirmation: depth = 1 etc.
+       * </pre>
+       *
+       * <code>optional int32 depth = 4;</code>
+       */
+      public Builder setDepth(int value) {
+        bitField0_ |= 0x00000008;
+        depth_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * If type == BUILDING then this is the depth of the transaction in the blockchain.
+       * Zero confirmations: depth = 0, one confirmation: depth = 1 etc.
+       * </pre>
+       *
+       * <code>optional int32 depth = 4;</code>
+       */
+      public Builder clearDepth() {
+        bitField0_ = (bitField0_ & ~0x00000008);
+        depth_ = 0;
+        onChanged();
+        return this;
+      }
 
+      private java.util.List<org.bitcoinj.wallet.Protos.PeerAddress> broadcastBy_ =
+        java.util.Collections.emptyList();
+      private void ensureBroadcastByIsMutable() {
+        if (!((bitField0_ & 0x00000010) == 0x00000010)) {
+          broadcastBy_ = new java.util.ArrayList<org.bitcoinj.wallet.Protos.PeerAddress>(broadcastBy_);
+          bitField0_ |= 0x00000010;
+         }
+      }
 
-      public final int getNumber() { return value; }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          org.bitcoinj.wallet.Protos.PeerAddress, org.bitcoinj.wallet.Protos.PeerAddress.Builder, org.bitcoinj.wallet.Protos.PeerAddressOrBuilder> broadcastByBuilder_;
 
-      public static Purpose valueOf(int value) {
-        switch (value) {
-          case 0: return UNKNOWN;
-          case 1: return USER_PAYMENT;
-          case 2: return KEY_ROTATION;
-          case 3: return ASSURANCE_CONTRACT_CLAIM;
-          case 4: return ASSURANCE_CONTRACT_PLEDGE;
-          case 5: return ASSURANCE_CONTRACT_STUB;
-          case 6: return RAISE_FEE;
-          default: return null;
+      /**
+       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
+       */
+      public java.util.List<org.bitcoinj.wallet.Protos.PeerAddress> getBroadcastByList() {
+        if (broadcastByBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(broadcastBy_);
+        } else {
+          return broadcastByBuilder_.getMessageList();
         }
       }
-
-      public static com.google.protobuf.Internal.EnumLiteMap<Purpose>
-          internalGetValueMap() {
-        return internalValueMap;
+      /**
+       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
+       */
+      public int getBroadcastByCount() {
+        if (broadcastByBuilder_ == null) {
+          return broadcastBy_.size();
+        } else {
+          return broadcastByBuilder_.getCount();
+        }
       }
-      private static com.google.protobuf.Internal.EnumLiteMap<Purpose>
-          internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap<Purpose>() {
-              public Purpose findValueByNumber(int number) {
-                return Purpose.valueOf(number);
-              }
-            };
-
-      public final com.google.protobuf.Descriptors.EnumValueDescriptor
-          getValueDescriptor() {
-        return getDescriptor().getValues().get(index);
+      /**
+       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
+       */
+      public org.bitcoinj.wallet.Protos.PeerAddress getBroadcastBy(int index) {
+        if (broadcastByBuilder_ == null) {
+          return broadcastBy_.get(index);
+        } else {
+          return broadcastByBuilder_.getMessage(index);
+        }
       }
-      public final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptorForType() {
-        return getDescriptor();
+      /**
+       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
+       */
+      public Builder setBroadcastBy(
+          int index, org.bitcoinj.wallet.Protos.PeerAddress value) {
+        if (broadcastByBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureBroadcastByIsMutable();
+          broadcastBy_.set(index, value);
+          onChanged();
+        } else {
+          broadcastByBuilder_.setMessage(index, value);
+        }
+        return this;
       }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptor() {
-        return org.bitcoinj.wallet.Protos.Transaction.getDescriptor().getEnumTypes().get(1);
+      /**
+       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
+       */
+      public Builder setBroadcastBy(
+          int index, org.bitcoinj.wallet.Protos.PeerAddress.Builder builderForValue) {
+        if (broadcastByBuilder_ == null) {
+          ensureBroadcastByIsMutable();
+          broadcastBy_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          broadcastByBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
       }
-
-      private static final Purpose[] VALUES = values();
-
-      public static Purpose valueOf(
-          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-        if (desc.getType() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException(
-            "EnumValueDescriptor is not for this type.");
+      /**
+       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
+       */
+      public Builder addBroadcastBy(org.bitcoinj.wallet.Protos.PeerAddress value) {
+        if (broadcastByBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureBroadcastByIsMutable();
+          broadcastBy_.add(value);
+          onChanged();
+        } else {
+          broadcastByBuilder_.addMessage(value);
         }
-        return VALUES[desc.getIndex()];
+        return this;
       }
-
-      private final int index;
-      private final int value;
-
-      private Purpose(int index, int value) {
-        this.index = index;
-        this.value = value;
+      /**
+       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
+       */
+      public Builder addBroadcastBy(
+          int index, org.bitcoinj.wallet.Protos.PeerAddress value) {
+        if (broadcastByBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureBroadcastByIsMutable();
+          broadcastBy_.add(index, value);
+          onChanged();
+        } else {
+          broadcastByBuilder_.addMessage(index, value);
+        }
+        return this;
       }
-
-      // @@protoc_insertion_point(enum_scope:wallet.Transaction.Purpose)
-    }
-
-    private int bitField0_;
-    public static final int VERSION_FIELD_NUMBER = 1;
-    private int version_;
-    /**
-     * <code>required int32 version = 1;</code>
-     *
-     * <pre>
-     * See Wallet.java for detailed description of pool semantics
-     * </pre>
-     */
-    public boolean hasVersion() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    /**
-     * <code>required int32 version = 1;</code>
-     *
-     * <pre>
-     * See Wallet.java for detailed description of pool semantics
-     * </pre>
-     */
-    public int getVersion() {
-      return version_;
-    }
-
-    public static final int HASH_FIELD_NUMBER = 2;
-    private com.google.protobuf.ByteString hash_;
-    /**
-     * <code>required bytes hash = 2;</code>
-     */
-    public boolean hasHash() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
-    /**
-     * <code>required bytes hash = 2;</code>
-     */
+      /**
+       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
+       */
+      public Builder addBroadcastBy(
+          org.bitcoinj.wallet.Protos.PeerAddress.Builder builderForValue) {
+        if (broadcastByBuilder_ == null) {
+          ensureBroadcastByIsMutable();
+          broadcastBy_.add(builderForValue.build());
+          onChanged();
+        } else {
+          broadcastByBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
+       */
+      public Builder addBroadcastBy(
+          int index, org.bitcoinj.wallet.Protos.PeerAddress.Builder builderForValue) {
+        if (broadcastByBuilder_ == null) {
+          ensureBroadcastByIsMutable();
+          broadcastBy_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          broadcastByBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
+       */
+      public Builder addAllBroadcastBy(
+          java.lang.Iterable<? extends org.bitcoinj.wallet.Protos.PeerAddress> values) {
+        if (broadcastByBuilder_ == null) {
+          ensureBroadcastByIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, broadcastBy_);
+          onChanged();
+        } else {
+          broadcastByBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
+       */
+      public Builder clearBroadcastBy() {
+        if (broadcastByBuilder_ == null) {
+          broadcastBy_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000010);
+          onChanged();
+        } else {
+          broadcastByBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
+       */
+      public Builder removeBroadcastBy(int index) {
+        if (broadcastByBuilder_ == null) {
+          ensureBroadcastByIsMutable();
+          broadcastBy_.remove(index);
+          onChanged();
+        } else {
+          broadcastByBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
+       */
+      public org.bitcoinj.wallet.Protos.PeerAddress.Builder getBroadcastByBuilder(
+          int index) {
+        return getBroadcastByFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
+       */
+      public org.bitcoinj.wallet.Protos.PeerAddressOrBuilder getBroadcastByOrBuilder(
+          int index) {
+        if (broadcastByBuilder_ == null) {
+          return broadcastBy_.get(index);  } else {
+          return broadcastByBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
+       */
+      public java.util.List<? extends org.bitcoinj.wallet.Protos.PeerAddressOrBuilder> 
+           getBroadcastByOrBuilderList() {
+        if (broadcastByBuilder_ != null) {
+          return broadcastByBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(broadcastBy_);
+        }
+      }
+      /**
+       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
+       */
+      public org.bitcoinj.wallet.Protos.PeerAddress.Builder addBroadcastByBuilder() {
+        return getBroadcastByFieldBuilder().addBuilder(
+            org.bitcoinj.wallet.Protos.PeerAddress.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
+       */
+      public org.bitcoinj.wallet.Protos.PeerAddress.Builder addBroadcastByBuilder(
+          int index) {
+        return getBroadcastByFieldBuilder().addBuilder(
+            index, org.bitcoinj.wallet.Protos.PeerAddress.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .wallet.PeerAddress broadcast_by = 6;</code>
+       */
+      public java.util.List<org.bitcoinj.wallet.Protos.PeerAddress.Builder> 
+           getBroadcastByBuilderList() {
+        return getBroadcastByFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          org.bitcoinj.wallet.Protos.PeerAddress, org.bitcoinj.wallet.Protos.PeerAddress.Builder, org.bitcoinj.wallet.Protos.PeerAddressOrBuilder> 
+          getBroadcastByFieldBuilder() {
+        if (broadcastByBuilder_ == null) {
+          broadcastByBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              org.bitcoinj.wallet.Protos.PeerAddress, org.bitcoinj.wallet.Protos.PeerAddress.Builder, org.bitcoinj.wallet.Protos.PeerAddressOrBuilder>(
+                  broadcastBy_,
+                  ((bitField0_ & 0x00000010) == 0x00000010),
+                  getParentForChildren(),
+                  isClean());
+          broadcastBy_ = null;
+        }
+        return broadcastByBuilder_;
+      }
+
+      private long lastBroadcastedAt_ ;
+      /**
+       * <pre>
+       * Millis since epoch the transaction was last announced to us.
+       * </pre>
+       *
+       * <code>optional int64 last_broadcasted_at = 8;</code>
+       */
+      public boolean hasLastBroadcastedAt() {
+        return ((bitField0_ & 0x00000020) == 0x00000020);
+      }
+      /**
+       * <pre>
+       * Millis since epoch the transaction was last announced to us.
+       * </pre>
+       *
+       * <code>optional int64 last_broadcasted_at = 8;</code>
+       */
+      public long getLastBroadcastedAt() {
+        return lastBroadcastedAt_;
+      }
+      /**
+       * <pre>
+       * Millis since epoch the transaction was last announced to us.
+       * </pre>
+       *
+       * <code>optional int64 last_broadcasted_at = 8;</code>
+       */
+      public Builder setLastBroadcastedAt(long value) {
+        bitField0_ |= 0x00000020;
+        lastBroadcastedAt_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Millis since epoch the transaction was last announced to us.
+       * </pre>
+       *
+       * <code>optional int64 last_broadcasted_at = 8;</code>
+       */
+      public Builder clearLastBroadcastedAt() {
+        bitField0_ = (bitField0_ & ~0x00000020);
+        lastBroadcastedAt_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int source_ = 0;
+      /**
+       * <code>optional .wallet.TransactionConfidence.Source source = 7;</code>
+       */
+      public boolean hasSource() {
+        return ((bitField0_ & 0x00000040) == 0x00000040);
+      }
+      /**
+       * <code>optional .wallet.TransactionConfidence.Source source = 7;</code>
+       */
+      public org.bitcoinj.wallet.Protos.TransactionConfidence.Source getSource() {
+        @SuppressWarnings("deprecation")
+        org.bitcoinj.wallet.Protos.TransactionConfidence.Source result = org.bitcoinj.wallet.Protos.TransactionConfidence.Source.valueOf(source_);
+        return result == null ? org.bitcoinj.wallet.Protos.TransactionConfidence.Source.SOURCE_UNKNOWN : result;
+      }
+      /**
+       * <code>optional .wallet.TransactionConfidence.Source source = 7;</code>
+       */
+      public Builder setSource(org.bitcoinj.wallet.Protos.TransactionConfidence.Source value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        bitField0_ |= 0x00000040;
+        source_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .wallet.TransactionConfidence.Source source = 7;</code>
+       */
+      public Builder clearSource() {
+        bitField0_ = (bitField0_ & ~0x00000040);
+        source_ = 0;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:wallet.TransactionConfidence)
+    }
+
+    // @@protoc_insertion_point(class_scope:wallet.TransactionConfidence)
+    private static final org.bitcoinj.wallet.Protos.TransactionConfidence DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new org.bitcoinj.wallet.Protos.TransactionConfidence();
+    }
+
+    public static org.bitcoinj.wallet.Protos.TransactionConfidence getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<TransactionConfidence>
+        PARSER = new com.google.protobuf.AbstractParser<TransactionConfidence>() {
+      @java.lang.Override
+      public TransactionConfidence parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new TransactionConfidence(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<TransactionConfidence> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<TransactionConfidence> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoinj.wallet.Protos.TransactionConfidence getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  public interface TransactionOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:wallet.Transaction)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <pre>
+     * See Wallet.java for detailed description of pool semantics
+     * </pre>
+     *
+     * <code>required int32 version = 1;</code>
+     */
+    boolean hasVersion();
+    /**
+     * <pre>
+     * See Wallet.java for detailed description of pool semantics
+     * </pre>
+     *
+     * <code>required int32 version = 1;</code>
+     */
+    int getVersion();
+
+    /**
+     * <code>required bytes hash = 2;</code>
+     */
+    boolean hasHash();
+    /**
+     * <code>required bytes hash = 2;</code>
+     */
+    com.google.protobuf.ByteString getHash();
+
+    /**
+     * <pre>
+     * If pool is not present, that means either:
+     *  - This Transaction is either not in a wallet at all (the proto is re-used elsewhere)
+     *  - Or it is stored but for other purposes, for example, because it is the overriding transaction of a double spend.
+     *  - Or the Pool enum got a new value which your software is too old to parse.
+     * </pre>
+     *
+     * <code>optional .wallet.Transaction.Pool pool = 3;</code>
+     */
+    boolean hasPool();
+    /**
+     * <pre>
+     * If pool is not present, that means either:
+     *  - This Transaction is either not in a wallet at all (the proto is re-used elsewhere)
+     *  - Or it is stored but for other purposes, for example, because it is the overriding transaction of a double spend.
+     *  - Or the Pool enum got a new value which your software is too old to parse.
+     * </pre>
+     *
+     * <code>optional .wallet.Transaction.Pool pool = 3;</code>
+     */
+    org.bitcoinj.wallet.Protos.Transaction.Pool getPool();
+
+    /**
+     * <pre>
+     * The nLockTime field is useful for contracts.
+     * </pre>
+     *
+     * <code>optional uint32 lock_time = 4;</code>
+     */
+    boolean hasLockTime();
+    /**
+     * <pre>
+     * The nLockTime field is useful for contracts.
+     * </pre>
+     *
+     * <code>optional uint32 lock_time = 4;</code>
+     */
+    int getLockTime();
+
+    /**
+     * <pre>
+     * millis since epoch the transaction was last updated
+     * </pre>
+     *
+     * <code>optional int64 updated_at = 5;</code>
+     */
+    boolean hasUpdatedAt();
+    /**
+     * <pre>
+     * millis since epoch the transaction was last updated
+     * </pre>
+     *
+     * <code>optional int64 updated_at = 5;</code>
+     */
+    long getUpdatedAt();
+
+    /**
+     * <pre>
+     * millis since epoch the transaction was included on the best chain
+     * </pre>
+     *
+     * <code>optional int64 included_in_best_chain_at = 1000;</code>
+     */
+    boolean hasIncludedInBestChainAt();
+    /**
+     * <pre>
+     * millis since epoch the transaction was included on the best chain
+     * </pre>
+     *
+     * <code>optional int64 included_in_best_chain_at = 1000;</code>
+     */
+    long getIncludedInBestChainAt();
+
+    /**
+     * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
+     */
+    java.util.List<org.bitcoinj.wallet.Protos.TransactionInput> 
+        getTransactionInputList();
+    /**
+     * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
+     */
+    org.bitcoinj.wallet.Protos.TransactionInput getTransactionInput(int index);
+    /**
+     * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
+     */
+    int getTransactionInputCount();
+    /**
+     * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
+     */
+    java.util.List<? extends org.bitcoinj.wallet.Protos.TransactionInputOrBuilder> 
+        getTransactionInputOrBuilderList();
+    /**
+     * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
+     */
+    org.bitcoinj.wallet.Protos.TransactionInputOrBuilder getTransactionInputOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+     */
+    java.util.List<org.bitcoinj.wallet.Protos.TransactionOutput> 
+        getTransactionOutputList();
+    /**
+     * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+     */
+    org.bitcoinj.wallet.Protos.TransactionOutput getTransactionOutput(int index);
+    /**
+     * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+     */
+    int getTransactionOutputCount();
+    /**
+     * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+     */
+    java.util.List<? extends org.bitcoinj.wallet.Protos.TransactionOutputOrBuilder> 
+        getTransactionOutputOrBuilderList();
+    /**
+     * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+     */
+    org.bitcoinj.wallet.Protos.TransactionOutputOrBuilder getTransactionOutputOrBuilder(
+        int index);
+
+    /**
+     * <pre>
+     * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
+     * ordering within a block.
+     * </pre>
+     *
+     * <code>repeated bytes block_hash = 8;</code>
+     */
+    java.util.List<com.google.protobuf.ByteString> getBlockHashList();
+    /**
+     * <pre>
+     * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
+     * ordering within a block.
+     * </pre>
+     *
+     * <code>repeated bytes block_hash = 8;</code>
+     */
+    int getBlockHashCount();
+    /**
+     * <pre>
+     * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
+     * ordering within a block.
+     * </pre>
+     *
+     * <code>repeated bytes block_hash = 8;</code>
+     */
+    com.google.protobuf.ByteString getBlockHash(int index);
+
+    /**
+     * <code>repeated int32 block_relativity_offsets = 11;</code>
+     */
+    java.util.List<java.lang.Integer> getBlockRelativityOffsetsList();
+    /**
+     * <code>repeated int32 block_relativity_offsets = 11;</code>
+     */
+    int getBlockRelativityOffsetsCount();
+    /**
+     * <code>repeated int32 block_relativity_offsets = 11;</code>
+     */
+    int getBlockRelativityOffsets(int index);
+
+    /**
+     * <pre>
+     * Data describing where the transaction is in the chain.
+     * </pre>
+     *
+     * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
+     */
+    boolean hasConfidence();
+    /**
+     * <pre>
+     * Data describing where the transaction is in the chain.
+     * </pre>
+     *
+     * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
+     */
+    org.bitcoinj.wallet.Protos.TransactionConfidence getConfidence();
+    /**
+     * <pre>
+     * Data describing where the transaction is in the chain.
+     * </pre>
+     *
+     * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
+     */
+    org.bitcoinj.wallet.Protos.TransactionConfidenceOrBuilder getConfidenceOrBuilder();
+
+    /**
+     * <code>optional .wallet.Transaction.Purpose purpose = 10 [default = UNKNOWN];</code>
+     */
+    boolean hasPurpose();
+    /**
+     * <code>optional .wallet.Transaction.Purpose purpose = 10 [default = UNKNOWN];</code>
+     */
+    org.bitcoinj.wallet.Protos.Transaction.Purpose getPurpose();
+
+    /**
+     * <pre>
+     * Exchange rate that was valid when the transaction was sent.
+     * </pre>
+     *
+     * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
+     */
+    boolean hasExchangeRate();
+    /**
+     * <pre>
+     * Exchange rate that was valid when the transaction was sent.
+     * </pre>
+     *
+     * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
+     */
+    org.bitcoinj.wallet.Protos.ExchangeRate getExchangeRate();
+    /**
+     * <pre>
+     * Exchange rate that was valid when the transaction was sent.
+     * </pre>
+     *
+     * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
+     */
+    org.bitcoinj.wallet.Protos.ExchangeRateOrBuilder getExchangeRateOrBuilder();
+
+    /**
+     * <pre>
+     * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
+     * transaction.
+     * </pre>
+     *
+     * <code>optional string memo = 13;</code>
+     */
+    boolean hasMemo();
+    /**
+     * <pre>
+     * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
+     * transaction.
+     * </pre>
+     *
+     * <code>optional string memo = 13;</code>
+     */
+    java.lang.String getMemo();
+    /**
+     * <pre>
+     * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
+     * transaction.
+     * </pre>
+     *
+     * <code>optional string memo = 13;</code>
+     */
+    com.google.protobuf.ByteString
+        getMemoBytes();
+  }
+  /**
+   * Protobuf type {@code wallet.Transaction}
+   */
+  public  static final class Transaction extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:wallet.Transaction)
+      TransactionOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use Transaction.newBuilder() to construct.
+    private Transaction(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private Transaction() {
+      version_ = 0;
+      hash_ = com.google.protobuf.ByteString.EMPTY;
+      pool_ = 4;
+      lockTime_ = 0;
+      updatedAt_ = 0L;
+      includedInBestChainAt_ = 0L;
+      transactionInput_ = java.util.Collections.emptyList();
+      transactionOutput_ = java.util.Collections.emptyList();
+      blockHash_ = java.util.Collections.emptyList();
+      blockRelativityOffsets_ = java.util.Collections.emptyList();
+      purpose_ = 0;
+      memo_ = "";
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private Transaction(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8: {
+              bitField0_ |= 0x00000001;
+              version_ = input.readInt32();
+              break;
+            }
+            case 18: {
+              bitField0_ |= 0x00000002;
+              hash_ = input.readBytes();
+              break;
+            }
+            case 24: {
+              int rawValue = input.readEnum();
+                @SuppressWarnings("deprecation")
+              org.bitcoinj.wallet.Protos.Transaction.Pool value = org.bitcoinj.wallet.Protos.Transaction.Pool.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(3, rawValue);
+              } else {
+                bitField0_ |= 0x00000004;
+                pool_ = rawValue;
+              }
+              break;
+            }
+            case 32: {
+              bitField0_ |= 0x00000008;
+              lockTime_ = input.readUInt32();
+              break;
+            }
+            case 40: {
+              bitField0_ |= 0x00000010;
+              updatedAt_ = input.readInt64();
+              break;
+            }
+            case 50: {
+              if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
+                transactionInput_ = new java.util.ArrayList<org.bitcoinj.wallet.Protos.TransactionInput>();
+                mutable_bitField0_ |= 0x00000040;
+              }
+              transactionInput_.add(
+                  input.readMessage(org.bitcoinj.wallet.Protos.TransactionInput.PARSER, extensionRegistry));
+              break;
+            }
+            case 58: {
+              if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
+                transactionOutput_ = new java.util.ArrayList<org.bitcoinj.wallet.Protos.TransactionOutput>();
+                mutable_bitField0_ |= 0x00000080;
+              }
+              transactionOutput_.add(
+                  input.readMessage(org.bitcoinj.wallet.Protos.TransactionOutput.PARSER, extensionRegistry));
+              break;
+            }
+            case 66: {
+              if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
+                blockHash_ = new java.util.ArrayList<com.google.protobuf.ByteString>();
+                mutable_bitField0_ |= 0x00000100;
+              }
+              blockHash_.add(input.readBytes());
+              break;
+            }
+            case 74: {
+              org.bitcoinj.wallet.Protos.TransactionConfidence.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000040) == 0x00000040)) {
+                subBuilder = confidence_.toBuilder();
+              }
+              confidence_ = input.readMessage(org.bitcoinj.wallet.Protos.TransactionConfidence.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(confidence_);
+                confidence_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000040;
+              break;
+            }
+            case 80: {
+              int rawValue = input.readEnum();
+                @SuppressWarnings("deprecation")
+              org.bitcoinj.wallet.Protos.Transaction.Purpose value = org.bitcoinj.wallet.Protos.Transaction.Purpose.valueOf(rawValue);
+              if (value == null) {
+                unknownFields.mergeVarintField(10, rawValue);
+              } else {
+                bitField0_ |= 0x00000080;
+                purpose_ = rawValue;
+              }
+              break;
+            }
+            case 88: {
+              if (!((mutable_bitField0_ & 0x00000200) == 0x00000200)) {
+                blockRelativityOffsets_ = new java.util.ArrayList<java.lang.Integer>();
+                mutable_bitField0_ |= 0x00000200;
+              }
+              blockRelativityOffsets_.add(input.readInt32());
+              break;
+            }
+            case 90: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000200) == 0x00000200) && input.getBytesUntilLimit() > 0) {
+                blockRelativityOffsets_ = new java.util.ArrayList<java.lang.Integer>();
+                mutable_bitField0_ |= 0x00000200;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                blockRelativityOffsets_.add(input.readInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 98: {
+              org.bitcoinj.wallet.Protos.ExchangeRate.Builder subBuilder = null;
+              if (((bitField0_ & 0x00000100) == 0x00000100)) {
+                subBuilder = exchangeRate_.toBuilder();
+              }
+              exchangeRate_ = input.readMessage(org.bitcoinj.wallet.Protos.ExchangeRate.PARSER, extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(exchangeRate_);
+                exchangeRate_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00000100;
+              break;
+            }
+            case 106: {
+              com.google.protobuf.ByteString bs = input.readBytes();
+              bitField0_ |= 0x00000200;
+              memo_ = bs;
+              break;
+            }
+            case 8000: {
+              bitField0_ |= 0x00000020;
+              includedInBestChainAt_ = input.readInt64();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
+          transactionInput_ = java.util.Collections.unmodifiableList(transactionInput_);
+        }
+        if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
+          transactionOutput_ = java.util.Collections.unmodifiableList(transactionOutput_);
+        }
+        if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
+          blockHash_ = java.util.Collections.unmodifiableList(blockHash_);
+        }
+        if (((mutable_bitField0_ & 0x00000200) == 0x00000200)) {
+          blockRelativityOffsets_ = java.util.Collections.unmodifiableList(blockRelativityOffsets_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return org.bitcoinj.wallet.Protos.internal_static_wallet_Transaction_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.bitcoinj.wallet.Protos.internal_static_wallet_Transaction_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.bitcoinj.wallet.Protos.Transaction.class, org.bitcoinj.wallet.Protos.Transaction.Builder.class);
+    }
+
+    /**
+     * <pre>
+     **
+     * This is a bitfield oriented enum, with the following bits:
+     * 
+     * bit 0 - spent
+     * bit 1 - appears in alt chain
+     * bit 2 - appears in best chain
+     * bit 3 - double-spent
+     * bit 4 - pending (we would like the tx to go into the best chain)
+     * 
+     * Not all combinations are interesting, just the ones actually used in the enum.
+     * </pre>
+     *
+     * Protobuf enum {@code wallet.Transaction.Pool}
+     */
+    public enum Pool
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <pre>
+       * In best chain, not all outputs spent
+       * </pre>
+       *
+       * <code>UNSPENT = 4;</code>
+       */
+      UNSPENT(4),
+      /**
+       * <pre>
+       * In best chain, all outputs spent
+       * </pre>
+       *
+       * <code>SPENT = 5;</code>
+       */
+      SPENT(5),
+      /**
+       * <pre>
+       * In non-best chain, not our transaction
+       * </pre>
+       *
+       * <code>INACTIVE = 2;</code>
+       */
+      INACTIVE(2),
+      /**
+       * <pre>
+       * Double-spent by a transaction in the best chain
+       * </pre>
+       *
+       * <code>DEAD = 10;</code>
+       */
+      DEAD(10),
+      /**
+       * <pre>
+       * Our transaction, not in any chain
+       * </pre>
+       *
+       * <code>PENDING = 16;</code>
+       */
+      PENDING(16),
+      /**
+       * <pre>
+       * In non-best chain, our transaction
+       * </pre>
+       *
+       * <code>PENDING_INACTIVE = 18;</code>
+       */
+      PENDING_INACTIVE(18),
+      ;
+
+      /**
+       * <pre>
+       * In best chain, not all outputs spent
+       * </pre>
+       *
+       * <code>UNSPENT = 4;</code>
+       */
+      public static final int UNSPENT_VALUE = 4;
+      /**
+       * <pre>
+       * In best chain, all outputs spent
+       * </pre>
+       *
+       * <code>SPENT = 5;</code>
+       */
+      public static final int SPENT_VALUE = 5;
+      /**
+       * <pre>
+       * In non-best chain, not our transaction
+       * </pre>
+       *
+       * <code>INACTIVE = 2;</code>
+       */
+      public static final int INACTIVE_VALUE = 2;
+      /**
+       * <pre>
+       * Double-spent by a transaction in the best chain
+       * </pre>
+       *
+       * <code>DEAD = 10;</code>
+       */
+      public static final int DEAD_VALUE = 10;
+      /**
+       * <pre>
+       * Our transaction, not in any chain
+       * </pre>
+       *
+       * <code>PENDING = 16;</code>
+       */
+      public static final int PENDING_VALUE = 16;
+      /**
+       * <pre>
+       * In non-best chain, our transaction
+       * </pre>
+       *
+       * <code>PENDING_INACTIVE = 18;</code>
+       */
+      public static final int PENDING_INACTIVE_VALUE = 18;
+
+
+      public final int getNumber() {
+        return value;
+      }
+
+      /**
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
+      public static Pool valueOf(int value) {
+        return forNumber(value);
+      }
+
+      public static Pool forNumber(int value) {
+        switch (value) {
+          case 4: return UNSPENT;
+          case 5: return SPENT;
+          case 2: return INACTIVE;
+          case 10: return DEAD;
+          case 16: return PENDING;
+          case 18: return PENDING_INACTIVE;
+          default: return null;
+        }
+      }
+
+      public static com.google.protobuf.Internal.EnumLiteMap<Pool>
+          internalGetValueMap() {
+        return internalValueMap;
+      }
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          Pool> internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<Pool>() {
+              public Pool findValueByNumber(int number) {
+                return Pool.forNumber(number);
+              }
+            };
+
+      public final com.google.protobuf.Descriptors.EnumValueDescriptor
+          getValueDescriptor() {
+        return getDescriptor().getValues().get(ordinal());
+      }
+      public final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptorForType() {
+        return getDescriptor();
+      }
+      public static final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptor() {
+        return org.bitcoinj.wallet.Protos.Transaction.getDescriptor().getEnumTypes().get(0);
+      }
+
+      private static final Pool[] VALUES = values();
+
+      public static Pool valueOf(
+          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+        if (desc.getType() != getDescriptor()) {
+          throw new java.lang.IllegalArgumentException(
+            "EnumValueDescriptor is not for this type.");
+        }
+        return VALUES[desc.getIndex()];
+      }
+
+      private final int value;
+
+      private Pool(int value) {
+        this.value = value;
+      }
+
+      // @@protoc_insertion_point(enum_scope:wallet.Transaction.Pool)
+    }
+
+    /**
+     * <pre>
+     * For what purpose the transaction was created.
+     * </pre>
+     *
+     * Protobuf enum {@code wallet.Transaction.Purpose}
+     */
+    public enum Purpose
+        implements com.google.protobuf.ProtocolMessageEnum {
+      /**
+       * <pre>
+       * Old wallets or the purpose genuinely is a mystery (e.g. imported from some external source).
+       * </pre>
+       *
+       * <code>UNKNOWN = 0;</code>
+       */
+      UNKNOWN(0),
+      /**
+       * <pre>
+       * Created in response to a user request for payment. This is the normal case.
+       * </pre>
+       *
+       * <code>USER_PAYMENT = 1;</code>
+       */
+      USER_PAYMENT(1),
+      /**
+       * <pre>
+       * Created automatically to move money from rotated keys.
+       * </pre>
+       *
+       * <code>KEY_ROTATION = 2;</code>
+       */
+      KEY_ROTATION(2),
+      /**
+       * <pre>
+       * Stuff used by Lighthouse.
+       * </pre>
+       *
+       * <code>ASSURANCE_CONTRACT_CLAIM = 3;</code>
+       */
+      ASSURANCE_CONTRACT_CLAIM(3),
+      /**
+       * <code>ASSURANCE_CONTRACT_PLEDGE = 4;</code>
+       */
+      ASSURANCE_CONTRACT_PLEDGE(4),
+      /**
+       * <code>ASSURANCE_CONTRACT_STUB = 5;</code>
+       */
+      ASSURANCE_CONTRACT_STUB(5),
+      /**
+       * <pre>
+       * Raise fee, e.g. child-pays-for-parent.
+       * </pre>
+       *
+       * <code>RAISE_FEE = 6;</code>
+       */
+      RAISE_FEE(6),
+      ;
+
+      /**
+       * <pre>
+       * Old wallets or the purpose genuinely is a mystery (e.g. imported from some external source).
+       * </pre>
+       *
+       * <code>UNKNOWN = 0;</code>
+       */
+      public static final int UNKNOWN_VALUE = 0;
+      /**
+       * <pre>
+       * Created in response to a user request for payment. This is the normal case.
+       * </pre>
+       *
+       * <code>USER_PAYMENT = 1;</code>
+       */
+      public static final int USER_PAYMENT_VALUE = 1;
+      /**
+       * <pre>
+       * Created automatically to move money from rotated keys.
+       * </pre>
+       *
+       * <code>KEY_ROTATION = 2;</code>
+       */
+      public static final int KEY_ROTATION_VALUE = 2;
+      /**
+       * <pre>
+       * Stuff used by Lighthouse.
+       * </pre>
+       *
+       * <code>ASSURANCE_CONTRACT_CLAIM = 3;</code>
+       */
+      public static final int ASSURANCE_CONTRACT_CLAIM_VALUE = 3;
+      /**
+       * <code>ASSURANCE_CONTRACT_PLEDGE = 4;</code>
+       */
+      public static final int ASSURANCE_CONTRACT_PLEDGE_VALUE = 4;
+      /**
+       * <code>ASSURANCE_CONTRACT_STUB = 5;</code>
+       */
+      public static final int ASSURANCE_CONTRACT_STUB_VALUE = 5;
+      /**
+       * <pre>
+       * Raise fee, e.g. child-pays-for-parent.
+       * </pre>
+       *
+       * <code>RAISE_FEE = 6;</code>
+       */
+      public static final int RAISE_FEE_VALUE = 6;
+
+
+      public final int getNumber() {
+        return value;
+      }
+
+      /**
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
+      public static Purpose valueOf(int value) {
+        return forNumber(value);
+      }
+
+      public static Purpose forNumber(int value) {
+        switch (value) {
+          case 0: return UNKNOWN;
+          case 1: return USER_PAYMENT;
+          case 2: return KEY_ROTATION;
+          case 3: return ASSURANCE_CONTRACT_CLAIM;
+          case 4: return ASSURANCE_CONTRACT_PLEDGE;
+          case 5: return ASSURANCE_CONTRACT_STUB;
+          case 6: return RAISE_FEE;
+          default: return null;
+        }
+      }
+
+      public static com.google.protobuf.Internal.EnumLiteMap<Purpose>
+          internalGetValueMap() {
+        return internalValueMap;
+      }
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          Purpose> internalValueMap =
+            new com.google.protobuf.Internal.EnumLiteMap<Purpose>() {
+              public Purpose findValueByNumber(int number) {
+                return Purpose.forNumber(number);
+              }
+            };
+
+      public final com.google.protobuf.Descriptors.EnumValueDescriptor
+          getValueDescriptor() {
+        return getDescriptor().getValues().get(ordinal());
+      }
+      public final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptorForType() {
+        return getDescriptor();
+      }
+      public static final com.google.protobuf.Descriptors.EnumDescriptor
+          getDescriptor() {
+        return org.bitcoinj.wallet.Protos.Transaction.getDescriptor().getEnumTypes().get(1);
+      }
+
+      private static final Purpose[] VALUES = values();
+
+      public static Purpose valueOf(
+          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+        if (desc.getType() != getDescriptor()) {
+          throw new java.lang.IllegalArgumentException(
+            "EnumValueDescriptor is not for this type.");
+        }
+        return VALUES[desc.getIndex()];
+      }
+
+      private final int value;
+
+      private Purpose(int value) {
+        this.value = value;
+      }
+
+      // @@protoc_insertion_point(enum_scope:wallet.Transaction.Purpose)
+    }
+
+    private int bitField0_;
+    public static final int VERSION_FIELD_NUMBER = 1;
+    private int version_;
+    /**
+     * <pre>
+     * See Wallet.java for detailed description of pool semantics
+     * </pre>
+     *
+     * <code>required int32 version = 1;</code>
+     */
+    public boolean hasVersion() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    /**
+     * <pre>
+     * See Wallet.java for detailed description of pool semantics
+     * </pre>
+     *
+     * <code>required int32 version = 1;</code>
+     */
+    public int getVersion() {
+      return version_;
+    }
+
+    public static final int HASH_FIELD_NUMBER = 2;
+    private com.google.protobuf.ByteString hash_;
+    /**
+     * <code>required bytes hash = 2;</code>
+     */
+    public boolean hasHash() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
+     * <code>required bytes hash = 2;</code>
+     */
     public com.google.protobuf.ByteString getHash() {
       return hash_;
     }
 
     public static final int POOL_FIELD_NUMBER = 3;
-    private org.bitcoinj.wallet.Protos.Transaction.Pool pool_;
+    private int pool_;
     /**
-     * <code>optional .wallet.Transaction.Pool pool = 3;</code>
-     *
      * <pre>
      * If pool is not present, that means either:
      *  - This Transaction is either not in a wallet at all (the proto is re-used elsewhere)
      *  - Or it is stored but for other purposes, for example, because it is the overriding transaction of a double spend.
      *  - Or the Pool enum got a new value which your software is too old to parse.
      * </pre>
+     *
+     * <code>optional .wallet.Transaction.Pool pool = 3;</code>
      */
     public boolean hasPool() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * <code>optional .wallet.Transaction.Pool pool = 3;</code>
-     *
      * <pre>
      * If pool is not present, that means either:
      *  - This Transaction is either not in a wallet at all (the proto is re-used elsewhere)
      *  - Or it is stored but for other purposes, for example, because it is the overriding transaction of a double spend.
      *  - Or the Pool enum got a new value which your software is too old to parse.
      * </pre>
+     *
+     * <code>optional .wallet.Transaction.Pool pool = 3;</code>
      */
     public org.bitcoinj.wallet.Protos.Transaction.Pool getPool() {
-      return pool_;
+      @SuppressWarnings("deprecation")
+      org.bitcoinj.wallet.Protos.Transaction.Pool result = org.bitcoinj.wallet.Protos.Transaction.Pool.valueOf(pool_);
+      return result == null ? org.bitcoinj.wallet.Protos.Transaction.Pool.UNSPENT : result;
     }
 
     public static final int LOCK_TIME_FIELD_NUMBER = 4;
     private int lockTime_;
     /**
-     * <code>optional uint32 lock_time = 4;</code>
-     *
      * <pre>
      * The nLockTime field is useful for contracts.
      * </pre>
+     *
+     * <code>optional uint32 lock_time = 4;</code>
      */
     public boolean hasLockTime() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * <code>optional uint32 lock_time = 4;</code>
-     *
      * <pre>
      * The nLockTime field is useful for contracts.
      * </pre>
+     *
+     * <code>optional uint32 lock_time = 4;</code>
      */
     public int getLockTime() {
       return lockTime_;
@@ -9061,26 +11698,49 @@ public int getLockTime() {
     public static final int UPDATED_AT_FIELD_NUMBER = 5;
     private long updatedAt_;
     /**
-     * <code>optional int64 updated_at = 5;</code>
-     *
      * <pre>
      * millis since epoch the transaction was last updated
      * </pre>
+     *
+     * <code>optional int64 updated_at = 5;</code>
      */
     public boolean hasUpdatedAt() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * <code>optional int64 updated_at = 5;</code>
-     *
      * <pre>
      * millis since epoch the transaction was last updated
      * </pre>
+     *
+     * <code>optional int64 updated_at = 5;</code>
      */
     public long getUpdatedAt() {
       return updatedAt_;
     }
 
+    public static final int INCLUDED_IN_BEST_CHAIN_AT_FIELD_NUMBER = 1000;
+    private long includedInBestChainAt_;
+    /**
+     * <pre>
+     * millis since epoch the transaction was included on the best chain
+     * </pre>
+     *
+     * <code>optional int64 included_in_best_chain_at = 1000;</code>
+     */
+    public boolean hasIncludedInBestChainAt() {
+      return ((bitField0_ & 0x00000020) == 0x00000020);
+    }
+    /**
+     * <pre>
+     * millis since epoch the transaction was included on the best chain
+     * </pre>
+     *
+     * <code>optional int64 included_in_best_chain_at = 1000;</code>
+     */
+    public long getIncludedInBestChainAt() {
+      return includedInBestChainAt_;
+    }
+
     public static final int TRANSACTION_INPUT_FIELD_NUMBER = 6;
     private java.util.List<org.bitcoinj.wallet.Protos.TransactionInput> transactionInput_;
     /**
@@ -9152,3046 +11812,2561 @@ public org.bitcoinj.wallet.Protos.TransactionOutputOrBuilder getTransactionOutpu
     }
 
     public static final int BLOCK_HASH_FIELD_NUMBER = 8;
-    private java.util.List<com.google.protobuf.ByteString> blockHash_;
-    /**
-     * <code>repeated bytes block_hash = 8;</code>
-     *
-     * <pre>
-     * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
-     * ordering within a block.
-     * </pre>
-     */
-    public java.util.List<com.google.protobuf.ByteString>
-        getBlockHashList() {
-      return blockHash_;
-    }
-    /**
-     * <code>repeated bytes block_hash = 8;</code>
-     *
-     * <pre>
-     * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
-     * ordering within a block.
-     * </pre>
-     */
-    public int getBlockHashCount() {
-      return blockHash_.size();
-    }
-    /**
-     * <code>repeated bytes block_hash = 8;</code>
-     *
-     * <pre>
-     * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
-     * ordering within a block.
-     * </pre>
-     */
-    public com.google.protobuf.ByteString getBlockHash(int index) {
-      return blockHash_.get(index);
-    }
-
-    public static final int BLOCK_RELATIVITY_OFFSETS_FIELD_NUMBER = 11;
-    private java.util.List<java.lang.Integer> blockRelativityOffsets_;
-    /**
-     * <code>repeated int32 block_relativity_offsets = 11;</code>
-     */
-    public java.util.List<java.lang.Integer>
-        getBlockRelativityOffsetsList() {
-      return blockRelativityOffsets_;
-    }
-    /**
-     * <code>repeated int32 block_relativity_offsets = 11;</code>
-     */
-    public int getBlockRelativityOffsetsCount() {
-      return blockRelativityOffsets_.size();
-    }
-    /**
-     * <code>repeated int32 block_relativity_offsets = 11;</code>
-     */
-    public int getBlockRelativityOffsets(int index) {
-      return blockRelativityOffsets_.get(index);
-    }
-
-    public static final int CONFIDENCE_FIELD_NUMBER = 9;
-    private org.bitcoinj.wallet.Protos.TransactionConfidence confidence_;
-    /**
-     * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
-     *
-     * <pre>
-     * Data describing where the transaction is in the chain.
-     * </pre>
-     */
-    public boolean hasConfidence() {
-      return ((bitField0_ & 0x00000020) == 0x00000020);
-    }
-    /**
-     * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
-     *
-     * <pre>
-     * Data describing where the transaction is in the chain.
-     * </pre>
-     */
-    public org.bitcoinj.wallet.Protos.TransactionConfidence getConfidence() {
-      return confidence_;
-    }
-    /**
-     * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
-     *
-     * <pre>
-     * Data describing where the transaction is in the chain.
-     * </pre>
-     */
-    public org.bitcoinj.wallet.Protos.TransactionConfidenceOrBuilder getConfidenceOrBuilder() {
-      return confidence_;
-    }
-
-    public static final int PURPOSE_FIELD_NUMBER = 10;
-    private org.bitcoinj.wallet.Protos.Transaction.Purpose purpose_;
-    /**
-     * <code>optional .wallet.Transaction.Purpose purpose = 10 [default = UNKNOWN];</code>
-     */
-    public boolean hasPurpose() {
-      return ((bitField0_ & 0x00000040) == 0x00000040);
-    }
-    /**
-     * <code>optional .wallet.Transaction.Purpose purpose = 10 [default = UNKNOWN];</code>
-     */
-    public org.bitcoinj.wallet.Protos.Transaction.Purpose getPurpose() {
-      return purpose_;
-    }
-
-    public static final int EXCHANGE_RATE_FIELD_NUMBER = 12;
-    private org.bitcoinj.wallet.Protos.ExchangeRate exchangeRate_;
-    /**
-     * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
-     *
-     * <pre>
-     * Exchange rate that was valid when the transaction was sent.
-     * </pre>
-     */
-    public boolean hasExchangeRate() {
-      return ((bitField0_ & 0x00000080) == 0x00000080);
-    }
-    /**
-     * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
-     *
-     * <pre>
-     * Exchange rate that was valid when the transaction was sent.
-     * </pre>
-     */
-    public org.bitcoinj.wallet.Protos.ExchangeRate getExchangeRate() {
-      return exchangeRate_;
-    }
-    /**
-     * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
-     *
-     * <pre>
-     * Exchange rate that was valid when the transaction was sent.
-     * </pre>
-     */
-    public org.bitcoinj.wallet.Protos.ExchangeRateOrBuilder getExchangeRateOrBuilder() {
-      return exchangeRate_;
-    }
-
-    public static final int MEMO_FIELD_NUMBER = 13;
-    private java.lang.Object memo_;
+    private java.util.List<com.google.protobuf.ByteString> blockHash_;
     /**
-     * <code>optional string memo = 13;</code>
-     *
      * <pre>
-     * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
-     * transaction.
+     * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
+     * ordering within a block.
      * </pre>
+     *
+     * <code>repeated bytes block_hash = 8;</code>
      */
-    public boolean hasMemo() {
-      return ((bitField0_ & 0x00000100) == 0x00000100);
+    public java.util.List<com.google.protobuf.ByteString>
+        getBlockHashList() {
+      return blockHash_;
     }
     /**
-     * <code>optional string memo = 13;</code>
-     *
      * <pre>
-     * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
-     * transaction.
+     * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
+     * ordering within a block.
      * </pre>
+     *
+     * <code>repeated bytes block_hash = 8;</code>
      */
-    public java.lang.String getMemo() {
-      java.lang.Object ref = memo_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (bs.isValidUtf8()) {
-          memo_ = s;
-        }
-        return s;
-      }
+    public int getBlockHashCount() {
+      return blockHash_.size();
     }
     /**
-     * <code>optional string memo = 13;</code>
-     *
      * <pre>
-     * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
-     * transaction.
+     * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
+     * ordering within a block.
      * </pre>
+     *
+     * <code>repeated bytes block_hash = 8;</code>
      */
-    public com.google.protobuf.ByteString
-        getMemoBytes() {
-      java.lang.Object ref = memo_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        memo_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    private void initFields() {
-      version_ = 0;
-      hash_ = com.google.protobuf.ByteString.EMPTY;
-      pool_ = org.bitcoinj.wallet.Protos.Transaction.Pool.UNSPENT;
-      lockTime_ = 0;
-      updatedAt_ = 0L;
-      transactionInput_ = java.util.Collections.emptyList();
-      transactionOutput_ = java.util.Collections.emptyList();
-      blockHash_ = java.util.Collections.emptyList();
-      blockRelativityOffsets_ = java.util.Collections.emptyList();
-      confidence_ = org.bitcoinj.wallet.Protos.TransactionConfidence.getDefaultInstance();
-      purpose_ = org.bitcoinj.wallet.Protos.Transaction.Purpose.UNKNOWN;
-      exchangeRate_ = org.bitcoinj.wallet.Protos.ExchangeRate.getDefaultInstance();
-      memo_ = "";
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      if (!hasVersion()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasHash()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      for (int i = 0; i < getTransactionInputCount(); i++) {
-        if (!getTransactionInput(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      for (int i = 0; i < getTransactionOutputCount(); i++) {
-        if (!getTransactionOutput(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      if (hasConfidence()) {
-        if (!getConfidence().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      if (hasExchangeRate()) {
-        if (!getExchangeRate().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeInt32(1, version_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeBytes(2, hash_);
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeEnum(3, pool_.getNumber());
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeUInt32(4, lockTime_);
-      }
-      if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        output.writeInt64(5, updatedAt_);
-      }
-      for (int i = 0; i < transactionInput_.size(); i++) {
-        output.writeMessage(6, transactionInput_.get(i));
-      }
-      for (int i = 0; i < transactionOutput_.size(); i++) {
-        output.writeMessage(7, transactionOutput_.get(i));
-      }
-      for (int i = 0; i < blockHash_.size(); i++) {
-        output.writeBytes(8, blockHash_.get(i));
-      }
-      if (((bitField0_ & 0x00000020) == 0x00000020)) {
-        output.writeMessage(9, confidence_);
-      }
-      if (((bitField0_ & 0x00000040) == 0x00000040)) {
-        output.writeEnum(10, purpose_.getNumber());
-      }
-      for (int i = 0; i < blockRelativityOffsets_.size(); i++) {
-        output.writeInt32(11, blockRelativityOffsets_.get(i));
-      }
-      if (((bitField0_ & 0x00000080) == 0x00000080)) {
-        output.writeMessage(12, exchangeRate_);
-      }
-      if (((bitField0_ & 0x00000100) == 0x00000100)) {
-        output.writeBytes(13, getMemoBytes());
-      }
-      getUnknownFields().writeTo(output);
-    }
-
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(1, version_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(2, hash_);
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(3, pool_.getNumber());
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, lockTime_);
-      }
-      if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt64Size(5, updatedAt_);
-      }
-      for (int i = 0; i < transactionInput_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, transactionInput_.get(i));
-      }
-      for (int i = 0; i < transactionOutput_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, transactionOutput_.get(i));
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < blockHash_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeBytesSizeNoTag(blockHash_.get(i));
-        }
-        size += dataSize;
-        size += 1 * getBlockHashList().size();
-      }
-      if (((bitField0_ & 0x00000020) == 0x00000020)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, confidence_);
-      }
-      if (((bitField0_ & 0x00000040) == 0x00000040)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(10, purpose_.getNumber());
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < blockRelativityOffsets_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeInt32SizeNoTag(blockRelativityOffsets_.get(i));
-        }
-        size += dataSize;
-        size += 1 * getBlockRelativityOffsetsList().size();
-      }
-      if (((bitField0_ & 0x00000080) == 0x00000080)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, exchangeRate_);
-      }
-      if (((bitField0_ & 0x00000100) == 0x00000100)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(13, getMemoBytes());
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public com.google.protobuf.ByteString getBlockHash(int index) {
+      return blockHash_.get(index);
     }
 
-    public static org.bitcoinj.wallet.Protos.Transaction parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static org.bitcoinj.wallet.Protos.Transaction parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static org.bitcoinj.wallet.Protos.Transaction parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static org.bitcoinj.wallet.Protos.Transaction parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static org.bitcoinj.wallet.Protos.Transaction parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-    public static org.bitcoinj.wallet.Protos.Transaction parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-    public static org.bitcoinj.wallet.Protos.Transaction parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
-    }
-    public static org.bitcoinj.wallet.Protos.Transaction parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    public static final int BLOCK_RELATIVITY_OFFSETS_FIELD_NUMBER = 11;
+    private java.util.List<java.lang.Integer> blockRelativityOffsets_;
+    /**
+     * <code>repeated int32 block_relativity_offsets = 11;</code>
+     */
+    public java.util.List<java.lang.Integer>
+        getBlockRelativityOffsetsList() {
+      return blockRelativityOffsets_;
     }
-    public static org.bitcoinj.wallet.Protos.Transaction parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input);
+    /**
+     * <code>repeated int32 block_relativity_offsets = 11;</code>
+     */
+    public int getBlockRelativityOffsetsCount() {
+      return blockRelativityOffsets_.size();
     }
-    public static org.bitcoinj.wallet.Protos.Transaction parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+    /**
+     * <code>repeated int32 block_relativity_offsets = 11;</code>
+     */
+    public int getBlockRelativityOffsets(int index) {
+      return blockRelativityOffsets_.get(index);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.bitcoinj.wallet.Protos.Transaction prototype) {
-      return newBuilder().mergeFrom(prototype);
+    public static final int CONFIDENCE_FIELD_NUMBER = 9;
+    private org.bitcoinj.wallet.Protos.TransactionConfidence confidence_;
+    /**
+     * <pre>
+     * Data describing where the transaction is in the chain.
+     * </pre>
+     *
+     * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
+     */
+    public boolean hasConfidence() {
+      return ((bitField0_ & 0x00000040) == 0x00000040);
     }
-    public Builder toBuilder() { return newBuilder(this); }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
+    /**
+     * <pre>
+     * Data describing where the transaction is in the chain.
+     * </pre>
+     *
+     * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
+     */
+    public org.bitcoinj.wallet.Protos.TransactionConfidence getConfidence() {
+      return confidence_ == null ? org.bitcoinj.wallet.Protos.TransactionConfidence.getDefaultInstance() : confidence_;
     }
     /**
-     * Protobuf type {@code wallet.Transaction}
+     * <pre>
+     * Data describing where the transaction is in the chain.
+     * </pre>
+     *
+     * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
      */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:wallet.Transaction)
-        org.bitcoinj.wallet.Protos.TransactionOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_Transaction_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_Transaction_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                org.bitcoinj.wallet.Protos.Transaction.class, org.bitcoinj.wallet.Protos.Transaction.Builder.class);
-      }
-
-      // Construct using org.bitcoinj.wallet.Protos.Transaction.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-          getTransactionInputFieldBuilder();
-          getTransactionOutputFieldBuilder();
-          getConfidenceFieldBuilder();
-          getExchangeRateFieldBuilder();
-        }
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-
-      public Builder clear() {
-        super.clear();
-        version_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000001);
-        hash_ = com.google.protobuf.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000002);
-        pool_ = org.bitcoinj.wallet.Protos.Transaction.Pool.UNSPENT;
-        bitField0_ = (bitField0_ & ~0x00000004);
-        lockTime_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000008);
-        updatedAt_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000010);
-        if (transactionInputBuilder_ == null) {
-          transactionInput_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000020);
-        } else {
-          transactionInputBuilder_.clear();
-        }
-        if (transactionOutputBuilder_ == null) {
-          transactionOutput_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000040);
-        } else {
-          transactionOutputBuilder_.clear();
-        }
-        blockHash_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000080);
-        blockRelativityOffsets_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000100);
-        if (confidenceBuilder_ == null) {
-          confidence_ = org.bitcoinj.wallet.Protos.TransactionConfidence.getDefaultInstance();
-        } else {
-          confidenceBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000200);
-        purpose_ = org.bitcoinj.wallet.Protos.Transaction.Purpose.UNKNOWN;
-        bitField0_ = (bitField0_ & ~0x00000400);
-        if (exchangeRateBuilder_ == null) {
-          exchangeRate_ = org.bitcoinj.wallet.Protos.ExchangeRate.getDefaultInstance();
-        } else {
-          exchangeRateBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000800);
-        memo_ = "";
-        bitField0_ = (bitField0_ & ~0x00001000);
-        return this;
-      }
-
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_Transaction_descriptor;
-      }
-
-      public org.bitcoinj.wallet.Protos.Transaction getDefaultInstanceForType() {
-        return org.bitcoinj.wallet.Protos.Transaction.getDefaultInstance();
-      }
+    public org.bitcoinj.wallet.Protos.TransactionConfidenceOrBuilder getConfidenceOrBuilder() {
+      return confidence_ == null ? org.bitcoinj.wallet.Protos.TransactionConfidence.getDefaultInstance() : confidence_;
+    }
 
-      public org.bitcoinj.wallet.Protos.Transaction build() {
-        org.bitcoinj.wallet.Protos.Transaction result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
+    public static final int PURPOSE_FIELD_NUMBER = 10;
+    private int purpose_;
+    /**
+     * <code>optional .wallet.Transaction.Purpose purpose = 10 [default = UNKNOWN];</code>
+     */
+    public boolean hasPurpose() {
+      return ((bitField0_ & 0x00000080) == 0x00000080);
+    }
+    /**
+     * <code>optional .wallet.Transaction.Purpose purpose = 10 [default = UNKNOWN];</code>
+     */
+    public org.bitcoinj.wallet.Protos.Transaction.Purpose getPurpose() {
+      @SuppressWarnings("deprecation")
+      org.bitcoinj.wallet.Protos.Transaction.Purpose result = org.bitcoinj.wallet.Protos.Transaction.Purpose.valueOf(purpose_);
+      return result == null ? org.bitcoinj.wallet.Protos.Transaction.Purpose.UNKNOWN : result;
+    }
 
-      public org.bitcoinj.wallet.Protos.Transaction buildPartial() {
-        org.bitcoinj.wallet.Protos.Transaction result = new org.bitcoinj.wallet.Protos.Transaction(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        result.version_ = version_;
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        result.hash_ = hash_;
-        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
-          to_bitField0_ |= 0x00000004;
-        }
-        result.pool_ = pool_;
-        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
-          to_bitField0_ |= 0x00000008;
-        }
-        result.lockTime_ = lockTime_;
-        if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
-          to_bitField0_ |= 0x00000010;
-        }
-        result.updatedAt_ = updatedAt_;
-        if (transactionInputBuilder_ == null) {
-          if (((bitField0_ & 0x00000020) == 0x00000020)) {
-            transactionInput_ = java.util.Collections.unmodifiableList(transactionInput_);
-            bitField0_ = (bitField0_ & ~0x00000020);
-          }
-          result.transactionInput_ = transactionInput_;
-        } else {
-          result.transactionInput_ = transactionInputBuilder_.build();
-        }
-        if (transactionOutputBuilder_ == null) {
-          if (((bitField0_ & 0x00000040) == 0x00000040)) {
-            transactionOutput_ = java.util.Collections.unmodifiableList(transactionOutput_);
-            bitField0_ = (bitField0_ & ~0x00000040);
-          }
-          result.transactionOutput_ = transactionOutput_;
-        } else {
-          result.transactionOutput_ = transactionOutputBuilder_.build();
-        }
-        if (((bitField0_ & 0x00000080) == 0x00000080)) {
-          blockHash_ = java.util.Collections.unmodifiableList(blockHash_);
-          bitField0_ = (bitField0_ & ~0x00000080);
-        }
-        result.blockHash_ = blockHash_;
-        if (((bitField0_ & 0x00000100) == 0x00000100)) {
-          blockRelativityOffsets_ = java.util.Collections.unmodifiableList(blockRelativityOffsets_);
-          bitField0_ = (bitField0_ & ~0x00000100);
-        }
-        result.blockRelativityOffsets_ = blockRelativityOffsets_;
-        if (((from_bitField0_ & 0x00000200) == 0x00000200)) {
-          to_bitField0_ |= 0x00000020;
-        }
-        if (confidenceBuilder_ == null) {
-          result.confidence_ = confidence_;
-        } else {
-          result.confidence_ = confidenceBuilder_.build();
-        }
-        if (((from_bitField0_ & 0x00000400) == 0x00000400)) {
-          to_bitField0_ |= 0x00000040;
-        }
-        result.purpose_ = purpose_;
-        if (((from_bitField0_ & 0x00000800) == 0x00000800)) {
-          to_bitField0_ |= 0x00000080;
-        }
-        if (exchangeRateBuilder_ == null) {
-          result.exchangeRate_ = exchangeRate_;
-        } else {
-          result.exchangeRate_ = exchangeRateBuilder_.build();
-        }
-        if (((from_bitField0_ & 0x00001000) == 0x00001000)) {
-          to_bitField0_ |= 0x00000100;
-        }
-        result.memo_ = memo_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
+    public static final int EXCHANGE_RATE_FIELD_NUMBER = 12;
+    private org.bitcoinj.wallet.Protos.ExchangeRate exchangeRate_;
+    /**
+     * <pre>
+     * Exchange rate that was valid when the transaction was sent.
+     * </pre>
+     *
+     * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
+     */
+    public boolean hasExchangeRate() {
+      return ((bitField0_ & 0x00000100) == 0x00000100);
+    }
+    /**
+     * <pre>
+     * Exchange rate that was valid when the transaction was sent.
+     * </pre>
+     *
+     * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
+     */
+    public org.bitcoinj.wallet.Protos.ExchangeRate getExchangeRate() {
+      return exchangeRate_ == null ? org.bitcoinj.wallet.Protos.ExchangeRate.getDefaultInstance() : exchangeRate_;
+    }
+    /**
+     * <pre>
+     * Exchange rate that was valid when the transaction was sent.
+     * </pre>
+     *
+     * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
+     */
+    public org.bitcoinj.wallet.Protos.ExchangeRateOrBuilder getExchangeRateOrBuilder() {
+      return exchangeRate_ == null ? org.bitcoinj.wallet.Protos.ExchangeRate.getDefaultInstance() : exchangeRate_;
+    }
 
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bitcoinj.wallet.Protos.Transaction) {
-          return mergeFrom((org.bitcoinj.wallet.Protos.Transaction)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
+    public static final int MEMO_FIELD_NUMBER = 13;
+    private volatile java.lang.Object memo_;
+    /**
+     * <pre>
+     * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
+     * transaction.
+     * </pre>
+     *
+     * <code>optional string memo = 13;</code>
+     */
+    public boolean hasMemo() {
+      return ((bitField0_ & 0x00000200) == 0x00000200);
+    }
+    /**
+     * <pre>
+     * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
+     * transaction.
+     * </pre>
+     *
+     * <code>optional string memo = 13;</code>
+     */
+    public java.lang.String getMemo() {
+      java.lang.Object ref = memo_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          memo_ = s;
         }
+        return s;
       }
-
-      public Builder mergeFrom(org.bitcoinj.wallet.Protos.Transaction other) {
-        if (other == org.bitcoinj.wallet.Protos.Transaction.getDefaultInstance()) return this;
-        if (other.hasVersion()) {
-          setVersion(other.getVersion());
-        }
-        if (other.hasHash()) {
-          setHash(other.getHash());
-        }
-        if (other.hasPool()) {
-          setPool(other.getPool());
-        }
-        if (other.hasLockTime()) {
-          setLockTime(other.getLockTime());
-        }
-        if (other.hasUpdatedAt()) {
-          setUpdatedAt(other.getUpdatedAt());
-        }
-        if (transactionInputBuilder_ == null) {
-          if (!other.transactionInput_.isEmpty()) {
-            if (transactionInput_.isEmpty()) {
-              transactionInput_ = other.transactionInput_;
-              bitField0_ = (bitField0_ & ~0x00000020);
-            } else {
-              ensureTransactionInputIsMutable();
-              transactionInput_.addAll(other.transactionInput_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.transactionInput_.isEmpty()) {
-            if (transactionInputBuilder_.isEmpty()) {
-              transactionInputBuilder_.dispose();
-              transactionInputBuilder_ = null;
-              transactionInput_ = other.transactionInput_;
-              bitField0_ = (bitField0_ & ~0x00000020);
-              transactionInputBuilder_ = 
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getTransactionInputFieldBuilder() : null;
-            } else {
-              transactionInputBuilder_.addAllMessages(other.transactionInput_);
-            }
-          }
-        }
-        if (transactionOutputBuilder_ == null) {
-          if (!other.transactionOutput_.isEmpty()) {
-            if (transactionOutput_.isEmpty()) {
-              transactionOutput_ = other.transactionOutput_;
-              bitField0_ = (bitField0_ & ~0x00000040);
-            } else {
-              ensureTransactionOutputIsMutable();
-              transactionOutput_.addAll(other.transactionOutput_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.transactionOutput_.isEmpty()) {
-            if (transactionOutputBuilder_.isEmpty()) {
-              transactionOutputBuilder_.dispose();
-              transactionOutputBuilder_ = null;
-              transactionOutput_ = other.transactionOutput_;
-              bitField0_ = (bitField0_ & ~0x00000040);
-              transactionOutputBuilder_ = 
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getTransactionOutputFieldBuilder() : null;
-            } else {
-              transactionOutputBuilder_.addAllMessages(other.transactionOutput_);
-            }
-          }
-        }
-        if (!other.blockHash_.isEmpty()) {
-          if (blockHash_.isEmpty()) {
-            blockHash_ = other.blockHash_;
-            bitField0_ = (bitField0_ & ~0x00000080);
-          } else {
-            ensureBlockHashIsMutable();
-            blockHash_.addAll(other.blockHash_);
-          }
-          onChanged();
-        }
-        if (!other.blockRelativityOffsets_.isEmpty()) {
-          if (blockRelativityOffsets_.isEmpty()) {
-            blockRelativityOffsets_ = other.blockRelativityOffsets_;
-            bitField0_ = (bitField0_ & ~0x00000100);
-          } else {
-            ensureBlockRelativityOffsetsIsMutable();
-            blockRelativityOffsets_.addAll(other.blockRelativityOffsets_);
-          }
-          onChanged();
-        }
-        if (other.hasConfidence()) {
-          mergeConfidence(other.getConfidence());
-        }
-        if (other.hasPurpose()) {
-          setPurpose(other.getPurpose());
-        }
-        if (other.hasExchangeRate()) {
-          mergeExchangeRate(other.getExchangeRate());
-        }
-        if (other.hasMemo()) {
-          bitField0_ |= 0x00001000;
-          memo_ = other.memo_;
-          onChanged();
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
+    }
+    /**
+     * <pre>
+     * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
+     * transaction.
+     * </pre>
+     *
+     * <code>optional string memo = 13;</code>
+     */
+    public com.google.protobuf.ByteString
+        getMemoBytes() {
+      java.lang.Object ref = memo_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        memo_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
       }
+    }
 
-      public final boolean isInitialized() {
-        if (!hasVersion()) {
-          
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      if (!hasVersion()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      if (!hasHash()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      for (int i = 0; i < getTransactionInputCount(); i++) {
+        if (!getTransactionInput(i).isInitialized()) {
+          memoizedIsInitialized = 0;
           return false;
         }
-        if (!hasHash()) {
-          
+      }
+      for (int i = 0; i < getTransactionOutputCount(); i++) {
+        if (!getTransactionOutput(i).isInitialized()) {
+          memoizedIsInitialized = 0;
           return false;
         }
-        for (int i = 0; i < getTransactionInputCount(); i++) {
-          if (!getTransactionInput(i).isInitialized()) {
-            
-            return false;
-          }
-        }
-        for (int i = 0; i < getTransactionOutputCount(); i++) {
-          if (!getTransactionOutput(i).isInitialized()) {
-            
-            return false;
-          }
-        }
-        if (hasConfidence()) {
-          if (!getConfidence().isInitialized()) {
-            
-            return false;
-          }
+      }
+      if (hasConfidence()) {
+        if (!getConfidence().isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
         }
-        if (hasExchangeRate()) {
-          if (!getExchangeRate().isInitialized()) {
-            
-            return false;
-          }
+      }
+      if (hasExchangeRate()) {
+        if (!getExchangeRate().isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
         }
-        return true;
       }
-
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        org.bitcoinj.wallet.Protos.Transaction parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bitcoinj.wallet.Protos.Transaction) e.getUnfinishedMessage();
-          throw e;
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        output.writeInt32(1, version_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        output.writeBytes(2, hash_);
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        output.writeEnum(3, pool_);
+      }
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        output.writeUInt32(4, lockTime_);
+      }
+      if (((bitField0_ & 0x00000010) == 0x00000010)) {
+        output.writeInt64(5, updatedAt_);
+      }
+      for (int i = 0; i < transactionInput_.size(); i++) {
+        output.writeMessage(6, transactionInput_.get(i));
+      }
+      for (int i = 0; i < transactionOutput_.size(); i++) {
+        output.writeMessage(7, transactionOutput_.get(i));
+      }
+      for (int i = 0; i < blockHash_.size(); i++) {
+        output.writeBytes(8, blockHash_.get(i));
+      }
+      if (((bitField0_ & 0x00000040) == 0x00000040)) {
+        output.writeMessage(9, getConfidence());
       }
-      private int bitField0_;
-
-      private int version_ ;
-      /**
-       * <code>required int32 version = 1;</code>
-       *
-       * <pre>
-       * See Wallet.java for detailed description of pool semantics
-       * </pre>
-       */
-      public boolean hasVersion() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
+      if (((bitField0_ & 0x00000080) == 0x00000080)) {
+        output.writeEnum(10, purpose_);
       }
-      /**
-       * <code>required int32 version = 1;</code>
-       *
-       * <pre>
-       * See Wallet.java for detailed description of pool semantics
-       * </pre>
-       */
-      public int getVersion() {
-        return version_;
+      for (int i = 0; i < blockRelativityOffsets_.size(); i++) {
+        output.writeInt32(11, blockRelativityOffsets_.get(i));
       }
-      /**
-       * <code>required int32 version = 1;</code>
-       *
-       * <pre>
-       * See Wallet.java for detailed description of pool semantics
-       * </pre>
-       */
-      public Builder setVersion(int value) {
-        bitField0_ |= 0x00000001;
-        version_ = value;
-        onChanged();
-        return this;
+      if (((bitField0_ & 0x00000100) == 0x00000100)) {
+        output.writeMessage(12, getExchangeRate());
       }
-      /**
-       * <code>required int32 version = 1;</code>
-       *
-       * <pre>
-       * See Wallet.java for detailed description of pool semantics
-       * </pre>
-       */
-      public Builder clearVersion() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        version_ = 0;
-        onChanged();
-        return this;
+      if (((bitField0_ & 0x00000200) == 0x00000200)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 13, memo_);
+      }
+      if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        output.writeInt64(1000, includedInBestChainAt_);
       }
+      unknownFields.writeTo(output);
+    }
 
-      private com.google.protobuf.ByteString hash_ = com.google.protobuf.ByteString.EMPTY;
-      /**
-       * <code>required bytes hash = 2;</code>
-       */
-      public boolean hasHash() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(1, version_);
       }
-      /**
-       * <code>required bytes hash = 2;</code>
-       */
-      public com.google.protobuf.ByteString getHash() {
-        return hash_;
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(2, hash_);
       }
-      /**
-       * <code>required bytes hash = 2;</code>
-       */
-      public Builder setHash(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
-        hash_ = value;
-        onChanged();
-        return this;
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(3, pool_);
       }
-      /**
-       * <code>required bytes hash = 2;</code>
-       */
-      public Builder clearHash() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        hash_ = getDefaultInstance().getHash();
-        onChanged();
-        return this;
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(4, lockTime_);
       }
-
-      private org.bitcoinj.wallet.Protos.Transaction.Pool pool_ = org.bitcoinj.wallet.Protos.Transaction.Pool.UNSPENT;
-      /**
-       * <code>optional .wallet.Transaction.Pool pool = 3;</code>
-       *
-       * <pre>
-       * If pool is not present, that means either:
-       *  - This Transaction is either not in a wallet at all (the proto is re-used elsewhere)
-       *  - Or it is stored but for other purposes, for example, because it is the overriding transaction of a double spend.
-       *  - Or the Pool enum got a new value which your software is too old to parse.
-       * </pre>
-       */
-      public boolean hasPool() {
-        return ((bitField0_ & 0x00000004) == 0x00000004);
+      if (((bitField0_ & 0x00000010) == 0x00000010)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt64Size(5, updatedAt_);
       }
-      /**
-       * <code>optional .wallet.Transaction.Pool pool = 3;</code>
-       *
-       * <pre>
-       * If pool is not present, that means either:
-       *  - This Transaction is either not in a wallet at all (the proto is re-used elsewhere)
-       *  - Or it is stored but for other purposes, for example, because it is the overriding transaction of a double spend.
-       *  - Or the Pool enum got a new value which your software is too old to parse.
-       * </pre>
-       */
-      public org.bitcoinj.wallet.Protos.Transaction.Pool getPool() {
-        return pool_;
+      for (int i = 0; i < transactionInput_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(6, transactionInput_.get(i));
       }
-      /**
-       * <code>optional .wallet.Transaction.Pool pool = 3;</code>
-       *
-       * <pre>
-       * If pool is not present, that means either:
-       *  - This Transaction is either not in a wallet at all (the proto is re-used elsewhere)
-       *  - Or it is stored but for other purposes, for example, because it is the overriding transaction of a double spend.
-       *  - Or the Pool enum got a new value which your software is too old to parse.
-       * </pre>
-       */
-      public Builder setPool(org.bitcoinj.wallet.Protos.Transaction.Pool value) {
-        if (value == null) {
-          throw new NullPointerException();
+      for (int i = 0; i < transactionOutput_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(7, transactionOutput_.get(i));
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < blockHash_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeBytesSizeNoTag(blockHash_.get(i));
         }
-        bitField0_ |= 0x00000004;
-        pool_ = value;
-        onChanged();
-        return this;
+        size += dataSize;
+        size += 1 * getBlockHashList().size();
       }
-      /**
-       * <code>optional .wallet.Transaction.Pool pool = 3;</code>
-       *
-       * <pre>
-       * If pool is not present, that means either:
-       *  - This Transaction is either not in a wallet at all (the proto is re-used elsewhere)
-       *  - Or it is stored but for other purposes, for example, because it is the overriding transaction of a double spend.
-       *  - Or the Pool enum got a new value which your software is too old to parse.
-       * </pre>
-       */
-      public Builder clearPool() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        pool_ = org.bitcoinj.wallet.Protos.Transaction.Pool.UNSPENT;
-        onChanged();
-        return this;
+      if (((bitField0_ & 0x00000040) == 0x00000040)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(9, getConfidence());
+      }
+      if (((bitField0_ & 0x00000080) == 0x00000080)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(10, purpose_);
       }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < blockRelativityOffsets_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(blockRelativityOffsets_.get(i));
+        }
+        size += dataSize;
+        size += 1 * getBlockRelativityOffsetsList().size();
+      }
+      if (((bitField0_ & 0x00000100) == 0x00000100)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(12, getExchangeRate());
+      }
+      if (((bitField0_ & 0x00000200) == 0x00000200)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, memo_);
+      }
+      if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt64Size(1000, includedInBestChainAt_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
 
-      private int lockTime_ ;
-      /**
-       * <code>optional uint32 lock_time = 4;</code>
-       *
-       * <pre>
-       * The nLockTime field is useful for contracts.
-       * </pre>
-       */
-      public boolean hasLockTime() {
-        return ((bitField0_ & 0x00000008) == 0x00000008);
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoinj.wallet.Protos.Transaction)) {
+        return super.equals(obj);
+      }
+      org.bitcoinj.wallet.Protos.Transaction other = (org.bitcoinj.wallet.Protos.Transaction) obj;
+
+      boolean result = true;
+      result = result && (hasVersion() == other.hasVersion());
+      if (hasVersion()) {
+        result = result && (getVersion()
+            == other.getVersion());
+      }
+      result = result && (hasHash() == other.hasHash());
+      if (hasHash()) {
+        result = result && getHash()
+            .equals(other.getHash());
+      }
+      result = result && (hasPool() == other.hasPool());
+      if (hasPool()) {
+        result = result && pool_ == other.pool_;
+      }
+      result = result && (hasLockTime() == other.hasLockTime());
+      if (hasLockTime()) {
+        result = result && (getLockTime()
+            == other.getLockTime());
+      }
+      result = result && (hasUpdatedAt() == other.hasUpdatedAt());
+      if (hasUpdatedAt()) {
+        result = result && (getUpdatedAt()
+            == other.getUpdatedAt());
+      }
+      result = result && (hasIncludedInBestChainAt() == other.hasIncludedInBestChainAt());
+      if (hasIncludedInBestChainAt()) {
+        result = result && (getIncludedInBestChainAt()
+            == other.getIncludedInBestChainAt());
+      }
+      result = result && getTransactionInputList()
+          .equals(other.getTransactionInputList());
+      result = result && getTransactionOutputList()
+          .equals(other.getTransactionOutputList());
+      result = result && getBlockHashList()
+          .equals(other.getBlockHashList());
+      result = result && getBlockRelativityOffsetsList()
+          .equals(other.getBlockRelativityOffsetsList());
+      result = result && (hasConfidence() == other.hasConfidence());
+      if (hasConfidence()) {
+        result = result && getConfidence()
+            .equals(other.getConfidence());
       }
-      /**
-       * <code>optional uint32 lock_time = 4;</code>
-       *
-       * <pre>
-       * The nLockTime field is useful for contracts.
-       * </pre>
-       */
-      public int getLockTime() {
-        return lockTime_;
+      result = result && (hasPurpose() == other.hasPurpose());
+      if (hasPurpose()) {
+        result = result && purpose_ == other.purpose_;
       }
-      /**
-       * <code>optional uint32 lock_time = 4;</code>
-       *
-       * <pre>
-       * The nLockTime field is useful for contracts.
-       * </pre>
-       */
-      public Builder setLockTime(int value) {
-        bitField0_ |= 0x00000008;
-        lockTime_ = value;
-        onChanged();
-        return this;
+      result = result && (hasExchangeRate() == other.hasExchangeRate());
+      if (hasExchangeRate()) {
+        result = result && getExchangeRate()
+            .equals(other.getExchangeRate());
       }
-      /**
-       * <code>optional uint32 lock_time = 4;</code>
-       *
-       * <pre>
-       * The nLockTime field is useful for contracts.
-       * </pre>
-       */
-      public Builder clearLockTime() {
-        bitField0_ = (bitField0_ & ~0x00000008);
-        lockTime_ = 0;
-        onChanged();
-        return this;
+      result = result && (hasMemo() == other.hasMemo());
+      if (hasMemo()) {
+        result = result && getMemo()
+            .equals(other.getMemo());
       }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
 
-      private long updatedAt_ ;
-      /**
-       * <code>optional int64 updated_at = 5;</code>
-       *
-       * <pre>
-       * millis since epoch the transaction was last updated
-       * </pre>
-       */
-      public boolean hasUpdatedAt() {
-        return ((bitField0_ & 0x00000010) == 0x00000010);
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasVersion()) {
+        hash = (37 * hash) + VERSION_FIELD_NUMBER;
+        hash = (53 * hash) + getVersion();
+      }
+      if (hasHash()) {
+        hash = (37 * hash) + HASH_FIELD_NUMBER;
+        hash = (53 * hash) + getHash().hashCode();
+      }
+      if (hasPool()) {
+        hash = (37 * hash) + POOL_FIELD_NUMBER;
+        hash = (53 * hash) + pool_;
+      }
+      if (hasLockTime()) {
+        hash = (37 * hash) + LOCK_TIME_FIELD_NUMBER;
+        hash = (53 * hash) + getLockTime();
+      }
+      if (hasUpdatedAt()) {
+        hash = (37 * hash) + UPDATED_AT_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getUpdatedAt());
+      }
+      if (hasIncludedInBestChainAt()) {
+        hash = (37 * hash) + INCLUDED_IN_BEST_CHAIN_AT_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getIncludedInBestChainAt());
+      }
+      if (getTransactionInputCount() > 0) {
+        hash = (37 * hash) + TRANSACTION_INPUT_FIELD_NUMBER;
+        hash = (53 * hash) + getTransactionInputList().hashCode();
+      }
+      if (getTransactionOutputCount() > 0) {
+        hash = (37 * hash) + TRANSACTION_OUTPUT_FIELD_NUMBER;
+        hash = (53 * hash) + getTransactionOutputList().hashCode();
+      }
+      if (getBlockHashCount() > 0) {
+        hash = (37 * hash) + BLOCK_HASH_FIELD_NUMBER;
+        hash = (53 * hash) + getBlockHashList().hashCode();
+      }
+      if (getBlockRelativityOffsetsCount() > 0) {
+        hash = (37 * hash) + BLOCK_RELATIVITY_OFFSETS_FIELD_NUMBER;
+        hash = (53 * hash) + getBlockRelativityOffsetsList().hashCode();
       }
-      /**
-       * <code>optional int64 updated_at = 5;</code>
-       *
-       * <pre>
-       * millis since epoch the transaction was last updated
-       * </pre>
-       */
-      public long getUpdatedAt() {
-        return updatedAt_;
+      if (hasConfidence()) {
+        hash = (37 * hash) + CONFIDENCE_FIELD_NUMBER;
+        hash = (53 * hash) + getConfidence().hashCode();
       }
-      /**
-       * <code>optional int64 updated_at = 5;</code>
-       *
-       * <pre>
-       * millis since epoch the transaction was last updated
-       * </pre>
-       */
-      public Builder setUpdatedAt(long value) {
-        bitField0_ |= 0x00000010;
-        updatedAt_ = value;
-        onChanged();
-        return this;
+      if (hasPurpose()) {
+        hash = (37 * hash) + PURPOSE_FIELD_NUMBER;
+        hash = (53 * hash) + purpose_;
       }
-      /**
-       * <code>optional int64 updated_at = 5;</code>
-       *
-       * <pre>
-       * millis since epoch the transaction was last updated
-       * </pre>
-       */
-      public Builder clearUpdatedAt() {
-        bitField0_ = (bitField0_ & ~0x00000010);
-        updatedAt_ = 0L;
-        onChanged();
-        return this;
+      if (hasExchangeRate()) {
+        hash = (37 * hash) + EXCHANGE_RATE_FIELD_NUMBER;
+        hash = (53 * hash) + getExchangeRate().hashCode();
       }
-
-      private java.util.List<org.bitcoinj.wallet.Protos.TransactionInput> transactionInput_ =
-        java.util.Collections.emptyList();
-      private void ensureTransactionInputIsMutable() {
-        if (!((bitField0_ & 0x00000020) == 0x00000020)) {
-          transactionInput_ = new java.util.ArrayList<org.bitcoinj.wallet.Protos.TransactionInput>(transactionInput_);
-          bitField0_ |= 0x00000020;
-         }
+      if (hasMemo()) {
+        hash = (37 * hash) + MEMO_FIELD_NUMBER;
+        hash = (53 * hash) + getMemo().hashCode();
       }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
 
-      private com.google.protobuf.RepeatedFieldBuilder<
-          org.bitcoinj.wallet.Protos.TransactionInput, org.bitcoinj.wallet.Protos.TransactionInput.Builder, org.bitcoinj.wallet.Protos.TransactionInputOrBuilder> transactionInputBuilder_;
+    public static org.bitcoinj.wallet.Protos.Transaction parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.wallet.Protos.Transaction parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.bitcoinj.wallet.Protos.Transaction parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.wallet.Protos.Transaction parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.bitcoinj.wallet.Protos.Transaction parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.wallet.Protos.Transaction parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.bitcoinj.wallet.Protos.Transaction parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static org.bitcoinj.wallet.Protos.Transaction parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static org.bitcoinj.wallet.Protos.Transaction parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static org.bitcoinj.wallet.Protos.Transaction parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static org.bitcoinj.wallet.Protos.Transaction parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static org.bitcoinj.wallet.Protos.Transaction parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
 
-      /**
-       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-       */
-      public java.util.List<org.bitcoinj.wallet.Protos.TransactionInput> getTransactionInputList() {
-        if (transactionInputBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(transactionInput_);
-        } else {
-          return transactionInputBuilder_.getMessageList();
-        }
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(org.bitcoinj.wallet.Protos.Transaction prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code wallet.Transaction}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:wallet.Transaction)
+        org.bitcoinj.wallet.Protos.TransactionOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_Transaction_descriptor;
       }
-      /**
-       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-       */
-      public int getTransactionInputCount() {
-        if (transactionInputBuilder_ == null) {
-          return transactionInput_.size();
-        } else {
-          return transactionInputBuilder_.getCount();
-        }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_Transaction_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                org.bitcoinj.wallet.Protos.Transaction.class, org.bitcoinj.wallet.Protos.Transaction.Builder.class);
       }
-      /**
-       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-       */
-      public org.bitcoinj.wallet.Protos.TransactionInput getTransactionInput(int index) {
-        if (transactionInputBuilder_ == null) {
-          return transactionInput_.get(index);
-        } else {
-          return transactionInputBuilder_.getMessage(index);
-        }
+
+      // Construct using org.bitcoinj.wallet.Protos.Transaction.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
       }
-      /**
-       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-       */
-      public Builder setTransactionInput(
-          int index, org.bitcoinj.wallet.Protos.TransactionInput value) {
-        if (transactionInputBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureTransactionInputIsMutable();
-          transactionInput_.set(index, value);
-          onChanged();
-        } else {
-          transactionInputBuilder_.setMessage(index, value);
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getTransactionInputFieldBuilder();
+          getTransactionOutputFieldBuilder();
+          getConfidenceFieldBuilder();
+          getExchangeRateFieldBuilder();
         }
-        return this;
       }
-      /**
-       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-       */
-      public Builder setTransactionInput(
-          int index, org.bitcoinj.wallet.Protos.TransactionInput.Builder builderForValue) {
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        version_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        hash_ = com.google.protobuf.ByteString.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        pool_ = 4;
+        bitField0_ = (bitField0_ & ~0x00000004);
+        lockTime_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000008);
+        updatedAt_ = 0L;
+        bitField0_ = (bitField0_ & ~0x00000010);
+        includedInBestChainAt_ = 0L;
+        bitField0_ = (bitField0_ & ~0x00000020);
         if (transactionInputBuilder_ == null) {
-          ensureTransactionInputIsMutable();
-          transactionInput_.set(index, builderForValue.build());
-          onChanged();
+          transactionInput_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000040);
         } else {
-          transactionInputBuilder_.setMessage(index, builderForValue.build());
+          transactionInputBuilder_.clear();
         }
-        return this;
-      }
-      /**
-       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-       */
-      public Builder addTransactionInput(org.bitcoinj.wallet.Protos.TransactionInput value) {
-        if (transactionInputBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureTransactionInputIsMutable();
-          transactionInput_.add(value);
-          onChanged();
+        if (transactionOutputBuilder_ == null) {
+          transactionOutput_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000080);
         } else {
-          transactionInputBuilder_.addMessage(value);
+          transactionOutputBuilder_.clear();
         }
-        return this;
-      }
-      /**
-       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-       */
-      public Builder addTransactionInput(
-          int index, org.bitcoinj.wallet.Protos.TransactionInput value) {
-        if (transactionInputBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureTransactionInputIsMutable();
-          transactionInput_.add(index, value);
-          onChanged();
+        blockHash_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000100);
+        blockRelativityOffsets_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000200);
+        if (confidenceBuilder_ == null) {
+          confidence_ = null;
         } else {
-          transactionInputBuilder_.addMessage(index, value);
+          confidenceBuilder_.clear();
         }
-        return this;
-      }
-      /**
-       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-       */
-      public Builder addTransactionInput(
-          org.bitcoinj.wallet.Protos.TransactionInput.Builder builderForValue) {
-        if (transactionInputBuilder_ == null) {
-          ensureTransactionInputIsMutable();
-          transactionInput_.add(builderForValue.build());
-          onChanged();
+        bitField0_ = (bitField0_ & ~0x00000400);
+        purpose_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000800);
+        if (exchangeRateBuilder_ == null) {
+          exchangeRate_ = null;
         } else {
-          transactionInputBuilder_.addMessage(builderForValue.build());
+          exchangeRateBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00001000);
+        memo_ = "";
+        bitField0_ = (bitField0_ & ~0x00002000);
         return this;
       }
-      /**
-       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-       */
-      public Builder addTransactionInput(
-          int index, org.bitcoinj.wallet.Protos.TransactionInput.Builder builderForValue) {
-        if (transactionInputBuilder_ == null) {
-          ensureTransactionInputIsMutable();
-          transactionInput_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          transactionInputBuilder_.addMessage(index, builderForValue.build());
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_Transaction_descriptor;
+      }
+
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.Transaction getDefaultInstanceForType() {
+        return org.bitcoinj.wallet.Protos.Transaction.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.Transaction build() {
+        org.bitcoinj.wallet.Protos.Transaction result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
         }
-        return this;
+        return result;
       }
-      /**
-       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-       */
-      public Builder addAllTransactionInput(
-          java.lang.Iterable<? extends org.bitcoinj.wallet.Protos.TransactionInput> values) {
+
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.Transaction buildPartial() {
+        org.bitcoinj.wallet.Protos.Transaction result = new org.bitcoinj.wallet.Protos.Transaction(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.version_ = version_;
+        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+          to_bitField0_ |= 0x00000002;
+        }
+        result.hash_ = hash_;
+        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+          to_bitField0_ |= 0x00000004;
+        }
+        result.pool_ = pool_;
+        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+          to_bitField0_ |= 0x00000008;
+        }
+        result.lockTime_ = lockTime_;
+        if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
+          to_bitField0_ |= 0x00000010;
+        }
+        result.updatedAt_ = updatedAt_;
+        if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
+          to_bitField0_ |= 0x00000020;
+        }
+        result.includedInBestChainAt_ = includedInBestChainAt_;
         if (transactionInputBuilder_ == null) {
-          ensureTransactionInputIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, transactionInput_);
-          onChanged();
+          if (((bitField0_ & 0x00000040) == 0x00000040)) {
+            transactionInput_ = java.util.Collections.unmodifiableList(transactionInput_);
+            bitField0_ = (bitField0_ & ~0x00000040);
+          }
+          result.transactionInput_ = transactionInput_;
         } else {
-          transactionInputBuilder_.addAllMessages(values);
+          result.transactionInput_ = transactionInputBuilder_.build();
         }
-        return this;
-      }
-      /**
-       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-       */
-      public Builder clearTransactionInput() {
-        if (transactionInputBuilder_ == null) {
-          transactionInput_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000020);
-          onChanged();
+        if (transactionOutputBuilder_ == null) {
+          if (((bitField0_ & 0x00000080) == 0x00000080)) {
+            transactionOutput_ = java.util.Collections.unmodifiableList(transactionOutput_);
+            bitField0_ = (bitField0_ & ~0x00000080);
+          }
+          result.transactionOutput_ = transactionOutput_;
         } else {
-          transactionInputBuilder_.clear();
+          result.transactionOutput_ = transactionOutputBuilder_.build();
         }
-        return this;
-      }
-      /**
-       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-       */
-      public Builder removeTransactionInput(int index) {
-        if (transactionInputBuilder_ == null) {
-          ensureTransactionInputIsMutable();
-          transactionInput_.remove(index);
-          onChanged();
+        if (((bitField0_ & 0x00000100) == 0x00000100)) {
+          blockHash_ = java.util.Collections.unmodifiableList(blockHash_);
+          bitField0_ = (bitField0_ & ~0x00000100);
+        }
+        result.blockHash_ = blockHash_;
+        if (((bitField0_ & 0x00000200) == 0x00000200)) {
+          blockRelativityOffsets_ = java.util.Collections.unmodifiableList(blockRelativityOffsets_);
+          bitField0_ = (bitField0_ & ~0x00000200);
+        }
+        result.blockRelativityOffsets_ = blockRelativityOffsets_;
+        if (((from_bitField0_ & 0x00000400) == 0x00000400)) {
+          to_bitField0_ |= 0x00000040;
+        }
+        if (confidenceBuilder_ == null) {
+          result.confidence_ = confidence_;
         } else {
-          transactionInputBuilder_.remove(index);
+          result.confidence_ = confidenceBuilder_.build();
         }
-        return this;
-      }
-      /**
-       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-       */
-      public org.bitcoinj.wallet.Protos.TransactionInput.Builder getTransactionInputBuilder(
-          int index) {
-        return getTransactionInputFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-       */
-      public org.bitcoinj.wallet.Protos.TransactionInputOrBuilder getTransactionInputOrBuilder(
-          int index) {
-        if (transactionInputBuilder_ == null) {
-          return transactionInput_.get(index);  } else {
-          return transactionInputBuilder_.getMessageOrBuilder(index);
+        if (((from_bitField0_ & 0x00000800) == 0x00000800)) {
+          to_bitField0_ |= 0x00000080;
         }
-      }
-      /**
-       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-       */
-      public java.util.List<? extends org.bitcoinj.wallet.Protos.TransactionInputOrBuilder> 
-           getTransactionInputOrBuilderList() {
-        if (transactionInputBuilder_ != null) {
-          return transactionInputBuilder_.getMessageOrBuilderList();
+        result.purpose_ = purpose_;
+        if (((from_bitField0_ & 0x00001000) == 0x00001000)) {
+          to_bitField0_ |= 0x00000100;
+        }
+        if (exchangeRateBuilder_ == null) {
+          result.exchangeRate_ = exchangeRate_;
         } else {
-          return java.util.Collections.unmodifiableList(transactionInput_);
+          result.exchangeRate_ = exchangeRateBuilder_.build();
         }
-      }
-      /**
-       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-       */
-      public org.bitcoinj.wallet.Protos.TransactionInput.Builder addTransactionInputBuilder() {
-        return getTransactionInputFieldBuilder().addBuilder(
-            org.bitcoinj.wallet.Protos.TransactionInput.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-       */
-      public org.bitcoinj.wallet.Protos.TransactionInput.Builder addTransactionInputBuilder(
-          int index) {
-        return getTransactionInputFieldBuilder().addBuilder(
-            index, org.bitcoinj.wallet.Protos.TransactionInput.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
-       */
-      public java.util.List<org.bitcoinj.wallet.Protos.TransactionInput.Builder> 
-           getTransactionInputBuilderList() {
-        return getTransactionInputFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilder<
-          org.bitcoinj.wallet.Protos.TransactionInput, org.bitcoinj.wallet.Protos.TransactionInput.Builder, org.bitcoinj.wallet.Protos.TransactionInputOrBuilder> 
-          getTransactionInputFieldBuilder() {
-        if (transactionInputBuilder_ == null) {
-          transactionInputBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.bitcoinj.wallet.Protos.TransactionInput, org.bitcoinj.wallet.Protos.TransactionInput.Builder, org.bitcoinj.wallet.Protos.TransactionInputOrBuilder>(
-                  transactionInput_,
-                  ((bitField0_ & 0x00000020) == 0x00000020),
-                  getParentForChildren(),
-                  isClean());
-          transactionInput_ = null;
+        if (((from_bitField0_ & 0x00002000) == 0x00002000)) {
+          to_bitField0_ |= 0x00000200;
         }
-        return transactionInputBuilder_;
+        result.memo_ = memo_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
       }
 
-      private java.util.List<org.bitcoinj.wallet.Protos.TransactionOutput> transactionOutput_ =
-        java.util.Collections.emptyList();
-      private void ensureTransactionOutputIsMutable() {
-        if (!((bitField0_ & 0x00000040) == 0x00000040)) {
-          transactionOutput_ = new java.util.ArrayList<org.bitcoinj.wallet.Protos.TransactionOutput>(transactionOutput_);
-          bitField0_ |= 0x00000040;
-         }
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof org.bitcoinj.wallet.Protos.Transaction) {
+          return mergeFrom((org.bitcoinj.wallet.Protos.Transaction)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
       }
 
-      private com.google.protobuf.RepeatedFieldBuilder<
-          org.bitcoinj.wallet.Protos.TransactionOutput, org.bitcoinj.wallet.Protos.TransactionOutput.Builder, org.bitcoinj.wallet.Protos.TransactionOutputOrBuilder> transactionOutputBuilder_;
-
-      /**
-       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
-       */
-      public java.util.List<org.bitcoinj.wallet.Protos.TransactionOutput> getTransactionOutputList() {
-        if (transactionOutputBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(transactionOutput_);
+      public Builder mergeFrom(org.bitcoinj.wallet.Protos.Transaction other) {
+        if (other == org.bitcoinj.wallet.Protos.Transaction.getDefaultInstance()) return this;
+        if (other.hasVersion()) {
+          setVersion(other.getVersion());
+        }
+        if (other.hasHash()) {
+          setHash(other.getHash());
+        }
+        if (other.hasPool()) {
+          setPool(other.getPool());
+        }
+        if (other.hasLockTime()) {
+          setLockTime(other.getLockTime());
+        }
+        if (other.hasUpdatedAt()) {
+          setUpdatedAt(other.getUpdatedAt());
+        }
+        if (other.hasIncludedInBestChainAt()) {
+          setIncludedInBestChainAt(other.getIncludedInBestChainAt());
+        }
+        if (transactionInputBuilder_ == null) {
+          if (!other.transactionInput_.isEmpty()) {
+            if (transactionInput_.isEmpty()) {
+              transactionInput_ = other.transactionInput_;
+              bitField0_ = (bitField0_ & ~0x00000040);
+            } else {
+              ensureTransactionInputIsMutable();
+              transactionInput_.addAll(other.transactionInput_);
+            }
+            onChanged();
+          }
         } else {
-          return transactionOutputBuilder_.getMessageList();
+          if (!other.transactionInput_.isEmpty()) {
+            if (transactionInputBuilder_.isEmpty()) {
+              transactionInputBuilder_.dispose();
+              transactionInputBuilder_ = null;
+              transactionInput_ = other.transactionInput_;
+              bitField0_ = (bitField0_ & ~0x00000040);
+              transactionInputBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getTransactionInputFieldBuilder() : null;
+            } else {
+              transactionInputBuilder_.addAllMessages(other.transactionInput_);
+            }
+          }
         }
-      }
-      /**
-       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
-       */
-      public int getTransactionOutputCount() {
         if (transactionOutputBuilder_ == null) {
-          return transactionOutput_.size();
+          if (!other.transactionOutput_.isEmpty()) {
+            if (transactionOutput_.isEmpty()) {
+              transactionOutput_ = other.transactionOutput_;
+              bitField0_ = (bitField0_ & ~0x00000080);
+            } else {
+              ensureTransactionOutputIsMutable();
+              transactionOutput_.addAll(other.transactionOutput_);
+            }
+            onChanged();
+          }
         } else {
-          return transactionOutputBuilder_.getCount();
+          if (!other.transactionOutput_.isEmpty()) {
+            if (transactionOutputBuilder_.isEmpty()) {
+              transactionOutputBuilder_.dispose();
+              transactionOutputBuilder_ = null;
+              transactionOutput_ = other.transactionOutput_;
+              bitField0_ = (bitField0_ & ~0x00000080);
+              transactionOutputBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getTransactionOutputFieldBuilder() : null;
+            } else {
+              transactionOutputBuilder_.addAllMessages(other.transactionOutput_);
+            }
+          }
         }
-      }
-      /**
-       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
-       */
-      public org.bitcoinj.wallet.Protos.TransactionOutput getTransactionOutput(int index) {
-        if (transactionOutputBuilder_ == null) {
-          return transactionOutput_.get(index);
-        } else {
-          return transactionOutputBuilder_.getMessage(index);
+        if (!other.blockHash_.isEmpty()) {
+          if (blockHash_.isEmpty()) {
+            blockHash_ = other.blockHash_;
+            bitField0_ = (bitField0_ & ~0x00000100);
+          } else {
+            ensureBlockHashIsMutable();
+            blockHash_.addAll(other.blockHash_);
+          }
+          onChanged();
         }
-      }
-      /**
-       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
-       */
-      public Builder setTransactionOutput(
-          int index, org.bitcoinj.wallet.Protos.TransactionOutput value) {
-        if (transactionOutputBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
+        if (!other.blockRelativityOffsets_.isEmpty()) {
+          if (blockRelativityOffsets_.isEmpty()) {
+            blockRelativityOffsets_ = other.blockRelativityOffsets_;
+            bitField0_ = (bitField0_ & ~0x00000200);
+          } else {
+            ensureBlockRelativityOffsetsIsMutable();
+            blockRelativityOffsets_.addAll(other.blockRelativityOffsets_);
           }
-          ensureTransactionOutputIsMutable();
-          transactionOutput_.set(index, value);
           onChanged();
-        } else {
-          transactionOutputBuilder_.setMessage(index, value);
         }
-        return this;
-      }
-      /**
-       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
-       */
-      public Builder setTransactionOutput(
-          int index, org.bitcoinj.wallet.Protos.TransactionOutput.Builder builderForValue) {
-        if (transactionOutputBuilder_ == null) {
-          ensureTransactionOutputIsMutable();
-          transactionOutput_.set(index, builderForValue.build());
+        if (other.hasConfidence()) {
+          mergeConfidence(other.getConfidence());
+        }
+        if (other.hasPurpose()) {
+          setPurpose(other.getPurpose());
+        }
+        if (other.hasExchangeRate()) {
+          mergeExchangeRate(other.getExchangeRate());
+        }
+        if (other.hasMemo()) {
+          bitField0_ |= 0x00002000;
+          memo_ = other.memo_;
           onChanged();
-        } else {
-          transactionOutputBuilder_.setMessage(index, builderForValue.build());
         }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
-      /**
-       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
-       */
-      public Builder addTransactionOutput(org.bitcoinj.wallet.Protos.TransactionOutput value) {
-        if (transactionOutputBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        if (!hasVersion()) {
+          return false;
+        }
+        if (!hasHash()) {
+          return false;
+        }
+        for (int i = 0; i < getTransactionInputCount(); i++) {
+          if (!getTransactionInput(i).isInitialized()) {
+            return false;
           }
-          ensureTransactionOutputIsMutable();
-          transactionOutput_.add(value);
-          onChanged();
-        } else {
-          transactionOutputBuilder_.addMessage(value);
         }
-        return this;
-      }
-      /**
-       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
-       */
-      public Builder addTransactionOutput(
-          int index, org.bitcoinj.wallet.Protos.TransactionOutput value) {
-        if (transactionOutputBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
+        for (int i = 0; i < getTransactionOutputCount(); i++) {
+          if (!getTransactionOutput(i).isInitialized()) {
+            return false;
           }
-          ensureTransactionOutputIsMutable();
-          transactionOutput_.add(index, value);
-          onChanged();
-        } else {
-          transactionOutputBuilder_.addMessage(index, value);
         }
-        return this;
+        if (hasConfidence()) {
+          if (!getConfidence().isInitialized()) {
+            return false;
+          }
+        }
+        if (hasExchangeRate()) {
+          if (!getExchangeRate().isInitialized()) {
+            return false;
+          }
+        }
+        return true;
       }
-      /**
-       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
-       */
-      public Builder addTransactionOutput(
-          org.bitcoinj.wallet.Protos.TransactionOutput.Builder builderForValue) {
-        if (transactionOutputBuilder_ == null) {
-          ensureTransactionOutputIsMutable();
-          transactionOutput_.add(builderForValue.build());
-          onChanged();
-        } else {
-          transactionOutputBuilder_.addMessage(builderForValue.build());
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        org.bitcoinj.wallet.Protos.Transaction parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (org.bitcoinj.wallet.Protos.Transaction) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
         }
         return this;
       }
+      private int bitField0_;
+
+      private int version_ ;
       /**
-       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+       * <pre>
+       * See Wallet.java for detailed description of pool semantics
+       * </pre>
+       *
+       * <code>required int32 version = 1;</code>
        */
-      public Builder addTransactionOutput(
-          int index, org.bitcoinj.wallet.Protos.TransactionOutput.Builder builderForValue) {
-        if (transactionOutputBuilder_ == null) {
-          ensureTransactionOutputIsMutable();
-          transactionOutput_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          transactionOutputBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
+      public boolean hasVersion() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+       * <pre>
+       * See Wallet.java for detailed description of pool semantics
+       * </pre>
+       *
+       * <code>required int32 version = 1;</code>
        */
-      public Builder addAllTransactionOutput(
-          java.lang.Iterable<? extends org.bitcoinj.wallet.Protos.TransactionOutput> values) {
-        if (transactionOutputBuilder_ == null) {
-          ensureTransactionOutputIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, transactionOutput_);
-          onChanged();
-        } else {
-          transactionOutputBuilder_.addAllMessages(values);
-        }
-        return this;
+      public int getVersion() {
+        return version_;
       }
       /**
-       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+       * <pre>
+       * See Wallet.java for detailed description of pool semantics
+       * </pre>
+       *
+       * <code>required int32 version = 1;</code>
        */
-      public Builder clearTransactionOutput() {
-        if (transactionOutputBuilder_ == null) {
-          transactionOutput_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000040);
-          onChanged();
-        } else {
-          transactionOutputBuilder_.clear();
-        }
+      public Builder setVersion(int value) {
+        bitField0_ |= 0x00000001;
+        version_ = value;
+        onChanged();
         return this;
       }
       /**
-       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+       * <pre>
+       * See Wallet.java for detailed description of pool semantics
+       * </pre>
+       *
+       * <code>required int32 version = 1;</code>
        */
-      public Builder removeTransactionOutput(int index) {
-        if (transactionOutputBuilder_ == null) {
-          ensureTransactionOutputIsMutable();
-          transactionOutput_.remove(index);
-          onChanged();
-        } else {
-          transactionOutputBuilder_.remove(index);
-        }
+      public Builder clearVersion() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        version_ = 0;
+        onChanged();
         return this;
       }
+
+      private com.google.protobuf.ByteString hash_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+       * <code>required bytes hash = 2;</code>
        */
-      public org.bitcoinj.wallet.Protos.TransactionOutput.Builder getTransactionOutputBuilder(
-          int index) {
-        return getTransactionOutputFieldBuilder().getBuilder(index);
+      public boolean hasHash() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+       * <code>required bytes hash = 2;</code>
        */
-      public org.bitcoinj.wallet.Protos.TransactionOutputOrBuilder getTransactionOutputOrBuilder(
-          int index) {
-        if (transactionOutputBuilder_ == null) {
-          return transactionOutput_.get(index);  } else {
-          return transactionOutputBuilder_.getMessageOrBuilder(index);
-        }
+      public com.google.protobuf.ByteString getHash() {
+        return hash_;
       }
       /**
-       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+       * <code>required bytes hash = 2;</code>
        */
-      public java.util.List<? extends org.bitcoinj.wallet.Protos.TransactionOutputOrBuilder> 
-           getTransactionOutputOrBuilderList() {
-        if (transactionOutputBuilder_ != null) {
-          return transactionOutputBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(transactionOutput_);
-        }
+      public Builder setHash(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000002;
+        hash_ = value;
+        onChanged();
+        return this;
       }
       /**
-       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+       * <code>required bytes hash = 2;</code>
        */
-      public org.bitcoinj.wallet.Protos.TransactionOutput.Builder addTransactionOutputBuilder() {
-        return getTransactionOutputFieldBuilder().addBuilder(
-            org.bitcoinj.wallet.Protos.TransactionOutput.getDefaultInstance());
+      public Builder clearHash() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        hash_ = getDefaultInstance().getHash();
+        onChanged();
+        return this;
       }
+
+      private int pool_ = 4;
       /**
-       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+       * <pre>
+       * If pool is not present, that means either:
+       *  - This Transaction is either not in a wallet at all (the proto is re-used elsewhere)
+       *  - Or it is stored but for other purposes, for example, because it is the overriding transaction of a double spend.
+       *  - Or the Pool enum got a new value which your software is too old to parse.
+       * </pre>
+       *
+       * <code>optional .wallet.Transaction.Pool pool = 3;</code>
        */
-      public org.bitcoinj.wallet.Protos.TransactionOutput.Builder addTransactionOutputBuilder(
-          int index) {
-        return getTransactionOutputFieldBuilder().addBuilder(
-            index, org.bitcoinj.wallet.Protos.TransactionOutput.getDefaultInstance());
+      public boolean hasPool() {
+        return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+       * <pre>
+       * If pool is not present, that means either:
+       *  - This Transaction is either not in a wallet at all (the proto is re-used elsewhere)
+       *  - Or it is stored but for other purposes, for example, because it is the overriding transaction of a double spend.
+       *  - Or the Pool enum got a new value which your software is too old to parse.
+       * </pre>
+       *
+       * <code>optional .wallet.Transaction.Pool pool = 3;</code>
        */
-      public java.util.List<org.bitcoinj.wallet.Protos.TransactionOutput.Builder> 
-           getTransactionOutputBuilderList() {
-        return getTransactionOutputFieldBuilder().getBuilderList();
+      public org.bitcoinj.wallet.Protos.Transaction.Pool getPool() {
+        @SuppressWarnings("deprecation")
+        org.bitcoinj.wallet.Protos.Transaction.Pool result = org.bitcoinj.wallet.Protos.Transaction.Pool.valueOf(pool_);
+        return result == null ? org.bitcoinj.wallet.Protos.Transaction.Pool.UNSPENT : result;
       }
-      private com.google.protobuf.RepeatedFieldBuilder<
-          org.bitcoinj.wallet.Protos.TransactionOutput, org.bitcoinj.wallet.Protos.TransactionOutput.Builder, org.bitcoinj.wallet.Protos.TransactionOutputOrBuilder> 
-          getTransactionOutputFieldBuilder() {
-        if (transactionOutputBuilder_ == null) {
-          transactionOutputBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.bitcoinj.wallet.Protos.TransactionOutput, org.bitcoinj.wallet.Protos.TransactionOutput.Builder, org.bitcoinj.wallet.Protos.TransactionOutputOrBuilder>(
-                  transactionOutput_,
-                  ((bitField0_ & 0x00000040) == 0x00000040),
-                  getParentForChildren(),
-                  isClean());
-          transactionOutput_ = null;
+      /**
+       * <pre>
+       * If pool is not present, that means either:
+       *  - This Transaction is either not in a wallet at all (the proto is re-used elsewhere)
+       *  - Or it is stored but for other purposes, for example, because it is the overriding transaction of a double spend.
+       *  - Or the Pool enum got a new value which your software is too old to parse.
+       * </pre>
+       *
+       * <code>optional .wallet.Transaction.Pool pool = 3;</code>
+       */
+      public Builder setPool(org.bitcoinj.wallet.Protos.Transaction.Pool value) {
+        if (value == null) {
+          throw new NullPointerException();
         }
-        return transactionOutputBuilder_;
-      }
-
-      private java.util.List<com.google.protobuf.ByteString> blockHash_ = java.util.Collections.emptyList();
-      private void ensureBlockHashIsMutable() {
-        if (!((bitField0_ & 0x00000080) == 0x00000080)) {
-          blockHash_ = new java.util.ArrayList<com.google.protobuf.ByteString>(blockHash_);
-          bitField0_ |= 0x00000080;
-         }
+        bitField0_ |= 0x00000004;
+        pool_ = value.getNumber();
+        onChanged();
+        return this;
       }
       /**
-       * <code>repeated bytes block_hash = 8;</code>
-       *
        * <pre>
-       * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
-       * ordering within a block.
+       * If pool is not present, that means either:
+       *  - This Transaction is either not in a wallet at all (the proto is re-used elsewhere)
+       *  - Or it is stored but for other purposes, for example, because it is the overriding transaction of a double spend.
+       *  - Or the Pool enum got a new value which your software is too old to parse.
        * </pre>
+       *
+       * <code>optional .wallet.Transaction.Pool pool = 3;</code>
        */
-      public java.util.List<com.google.protobuf.ByteString>
-          getBlockHashList() {
-        return java.util.Collections.unmodifiableList(blockHash_);
+      public Builder clearPool() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        pool_ = 4;
+        onChanged();
+        return this;
       }
+
+      private int lockTime_ ;
       /**
-       * <code>repeated bytes block_hash = 8;</code>
-       *
        * <pre>
-       * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
-       * ordering within a block.
+       * The nLockTime field is useful for contracts.
        * </pre>
+       *
+       * <code>optional uint32 lock_time = 4;</code>
        */
-      public int getBlockHashCount() {
-        return blockHash_.size();
+      public boolean hasLockTime() {
+        return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * <code>repeated bytes block_hash = 8;</code>
-       *
        * <pre>
-       * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
-       * ordering within a block.
+       * The nLockTime field is useful for contracts.
        * </pre>
+       *
+       * <code>optional uint32 lock_time = 4;</code>
        */
-      public com.google.protobuf.ByteString getBlockHash(int index) {
-        return blockHash_.get(index);
+      public int getLockTime() {
+        return lockTime_;
       }
       /**
-       * <code>repeated bytes block_hash = 8;</code>
-       *
        * <pre>
-       * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
-       * ordering within a block.
+       * The nLockTime field is useful for contracts.
        * </pre>
+       *
+       * <code>optional uint32 lock_time = 4;</code>
        */
-      public Builder setBlockHash(
-          int index, com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureBlockHashIsMutable();
-        blockHash_.set(index, value);
+      public Builder setLockTime(int value) {
+        bitField0_ |= 0x00000008;
+        lockTime_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>repeated bytes block_hash = 8;</code>
-       *
        * <pre>
-       * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
-       * ordering within a block.
+       * The nLockTime field is useful for contracts.
        * </pre>
+       *
+       * <code>optional uint32 lock_time = 4;</code>
        */
-      public Builder addBlockHash(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureBlockHashIsMutable();
-        blockHash_.add(value);
+      public Builder clearLockTime() {
+        bitField0_ = (bitField0_ & ~0x00000008);
+        lockTime_ = 0;
         onChanged();
         return this;
       }
+
+      private long updatedAt_ ;
       /**
-       * <code>repeated bytes block_hash = 8;</code>
-       *
        * <pre>
-       * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
-       * ordering within a block.
+       * millis since epoch the transaction was last updated
        * </pre>
+       *
+       * <code>optional int64 updated_at = 5;</code>
        */
-      public Builder addAllBlockHash(
-          java.lang.Iterable<? extends com.google.protobuf.ByteString> values) {
-        ensureBlockHashIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, blockHash_);
-        onChanged();
-        return this;
+      public boolean hasUpdatedAt() {
+        return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * <code>repeated bytes block_hash = 8;</code>
+       * <pre>
+       * millis since epoch the transaction was last updated
+       * </pre>
        *
+       * <code>optional int64 updated_at = 5;</code>
+       */
+      public long getUpdatedAt() {
+        return updatedAt_;
+      }
+      /**
        * <pre>
-       * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
-       * ordering within a block.
+       * millis since epoch the transaction was last updated
        * </pre>
+       *
+       * <code>optional int64 updated_at = 5;</code>
        */
-      public Builder clearBlockHash() {
-        blockHash_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000080);
+      public Builder setUpdatedAt(long value) {
+        bitField0_ |= 0x00000010;
+        updatedAt_ = value;
         onChanged();
         return this;
       }
-
-      private java.util.List<java.lang.Integer> blockRelativityOffsets_ = java.util.Collections.emptyList();
-      private void ensureBlockRelativityOffsetsIsMutable() {
-        if (!((bitField0_ & 0x00000100) == 0x00000100)) {
-          blockRelativityOffsets_ = new java.util.ArrayList<java.lang.Integer>(blockRelativityOffsets_);
-          bitField0_ |= 0x00000100;
-         }
-      }
       /**
-       * <code>repeated int32 block_relativity_offsets = 11;</code>
+       * <pre>
+       * millis since epoch the transaction was last updated
+       * </pre>
+       *
+       * <code>optional int64 updated_at = 5;</code>
        */
-      public java.util.List<java.lang.Integer>
-          getBlockRelativityOffsetsList() {
-        return java.util.Collections.unmodifiableList(blockRelativityOffsets_);
+      public Builder clearUpdatedAt() {
+        bitField0_ = (bitField0_ & ~0x00000010);
+        updatedAt_ = 0L;
+        onChanged();
+        return this;
       }
+
+      private long includedInBestChainAt_ ;
       /**
-       * <code>repeated int32 block_relativity_offsets = 11;</code>
+       * <pre>
+       * millis since epoch the transaction was included on the best chain
+       * </pre>
+       *
+       * <code>optional int64 included_in_best_chain_at = 1000;</code>
        */
-      public int getBlockRelativityOffsetsCount() {
-        return blockRelativityOffsets_.size();
+      public boolean hasIncludedInBestChainAt() {
+        return ((bitField0_ & 0x00000020) == 0x00000020);
       }
       /**
-       * <code>repeated int32 block_relativity_offsets = 11;</code>
+       * <pre>
+       * millis since epoch the transaction was included on the best chain
+       * </pre>
+       *
+       * <code>optional int64 included_in_best_chain_at = 1000;</code>
        */
-      public int getBlockRelativityOffsets(int index) {
-        return blockRelativityOffsets_.get(index);
+      public long getIncludedInBestChainAt() {
+        return includedInBestChainAt_;
       }
       /**
-       * <code>repeated int32 block_relativity_offsets = 11;</code>
+       * <pre>
+       * millis since epoch the transaction was included on the best chain
+       * </pre>
+       *
+       * <code>optional int64 included_in_best_chain_at = 1000;</code>
        */
-      public Builder setBlockRelativityOffsets(
-          int index, int value) {
-        ensureBlockRelativityOffsetsIsMutable();
-        blockRelativityOffsets_.set(index, value);
+      public Builder setIncludedInBestChainAt(long value) {
+        bitField0_ |= 0x00000020;
+        includedInBestChainAt_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>repeated int32 block_relativity_offsets = 11;</code>
+       * <pre>
+       * millis since epoch the transaction was included on the best chain
+       * </pre>
+       *
+       * <code>optional int64 included_in_best_chain_at = 1000;</code>
        */
-      public Builder addBlockRelativityOffsets(int value) {
-        ensureBlockRelativityOffsetsIsMutable();
-        blockRelativityOffsets_.add(value);
+      public Builder clearIncludedInBestChainAt() {
+        bitField0_ = (bitField0_ & ~0x00000020);
+        includedInBestChainAt_ = 0L;
         onChanged();
         return this;
       }
+
+      private java.util.List<org.bitcoinj.wallet.Protos.TransactionInput> transactionInput_ =
+        java.util.Collections.emptyList();
+      private void ensureTransactionInputIsMutable() {
+        if (!((bitField0_ & 0x00000040) == 0x00000040)) {
+          transactionInput_ = new java.util.ArrayList<org.bitcoinj.wallet.Protos.TransactionInput>(transactionInput_);
+          bitField0_ |= 0x00000040;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          org.bitcoinj.wallet.Protos.TransactionInput, org.bitcoinj.wallet.Protos.TransactionInput.Builder, org.bitcoinj.wallet.Protos.TransactionInputOrBuilder> transactionInputBuilder_;
+
       /**
-       * <code>repeated int32 block_relativity_offsets = 11;</code>
+       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
        */
-      public Builder addAllBlockRelativityOffsets(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureBlockRelativityOffsetsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, blockRelativityOffsets_);
-        onChanged();
-        return this;
+      public java.util.List<org.bitcoinj.wallet.Protos.TransactionInput> getTransactionInputList() {
+        if (transactionInputBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(transactionInput_);
+        } else {
+          return transactionInputBuilder_.getMessageList();
+        }
       }
       /**
-       * <code>repeated int32 block_relativity_offsets = 11;</code>
+       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
        */
-      public Builder clearBlockRelativityOffsets() {
-        blockRelativityOffsets_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000100);
-        onChanged();
+      public int getTransactionInputCount() {
+        if (transactionInputBuilder_ == null) {
+          return transactionInput_.size();
+        } else {
+          return transactionInputBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
+       */
+      public org.bitcoinj.wallet.Protos.TransactionInput getTransactionInput(int index) {
+        if (transactionInputBuilder_ == null) {
+          return transactionInput_.get(index);
+        } else {
+          return transactionInputBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
+       */
+      public Builder setTransactionInput(
+          int index, org.bitcoinj.wallet.Protos.TransactionInput value) {
+        if (transactionInputBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureTransactionInputIsMutable();
+          transactionInput_.set(index, value);
+          onChanged();
+        } else {
+          transactionInputBuilder_.setMessage(index, value);
+        }
         return this;
       }
-
-      private org.bitcoinj.wallet.Protos.TransactionConfidence confidence_ = org.bitcoinj.wallet.Protos.TransactionConfidence.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          org.bitcoinj.wallet.Protos.TransactionConfidence, org.bitcoinj.wallet.Protos.TransactionConfidence.Builder, org.bitcoinj.wallet.Protos.TransactionConfidenceOrBuilder> confidenceBuilder_;
       /**
-       * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
-       *
-       * <pre>
-       * Data describing where the transaction is in the chain.
-       * </pre>
+       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
        */
-      public boolean hasConfidence() {
-        return ((bitField0_ & 0x00000200) == 0x00000200);
+      public Builder setTransactionInput(
+          int index, org.bitcoinj.wallet.Protos.TransactionInput.Builder builderForValue) {
+        if (transactionInputBuilder_ == null) {
+          ensureTransactionInputIsMutable();
+          transactionInput_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          transactionInputBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
       }
       /**
-       * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
-       *
-       * <pre>
-       * Data describing where the transaction is in the chain.
-       * </pre>
+       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
        */
-      public org.bitcoinj.wallet.Protos.TransactionConfidence getConfidence() {
-        if (confidenceBuilder_ == null) {
-          return confidence_;
+      public Builder addTransactionInput(org.bitcoinj.wallet.Protos.TransactionInput value) {
+        if (transactionInputBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureTransactionInputIsMutable();
+          transactionInput_.add(value);
+          onChanged();
         } else {
-          return confidenceBuilder_.getMessage();
+          transactionInputBuilder_.addMessage(value);
         }
+        return this;
       }
       /**
-       * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
-       *
-       * <pre>
-       * Data describing where the transaction is in the chain.
-       * </pre>
+       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
        */
-      public Builder setConfidence(org.bitcoinj.wallet.Protos.TransactionConfidence value) {
-        if (confidenceBuilder_ == null) {
+      public Builder addTransactionInput(
+          int index, org.bitcoinj.wallet.Protos.TransactionInput value) {
+        if (transactionInputBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          confidence_ = value;
+          ensureTransactionInputIsMutable();
+          transactionInput_.add(index, value);
           onChanged();
         } else {
-          confidenceBuilder_.setMessage(value);
+          transactionInputBuilder_.addMessage(index, value);
         }
-        bitField0_ |= 0x00000200;
         return this;
       }
       /**
-       * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
-       *
-       * <pre>
-       * Data describing where the transaction is in the chain.
-       * </pre>
+       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
        */
-      public Builder setConfidence(
-          org.bitcoinj.wallet.Protos.TransactionConfidence.Builder builderForValue) {
-        if (confidenceBuilder_ == null) {
-          confidence_ = builderForValue.build();
+      public Builder addTransactionInput(
+          org.bitcoinj.wallet.Protos.TransactionInput.Builder builderForValue) {
+        if (transactionInputBuilder_ == null) {
+          ensureTransactionInputIsMutable();
+          transactionInput_.add(builderForValue.build());
           onChanged();
         } else {
-          confidenceBuilder_.setMessage(builderForValue.build());
+          transactionInputBuilder_.addMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000200;
         return this;
       }
       /**
-       * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
-       *
-       * <pre>
-       * Data describing where the transaction is in the chain.
-       * </pre>
+       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
        */
-      public Builder mergeConfidence(org.bitcoinj.wallet.Protos.TransactionConfidence value) {
-        if (confidenceBuilder_ == null) {
-          if (((bitField0_ & 0x00000200) == 0x00000200) &&
-              confidence_ != org.bitcoinj.wallet.Protos.TransactionConfidence.getDefaultInstance()) {
-            confidence_ =
-              org.bitcoinj.wallet.Protos.TransactionConfidence.newBuilder(confidence_).mergeFrom(value).buildPartial();
-          } else {
-            confidence_ = value;
-          }
+      public Builder addTransactionInput(
+          int index, org.bitcoinj.wallet.Protos.TransactionInput.Builder builderForValue) {
+        if (transactionInputBuilder_ == null) {
+          ensureTransactionInputIsMutable();
+          transactionInput_.add(index, builderForValue.build());
           onChanged();
         } else {
-          confidenceBuilder_.mergeFrom(value);
+          transactionInputBuilder_.addMessage(index, builderForValue.build());
         }
-        bitField0_ |= 0x00000200;
         return this;
       }
       /**
-       * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
-       *
-       * <pre>
-       * Data describing where the transaction is in the chain.
-       * </pre>
+       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
        */
-      public Builder clearConfidence() {
-        if (confidenceBuilder_ == null) {
-          confidence_ = org.bitcoinj.wallet.Protos.TransactionConfidence.getDefaultInstance();
+      public Builder addAllTransactionInput(
+          java.lang.Iterable<? extends org.bitcoinj.wallet.Protos.TransactionInput> values) {
+        if (transactionInputBuilder_ == null) {
+          ensureTransactionInputIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, transactionInput_);
           onChanged();
         } else {
-          confidenceBuilder_.clear();
+          transactionInputBuilder_.addAllMessages(values);
         }
-        bitField0_ = (bitField0_ & ~0x00000200);
         return this;
       }
       /**
-       * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
-       *
-       * <pre>
-       * Data describing where the transaction is in the chain.
-       * </pre>
+       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
        */
-      public org.bitcoinj.wallet.Protos.TransactionConfidence.Builder getConfidenceBuilder() {
-        bitField0_ |= 0x00000200;
-        onChanged();
-        return getConfidenceFieldBuilder().getBuilder();
+      public Builder clearTransactionInput() {
+        if (transactionInputBuilder_ == null) {
+          transactionInput_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000040);
+          onChanged();
+        } else {
+          transactionInputBuilder_.clear();
+        }
+        return this;
       }
       /**
-       * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
-       *
-       * <pre>
-       * Data describing where the transaction is in the chain.
-       * </pre>
+       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
        */
-      public org.bitcoinj.wallet.Protos.TransactionConfidenceOrBuilder getConfidenceOrBuilder() {
-        if (confidenceBuilder_ != null) {
-          return confidenceBuilder_.getMessageOrBuilder();
+      public Builder removeTransactionInput(int index) {
+        if (transactionInputBuilder_ == null) {
+          ensureTransactionInputIsMutable();
+          transactionInput_.remove(index);
+          onChanged();
         } else {
-          return confidence_;
+          transactionInputBuilder_.remove(index);
         }
+        return this;
       }
       /**
-       * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
-       *
-       * <pre>
-       * Data describing where the transaction is in the chain.
-       * </pre>
+       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
        */
-      private com.google.protobuf.SingleFieldBuilder<
-          org.bitcoinj.wallet.Protos.TransactionConfidence, org.bitcoinj.wallet.Protos.TransactionConfidence.Builder, org.bitcoinj.wallet.Protos.TransactionConfidenceOrBuilder> 
-          getConfidenceFieldBuilder() {
-        if (confidenceBuilder_ == null) {
-          confidenceBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              org.bitcoinj.wallet.Protos.TransactionConfidence, org.bitcoinj.wallet.Protos.TransactionConfidence.Builder, org.bitcoinj.wallet.Protos.TransactionConfidenceOrBuilder>(
-                  getConfidence(),
-                  getParentForChildren(),
-                  isClean());
-          confidence_ = null;
+      public org.bitcoinj.wallet.Protos.TransactionInput.Builder getTransactionInputBuilder(
+          int index) {
+        return getTransactionInputFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
+       */
+      public org.bitcoinj.wallet.Protos.TransactionInputOrBuilder getTransactionInputOrBuilder(
+          int index) {
+        if (transactionInputBuilder_ == null) {
+          return transactionInput_.get(index);  } else {
+          return transactionInputBuilder_.getMessageOrBuilder(index);
         }
-        return confidenceBuilder_;
       }
-
-      private org.bitcoinj.wallet.Protos.Transaction.Purpose purpose_ = org.bitcoinj.wallet.Protos.Transaction.Purpose.UNKNOWN;
       /**
-       * <code>optional .wallet.Transaction.Purpose purpose = 10 [default = UNKNOWN];</code>
+       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
        */
-      public boolean hasPurpose() {
-        return ((bitField0_ & 0x00000400) == 0x00000400);
+      public java.util.List<? extends org.bitcoinj.wallet.Protos.TransactionInputOrBuilder> 
+           getTransactionInputOrBuilderList() {
+        if (transactionInputBuilder_ != null) {
+          return transactionInputBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(transactionInput_);
+        }
       }
       /**
-       * <code>optional .wallet.Transaction.Purpose purpose = 10 [default = UNKNOWN];</code>
+       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
        */
-      public org.bitcoinj.wallet.Protos.Transaction.Purpose getPurpose() {
-        return purpose_;
+      public org.bitcoinj.wallet.Protos.TransactionInput.Builder addTransactionInputBuilder() {
+        return getTransactionInputFieldBuilder().addBuilder(
+            org.bitcoinj.wallet.Protos.TransactionInput.getDefaultInstance());
       }
       /**
-       * <code>optional .wallet.Transaction.Purpose purpose = 10 [default = UNKNOWN];</code>
+       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
        */
-      public Builder setPurpose(org.bitcoinj.wallet.Protos.Transaction.Purpose value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        bitField0_ |= 0x00000400;
-        purpose_ = value;
-        onChanged();
-        return this;
+      public org.bitcoinj.wallet.Protos.TransactionInput.Builder addTransactionInputBuilder(
+          int index) {
+        return getTransactionInputFieldBuilder().addBuilder(
+            index, org.bitcoinj.wallet.Protos.TransactionInput.getDefaultInstance());
       }
       /**
-       * <code>optional .wallet.Transaction.Purpose purpose = 10 [default = UNKNOWN];</code>
+       * <code>repeated .wallet.TransactionInput transaction_input = 6;</code>
        */
-      public Builder clearPurpose() {
-        bitField0_ = (bitField0_ & ~0x00000400);
-        purpose_ = org.bitcoinj.wallet.Protos.Transaction.Purpose.UNKNOWN;
-        onChanged();
-        return this;
+      public java.util.List<org.bitcoinj.wallet.Protos.TransactionInput.Builder> 
+           getTransactionInputBuilderList() {
+        return getTransactionInputFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          org.bitcoinj.wallet.Protos.TransactionInput, org.bitcoinj.wallet.Protos.TransactionInput.Builder, org.bitcoinj.wallet.Protos.TransactionInputOrBuilder> 
+          getTransactionInputFieldBuilder() {
+        if (transactionInputBuilder_ == null) {
+          transactionInputBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              org.bitcoinj.wallet.Protos.TransactionInput, org.bitcoinj.wallet.Protos.TransactionInput.Builder, org.bitcoinj.wallet.Protos.TransactionInputOrBuilder>(
+                  transactionInput_,
+                  ((bitField0_ & 0x00000040) == 0x00000040),
+                  getParentForChildren(),
+                  isClean());
+          transactionInput_ = null;
+        }
+        return transactionInputBuilder_;
       }
 
-      private org.bitcoinj.wallet.Protos.ExchangeRate exchangeRate_ = org.bitcoinj.wallet.Protos.ExchangeRate.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          org.bitcoinj.wallet.Protos.ExchangeRate, org.bitcoinj.wallet.Protos.ExchangeRate.Builder, org.bitcoinj.wallet.Protos.ExchangeRateOrBuilder> exchangeRateBuilder_;
-      /**
-       * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
-       *
-       * <pre>
-       * Exchange rate that was valid when the transaction was sent.
-       * </pre>
-       */
-      public boolean hasExchangeRate() {
-        return ((bitField0_ & 0x00000800) == 0x00000800);
+      private java.util.List<org.bitcoinj.wallet.Protos.TransactionOutput> transactionOutput_ =
+        java.util.Collections.emptyList();
+      private void ensureTransactionOutputIsMutable() {
+        if (!((bitField0_ & 0x00000080) == 0x00000080)) {
+          transactionOutput_ = new java.util.ArrayList<org.bitcoinj.wallet.Protos.TransactionOutput>(transactionOutput_);
+          bitField0_ |= 0x00000080;
+         }
       }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          org.bitcoinj.wallet.Protos.TransactionOutput, org.bitcoinj.wallet.Protos.TransactionOutput.Builder, org.bitcoinj.wallet.Protos.TransactionOutputOrBuilder> transactionOutputBuilder_;
+
       /**
-       * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
-       *
-       * <pre>
-       * Exchange rate that was valid when the transaction was sent.
-       * </pre>
+       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
        */
-      public org.bitcoinj.wallet.Protos.ExchangeRate getExchangeRate() {
-        if (exchangeRateBuilder_ == null) {
-          return exchangeRate_;
+      public java.util.List<org.bitcoinj.wallet.Protos.TransactionOutput> getTransactionOutputList() {
+        if (transactionOutputBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(transactionOutput_);
         } else {
-          return exchangeRateBuilder_.getMessage();
+          return transactionOutputBuilder_.getMessageList();
         }
       }
       /**
-       * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
-       *
-       * <pre>
-       * Exchange rate that was valid when the transaction was sent.
-       * </pre>
+       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
        */
-      public Builder setExchangeRate(org.bitcoinj.wallet.Protos.ExchangeRate value) {
-        if (exchangeRateBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          exchangeRate_ = value;
-          onChanged();
+      public int getTransactionOutputCount() {
+        if (transactionOutputBuilder_ == null) {
+          return transactionOutput_.size();
         } else {
-          exchangeRateBuilder_.setMessage(value);
+          return transactionOutputBuilder_.getCount();
         }
-        bitField0_ |= 0x00000800;
-        return this;
       }
       /**
-       * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
-       *
-       * <pre>
-       * Exchange rate that was valid when the transaction was sent.
-       * </pre>
+       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
        */
-      public Builder setExchangeRate(
-          org.bitcoinj.wallet.Protos.ExchangeRate.Builder builderForValue) {
-        if (exchangeRateBuilder_ == null) {
-          exchangeRate_ = builderForValue.build();
-          onChanged();
+      public org.bitcoinj.wallet.Protos.TransactionOutput getTransactionOutput(int index) {
+        if (transactionOutputBuilder_ == null) {
+          return transactionOutput_.get(index);
         } else {
-          exchangeRateBuilder_.setMessage(builderForValue.build());
+          return transactionOutputBuilder_.getMessage(index);
         }
-        bitField0_ |= 0x00000800;
-        return this;
       }
       /**
-       * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
-       *
-       * <pre>
-       * Exchange rate that was valid when the transaction was sent.
-       * </pre>
+       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
        */
-      public Builder mergeExchangeRate(org.bitcoinj.wallet.Protos.ExchangeRate value) {
-        if (exchangeRateBuilder_ == null) {
-          if (((bitField0_ & 0x00000800) == 0x00000800) &&
-              exchangeRate_ != org.bitcoinj.wallet.Protos.ExchangeRate.getDefaultInstance()) {
-            exchangeRate_ =
-              org.bitcoinj.wallet.Protos.ExchangeRate.newBuilder(exchangeRate_).mergeFrom(value).buildPartial();
-          } else {
-            exchangeRate_ = value;
+      public Builder setTransactionOutput(
+          int index, org.bitcoinj.wallet.Protos.TransactionOutput value) {
+        if (transactionOutputBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
           }
+          ensureTransactionOutputIsMutable();
+          transactionOutput_.set(index, value);
           onChanged();
         } else {
-          exchangeRateBuilder_.mergeFrom(value);
+          transactionOutputBuilder_.setMessage(index, value);
         }
-        bitField0_ |= 0x00000800;
         return this;
       }
       /**
-       * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
-       *
-       * <pre>
-       * Exchange rate that was valid when the transaction was sent.
-       * </pre>
+       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
        */
-      public Builder clearExchangeRate() {
-        if (exchangeRateBuilder_ == null) {
-          exchangeRate_ = org.bitcoinj.wallet.Protos.ExchangeRate.getDefaultInstance();
+      public Builder setTransactionOutput(
+          int index, org.bitcoinj.wallet.Protos.TransactionOutput.Builder builderForValue) {
+        if (transactionOutputBuilder_ == null) {
+          ensureTransactionOutputIsMutable();
+          transactionOutput_.set(index, builderForValue.build());
           onChanged();
         } else {
-          exchangeRateBuilder_.clear();
+          transactionOutputBuilder_.setMessage(index, builderForValue.build());
         }
-        bitField0_ = (bitField0_ & ~0x00000800);
         return this;
       }
       /**
-       * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
-       *
-       * <pre>
-       * Exchange rate that was valid when the transaction was sent.
-       * </pre>
-       */
-      public org.bitcoinj.wallet.Protos.ExchangeRate.Builder getExchangeRateBuilder() {
-        bitField0_ |= 0x00000800;
-        onChanged();
-        return getExchangeRateFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
-       *
-       * <pre>
-       * Exchange rate that was valid when the transaction was sent.
-       * </pre>
+       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
        */
-      public org.bitcoinj.wallet.Protos.ExchangeRateOrBuilder getExchangeRateOrBuilder() {
-        if (exchangeRateBuilder_ != null) {
-          return exchangeRateBuilder_.getMessageOrBuilder();
+      public Builder addTransactionOutput(org.bitcoinj.wallet.Protos.TransactionOutput value) {
+        if (transactionOutputBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureTransactionOutputIsMutable();
+          transactionOutput_.add(value);
+          onChanged();
         } else {
-          return exchangeRate_;
-        }
-      }
-      /**
-       * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
-       *
-       * <pre>
-       * Exchange rate that was valid when the transaction was sent.
-       * </pre>
-       */
-      private com.google.protobuf.SingleFieldBuilder<
-          org.bitcoinj.wallet.Protos.ExchangeRate, org.bitcoinj.wallet.Protos.ExchangeRate.Builder, org.bitcoinj.wallet.Protos.ExchangeRateOrBuilder> 
-          getExchangeRateFieldBuilder() {
-        if (exchangeRateBuilder_ == null) {
-          exchangeRateBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              org.bitcoinj.wallet.Protos.ExchangeRate, org.bitcoinj.wallet.Protos.ExchangeRate.Builder, org.bitcoinj.wallet.Protos.ExchangeRateOrBuilder>(
-                  getExchangeRate(),
-                  getParentForChildren(),
-                  isClean());
-          exchangeRate_ = null;
+          transactionOutputBuilder_.addMessage(value);
         }
-        return exchangeRateBuilder_;
-      }
-
-      private java.lang.Object memo_ = "";
-      /**
-       * <code>optional string memo = 13;</code>
-       *
-       * <pre>
-       * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
-       * transaction.
-       * </pre>
-       */
-      public boolean hasMemo() {
-        return ((bitField0_ & 0x00001000) == 0x00001000);
+        return this;
       }
       /**
-       * <code>optional string memo = 13;</code>
-       *
-       * <pre>
-       * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
-       * transaction.
-       * </pre>
+       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
        */
-      public java.lang.String getMemo() {
-        java.lang.Object ref = memo_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          if (bs.isValidUtf8()) {
-            memo_ = s;
+      public Builder addTransactionOutput(
+          int index, org.bitcoinj.wallet.Protos.TransactionOutput value) {
+        if (transactionOutputBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
           }
-          return s;
+          ensureTransactionOutputIsMutable();
+          transactionOutput_.add(index, value);
+          onChanged();
+        } else {
+          transactionOutputBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+       */
+      public Builder addTransactionOutput(
+          org.bitcoinj.wallet.Protos.TransactionOutput.Builder builderForValue) {
+        if (transactionOutputBuilder_ == null) {
+          ensureTransactionOutputIsMutable();
+          transactionOutput_.add(builderForValue.build());
+          onChanged();
         } else {
-          return (java.lang.String) ref;
+          transactionOutputBuilder_.addMessage(builderForValue.build());
         }
+        return this;
       }
       /**
-       * <code>optional string memo = 13;</code>
-       *
-       * <pre>
-       * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
-       * transaction.
-       * </pre>
+       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
        */
-      public com.google.protobuf.ByteString
-          getMemoBytes() {
-        java.lang.Object ref = memo_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          memo_ = b;
-          return b;
+      public Builder addTransactionOutput(
+          int index, org.bitcoinj.wallet.Protos.TransactionOutput.Builder builderForValue) {
+        if (transactionOutputBuilder_ == null) {
+          ensureTransactionOutputIsMutable();
+          transactionOutput_.add(index, builderForValue.build());
+          onChanged();
         } else {
-          return (com.google.protobuf.ByteString) ref;
+          transactionOutputBuilder_.addMessage(index, builderForValue.build());
         }
+        return this;
       }
       /**
-       * <code>optional string memo = 13;</code>
-       *
-       * <pre>
-       * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
-       * transaction.
-       * </pre>
+       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
        */
-      public Builder setMemo(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00001000;
-        memo_ = value;
-        onChanged();
+      public Builder addAllTransactionOutput(
+          java.lang.Iterable<? extends org.bitcoinj.wallet.Protos.TransactionOutput> values) {
+        if (transactionOutputBuilder_ == null) {
+          ensureTransactionOutputIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, transactionOutput_);
+          onChanged();
+        } else {
+          transactionOutputBuilder_.addAllMessages(values);
+        }
         return this;
       }
       /**
-       * <code>optional string memo = 13;</code>
-       *
-       * <pre>
-       * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
-       * transaction.
-       * </pre>
+       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
        */
-      public Builder clearMemo() {
-        bitField0_ = (bitField0_ & ~0x00001000);
-        memo_ = getDefaultInstance().getMemo();
-        onChanged();
+      public Builder clearTransactionOutput() {
+        if (transactionOutputBuilder_ == null) {
+          transactionOutput_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000080);
+          onChanged();
+        } else {
+          transactionOutputBuilder_.clear();
+        }
         return this;
       }
       /**
-       * <code>optional string memo = 13;</code>
-       *
-       * <pre>
-       * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
-       * transaction.
-       * </pre>
+       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
        */
-      public Builder setMemoBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00001000;
-        memo_ = value;
-        onChanged();
+      public Builder removeTransactionOutput(int index) {
+        if (transactionOutputBuilder_ == null) {
+          ensureTransactionOutputIsMutable();
+          transactionOutput_.remove(index);
+          onChanged();
+        } else {
+          transactionOutputBuilder_.remove(index);
+        }
         return this;
       }
-
-      // @@protoc_insertion_point(builder_scope:wallet.Transaction)
-    }
-
-    static {
-      defaultInstance = new Transaction(true);
-      defaultInstance.initFields();
-    }
-
-    // @@protoc_insertion_point(class_scope:wallet.Transaction)
-  }
-
-  public interface ScryptParametersOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:wallet.ScryptParameters)
-      com.google.protobuf.MessageOrBuilder {
-
-    /**
-     * <code>required bytes salt = 1;</code>
-     *
-     * <pre>
-     * Salt to use in generation of the wallet password (8 bytes)
-     * </pre>
-     */
-    boolean hasSalt();
-    /**
-     * <code>required bytes salt = 1;</code>
-     *
-     * <pre>
-     * Salt to use in generation of the wallet password (8 bytes)
-     * </pre>
-     */
-    com.google.protobuf.ByteString getSalt();
-
-    /**
-     * <code>optional int64 n = 2 [default = 16384];</code>
-     *
-     * <pre>
-     * CPU/ memory cost parameter
-     * </pre>
-     */
-    boolean hasN();
-    /**
-     * <code>optional int64 n = 2 [default = 16384];</code>
-     *
-     * <pre>
-     * CPU/ memory cost parameter
-     * </pre>
-     */
-    long getN();
-
-    /**
-     * <code>optional int32 r = 3 [default = 8];</code>
-     *
-     * <pre>
-     * Block size parameter
-     * </pre>
-     */
-    boolean hasR();
-    /**
-     * <code>optional int32 r = 3 [default = 8];</code>
-     *
-     * <pre>
-     * Block size parameter
-     * </pre>
-     */
-    int getR();
-
-    /**
-     * <code>optional int32 p = 4 [default = 1];</code>
-     *
-     * <pre>
-     * Parallelisation parameter
-     * </pre>
-     */
-    boolean hasP();
-    /**
-     * <code>optional int32 p = 4 [default = 1];</code>
-     *
-     * <pre>
-     * Parallelisation parameter
-     * </pre>
-     */
-    int getP();
-  }
-  /**
-   * Protobuf type {@code wallet.ScryptParameters}
-   *
-   * <pre>
-   ** The parameters used in the scrypt key derivation function.
-   *  The default values are taken from http://www.tarsnap.com/scrypt/scrypt-slides.pdf.
-   *  They can be increased - n is the number of iterations performed and
-   *  r and p can be used to tweak the algorithm - see:
-   *  http://stackoverflow.com/questions/11126315/what-are-optimal-scrypt-work-factors
-   * </pre>
-   */
-  public static final class ScryptParameters extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:wallet.ScryptParameters)
-      ScryptParametersOrBuilder {
-    // Use ScryptParameters.newBuilder() to construct.
-    private ScryptParameters(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
-      super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private ScryptParameters(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final ScryptParameters defaultInstance;
-    public static ScryptParameters getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public ScryptParameters getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
-      return this.unknownFields;
-    }
-    private ScryptParameters(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
-      int mutable_bitField0_ = 0;
-      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              bitField0_ |= 0x00000001;
-              salt_ = input.readBytes();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              n_ = input.readInt64();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              r_ = input.readInt32();
-              break;
-            }
-            case 32: {
-              bitField0_ |= 0x00000008;
-              p_ = input.readInt32();
-              break;
-            }
-          }
+      /**
+       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+       */
+      public org.bitcoinj.wallet.Protos.TransactionOutput.Builder getTransactionOutputBuilder(
+          int index) {
+        return getTransactionOutputFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+       */
+      public org.bitcoinj.wallet.Protos.TransactionOutputOrBuilder getTransactionOutputOrBuilder(
+          int index) {
+        if (transactionOutputBuilder_ == null) {
+          return transactionOutput_.get(index);  } else {
+          return transactionOutputBuilder_.getMessageOrBuilder(index);
         }
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
-      } finally {
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
       }
-    }
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return org.bitcoinj.wallet.Protos.internal_static_wallet_ScryptParameters_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return org.bitcoinj.wallet.Protos.internal_static_wallet_ScryptParameters_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              org.bitcoinj.wallet.Protos.ScryptParameters.class, org.bitcoinj.wallet.Protos.ScryptParameters.Builder.class);
-    }
-
-    public static com.google.protobuf.Parser<ScryptParameters> PARSER =
-        new com.google.protobuf.AbstractParser<ScryptParameters>() {
-      public ScryptParameters parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ScryptParameters(input, extensionRegistry);
+      /**
+       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+       */
+      public java.util.List<? extends org.bitcoinj.wallet.Protos.TransactionOutputOrBuilder> 
+           getTransactionOutputOrBuilderList() {
+        if (transactionOutputBuilder_ != null) {
+          return transactionOutputBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(transactionOutput_);
+        }
       }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<ScryptParameters> getParserForType() {
-      return PARSER;
-    }
-
-    private int bitField0_;
-    public static final int SALT_FIELD_NUMBER = 1;
-    private com.google.protobuf.ByteString salt_;
-    /**
-     * <code>required bytes salt = 1;</code>
-     *
-     * <pre>
-     * Salt to use in generation of the wallet password (8 bytes)
-     * </pre>
-     */
-    public boolean hasSalt() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    /**
-     * <code>required bytes salt = 1;</code>
-     *
-     * <pre>
-     * Salt to use in generation of the wallet password (8 bytes)
-     * </pre>
-     */
-    public com.google.protobuf.ByteString getSalt() {
-      return salt_;
-    }
-
-    public static final int N_FIELD_NUMBER = 2;
-    private long n_;
-    /**
-     * <code>optional int64 n = 2 [default = 16384];</code>
-     *
-     * <pre>
-     * CPU/ memory cost parameter
-     * </pre>
-     */
-    public boolean hasN() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
-    /**
-     * <code>optional int64 n = 2 [default = 16384];</code>
-     *
-     * <pre>
-     * CPU/ memory cost parameter
-     * </pre>
-     */
-    public long getN() {
-      return n_;
-    }
-
-    public static final int R_FIELD_NUMBER = 3;
-    private int r_;
-    /**
-     * <code>optional int32 r = 3 [default = 8];</code>
-     *
-     * <pre>
-     * Block size parameter
-     * </pre>
-     */
-    public boolean hasR() {
-      return ((bitField0_ & 0x00000004) == 0x00000004);
-    }
-    /**
-     * <code>optional int32 r = 3 [default = 8];</code>
-     *
-     * <pre>
-     * Block size parameter
-     * </pre>
-     */
-    public int getR() {
-      return r_;
-    }
-
-    public static final int P_FIELD_NUMBER = 4;
-    private int p_;
-    /**
-     * <code>optional int32 p = 4 [default = 1];</code>
-     *
-     * <pre>
-     * Parallelisation parameter
-     * </pre>
-     */
-    public boolean hasP() {
-      return ((bitField0_ & 0x00000008) == 0x00000008);
-    }
-    /**
-     * <code>optional int32 p = 4 [default = 1];</code>
-     *
-     * <pre>
-     * Parallelisation parameter
-     * </pre>
-     */
-    public int getP() {
-      return p_;
-    }
-
-    private void initFields() {
-      salt_ = com.google.protobuf.ByteString.EMPTY;
-      n_ = 16384L;
-      r_ = 8;
-      p_ = 1;
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      if (!hasSalt()) {
-        memoizedIsInitialized = 0;
-        return false;
+      /**
+       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+       */
+      public org.bitcoinj.wallet.Protos.TransactionOutput.Builder addTransactionOutputBuilder() {
+        return getTransactionOutputFieldBuilder().addBuilder(
+            org.bitcoinj.wallet.Protos.TransactionOutput.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+       */
+      public org.bitcoinj.wallet.Protos.TransactionOutput.Builder addTransactionOutputBuilder(
+          int index) {
+        return getTransactionOutputFieldBuilder().addBuilder(
+            index, org.bitcoinj.wallet.Protos.TransactionOutput.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .wallet.TransactionOutput transaction_output = 7;</code>
+       */
+      public java.util.List<org.bitcoinj.wallet.Protos.TransactionOutput.Builder> 
+           getTransactionOutputBuilderList() {
+        return getTransactionOutputFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          org.bitcoinj.wallet.Protos.TransactionOutput, org.bitcoinj.wallet.Protos.TransactionOutput.Builder, org.bitcoinj.wallet.Protos.TransactionOutputOrBuilder> 
+          getTransactionOutputFieldBuilder() {
+        if (transactionOutputBuilder_ == null) {
+          transactionOutputBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              org.bitcoinj.wallet.Protos.TransactionOutput, org.bitcoinj.wallet.Protos.TransactionOutput.Builder, org.bitcoinj.wallet.Protos.TransactionOutputOrBuilder>(
+                  transactionOutput_,
+                  ((bitField0_ & 0x00000080) == 0x00000080),
+                  getParentForChildren(),
+                  isClean());
+          transactionOutput_ = null;
+        }
+        return transactionOutputBuilder_;
       }
-      memoizedIsInitialized = 1;
-      return true;
-    }
 
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeBytes(1, salt_);
+      private java.util.List<com.google.protobuf.ByteString> blockHash_ = java.util.Collections.emptyList();
+      private void ensureBlockHashIsMutable() {
+        if (!((bitField0_ & 0x00000100) == 0x00000100)) {
+          blockHash_ = new java.util.ArrayList<com.google.protobuf.ByteString>(blockHash_);
+          bitField0_ |= 0x00000100;
+         }
+      }
+      /**
+       * <pre>
+       * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
+       * ordering within a block.
+       * </pre>
+       *
+       * <code>repeated bytes block_hash = 8;</code>
+       */
+      public java.util.List<com.google.protobuf.ByteString>
+          getBlockHashList() {
+        return java.util.Collections.unmodifiableList(blockHash_);
+      }
+      /**
+       * <pre>
+       * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
+       * ordering within a block.
+       * </pre>
+       *
+       * <code>repeated bytes block_hash = 8;</code>
+       */
+      public int getBlockHashCount() {
+        return blockHash_.size();
+      }
+      /**
+       * <pre>
+       * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
+       * ordering within a block.
+       * </pre>
+       *
+       * <code>repeated bytes block_hash = 8;</code>
+       */
+      public com.google.protobuf.ByteString getBlockHash(int index) {
+        return blockHash_.get(index);
+      }
+      /**
+       * <pre>
+       * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
+       * ordering within a block.
+       * </pre>
+       *
+       * <code>repeated bytes block_hash = 8;</code>
+       */
+      public Builder setBlockHash(
+          int index, com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureBlockHashIsMutable();
+        blockHash_.set(index, value);
+        onChanged();
+        return this;
       }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeInt64(2, n_);
+      /**
+       * <pre>
+       * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
+       * ordering within a block.
+       * </pre>
+       *
+       * <code>repeated bytes block_hash = 8;</code>
+       */
+      public Builder addBlockHash(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureBlockHashIsMutable();
+        blockHash_.add(value);
+        onChanged();
+        return this;
       }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeInt32(3, r_);
+      /**
+       * <pre>
+       * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
+       * ordering within a block.
+       * </pre>
+       *
+       * <code>repeated bytes block_hash = 8;</code>
+       */
+      public Builder addAllBlockHash(
+          java.lang.Iterable<? extends com.google.protobuf.ByteString> values) {
+        ensureBlockHashIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, blockHash_);
+        onChanged();
+        return this;
       }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeInt32(4, p_);
+      /**
+       * <pre>
+       * A list of blocks in which the transaction has been observed (on any chain). Also, a number used to disambiguate
+       * ordering within a block.
+       * </pre>
+       *
+       * <code>repeated bytes block_hash = 8;</code>
+       */
+      public Builder clearBlockHash() {
+        blockHash_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000100);
+        onChanged();
+        return this;
       }
-      getUnknownFields().writeTo(output);
-    }
-
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
 
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(1, salt_);
+      private java.util.List<java.lang.Integer> blockRelativityOffsets_ = java.util.Collections.emptyList();
+      private void ensureBlockRelativityOffsetsIsMutable() {
+        if (!((bitField0_ & 0x00000200) == 0x00000200)) {
+          blockRelativityOffsets_ = new java.util.ArrayList<java.lang.Integer>(blockRelativityOffsets_);
+          bitField0_ |= 0x00000200;
+         }
       }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt64Size(2, n_);
+      /**
+       * <code>repeated int32 block_relativity_offsets = 11;</code>
+       */
+      public java.util.List<java.lang.Integer>
+          getBlockRelativityOffsetsList() {
+        return java.util.Collections.unmodifiableList(blockRelativityOffsets_);
       }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(3, r_);
+      /**
+       * <code>repeated int32 block_relativity_offsets = 11;</code>
+       */
+      public int getBlockRelativityOffsetsCount() {
+        return blockRelativityOffsets_.size();
       }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, p_);
+      /**
+       * <code>repeated int32 block_relativity_offsets = 11;</code>
+       */
+      public int getBlockRelativityOffsets(int index) {
+        return blockRelativityOffsets_.get(index);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
-    public static org.bitcoinj.wallet.Protos.ScryptParameters parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static org.bitcoinj.wallet.Protos.ScryptParameters parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static org.bitcoinj.wallet.Protos.ScryptParameters parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static org.bitcoinj.wallet.Protos.ScryptParameters parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static org.bitcoinj.wallet.Protos.ScryptParameters parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-    public static org.bitcoinj.wallet.Protos.ScryptParameters parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-    public static org.bitcoinj.wallet.Protos.ScryptParameters parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
-    }
-    public static org.bitcoinj.wallet.Protos.ScryptParameters parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
-    }
-    public static org.bitcoinj.wallet.Protos.ScryptParameters parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-    public static org.bitcoinj.wallet.Protos.ScryptParameters parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.bitcoinj.wallet.Protos.ScryptParameters prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() { return newBuilder(this); }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * Protobuf type {@code wallet.ScryptParameters}
-     *
-     * <pre>
-     ** The parameters used in the scrypt key derivation function.
-     *  The default values are taken from http://www.tarsnap.com/scrypt/scrypt-slides.pdf.
-     *  They can be increased - n is the number of iterations performed and
-     *  r and p can be used to tweak the algorithm - see:
-     *  http://stackoverflow.com/questions/11126315/what-are-optimal-scrypt-work-factors
-     * </pre>
-     */
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:wallet.ScryptParameters)
-        org.bitcoinj.wallet.Protos.ScryptParametersOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_ScryptParameters_descriptor;
+      /**
+       * <code>repeated int32 block_relativity_offsets = 11;</code>
+       */
+      public Builder setBlockRelativityOffsets(
+          int index, int value) {
+        ensureBlockRelativityOffsetsIsMutable();
+        blockRelativityOffsets_.set(index, value);
+        onChanged();
+        return this;
       }
-
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_ScryptParameters_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                org.bitcoinj.wallet.Protos.ScryptParameters.class, org.bitcoinj.wallet.Protos.ScryptParameters.Builder.class);
+      /**
+       * <code>repeated int32 block_relativity_offsets = 11;</code>
+       */
+      public Builder addBlockRelativityOffsets(int value) {
+        ensureBlockRelativityOffsetsIsMutable();
+        blockRelativityOffsets_.add(value);
+        onChanged();
+        return this;
       }
-
-      // Construct using org.bitcoinj.wallet.Protos.ScryptParameters.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
+      /**
+       * <code>repeated int32 block_relativity_offsets = 11;</code>
+       */
+      public Builder addAllBlockRelativityOffsets(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureBlockRelativityOffsetsIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, blockRelativityOffsets_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 block_relativity_offsets = 11;</code>
+       */
+      public Builder clearBlockRelativityOffsets() {
+        blockRelativityOffsets_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000200);
+        onChanged();
+        return this;
       }
 
-      private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
+      private org.bitcoinj.wallet.Protos.TransactionConfidence confidence_ = null;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          org.bitcoinj.wallet.Protos.TransactionConfidence, org.bitcoinj.wallet.Protos.TransactionConfidence.Builder, org.bitcoinj.wallet.Protos.TransactionConfidenceOrBuilder> confidenceBuilder_;
+      /**
+       * <pre>
+       * Data describing where the transaction is in the chain.
+       * </pre>
+       *
+       * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
+       */
+      public boolean hasConfidence() {
+        return ((bitField0_ & 0x00000400) == 0x00000400);
       }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+      /**
+       * <pre>
+       * Data describing where the transaction is in the chain.
+       * </pre>
+       *
+       * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
+       */
+      public org.bitcoinj.wallet.Protos.TransactionConfidence getConfidence() {
+        if (confidenceBuilder_ == null) {
+          return confidence_ == null ? org.bitcoinj.wallet.Protos.TransactionConfidence.getDefaultInstance() : confidence_;
+        } else {
+          return confidenceBuilder_.getMessage();
+        }
+      }
+      /**
+       * <pre>
+       * Data describing where the transaction is in the chain.
+       * </pre>
+       *
+       * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
+       */
+      public Builder setConfidence(org.bitcoinj.wallet.Protos.TransactionConfidence value) {
+        if (confidenceBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          confidence_ = value;
+          onChanged();
+        } else {
+          confidenceBuilder_.setMessage(value);
         }
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-
-      public Builder clear() {
-        super.clear();
-        salt_ = com.google.protobuf.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
-        n_ = 16384L;
-        bitField0_ = (bitField0_ & ~0x00000002);
-        r_ = 8;
-        bitField0_ = (bitField0_ & ~0x00000004);
-        p_ = 1;
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ |= 0x00000400;
         return this;
       }
-
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_ScryptParameters_descriptor;
-      }
-
-      public org.bitcoinj.wallet.Protos.ScryptParameters getDefaultInstanceForType() {
-        return org.bitcoinj.wallet.Protos.ScryptParameters.getDefaultInstance();
-      }
-
-      public org.bitcoinj.wallet.Protos.ScryptParameters build() {
-        org.bitcoinj.wallet.Protos.ScryptParameters result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
+      /**
+       * <pre>
+       * Data describing where the transaction is in the chain.
+       * </pre>
+       *
+       * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
+       */
+      public Builder setConfidence(
+          org.bitcoinj.wallet.Protos.TransactionConfidence.Builder builderForValue) {
+        if (confidenceBuilder_ == null) {
+          confidence_ = builderForValue.build();
+          onChanged();
+        } else {
+          confidenceBuilder_.setMessage(builderForValue.build());
         }
-        return result;
+        bitField0_ |= 0x00000400;
+        return this;
       }
-
-      public org.bitcoinj.wallet.Protos.ScryptParameters buildPartial() {
-        org.bitcoinj.wallet.Protos.ScryptParameters result = new org.bitcoinj.wallet.Protos.ScryptParameters(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        result.salt_ = salt_;
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        result.n_ = n_;
-        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
-          to_bitField0_ |= 0x00000004;
-        }
-        result.r_ = r_;
-        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
-          to_bitField0_ |= 0x00000008;
+      /**
+       * <pre>
+       * Data describing where the transaction is in the chain.
+       * </pre>
+       *
+       * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
+       */
+      public Builder mergeConfidence(org.bitcoinj.wallet.Protos.TransactionConfidence value) {
+        if (confidenceBuilder_ == null) {
+          if (((bitField0_ & 0x00000400) == 0x00000400) &&
+              confidence_ != null &&
+              confidence_ != org.bitcoinj.wallet.Protos.TransactionConfidence.getDefaultInstance()) {
+            confidence_ =
+              org.bitcoinj.wallet.Protos.TransactionConfidence.newBuilder(confidence_).mergeFrom(value).buildPartial();
+          } else {
+            confidence_ = value;
+          }
+          onChanged();
+        } else {
+          confidenceBuilder_.mergeFrom(value);
         }
-        result.p_ = p_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
+        bitField0_ |= 0x00000400;
+        return this;
       }
-
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bitcoinj.wallet.Protos.ScryptParameters) {
-          return mergeFrom((org.bitcoinj.wallet.Protos.ScryptParameters)other);
+      /**
+       * <pre>
+       * Data describing where the transaction is in the chain.
+       * </pre>
+       *
+       * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
+       */
+      public Builder clearConfidence() {
+        if (confidenceBuilder_ == null) {
+          confidence_ = null;
+          onChanged();
         } else {
-          super.mergeFrom(other);
-          return this;
+          confidenceBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000400);
+        return this;
       }
-
-      public Builder mergeFrom(org.bitcoinj.wallet.Protos.ScryptParameters other) {
-        if (other == org.bitcoinj.wallet.Protos.ScryptParameters.getDefaultInstance()) return this;
-        if (other.hasSalt()) {
-          setSalt(other.getSalt());
-        }
-        if (other.hasN()) {
-          setN(other.getN());
-        }
-        if (other.hasR()) {
-          setR(other.getR());
-        }
-        if (other.hasP()) {
-          setP(other.getP());
+      /**
+       * <pre>
+       * Data describing where the transaction is in the chain.
+       * </pre>
+       *
+       * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
+       */
+      public org.bitcoinj.wallet.Protos.TransactionConfidence.Builder getConfidenceBuilder() {
+        bitField0_ |= 0x00000400;
+        onChanged();
+        return getConfidenceFieldBuilder().getBuilder();
+      }
+      /**
+       * <pre>
+       * Data describing where the transaction is in the chain.
+       * </pre>
+       *
+       * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
+       */
+      public org.bitcoinj.wallet.Protos.TransactionConfidenceOrBuilder getConfidenceOrBuilder() {
+        if (confidenceBuilder_ != null) {
+          return confidenceBuilder_.getMessageOrBuilder();
+        } else {
+          return confidence_ == null ?
+              org.bitcoinj.wallet.Protos.TransactionConfidence.getDefaultInstance() : confidence_;
         }
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
       }
-
-      public final boolean isInitialized() {
-        if (!hasSalt()) {
-          
-          return false;
+      /**
+       * <pre>
+       * Data describing where the transaction is in the chain.
+       * </pre>
+       *
+       * <code>optional .wallet.TransactionConfidence confidence = 9;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          org.bitcoinj.wallet.Protos.TransactionConfidence, org.bitcoinj.wallet.Protos.TransactionConfidence.Builder, org.bitcoinj.wallet.Protos.TransactionConfidenceOrBuilder> 
+          getConfidenceFieldBuilder() {
+        if (confidenceBuilder_ == null) {
+          confidenceBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              org.bitcoinj.wallet.Protos.TransactionConfidence, org.bitcoinj.wallet.Protos.TransactionConfidence.Builder, org.bitcoinj.wallet.Protos.TransactionConfidenceOrBuilder>(
+                  getConfidence(),
+                  getParentForChildren(),
+                  isClean());
+          confidence_ = null;
         }
-        return true;
+        return confidenceBuilder_;
       }
 
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        org.bitcoinj.wallet.Protos.ScryptParameters parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bitcoinj.wallet.Protos.ScryptParameters) e.getUnfinishedMessage();
-          throw e;
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
+      private int purpose_ = 0;
+      /**
+       * <code>optional .wallet.Transaction.Purpose purpose = 10 [default = UNKNOWN];</code>
+       */
+      public boolean hasPurpose() {
+        return ((bitField0_ & 0x00000800) == 0x00000800);
+      }
+      /**
+       * <code>optional .wallet.Transaction.Purpose purpose = 10 [default = UNKNOWN];</code>
+       */
+      public org.bitcoinj.wallet.Protos.Transaction.Purpose getPurpose() {
+        @SuppressWarnings("deprecation")
+        org.bitcoinj.wallet.Protos.Transaction.Purpose result = org.bitcoinj.wallet.Protos.Transaction.Purpose.valueOf(purpose_);
+        return result == null ? org.bitcoinj.wallet.Protos.Transaction.Purpose.UNKNOWN : result;
+      }
+      /**
+       * <code>optional .wallet.Transaction.Purpose purpose = 10 [default = UNKNOWN];</code>
+       */
+      public Builder setPurpose(org.bitcoinj.wallet.Protos.Transaction.Purpose value) {
+        if (value == null) {
+          throw new NullPointerException();
         }
+        bitField0_ |= 0x00000800;
+        purpose_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional .wallet.Transaction.Purpose purpose = 10 [default = UNKNOWN];</code>
+       */
+      public Builder clearPurpose() {
+        bitField0_ = (bitField0_ & ~0x00000800);
+        purpose_ = 0;
+        onChanged();
         return this;
       }
-      private int bitField0_;
 
-      private com.google.protobuf.ByteString salt_ = com.google.protobuf.ByteString.EMPTY;
+      private org.bitcoinj.wallet.Protos.ExchangeRate exchangeRate_ = null;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          org.bitcoinj.wallet.Protos.ExchangeRate, org.bitcoinj.wallet.Protos.ExchangeRate.Builder, org.bitcoinj.wallet.Protos.ExchangeRateOrBuilder> exchangeRateBuilder_;
       /**
-       * <code>required bytes salt = 1;</code>
-       *
        * <pre>
-       * Salt to use in generation of the wallet password (8 bytes)
+       * Exchange rate that was valid when the transaction was sent.
        * </pre>
+       *
+       * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
        */
-      public boolean hasSalt() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
+      public boolean hasExchangeRate() {
+        return ((bitField0_ & 0x00001000) == 0x00001000);
       }
       /**
-       * <code>required bytes salt = 1;</code>
-       *
        * <pre>
-       * Salt to use in generation of the wallet password (8 bytes)
+       * Exchange rate that was valid when the transaction was sent.
        * </pre>
+       *
+       * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
        */
-      public com.google.protobuf.ByteString getSalt() {
-        return salt_;
+      public org.bitcoinj.wallet.Protos.ExchangeRate getExchangeRate() {
+        if (exchangeRateBuilder_ == null) {
+          return exchangeRate_ == null ? org.bitcoinj.wallet.Protos.ExchangeRate.getDefaultInstance() : exchangeRate_;
+        } else {
+          return exchangeRateBuilder_.getMessage();
+        }
       }
       /**
-       * <code>required bytes salt = 1;</code>
-       *
        * <pre>
-       * Salt to use in generation of the wallet password (8 bytes)
+       * Exchange rate that was valid when the transaction was sent.
        * </pre>
+       *
+       * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
        */
-      public Builder setSalt(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
-        salt_ = value;
-        onChanged();
+      public Builder setExchangeRate(org.bitcoinj.wallet.Protos.ExchangeRate value) {
+        if (exchangeRateBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          exchangeRate_ = value;
+          onChanged();
+        } else {
+          exchangeRateBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00001000;
         return this;
       }
       /**
-       * <code>required bytes salt = 1;</code>
-       *
        * <pre>
-       * Salt to use in generation of the wallet password (8 bytes)
+       * Exchange rate that was valid when the transaction was sent.
        * </pre>
+       *
+       * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
        */
-      public Builder clearSalt() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        salt_ = getDefaultInstance().getSalt();
-        onChanged();
+      public Builder setExchangeRate(
+          org.bitcoinj.wallet.Protos.ExchangeRate.Builder builderForValue) {
+        if (exchangeRateBuilder_ == null) {
+          exchangeRate_ = builderForValue.build();
+          onChanged();
+        } else {
+          exchangeRateBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00001000;
         return this;
       }
-
-      private long n_ = 16384L;
       /**
-       * <code>optional int64 n = 2 [default = 16384];</code>
-       *
        * <pre>
-       * CPU/ memory cost parameter
+       * Exchange rate that was valid when the transaction was sent.
        * </pre>
-       */
-      public boolean hasN() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
-      }
-      /**
-       * <code>optional int64 n = 2 [default = 16384];</code>
        *
-       * <pre>
-       * CPU/ memory cost parameter
-       * </pre>
+       * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
        */
-      public long getN() {
-        return n_;
+      public Builder mergeExchangeRate(org.bitcoinj.wallet.Protos.ExchangeRate value) {
+        if (exchangeRateBuilder_ == null) {
+          if (((bitField0_ & 0x00001000) == 0x00001000) &&
+              exchangeRate_ != null &&
+              exchangeRate_ != org.bitcoinj.wallet.Protos.ExchangeRate.getDefaultInstance()) {
+            exchangeRate_ =
+              org.bitcoinj.wallet.Protos.ExchangeRate.newBuilder(exchangeRate_).mergeFrom(value).buildPartial();
+          } else {
+            exchangeRate_ = value;
+          }
+          onChanged();
+        } else {
+          exchangeRateBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00001000;
+        return this;
       }
       /**
-       * <code>optional int64 n = 2 [default = 16384];</code>
-       *
        * <pre>
-       * CPU/ memory cost parameter
+       * Exchange rate that was valid when the transaction was sent.
        * </pre>
+       *
+       * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
        */
-      public Builder setN(long value) {
-        bitField0_ |= 0x00000002;
-        n_ = value;
-        onChanged();
+      public Builder clearExchangeRate() {
+        if (exchangeRateBuilder_ == null) {
+          exchangeRate_ = null;
+          onChanged();
+        } else {
+          exchangeRateBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00001000);
         return this;
       }
       /**
-       * <code>optional int64 n = 2 [default = 16384];</code>
-       *
        * <pre>
-       * CPU/ memory cost parameter
+       * Exchange rate that was valid when the transaction was sent.
        * </pre>
+       *
+       * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
        */
-      public Builder clearN() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        n_ = 16384L;
+      public org.bitcoinj.wallet.Protos.ExchangeRate.Builder getExchangeRateBuilder() {
+        bitField0_ |= 0x00001000;
         onChanged();
-        return this;
+        return getExchangeRateFieldBuilder().getBuilder();
       }
-
-      private int r_ = 8;
       /**
-       * <code>optional int32 r = 3 [default = 8];</code>
-       *
        * <pre>
-       * Block size parameter
+       * Exchange rate that was valid when the transaction was sent.
        * </pre>
+       *
+       * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
        */
-      public boolean hasR() {
-        return ((bitField0_ & 0x00000004) == 0x00000004);
+      public org.bitcoinj.wallet.Protos.ExchangeRateOrBuilder getExchangeRateOrBuilder() {
+        if (exchangeRateBuilder_ != null) {
+          return exchangeRateBuilder_.getMessageOrBuilder();
+        } else {
+          return exchangeRate_ == null ?
+              org.bitcoinj.wallet.Protos.ExchangeRate.getDefaultInstance() : exchangeRate_;
+        }
       }
       /**
-       * <code>optional int32 r = 3 [default = 8];</code>
-       *
        * <pre>
-       * Block size parameter
+       * Exchange rate that was valid when the transaction was sent.
        * </pre>
+       *
+       * <code>optional .wallet.ExchangeRate exchange_rate = 12;</code>
        */
-      public int getR() {
-        return r_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          org.bitcoinj.wallet.Protos.ExchangeRate, org.bitcoinj.wallet.Protos.ExchangeRate.Builder, org.bitcoinj.wallet.Protos.ExchangeRateOrBuilder> 
+          getExchangeRateFieldBuilder() {
+        if (exchangeRateBuilder_ == null) {
+          exchangeRateBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              org.bitcoinj.wallet.Protos.ExchangeRate, org.bitcoinj.wallet.Protos.ExchangeRate.Builder, org.bitcoinj.wallet.Protos.ExchangeRateOrBuilder>(
+                  getExchangeRate(),
+                  getParentForChildren(),
+                  isClean());
+          exchangeRate_ = null;
+        }
+        return exchangeRateBuilder_;
       }
+
+      private java.lang.Object memo_ = "";
       /**
-       * <code>optional int32 r = 3 [default = 8];</code>
-       *
        * <pre>
-       * Block size parameter
+       * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
+       * transaction.
        * </pre>
+       *
+       * <code>optional string memo = 13;</code>
        */
-      public Builder setR(int value) {
-        bitField0_ |= 0x00000004;
-        r_ = value;
-        onChanged();
-        return this;
+      public boolean hasMemo() {
+        return ((bitField0_ & 0x00002000) == 0x00002000);
       }
       /**
-       * <code>optional int32 r = 3 [default = 8];</code>
-       *
        * <pre>
-       * Block size parameter
+       * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
+       * transaction.
        * </pre>
+       *
+       * <code>optional string memo = 13;</code>
        */
-      public Builder clearR() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        r_ = 8;
-        onChanged();
-        return this;
+      public java.lang.String getMemo() {
+        java.lang.Object ref = memo_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            memo_ = s;
+          }
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
       }
-
-      private int p_ = 1;
       /**
-       * <code>optional int32 p = 4 [default = 1];</code>
-       *
        * <pre>
-       * Parallelisation parameter
+       * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
+       * transaction.
        * </pre>
+       *
+       * <code>optional string memo = 13;</code>
        */
-      public boolean hasP() {
-        return ((bitField0_ & 0x00000008) == 0x00000008);
+      public com.google.protobuf.ByteString
+          getMemoBytes() {
+        java.lang.Object ref = memo_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          memo_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
       }
       /**
-       * <code>optional int32 p = 4 [default = 1];</code>
-       *
        * <pre>
-       * Parallelisation parameter
+       * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
+       * transaction.
        * </pre>
+       *
+       * <code>optional string memo = 13;</code>
        */
-      public int getP() {
-        return p_;
+      public Builder setMemo(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00002000;
+        memo_ = value;
+        onChanged();
+        return this;
       }
       /**
-       * <code>optional int32 p = 4 [default = 1];</code>
-       *
        * <pre>
-       * Parallelisation parameter
+       * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
+       * transaction.
        * </pre>
+       *
+       * <code>optional string memo = 13;</code>
        */
-      public Builder setP(int value) {
-        bitField0_ |= 0x00000008;
-        p_ = value;
+      public Builder clearMemo() {
+        bitField0_ = (bitField0_ & ~0x00002000);
+        memo_ = getDefaultInstance().getMemo();
         onChanged();
         return this;
       }
       /**
-       * <code>optional int32 p = 4 [default = 1];</code>
-       *
        * <pre>
-       * Parallelisation parameter
+       * Memo of the transaction. It can be used to record the memo of the payment request that initiated the
+       * transaction.
        * </pre>
+       *
+       * <code>optional string memo = 13;</code>
        */
-      public Builder clearP() {
-        bitField0_ = (bitField0_ & ~0x00000008);
-        p_ = 1;
+      public Builder setMemoBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00002000;
+        memo_ = value;
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
 
-      // @@protoc_insertion_point(builder_scope:wallet.ScryptParameters)
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:wallet.Transaction)
     }
 
+    // @@protoc_insertion_point(class_scope:wallet.Transaction)
+    private static final org.bitcoinj.wallet.Protos.Transaction DEFAULT_INSTANCE;
     static {
-      defaultInstance = new ScryptParameters(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoinj.wallet.Protos.Transaction();
+    }
+
+    public static org.bitcoinj.wallet.Protos.Transaction getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<Transaction>
+        PARSER = new com.google.protobuf.AbstractParser<Transaction>() {
+      @java.lang.Override
+      public Transaction parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new Transaction(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<Transaction> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Transaction> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoinj.wallet.Protos.Transaction getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:wallet.ScryptParameters)
   }
 
-  public interface ExtensionOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:wallet.Extension)
+  public interface ScryptParametersOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:wallet.ScryptParameters)
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>required string id = 1;</code>
-     *
      * <pre>
-     * like org.whatever.foo.bar
+     * Salt to use in generation of the wallet password (8 bytes)
      * </pre>
+     *
+     * <code>required bytes salt = 1;</code>
      */
-    boolean hasId();
+    boolean hasSalt();
     /**
-     * <code>required string id = 1;</code>
-     *
      * <pre>
-     * like org.whatever.foo.bar
+     * Salt to use in generation of the wallet password (8 bytes)
      * </pre>
+     *
+     * <code>required bytes salt = 1;</code>
      */
-    java.lang.String getId();
+    com.google.protobuf.ByteString getSalt();
+
     /**
-     * <code>required string id = 1;</code>
+     * <pre>
+     * CPU/ memory cost parameter
+     * </pre>
      *
+     * <code>optional int64 n = 2 [default = 16384];</code>
+     */
+    boolean hasN();
+    /**
      * <pre>
-     * like org.whatever.foo.bar
+     * CPU/ memory cost parameter
      * </pre>
+     *
+     * <code>optional int64 n = 2 [default = 16384];</code>
      */
-    com.google.protobuf.ByteString
-        getIdBytes();
+    long getN();
 
     /**
-     * <code>required bytes data = 2;</code>
+     * <pre>
+     * Block size parameter
+     * </pre>
+     *
+     * <code>optional int32 r = 3 [default = 8];</code>
      */
-    boolean hasData();
+    boolean hasR();
     /**
-     * <code>required bytes data = 2;</code>
+     * <pre>
+     * Block size parameter
+     * </pre>
+     *
+     * <code>optional int32 r = 3 [default = 8];</code>
      */
-    com.google.protobuf.ByteString getData();
+    int getR();
 
     /**
-     * <code>required bool mandatory = 3;</code>
-     *
      * <pre>
-     * If we do not understand a mandatory extension, abort to prevent data loss.
-     * For example, this could be applied to a new type of holding, such as a contract, where
-     * dropping of an extension in a read/write cycle could cause loss of value.
+     * Parallelisation parameter
      * </pre>
+     *
+     * <code>optional int32 p = 4 [default = 1];</code>
      */
-    boolean hasMandatory();
+    boolean hasP();
     /**
-     * <code>required bool mandatory = 3;</code>
-     *
      * <pre>
-     * If we do not understand a mandatory extension, abort to prevent data loss.
-     * For example, this could be applied to a new type of holding, such as a contract, where
-     * dropping of an extension in a read/write cycle could cause loss of value.
+     * Parallelisation parameter
      * </pre>
+     *
+     * <code>optional int32 p = 4 [default = 1];</code>
      */
-    boolean getMandatory();
+    int getP();
   }
   /**
-   * Protobuf type {@code wallet.Extension}
-   *
    * <pre>
-   ** An extension to the wallet 
+   ** The parameters used in the scrypt key derivation function.
+   *  The default values are taken from http://www.tarsnap.com/scrypt/scrypt-slides.pdf.
+   *  They can be increased - n is the number of iterations performed and
+   *  r and p can be used to tweak the algorithm - see:
+   *  http://stackoverflow.com/questions/11126315/what-are-optimal-scrypt-work-factors
    * </pre>
+   *
+   * Protobuf type {@code wallet.ScryptParameters}
    */
-  public static final class Extension extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:wallet.Extension)
-      ExtensionOrBuilder {
-    // Use Extension.newBuilder() to construct.
-    private Extension(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+  public  static final class ScryptParameters extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:wallet.ScryptParameters)
+      ScryptParametersOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use ScryptParameters.newBuilder() to construct.
+    private ScryptParameters(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
     }
-    private Extension(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Extension defaultInstance;
-    public static Extension getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public Extension getDefaultInstanceForType() {
-      return defaultInstance;
+    private ScryptParameters() {
+      salt_ = com.google.protobuf.ByteString.EMPTY;
+      n_ = 16384L;
+      r_ = 8;
+      p_ = 1;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
-    private Extension(
+    private ScryptParameters(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -12203,27 +14378,31 @@ private Extension(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
-              com.google.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
-              id_ = bs;
+              salt_ = input.readBytes();
               break;
             }
-            case 18: {
+            case 16: {
               bitField0_ |= 0x00000002;
-              data_ = input.readBytes();
+              n_ = input.readInt64();
               break;
             }
             case 24: {
               bitField0_ |= 0x00000004;
-              mandatory_ = input.readBool();
+              r_ = input.readInt32();
+              break;
+            }
+            case 32: {
+              bitField0_ |= 0x00000008;
+              p_ = input.readInt32();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
               break;
             }
           }
@@ -12232,7 +14411,7 @@ private Extension(
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -12240,148 +14419,118 @@ private Extension(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bitcoinj.wallet.Protos.internal_static_wallet_Extension_descriptor;
+      return org.bitcoinj.wallet.Protos.internal_static_wallet_ScryptParameters_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bitcoinj.wallet.Protos.internal_static_wallet_Extension_fieldAccessorTable
+      return org.bitcoinj.wallet.Protos.internal_static_wallet_ScryptParameters_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bitcoinj.wallet.Protos.Extension.class, org.bitcoinj.wallet.Protos.Extension.Builder.class);
-    }
-
-    public static com.google.protobuf.Parser<Extension> PARSER =
-        new com.google.protobuf.AbstractParser<Extension>() {
-      public Extension parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Extension(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Extension> getParserForType() {
-      return PARSER;
+              org.bitcoinj.wallet.Protos.ScryptParameters.class, org.bitcoinj.wallet.Protos.ScryptParameters.Builder.class);
     }
 
     private int bitField0_;
-    public static final int ID_FIELD_NUMBER = 1;
-    private java.lang.Object id_;
+    public static final int SALT_FIELD_NUMBER = 1;
+    private com.google.protobuf.ByteString salt_;
     /**
-     * <code>required string id = 1;</code>
-     *
      * <pre>
-     * like org.whatever.foo.bar
+     * Salt to use in generation of the wallet password (8 bytes)
      * </pre>
+     *
+     * <code>required bytes salt = 1;</code>
      */
-    public boolean hasId() {
+    public boolean hasSalt() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required string id = 1;</code>
-     *
      * <pre>
-     * like org.whatever.foo.bar
+     * Salt to use in generation of the wallet password (8 bytes)
      * </pre>
+     *
+     * <code>required bytes salt = 1;</code>
      */
-    public java.lang.String getId() {
-      java.lang.Object ref = id_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (bs.isValidUtf8()) {
-          id_ = s;
-        }
-        return s;
-      }
+    public com.google.protobuf.ByteString getSalt() {
+      return salt_;
     }
+
+    public static final int N_FIELD_NUMBER = 2;
+    private long n_;
     /**
-     * <code>required string id = 1;</code>
+     * <pre>
+     * CPU/ memory cost parameter
+     * </pre>
      *
+     * <code>optional int64 n = 2 [default = 16384];</code>
+     */
+    public boolean hasN() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
      * <pre>
-     * like org.whatever.foo.bar
+     * CPU/ memory cost parameter
      * </pre>
+     *
+     * <code>optional int64 n = 2 [default = 16384];</code>
      */
-    public com.google.protobuf.ByteString
-        getIdBytes() {
-      java.lang.Object ref = id_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        id_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
+    public long getN() {
+      return n_;
     }
 
-    public static final int DATA_FIELD_NUMBER = 2;
-    private com.google.protobuf.ByteString data_;
+    public static final int R_FIELD_NUMBER = 3;
+    private int r_;
     /**
-     * <code>required bytes data = 2;</code>
+     * <pre>
+     * Block size parameter
+     * </pre>
+     *
+     * <code>optional int32 r = 3 [default = 8];</code>
      */
-    public boolean hasData() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
+    public boolean hasR() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * <code>required bytes data = 2;</code>
+     * <pre>
+     * Block size parameter
+     * </pre>
+     *
+     * <code>optional int32 r = 3 [default = 8];</code>
      */
-    public com.google.protobuf.ByteString getData() {
-      return data_;
+    public int getR() {
+      return r_;
     }
 
-    public static final int MANDATORY_FIELD_NUMBER = 3;
-    private boolean mandatory_;
+    public static final int P_FIELD_NUMBER = 4;
+    private int p_;
     /**
-     * <code>required bool mandatory = 3;</code>
-     *
      * <pre>
-     * If we do not understand a mandatory extension, abort to prevent data loss.
-     * For example, this could be applied to a new type of holding, such as a contract, where
-     * dropping of an extension in a read/write cycle could cause loss of value.
+     * Parallelisation parameter
      * </pre>
+     *
+     * <code>optional int32 p = 4 [default = 1];</code>
      */
-    public boolean hasMandatory() {
-      return ((bitField0_ & 0x00000004) == 0x00000004);
+    public boolean hasP() {
+      return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * <code>required bool mandatory = 3;</code>
-     *
      * <pre>
-     * If we do not understand a mandatory extension, abort to prevent data loss.
-     * For example, this could be applied to a new type of holding, such as a contract, where
-     * dropping of an extension in a read/write cycle could cause loss of value.
+     * Parallelisation parameter
      * </pre>
-     */
-    public boolean getMandatory() {
-      return mandatory_;
+     *
+     * <code>optional int32 p = 4 [default = 1];</code>
+     */
+    public int getP() {
+      return p_;
     }
 
-    private void initFields() {
-      id_ = "";
-      data_ = com.google.protobuf.ByteString.EMPTY;
-      mandatory_ = false;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
       if (isInitialized == 0) return false;
 
-      if (!hasId()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasData()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasMandatory()) {
+      if (!hasSalt()) {
         memoizedIsInitialized = 0;
         return false;
       }
@@ -12389,263 +14538,388 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeBytes(1, getIdBytes());
+        output.writeBytes(1, salt_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeBytes(2, data_);
+        output.writeInt64(2, n_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeBool(3, mandatory_);
+        output.writeInt32(3, r_);
+      }
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        output.writeInt32(4, p_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(1, getIdBytes());
+          .computeBytesSize(1, salt_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(2, data_);
+          .computeInt64Size(2, n_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(3, mandatory_);
+          .computeInt32Size(3, r_);
+      }
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(4, p_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoinj.wallet.Protos.ScryptParameters)) {
+        return super.equals(obj);
+      }
+      org.bitcoinj.wallet.Protos.ScryptParameters other = (org.bitcoinj.wallet.Protos.ScryptParameters) obj;
+
+      boolean result = true;
+      result = result && (hasSalt() == other.hasSalt());
+      if (hasSalt()) {
+        result = result && getSalt()
+            .equals(other.getSalt());
+      }
+      result = result && (hasN() == other.hasN());
+      if (hasN()) {
+        result = result && (getN()
+            == other.getN());
+      }
+      result = result && (hasR() == other.hasR());
+      if (hasR()) {
+        result = result && (getR()
+            == other.getR());
+      }
+      result = result && (hasP() == other.hasP());
+      if (hasP()) {
+        result = result && (getP()
+            == other.getP());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
     }
 
-    public static org.bitcoinj.wallet.Protos.Extension parseFrom(
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasSalt()) {
+        hash = (37 * hash) + SALT_FIELD_NUMBER;
+        hash = (53 * hash) + getSalt().hashCode();
+      }
+      if (hasN()) {
+        hash = (37 * hash) + N_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getN());
+      }
+      if (hasR()) {
+        hash = (37 * hash) + R_FIELD_NUMBER;
+        hash = (53 * hash) + getR();
+      }
+      if (hasP()) {
+        hash = (37 * hash) + P_FIELD_NUMBER;
+        hash = (53 * hash) + getP();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static org.bitcoinj.wallet.Protos.ScryptParameters parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.wallet.Protos.ScryptParameters parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.bitcoinj.wallet.Protos.ScryptParameters parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bitcoinj.wallet.Protos.Extension parseFrom(
+    public static org.bitcoinj.wallet.Protos.ScryptParameters parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bitcoinj.wallet.Protos.Extension parseFrom(byte[] data)
+    public static org.bitcoinj.wallet.Protos.ScryptParameters parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bitcoinj.wallet.Protos.Extension parseFrom(
+    public static org.bitcoinj.wallet.Protos.ScryptParameters parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bitcoinj.wallet.Protos.Extension parseFrom(java.io.InputStream input)
+    public static org.bitcoinj.wallet.Protos.ScryptParameters parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
-    public static org.bitcoinj.wallet.Protos.Extension parseFrom(
+    public static org.bitcoinj.wallet.Protos.ScryptParameters parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bitcoinj.wallet.Protos.Extension parseDelimitedFrom(java.io.InputStream input)
+    public static org.bitcoinj.wallet.Protos.ScryptParameters parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bitcoinj.wallet.Protos.Extension parseDelimitedFrom(
+    public static org.bitcoinj.wallet.Protos.ScryptParameters parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bitcoinj.wallet.Protos.Extension parseFrom(
+    public static org.bitcoinj.wallet.Protos.ScryptParameters parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
-    public static org.bitcoinj.wallet.Protos.Extension parseFrom(
+    public static org.bitcoinj.wallet.Protos.ScryptParameters parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.bitcoinj.wallet.Protos.Extension prototype) {
-      return newBuilder().mergeFrom(prototype);
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(org.bitcoinj.wallet.Protos.ScryptParameters prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code wallet.Extension}
-     *
      * <pre>
-     ** An extension to the wallet 
+     ** The parameters used in the scrypt key derivation function.
+     *  The default values are taken from http://www.tarsnap.com/scrypt/scrypt-slides.pdf.
+     *  They can be increased - n is the number of iterations performed and
+     *  r and p can be used to tweak the algorithm - see:
+     *  http://stackoverflow.com/questions/11126315/what-are-optimal-scrypt-work-factors
      * </pre>
+     *
+     * Protobuf type {@code wallet.ScryptParameters}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:wallet.Extension)
-        org.bitcoinj.wallet.Protos.ExtensionOrBuilder {
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:wallet.ScryptParameters)
+        org.bitcoinj.wallet.Protos.ScryptParametersOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_Extension_descriptor;
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_ScryptParameters_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_Extension_fieldAccessorTable
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_ScryptParameters_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bitcoinj.wallet.Protos.Extension.class, org.bitcoinj.wallet.Protos.Extension.Builder.class);
+                org.bitcoinj.wallet.Protos.ScryptParameters.class, org.bitcoinj.wallet.Protos.ScryptParameters.Builder.class);
       }
 
-      // Construct using org.bitcoinj.wallet.Protos.Extension.newBuilder()
+      // Construct using org.bitcoinj.wallet.Protos.ScryptParameters.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
-        id_ = "";
+        salt_ = com.google.protobuf.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000001);
-        data_ = com.google.protobuf.ByteString.EMPTY;
+        n_ = 16384L;
         bitField0_ = (bitField0_ & ~0x00000002);
-        mandatory_ = false;
+        r_ = 8;
         bitField0_ = (bitField0_ & ~0x00000004);
+        p_ = 1;
+        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_Extension_descriptor;
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_ScryptParameters_descriptor;
       }
 
-      public org.bitcoinj.wallet.Protos.Extension getDefaultInstanceForType() {
-        return org.bitcoinj.wallet.Protos.Extension.getDefaultInstance();
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.ScryptParameters getDefaultInstanceForType() {
+        return org.bitcoinj.wallet.Protos.ScryptParameters.getDefaultInstance();
       }
 
-      public org.bitcoinj.wallet.Protos.Extension build() {
-        org.bitcoinj.wallet.Protos.Extension result = buildPartial();
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.ScryptParameters build() {
+        org.bitcoinj.wallet.Protos.ScryptParameters result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.bitcoinj.wallet.Protos.Extension buildPartial() {
-        org.bitcoinj.wallet.Protos.Extension result = new org.bitcoinj.wallet.Protos.Extension(this);
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.ScryptParameters buildPartial() {
+        org.bitcoinj.wallet.Protos.ScryptParameters result = new org.bitcoinj.wallet.Protos.ScryptParameters(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
           to_bitField0_ |= 0x00000001;
         }
-        result.id_ = id_;
+        result.salt_ = salt_;
         if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
           to_bitField0_ |= 0x00000002;
         }
-        result.data_ = data_;
+        result.n_ = n_;
         if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
           to_bitField0_ |= 0x00000004;
         }
-        result.mandatory_ = mandatory_;
+        result.r_ = r_;
+        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+          to_bitField0_ |= 0x00000008;
+        }
+        result.p_ = p_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bitcoinj.wallet.Protos.Extension) {
-          return mergeFrom((org.bitcoinj.wallet.Protos.Extension)other);
+        if (other instanceof org.bitcoinj.wallet.Protos.ScryptParameters) {
+          return mergeFrom((org.bitcoinj.wallet.Protos.ScryptParameters)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bitcoinj.wallet.Protos.Extension other) {
-        if (other == org.bitcoinj.wallet.Protos.Extension.getDefaultInstance()) return this;
-        if (other.hasId()) {
-          bitField0_ |= 0x00000001;
-          id_ = other.id_;
-          onChanged();
+      public Builder mergeFrom(org.bitcoinj.wallet.Protos.ScryptParameters other) {
+        if (other == org.bitcoinj.wallet.Protos.ScryptParameters.getDefaultInstance()) return this;
+        if (other.hasSalt()) {
+          setSalt(other.getSalt());
         }
-        if (other.hasData()) {
-          setData(other.getData());
+        if (other.hasN()) {
+          setN(other.getN());
         }
-        if (other.hasMandatory()) {
-          setMandatory(other.getMandatory());
+        if (other.hasR()) {
+          setR(other.getR());
+        }
+        if (other.hasP()) {
+          setP(other.getP());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
-        if (!hasId()) {
-          
-          return false;
-        }
-        if (!hasData()) {
-          
-          return false;
-        }
-        if (!hasMandatory()) {
-          
+        if (!hasSalt()) {
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bitcoinj.wallet.Protos.Extension parsedMessage = null;
+        org.bitcoinj.wallet.Protos.ScryptParameters parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bitcoinj.wallet.Protos.Extension) e.getUnfinishedMessage();
-          throw e;
+          parsedMessage = (org.bitcoinj.wallet.Protos.ScryptParameters) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -12655,225 +14929,282 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private java.lang.Object id_ = "";
+      private com.google.protobuf.ByteString salt_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>required string id = 1;</code>
-       *
        * <pre>
-       * like org.whatever.foo.bar
+       * Salt to use in generation of the wallet password (8 bytes)
        * </pre>
+       *
+       * <code>required bytes salt = 1;</code>
        */
-      public boolean hasId() {
+      public boolean hasSalt() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>required string id = 1;</code>
-       *
        * <pre>
-       * like org.whatever.foo.bar
+       * Salt to use in generation of the wallet password (8 bytes)
        * </pre>
+       *
+       * <code>required bytes salt = 1;</code>
        */
-      public java.lang.String getId() {
-        java.lang.Object ref = id_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          if (bs.isValidUtf8()) {
-            id_ = s;
-          }
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
+      public com.google.protobuf.ByteString getSalt() {
+        return salt_;
       }
       /**
-       * <code>required string id = 1;</code>
+       * <pre>
+       * Salt to use in generation of the wallet password (8 bytes)
+       * </pre>
        *
+       * <code>required bytes salt = 1;</code>
+       */
+      public Builder setSalt(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000001;
+        salt_ = value;
+        onChanged();
+        return this;
+      }
+      /**
        * <pre>
-       * like org.whatever.foo.bar
+       * Salt to use in generation of the wallet password (8 bytes)
        * </pre>
+       *
+       * <code>required bytes salt = 1;</code>
        */
-      public com.google.protobuf.ByteString
-          getIdBytes() {
-        java.lang.Object ref = id_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          id_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
+      public Builder clearSalt() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        salt_ = getDefaultInstance().getSalt();
+        onChanged();
+        return this;
       }
+
+      private long n_ = 16384L;
       /**
-       * <code>required string id = 1;</code>
-       *
        * <pre>
-       * like org.whatever.foo.bar
+       * CPU/ memory cost parameter
        * </pre>
+       *
+       * <code>optional int64 n = 2 [default = 16384];</code>
        */
-      public Builder setId(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
-        id_ = value;
-        onChanged();
-        return this;
+      public boolean hasN() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>required string id = 1;</code>
+       * <pre>
+       * CPU/ memory cost parameter
+       * </pre>
        *
+       * <code>optional int64 n = 2 [default = 16384];</code>
+       */
+      public long getN() {
+        return n_;
+      }
+      /**
        * <pre>
-       * like org.whatever.foo.bar
+       * CPU/ memory cost parameter
        * </pre>
+       *
+       * <code>optional int64 n = 2 [default = 16384];</code>
        */
-      public Builder clearId() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        id_ = getDefaultInstance().getId();
+      public Builder setN(long value) {
+        bitField0_ |= 0x00000002;
+        n_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>required string id = 1;</code>
-       *
        * <pre>
-       * like org.whatever.foo.bar
+       * CPU/ memory cost parameter
        * </pre>
+       *
+       * <code>optional int64 n = 2 [default = 16384];</code>
        */
-      public Builder setIdBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
-        id_ = value;
+      public Builder clearN() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        n_ = 16384L;
         onChanged();
         return this;
       }
 
-      private com.google.protobuf.ByteString data_ = com.google.protobuf.ByteString.EMPTY;
+      private int r_ = 8;
       /**
-       * <code>required bytes data = 2;</code>
+       * <pre>
+       * Block size parameter
+       * </pre>
+       *
+       * <code>optional int32 r = 3 [default = 8];</code>
        */
-      public boolean hasData() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
+      public boolean hasR() {
+        return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>required bytes data = 2;</code>
+       * <pre>
+       * Block size parameter
+       * </pre>
+       *
+       * <code>optional int32 r = 3 [default = 8];</code>
        */
-      public com.google.protobuf.ByteString getData() {
-        return data_;
+      public int getR() {
+        return r_;
       }
       /**
-       * <code>required bytes data = 2;</code>
+       * <pre>
+       * Block size parameter
+       * </pre>
+       *
+       * <code>optional int32 r = 3 [default = 8];</code>
        */
-      public Builder setData(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
-        data_ = value;
+      public Builder setR(int value) {
+        bitField0_ |= 0x00000004;
+        r_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>required bytes data = 2;</code>
+       * <pre>
+       * Block size parameter
+       * </pre>
+       *
+       * <code>optional int32 r = 3 [default = 8];</code>
        */
-      public Builder clearData() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        data_ = getDefaultInstance().getData();
+      public Builder clearR() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        r_ = 8;
         onChanged();
         return this;
       }
 
-      private boolean mandatory_ ;
+      private int p_ = 1;
       /**
-       * <code>required bool mandatory = 3;</code>
-       *
        * <pre>
-       * If we do not understand a mandatory extension, abort to prevent data loss.
-       * For example, this could be applied to a new type of holding, such as a contract, where
-       * dropping of an extension in a read/write cycle could cause loss of value.
+       * Parallelisation parameter
        * </pre>
+       *
+       * <code>optional int32 p = 4 [default = 1];</code>
        */
-      public boolean hasMandatory() {
-        return ((bitField0_ & 0x00000004) == 0x00000004);
+      public boolean hasP() {
+        return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * <code>required bool mandatory = 3;</code>
-       *
        * <pre>
-       * If we do not understand a mandatory extension, abort to prevent data loss.
-       * For example, this could be applied to a new type of holding, such as a contract, where
-       * dropping of an extension in a read/write cycle could cause loss of value.
+       * Parallelisation parameter
        * </pre>
+       *
+       * <code>optional int32 p = 4 [default = 1];</code>
        */
-      public boolean getMandatory() {
-        return mandatory_;
+      public int getP() {
+        return p_;
       }
       /**
-       * <code>required bool mandatory = 3;</code>
-       *
        * <pre>
-       * If we do not understand a mandatory extension, abort to prevent data loss.
-       * For example, this could be applied to a new type of holding, such as a contract, where
-       * dropping of an extension in a read/write cycle could cause loss of value.
+       * Parallelisation parameter
        * </pre>
+       *
+       * <code>optional int32 p = 4 [default = 1];</code>
        */
-      public Builder setMandatory(boolean value) {
-        bitField0_ |= 0x00000004;
-        mandatory_ = value;
+      public Builder setP(int value) {
+        bitField0_ |= 0x00000008;
+        p_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>required bool mandatory = 3;</code>
-       *
        * <pre>
-       * If we do not understand a mandatory extension, abort to prevent data loss.
-       * For example, this could be applied to a new type of holding, such as a contract, where
-       * dropping of an extension in a read/write cycle could cause loss of value.
+       * Parallelisation parameter
        * </pre>
+       *
+       * <code>optional int32 p = 4 [default = 1];</code>
        */
-      public Builder clearMandatory() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        mandatory_ = false;
+      public Builder clearP() {
+        bitField0_ = (bitField0_ & ~0x00000008);
+        p_ = 1;
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
 
-      // @@protoc_insertion_point(builder_scope:wallet.Extension)
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:wallet.ScryptParameters)
     }
 
+    // @@protoc_insertion_point(class_scope:wallet.ScryptParameters)
+    private static final org.bitcoinj.wallet.Protos.ScryptParameters DEFAULT_INSTANCE;
     static {
-      defaultInstance = new Extension(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoinj.wallet.Protos.ScryptParameters();
+    }
+
+    public static org.bitcoinj.wallet.Protos.ScryptParameters getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<ScryptParameters>
+        PARSER = new com.google.protobuf.AbstractParser<ScryptParameters>() {
+      @java.lang.Override
+      public ScryptParameters parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new ScryptParameters(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<ScryptParameters> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<ScryptParameters> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoinj.wallet.Protos.ScryptParameters getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:wallet.Extension)
   }
 
-  public interface TagOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:wallet.Tag)
+  public interface ExtensionOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:wallet.Extension)
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>required string tag = 1;</code>
+     * <pre>
+     * like org.whatever.foo.bar
+     * </pre>
+     *
+     * <code>required string id = 1;</code>
      */
-    boolean hasTag();
+    boolean hasId();
     /**
-     * <code>required string tag = 1;</code>
+     * <pre>
+     * like org.whatever.foo.bar
+     * </pre>
+     *
+     * <code>required string id = 1;</code>
      */
-    java.lang.String getTag();
+    java.lang.String getId();
     /**
-     * <code>required string tag = 1;</code>
+     * <pre>
+     * like org.whatever.foo.bar
+     * </pre>
+     *
+     * <code>required string id = 1;</code>
      */
     com.google.protobuf.ByteString
-        getTagBytes();
+        getIdBytes();
 
     /**
      * <code>required bytes data = 2;</code>
@@ -12883,48 +15214,63 @@ public interface TagOrBuilder extends
      * <code>required bytes data = 2;</code>
      */
     com.google.protobuf.ByteString getData();
+
+    /**
+     * <pre>
+     * If we do not understand a mandatory extension, abort to prevent data loss.
+     * For example, this could be applied to a new type of holding, such as a contract, where
+     * dropping of an extension in a read/write cycle could cause loss of value.
+     * </pre>
+     *
+     * <code>required bool mandatory = 3;</code>
+     */
+    boolean hasMandatory();
+    /**
+     * <pre>
+     * If we do not understand a mandatory extension, abort to prevent data loss.
+     * For example, this could be applied to a new type of holding, such as a contract, where
+     * dropping of an extension in a read/write cycle could cause loss of value.
+     * </pre>
+     *
+     * <code>required bool mandatory = 3;</code>
+     */
+    boolean getMandatory();
   }
   /**
-   * Protobuf type {@code wallet.Tag}
-   *
    * <pre>
-   **
-   * A simple key-&gt;value mapping that has no interpreted content at all. A bit like the extensions mechanism except
-   * an extension is keyed by the ID of a piece of code that's loaded with the given data, and has the concept of
-   * being mandatory if that code isn't found. Whereas this is just a blind key/value store.
+   ** An extension to the wallet 
    * </pre>
+   *
+   * Protobuf type {@code wallet.Extension}
    */
-  public static final class Tag extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:wallet.Tag)
-      TagOrBuilder {
-    // Use Tag.newBuilder() to construct.
-    private Tag(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+  public  static final class Extension extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:wallet.Extension)
+      ExtensionOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use Extension.newBuilder() to construct.
+    private Extension(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private Tag(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Tag defaultInstance;
-    public static Tag getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public Tag getDefaultInstanceForType() {
-      return defaultInstance;
+    private Extension() {
+      id_ = "";
+      data_ = com.google.protobuf.ByteString.EMPTY;
+      mandatory_ = false;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
-    private Tag(
+    private Extension(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -12936,17 +15282,10 @@ private Tag(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               com.google.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
-              tag_ = bs;
+              id_ = bs;
               break;
             }
             case 18: {
@@ -12954,13 +15293,25 @@ private Tag(
               data_ = input.readBytes();
               break;
             }
+            case 24: {
+              bitField0_ |= 0x00000004;
+              mandatory_ = input.readBool();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -12968,45 +15319,39 @@ private Tag(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bitcoinj.wallet.Protos.internal_static_wallet_Tag_descriptor;
+      return org.bitcoinj.wallet.Protos.internal_static_wallet_Extension_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bitcoinj.wallet.Protos.internal_static_wallet_Tag_fieldAccessorTable
+      return org.bitcoinj.wallet.Protos.internal_static_wallet_Extension_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bitcoinj.wallet.Protos.Tag.class, org.bitcoinj.wallet.Protos.Tag.Builder.class);
-    }
-
-    public static com.google.protobuf.Parser<Tag> PARSER =
-        new com.google.protobuf.AbstractParser<Tag>() {
-      public Tag parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Tag(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Tag> getParserForType() {
-      return PARSER;
+              org.bitcoinj.wallet.Protos.Extension.class, org.bitcoinj.wallet.Protos.Extension.Builder.class);
     }
 
     private int bitField0_;
-    public static final int TAG_FIELD_NUMBER = 1;
-    private java.lang.Object tag_;
+    public static final int ID_FIELD_NUMBER = 1;
+    private volatile java.lang.Object id_;
     /**
-     * <code>required string tag = 1;</code>
+     * <pre>
+     * like org.whatever.foo.bar
+     * </pre>
+     *
+     * <code>required string id = 1;</code>
      */
-    public boolean hasTag() {
+    public boolean hasId() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required string tag = 1;</code>
+     * <pre>
+     * like org.whatever.foo.bar
+     * </pre>
+     *
+     * <code>required string id = 1;</code>
      */
-    public java.lang.String getTag() {
-      java.lang.Object ref = tag_;
+    public java.lang.String getId() {
+      java.lang.Object ref = id_;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
@@ -13014,22 +15359,26 @@ public java.lang.String getTag() {
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
-          tag_ = s;
+          id_ = s;
         }
         return s;
       }
     }
     /**
-     * <code>required string tag = 1;</code>
+     * <pre>
+     * like org.whatever.foo.bar
+     * </pre>
+     *
+     * <code>required string id = 1;</code>
      */
     public com.google.protobuf.ByteString
-        getTagBytes() {
-      java.lang.Object ref = tag_;
+        getIdBytes() {
+      java.lang.Object ref = id_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        tag_ = b;
+        id_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
@@ -13051,17 +15400,41 @@ public com.google.protobuf.ByteString getData() {
       return data_;
     }
 
-    private void initFields() {
-      tag_ = "";
-      data_ = com.google.protobuf.ByteString.EMPTY;
+    public static final int MANDATORY_FIELD_NUMBER = 3;
+    private boolean mandatory_;
+    /**
+     * <pre>
+     * If we do not understand a mandatory extension, abort to prevent data loss.
+     * For example, this could be applied to a new type of holding, such as a contract, where
+     * dropping of an extension in a read/write cycle could cause loss of value.
+     * </pre>
+     *
+     * <code>required bool mandatory = 3;</code>
+     */
+    public boolean hasMandatory() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
+    }
+    /**
+     * <pre>
+     * If we do not understand a mandatory extension, abort to prevent data loss.
+     * For example, this could be applied to a new type of holding, such as a contract, where
+     * dropping of an extension in a read/write cycle could cause loss of value.
+     * </pre>
+     *
+     * <code>required bool mandatory = 3;</code>
+     */
+    public boolean getMandatory() {
+      return mandatory_;
     }
+
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
       if (isInitialized == 0) return false;
 
-      if (!hasTag()) {
+      if (!hasId()) {
         memoizedIsInitialized = 0;
         return false;
       }
@@ -13069,250 +15442,374 @@ public final boolean isInitialized() {
         memoizedIsInitialized = 0;
         return false;
       }
+      if (!hasMandatory()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
       memoizedIsInitialized = 1;
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeBytes(1, getTagBytes());
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, id_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeBytes(2, data_);
       }
-      getUnknownFields().writeTo(output);
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        output.writeBool(3, mandatory_);
+      }
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(1, getTagBytes());
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, id_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(2, data_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(3, mandatory_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoinj.wallet.Protos.Extension)) {
+        return super.equals(obj);
+      }
+      org.bitcoinj.wallet.Protos.Extension other = (org.bitcoinj.wallet.Protos.Extension) obj;
+
+      boolean result = true;
+      result = result && (hasId() == other.hasId());
+      if (hasId()) {
+        result = result && getId()
+            .equals(other.getId());
+      }
+      result = result && (hasData() == other.hasData());
+      if (hasData()) {
+        result = result && getData()
+            .equals(other.getData());
+      }
+      result = result && (hasMandatory() == other.hasMandatory());
+      if (hasMandatory()) {
+        result = result && (getMandatory()
+            == other.getMandatory());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
     }
 
-    public static org.bitcoinj.wallet.Protos.Tag parseFrom(
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasId()) {
+        hash = (37 * hash) + ID_FIELD_NUMBER;
+        hash = (53 * hash) + getId().hashCode();
+      }
+      if (hasData()) {
+        hash = (37 * hash) + DATA_FIELD_NUMBER;
+        hash = (53 * hash) + getData().hashCode();
+      }
+      if (hasMandatory()) {
+        hash = (37 * hash) + MANDATORY_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+            getMandatory());
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static org.bitcoinj.wallet.Protos.Extension parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.wallet.Protos.Extension parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.bitcoinj.wallet.Protos.Extension parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bitcoinj.wallet.Protos.Tag parseFrom(
+    public static org.bitcoinj.wallet.Protos.Extension parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bitcoinj.wallet.Protos.Tag parseFrom(byte[] data)
+    public static org.bitcoinj.wallet.Protos.Extension parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bitcoinj.wallet.Protos.Tag parseFrom(
+    public static org.bitcoinj.wallet.Protos.Extension parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bitcoinj.wallet.Protos.Tag parseFrom(java.io.InputStream input)
+    public static org.bitcoinj.wallet.Protos.Extension parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
-    public static org.bitcoinj.wallet.Protos.Tag parseFrom(
+    public static org.bitcoinj.wallet.Protos.Extension parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bitcoinj.wallet.Protos.Tag parseDelimitedFrom(java.io.InputStream input)
+    public static org.bitcoinj.wallet.Protos.Extension parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bitcoinj.wallet.Protos.Tag parseDelimitedFrom(
+    public static org.bitcoinj.wallet.Protos.Extension parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bitcoinj.wallet.Protos.Tag parseFrom(
+    public static org.bitcoinj.wallet.Protos.Extension parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
-    public static org.bitcoinj.wallet.Protos.Tag parseFrom(
+    public static org.bitcoinj.wallet.Protos.Extension parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.bitcoinj.wallet.Protos.Tag prototype) {
-      return newBuilder().mergeFrom(prototype);
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(org.bitcoinj.wallet.Protos.Extension prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code wallet.Tag}
-     *
      * <pre>
-     **
-     * A simple key-&gt;value mapping that has no interpreted content at all. A bit like the extensions mechanism except
-     * an extension is keyed by the ID of a piece of code that's loaded with the given data, and has the concept of
-     * being mandatory if that code isn't found. Whereas this is just a blind key/value store.
+     ** An extension to the wallet 
      * </pre>
+     *
+     * Protobuf type {@code wallet.Extension}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:wallet.Tag)
-        org.bitcoinj.wallet.Protos.TagOrBuilder {
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:wallet.Extension)
+        org.bitcoinj.wallet.Protos.ExtensionOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_Tag_descriptor;
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_Extension_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_Tag_fieldAccessorTable
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_Extension_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bitcoinj.wallet.Protos.Tag.class, org.bitcoinj.wallet.Protos.Tag.Builder.class);
+                org.bitcoinj.wallet.Protos.Extension.class, org.bitcoinj.wallet.Protos.Extension.Builder.class);
       }
 
-      // Construct using org.bitcoinj.wallet.Protos.Tag.newBuilder()
+      // Construct using org.bitcoinj.wallet.Protos.Extension.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
-        tag_ = "";
+        id_ = "";
         bitField0_ = (bitField0_ & ~0x00000001);
         data_ = com.google.protobuf.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
+        mandatory_ = false;
+        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_Tag_descriptor;
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_Extension_descriptor;
       }
 
-      public org.bitcoinj.wallet.Protos.Tag getDefaultInstanceForType() {
-        return org.bitcoinj.wallet.Protos.Tag.getDefaultInstance();
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.Extension getDefaultInstanceForType() {
+        return org.bitcoinj.wallet.Protos.Extension.getDefaultInstance();
       }
 
-      public org.bitcoinj.wallet.Protos.Tag build() {
-        org.bitcoinj.wallet.Protos.Tag result = buildPartial();
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.Extension build() {
+        org.bitcoinj.wallet.Protos.Extension result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.bitcoinj.wallet.Protos.Tag buildPartial() {
-        org.bitcoinj.wallet.Protos.Tag result = new org.bitcoinj.wallet.Protos.Tag(this);
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.Extension buildPartial() {
+        org.bitcoinj.wallet.Protos.Extension result = new org.bitcoinj.wallet.Protos.Extension(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
           to_bitField0_ |= 0x00000001;
         }
-        result.tag_ = tag_;
+        result.id_ = id_;
         if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
           to_bitField0_ |= 0x00000002;
         }
         result.data_ = data_;
+        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+          to_bitField0_ |= 0x00000004;
+        }
+        result.mandatory_ = mandatory_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bitcoinj.wallet.Protos.Tag) {
-          return mergeFrom((org.bitcoinj.wallet.Protos.Tag)other);
+        if (other instanceof org.bitcoinj.wallet.Protos.Extension) {
+          return mergeFrom((org.bitcoinj.wallet.Protos.Extension)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bitcoinj.wallet.Protos.Tag other) {
-        if (other == org.bitcoinj.wallet.Protos.Tag.getDefaultInstance()) return this;
-        if (other.hasTag()) {
+      public Builder mergeFrom(org.bitcoinj.wallet.Protos.Extension other) {
+        if (other == org.bitcoinj.wallet.Protos.Extension.getDefaultInstance()) return this;
+        if (other.hasId()) {
           bitField0_ |= 0x00000001;
-          tag_ = other.tag_;
+          id_ = other.id_;
           onChanged();
         }
         if (other.hasData()) {
           setData(other.getData());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        if (other.hasMandatory()) {
+          setMandatory(other.getMandatory());
+        }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
-        if (!hasTag()) {
-          
+        if (!hasId()) {
           return false;
         }
         if (!hasData()) {
-          
+          return false;
+        }
+        if (!hasMandatory()) {
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bitcoinj.wallet.Protos.Tag parsedMessage = null;
+        org.bitcoinj.wallet.Protos.Extension parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bitcoinj.wallet.Protos.Tag) e.getUnfinishedMessage();
-          throw e;
+          parsedMessage = (org.bitcoinj.wallet.Protos.Extension) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -13322,24 +15819,32 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private java.lang.Object tag_ = "";
+      private java.lang.Object id_ = "";
       /**
-       * <code>required string tag = 1;</code>
+       * <pre>
+       * like org.whatever.foo.bar
+       * </pre>
+       *
+       * <code>required string id = 1;</code>
        */
-      public boolean hasTag() {
+      public boolean hasId() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>required string tag = 1;</code>
+       * <pre>
+       * like org.whatever.foo.bar
+       * </pre>
+       *
+       * <code>required string id = 1;</code>
        */
-      public java.lang.String getTag() {
-        java.lang.Object ref = tag_;
+      public java.lang.String getId() {
+        java.lang.Object ref = id_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
-            tag_ = s;
+            id_ = s;
           }
           return s;
         } else {
@@ -13347,53 +15852,69 @@ public java.lang.String getTag() {
         }
       }
       /**
-       * <code>required string tag = 1;</code>
+       * <pre>
+       * like org.whatever.foo.bar
+       * </pre>
+       *
+       * <code>required string id = 1;</code>
        */
       public com.google.protobuf.ByteString
-          getTagBytes() {
-        java.lang.Object ref = tag_;
+          getIdBytes() {
+        java.lang.Object ref = id_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          tag_ = b;
+          id_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
-       * <code>required string tag = 1;</code>
+       * <pre>
+       * like org.whatever.foo.bar
+       * </pre>
+       *
+       * <code>required string id = 1;</code>
        */
-      public Builder setTag(
+      public Builder setId(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   bitField0_ |= 0x00000001;
-        tag_ = value;
+        id_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>required string tag = 1;</code>
+       * <pre>
+       * like org.whatever.foo.bar
+       * </pre>
+       *
+       * <code>required string id = 1;</code>
        */
-      public Builder clearTag() {
+      public Builder clearId() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        tag_ = getDefaultInstance().getTag();
+        id_ = getDefaultInstance().getId();
         onChanged();
         return this;
       }
       /**
-       * <code>required string tag = 1;</code>
+       * <pre>
+       * like org.whatever.foo.bar
+       * </pre>
+       *
+       * <code>required string id = 1;</code>
        */
-      public Builder setTagBytes(
+      public Builder setIdBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
   bitField0_ |= 0x00000001;
-        tag_ = value;
+        id_ = value;
         onChanged();
         return this;
       }
@@ -13433,103 +15954,178 @@ public Builder clearData() {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:wallet.Tag)
+      private boolean mandatory_ ;
+      /**
+       * <pre>
+       * If we do not understand a mandatory extension, abort to prevent data loss.
+       * For example, this could be applied to a new type of holding, such as a contract, where
+       * dropping of an extension in a read/write cycle could cause loss of value.
+       * </pre>
+       *
+       * <code>required bool mandatory = 3;</code>
+       */
+      public boolean hasMandatory() {
+        return ((bitField0_ & 0x00000004) == 0x00000004);
+      }
+      /**
+       * <pre>
+       * If we do not understand a mandatory extension, abort to prevent data loss.
+       * For example, this could be applied to a new type of holding, such as a contract, where
+       * dropping of an extension in a read/write cycle could cause loss of value.
+       * </pre>
+       *
+       * <code>required bool mandatory = 3;</code>
+       */
+      public boolean getMandatory() {
+        return mandatory_;
+      }
+      /**
+       * <pre>
+       * If we do not understand a mandatory extension, abort to prevent data loss.
+       * For example, this could be applied to a new type of holding, such as a contract, where
+       * dropping of an extension in a read/write cycle could cause loss of value.
+       * </pre>
+       *
+       * <code>required bool mandatory = 3;</code>
+       */
+      public Builder setMandatory(boolean value) {
+        bitField0_ |= 0x00000004;
+        mandatory_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * If we do not understand a mandatory extension, abort to prevent data loss.
+       * For example, this could be applied to a new type of holding, such as a contract, where
+       * dropping of an extension in a read/write cycle could cause loss of value.
+       * </pre>
+       *
+       * <code>required bool mandatory = 3;</code>
+       */
+      public Builder clearMandatory() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        mandatory_ = false;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:wallet.Extension)
     }
 
+    // @@protoc_insertion_point(class_scope:wallet.Extension)
+    private static final org.bitcoinj.wallet.Protos.Extension DEFAULT_INSTANCE;
     static {
-      defaultInstance = new Tag(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoinj.wallet.Protos.Extension();
+    }
+
+    public static org.bitcoinj.wallet.Protos.Extension getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<Extension>
+        PARSER = new com.google.protobuf.AbstractParser<Extension>() {
+      @java.lang.Override
+      public Extension parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new Extension(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<Extension> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Extension> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoinj.wallet.Protos.Extension getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:wallet.Tag)
   }
 
-  public interface TransactionSignerOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:wallet.TransactionSigner)
+  public interface TagOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:wallet.Tag)
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>required string class_name = 1;</code>
-     *
-     * <pre>
-     * fully qualified class name of TransactionSigner implementation
-     * </pre>
+     * <code>required string tag = 1;</code>
      */
-    boolean hasClassName();
+    boolean hasTag();
     /**
-     * <code>required string class_name = 1;</code>
-     *
-     * <pre>
-     * fully qualified class name of TransactionSigner implementation
-     * </pre>
+     * <code>required string tag = 1;</code>
      */
-    java.lang.String getClassName();
+    java.lang.String getTag();
     /**
-     * <code>required string class_name = 1;</code>
-     *
-     * <pre>
-     * fully qualified class name of TransactionSigner implementation
-     * </pre>
+     * <code>required string tag = 1;</code>
      */
     com.google.protobuf.ByteString
-        getClassNameBytes();
+        getTagBytes();
 
     /**
-     * <code>optional bytes data = 2;</code>
-     *
-     * <pre>
-     * arbitrary data required for signer to function
-     * </pre>
+     * <code>required bytes data = 2;</code>
      */
     boolean hasData();
     /**
-     * <code>optional bytes data = 2;</code>
-     *
-     * <pre>
-     * arbitrary data required for signer to function
-     * </pre>
+     * <code>required bytes data = 2;</code>
      */
     com.google.protobuf.ByteString getData();
   }
   /**
-   * Protobuf type {@code wallet.TransactionSigner}
-   *
    * <pre>
    **
-   * Data required to reconstruct TransactionSigner.
+   * A simple key-&gt;value mapping that has no interpreted content at all. A bit like the extensions mechanism except
+   * an extension is keyed by the ID of a piece of code that's loaded with the given data, and has the concept of
+   * being mandatory if that code isn't found. Whereas this is just a blind key/value store.
    * </pre>
+   *
+   * Protobuf type {@code wallet.Tag}
    */
-  public static final class TransactionSigner extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:wallet.TransactionSigner)
-      TransactionSignerOrBuilder {
-    // Use TransactionSigner.newBuilder() to construct.
-    private TransactionSigner(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+  public  static final class Tag extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:wallet.Tag)
+      TagOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use Tag.newBuilder() to construct.
+    private Tag(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private TransactionSigner(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final TransactionSigner defaultInstance;
-    public static TransactionSigner getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public TransactionSigner getDefaultInstanceForType() {
-      return defaultInstance;
+    private Tag() {
+      tag_ = "";
+      data_ = com.google.protobuf.ByteString.EMPTY;
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
-    private TransactionSigner(
+    private Tag(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -13541,17 +16137,10 @@ private TransactionSigner(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               com.google.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
-              className_ = bs;
+              tag_ = bs;
               break;
             }
             case 18: {
@@ -13559,13 +16148,20 @@ private TransactionSigner(
               data_ = input.readBytes();
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -13573,53 +16169,31 @@ private TransactionSigner(
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionSigner_descriptor;
+      return org.bitcoinj.wallet.Protos.internal_static_wallet_Tag_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionSigner_fieldAccessorTable
+      return org.bitcoinj.wallet.Protos.internal_static_wallet_Tag_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.bitcoinj.wallet.Protos.TransactionSigner.class, org.bitcoinj.wallet.Protos.TransactionSigner.Builder.class);
-    }
-
-    public static com.google.protobuf.Parser<TransactionSigner> PARSER =
-        new com.google.protobuf.AbstractParser<TransactionSigner>() {
-      public TransactionSigner parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TransactionSigner(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<TransactionSigner> getParserForType() {
-      return PARSER;
+              org.bitcoinj.wallet.Protos.Tag.class, org.bitcoinj.wallet.Protos.Tag.Builder.class);
     }
 
     private int bitField0_;
-    public static final int CLASS_NAME_FIELD_NUMBER = 1;
-    private java.lang.Object className_;
+    public static final int TAG_FIELD_NUMBER = 1;
+    private volatile java.lang.Object tag_;
     /**
-     * <code>required string class_name = 1;</code>
-     *
-     * <pre>
-     * fully qualified class name of TransactionSigner implementation
-     * </pre>
+     * <code>required string tag = 1;</code>
      */
-    public boolean hasClassName() {
+    public boolean hasTag() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required string class_name = 1;</code>
-     *
-     * <pre>
-     * fully qualified class name of TransactionSigner implementation
-     * </pre>
+     * <code>required string tag = 1;</code>
      */
-    public java.lang.String getClassName() {
-      java.lang.Object ref = className_;
+    public java.lang.String getTag() {
+      java.lang.Object ref = tag_;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
@@ -13627,26 +16201,22 @@ public java.lang.String getClassName() {
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
         if (bs.isValidUtf8()) {
-          className_ = s;
+          tag_ = s;
         }
         return s;
       }
     }
     /**
-     * <code>required string class_name = 1;</code>
-     *
-     * <pre>
-     * fully qualified class name of TransactionSigner implementation
-     * </pre>
+     * <code>required string tag = 1;</code>
      */
     public com.google.protobuf.ByteString
-        getClassNameBytes() {
-      java.lang.Object ref = className_;
+        getTagBytes() {
+      java.lang.Object ref = tag_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        className_ = b;
+        tag_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
@@ -13656,37 +16226,30 @@ public java.lang.String getClassName() {
     public static final int DATA_FIELD_NUMBER = 2;
     private com.google.protobuf.ByteString data_;
     /**
-     * <code>optional bytes data = 2;</code>
-     *
-     * <pre>
-     * arbitrary data required for signer to function
-     * </pre>
+     * <code>required bytes data = 2;</code>
      */
     public boolean hasData() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>optional bytes data = 2;</code>
-     *
-     * <pre>
-     * arbitrary data required for signer to function
-     * </pre>
+     * <code>required bytes data = 2;</code>
      */
     public com.google.protobuf.ByteString getData() {
       return data_;
     }
 
-    private void initFields() {
-      className_ = "";
-      data_ = com.google.protobuf.ByteString.EMPTY;
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
       if (isInitialized == 0) return false;
 
-      if (!hasClassName()) {
+      if (!hasTag()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      if (!hasData()) {
         memoizedIsInitialized = 0;
         return false;
       }
@@ -13694,190 +16257,252 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeBytes(1, getClassNameBytes());
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, tag_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeBytes(2, data_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(1, getClassNameBytes());
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, tag_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(2, data_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoinj.wallet.Protos.Tag)) {
+        return super.equals(obj);
+      }
+      org.bitcoinj.wallet.Protos.Tag other = (org.bitcoinj.wallet.Protos.Tag) obj;
+
+      boolean result = true;
+      result = result && (hasTag() == other.hasTag());
+      if (hasTag()) {
+        result = result && getTag()
+            .equals(other.getTag());
+      }
+      result = result && (hasData() == other.hasData());
+      if (hasData()) {
+        result = result && getData()
+            .equals(other.getData());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasTag()) {
+        hash = (37 * hash) + TAG_FIELD_NUMBER;
+        hash = (53 * hash) + getTag().hashCode();
+      }
+      if (hasData()) {
+        hash = (37 * hash) + DATA_FIELD_NUMBER;
+        hash = (53 * hash) + getData().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static org.bitcoinj.wallet.Protos.Tag parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
     }
-
-    public static org.bitcoinj.wallet.Protos.TransactionSigner parseFrom(
+    public static org.bitcoinj.wallet.Protos.Tag parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static org.bitcoinj.wallet.Protos.Tag parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionSigner parseFrom(
+    public static org.bitcoinj.wallet.Protos.Tag parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionSigner parseFrom(byte[] data)
+    public static org.bitcoinj.wallet.Protos.Tag parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionSigner parseFrom(
+    public static org.bitcoinj.wallet.Protos.Tag parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionSigner parseFrom(java.io.InputStream input)
+    public static org.bitcoinj.wallet.Protos.Tag parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionSigner parseFrom(
+    public static org.bitcoinj.wallet.Protos.Tag parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionSigner parseDelimitedFrom(java.io.InputStream input)
+    public static org.bitcoinj.wallet.Protos.Tag parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionSigner parseDelimitedFrom(
+    public static org.bitcoinj.wallet.Protos.Tag parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionSigner parseFrom(
+    public static org.bitcoinj.wallet.Protos.Tag parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
-    public static org.bitcoinj.wallet.Protos.TransactionSigner parseFrom(
+    public static org.bitcoinj.wallet.Protos.Tag parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.bitcoinj.wallet.Protos.TransactionSigner prototype) {
-      return newBuilder().mergeFrom(prototype);
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(org.bitcoinj.wallet.Protos.Tag prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code wallet.TransactionSigner}
-     *
      * <pre>
      **
-     * Data required to reconstruct TransactionSigner.
+     * A simple key-&gt;value mapping that has no interpreted content at all. A bit like the extensions mechanism except
+     * an extension is keyed by the ID of a piece of code that's loaded with the given data, and has the concept of
+     * being mandatory if that code isn't found. Whereas this is just a blind key/value store.
      * </pre>
+     *
+     * Protobuf type {@code wallet.Tag}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:wallet.TransactionSigner)
-        org.bitcoinj.wallet.Protos.TransactionSignerOrBuilder {
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:wallet.Tag)
+        org.bitcoinj.wallet.Protos.TagOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionSigner_descriptor;
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_Tag_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionSigner_fieldAccessorTable
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_Tag_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.bitcoinj.wallet.Protos.TransactionSigner.class, org.bitcoinj.wallet.Protos.TransactionSigner.Builder.class);
+                org.bitcoinj.wallet.Protos.Tag.class, org.bitcoinj.wallet.Protos.Tag.Builder.class);
       }
 
-      // Construct using org.bitcoinj.wallet.Protos.TransactionSigner.newBuilder()
+      // Construct using org.bitcoinj.wallet.Protos.Tag.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
-        className_ = "";
+        tag_ = "";
         bitField0_ = (bitField0_ & ~0x00000001);
         data_ = com.google.protobuf.ByteString.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.bitcoinj.wallet.Protos.internal_static_wallet_TransactionSigner_descriptor;
+        return org.bitcoinj.wallet.Protos.internal_static_wallet_Tag_descriptor;
       }
 
-      public org.bitcoinj.wallet.Protos.TransactionSigner getDefaultInstanceForType() {
-        return org.bitcoinj.wallet.Protos.TransactionSigner.getDefaultInstance();
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.Tag getDefaultInstanceForType() {
+        return org.bitcoinj.wallet.Protos.Tag.getDefaultInstance();
       }
 
-      public org.bitcoinj.wallet.Protos.TransactionSigner build() {
-        org.bitcoinj.wallet.Protos.TransactionSigner result = buildPartial();
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.Tag build() {
+        org.bitcoinj.wallet.Protos.Tag result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.bitcoinj.wallet.Protos.TransactionSigner buildPartial() {
-        org.bitcoinj.wallet.Protos.TransactionSigner result = new org.bitcoinj.wallet.Protos.TransactionSigner(this);
+      @java.lang.Override
+      public org.bitcoinj.wallet.Protos.Tag buildPartial() {
+        org.bitcoinj.wallet.Protos.Tag result = new org.bitcoinj.wallet.Protos.Tag(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
           to_bitField0_ |= 0x00000001;
         }
-        result.className_ = className_;
+        result.tag_ = tag_;
         if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
           to_bitField0_ |= 0x00000002;
         }
@@ -13887,47 +16512,85 @@ public org.bitcoinj.wallet.Protos.TransactionSigner buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.bitcoinj.wallet.Protos.TransactionSigner) {
-          return mergeFrom((org.bitcoinj.wallet.Protos.TransactionSigner)other);
+        if (other instanceof org.bitcoinj.wallet.Protos.Tag) {
+          return mergeFrom((org.bitcoinj.wallet.Protos.Tag)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.bitcoinj.wallet.Protos.TransactionSigner other) {
-        if (other == org.bitcoinj.wallet.Protos.TransactionSigner.getDefaultInstance()) return this;
-        if (other.hasClassName()) {
+      public Builder mergeFrom(org.bitcoinj.wallet.Protos.Tag other) {
+        if (other == org.bitcoinj.wallet.Protos.Tag.getDefaultInstance()) return this;
+        if (other.hasTag()) {
           bitField0_ |= 0x00000001;
-          className_ = other.className_;
+          tag_ = other.tag_;
           onChanged();
         }
         if (other.hasData()) {
           setData(other.getData());
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
-        if (!hasClassName()) {
-          
+        if (!hasTag()) {
+          return false;
+        }
+        if (!hasData()) {
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.bitcoinj.wallet.Protos.TransactionSigner parsedMessage = null;
+        org.bitcoinj.wallet.Protos.Tag parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.bitcoinj.wallet.Protos.TransactionSigner) e.getUnfinishedMessage();
-          throw e;
+          parsedMessage = (org.bitcoinj.wallet.Protos.Tag) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -13937,32 +16600,24 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private java.lang.Object className_ = "";
+      private java.lang.Object tag_ = "";
       /**
-       * <code>required string class_name = 1;</code>
-       *
-       * <pre>
-       * fully qualified class name of TransactionSigner implementation
-       * </pre>
+       * <code>required string tag = 1;</code>
        */
-      public boolean hasClassName() {
+      public boolean hasTag() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>required string class_name = 1;</code>
-       *
-       * <pre>
-       * fully qualified class name of TransactionSigner implementation
-       * </pre>
+       * <code>required string tag = 1;</code>
        */
-      public java.lang.String getClassName() {
-        java.lang.Object ref = className_;
+      public java.lang.String getTag() {
+        java.lang.Object ref = tag_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
           if (bs.isValidUtf8()) {
-            className_ = s;
+            tag_ = s;
           }
           return s;
         } else {
@@ -13970,100 +16625,72 @@ public java.lang.String getClassName() {
         }
       }
       /**
-       * <code>required string class_name = 1;</code>
-       *
-       * <pre>
-       * fully qualified class name of TransactionSigner implementation
-       * </pre>
+       * <code>required string tag = 1;</code>
        */
       public com.google.protobuf.ByteString
-          getClassNameBytes() {
-        java.lang.Object ref = className_;
+          getTagBytes() {
+        java.lang.Object ref = tag_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          className_ = b;
+          tag_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
-       * <code>required string class_name = 1;</code>
-       *
-       * <pre>
-       * fully qualified class name of TransactionSigner implementation
-       * </pre>
+       * <code>required string tag = 1;</code>
        */
-      public Builder setClassName(
+      public Builder setTag(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   bitField0_ |= 0x00000001;
-        className_ = value;
+        tag_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>required string class_name = 1;</code>
-       *
-       * <pre>
-       * fully qualified class name of TransactionSigner implementation
-       * </pre>
+       * <code>required string tag = 1;</code>
        */
-      public Builder clearClassName() {
+      public Builder clearTag() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        className_ = getDefaultInstance().getClassName();
+        tag_ = getDefaultInstance().getTag();
         onChanged();
         return this;
       }
       /**
-       * <code>required string class_name = 1;</code>
-       *
-       * <pre>
-       * fully qualified class name of TransactionSigner implementation
-       * </pre>
+       * <code>required string tag = 1;</code>
        */
-      public Builder setClassNameBytes(
+      public Builder setTagBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
   bitField0_ |= 0x00000001;
-        className_ = value;
+        tag_ = value;
         onChanged();
         return this;
       }
 
       private com.google.protobuf.ByteString data_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>optional bytes data = 2;</code>
-       *
-       * <pre>
-       * arbitrary data required for signer to function
-       * </pre>
+       * <code>required bytes data = 2;</code>
        */
       public boolean hasData() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>optional bytes data = 2;</code>
-       *
-       * <pre>
-       * arbitrary data required for signer to function
-       * </pre>
+       * <code>required bytes data = 2;</code>
        */
       public com.google.protobuf.ByteString getData() {
         return data_;
       }
       /**
-       * <code>optional bytes data = 2;</code>
-       *
-       * <pre>
-       * arbitrary data required for signer to function
-       * </pre>
+       * <code>required bytes data = 2;</code>
        */
       public Builder setData(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -14075,11 +16702,7 @@ public Builder setData(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>optional bytes data = 2;</code>
-       *
-       * <pre>
-       * arbitrary data required for signer to function
-       * </pre>
+       * <code>required bytes data = 2;</code>
        */
       public Builder clearData() {
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -14087,16 +16710,57 @@ public Builder clearData() {
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
 
-      // @@protoc_insertion_point(builder_scope:wallet.TransactionSigner)
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:wallet.Tag)
     }
 
+    // @@protoc_insertion_point(class_scope:wallet.Tag)
+    private static final org.bitcoinj.wallet.Protos.Tag DEFAULT_INSTANCE;
     static {
-      defaultInstance = new TransactionSigner(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoinj.wallet.Protos.Tag();
+    }
+
+    public static org.bitcoinj.wallet.Protos.Tag getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<Tag>
+        PARSER = new com.google.protobuf.AbstractParser<Tag>() {
+      @java.lang.Override
+      public Tag parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new Tag(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<Tag> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Tag> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoinj.wallet.Protos.Tag getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:wallet.TransactionSigner)
   }
 
   public interface WalletOrBuilder extends
@@ -14104,62 +16768,62 @@ public interface WalletOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>required string network_identifier = 1;</code>
-     *
      * <pre>
      * the network used by this wallet
      * </pre>
+     *
+     * <code>required string network_identifier = 1;</code>
      */
     boolean hasNetworkIdentifier();
     /**
-     * <code>required string network_identifier = 1;</code>
-     *
      * <pre>
      * the network used by this wallet
      * </pre>
+     *
+     * <code>required string network_identifier = 1;</code>
      */
     java.lang.String getNetworkIdentifier();
     /**
-     * <code>required string network_identifier = 1;</code>
-     *
      * <pre>
      * the network used by this wallet
      * </pre>
+     *
+     * <code>required string network_identifier = 1;</code>
      */
     com.google.protobuf.ByteString
         getNetworkIdentifierBytes();
 
     /**
-     * <code>optional bytes last_seen_block_hash = 2;</code>
-     *
      * <pre>
      * The SHA256 hash of the head of the best chain seen by this wallet.
      * </pre>
+     *
+     * <code>optional bytes last_seen_block_hash = 2;</code>
      */
     boolean hasLastSeenBlockHash();
     /**
-     * <code>optional bytes last_seen_block_hash = 2;</code>
-     *
      * <pre>
      * The SHA256 hash of the head of the best chain seen by this wallet.
      * </pre>
+     *
+     * <code>optional bytes last_seen_block_hash = 2;</code>
      */
     com.google.protobuf.ByteString getLastSeenBlockHash();
 
     /**
-     * <code>optional uint32 last_seen_block_height = 12;</code>
-     *
      * <pre>
      * The height in the chain of the last seen block.
      * </pre>
+     *
+     * <code>optional uint32 last_seen_block_height = 12;</code>
      */
     boolean hasLastSeenBlockHeight();
     /**
-     * <code>optional uint32 last_seen_block_height = 12;</code>
-     *
      * <pre>
      * The height in the chain of the last seen block.
      * </pre>
+     *
+     * <code>optional uint32 last_seen_block_height = 12;</code>
      */
     int getLastSeenBlockHeight();
 
@@ -14267,23 +16931,23 @@ org.bitcoinj.wallet.Protos.ScriptOrBuilder getWatchedScriptOrBuilder(
     org.bitcoinj.wallet.Protos.ScryptParametersOrBuilder getEncryptionParametersOrBuilder();
 
     /**
-     * <code>optional int32 version = 7 [default = 1];</code>
-     *
      * <pre>
      * The version number of the wallet - used to detect wallets that were produced in the future
      * (i.e. the wallet may contain some future format this protobuf or parser code does not know about).
      * A version that's higher than the default is considered from the future.
      * </pre>
+     *
+     * <code>optional int32 version = 7 [default = 1];</code>
      */
     boolean hasVersion();
     /**
-     * <code>optional int32 version = 7 [default = 1];</code>
-     *
      * <pre>
      * The version number of the wallet - used to detect wallets that were produced in the future
      * (i.e. the wallet may contain some future format this protobuf or parser code does not know about).
      * A version that's higher than the default is considered from the future.
      * </pre>
+     *
+     * <code>optional int32 version = 7 [default = 1];</code>
      */
     int getVersion();
 
@@ -14312,49 +16976,49 @@ org.bitcoinj.wallet.Protos.ExtensionOrBuilder getExtensionOrBuilder(
         int index);
 
     /**
-     * <code>optional string description = 11;</code>
-     *
      * <pre>
      * A UTF8 encoded text description of the wallet that is intended for end user provided text.
      * </pre>
+     *
+     * <code>optional string description = 11;</code>
      */
     boolean hasDescription();
     /**
-     * <code>optional string description = 11;</code>
-     *
      * <pre>
      * A UTF8 encoded text description of the wallet that is intended for end user provided text.
      * </pre>
+     *
+     * <code>optional string description = 11;</code>
      */
     java.lang.String getDescription();
     /**
-     * <code>optional string description = 11;</code>
-     *
      * <pre>
      * A UTF8 encoded text description of the wallet that is intended for end user provided text.
      * </pre>
+     *
+     * <code>optional string description = 11;</code>
      */
     com.google.protobuf.ByteString
         getDescriptionBytes();
 
     /**
-     * <code>optional uint64 key_rotation_time = 13;</code>
-     *
      * <pre>
      * UNIX time in seconds since the epoch. If set, then any keys created before this date are assumed to be no longer
      * wanted. Money sent to them will be re-spent automatically to the first key that was created after this time. It
      * can be used to recover a compromised wallet, or just as part of preventative defence-in-depth measures.
      * </pre>
+     *
+     * <code>optional uint64 key_rotation_time = 13;</code>
      */
     boolean hasKeyRotationTime();
     /**
-     * <code>optional uint64 key_rotation_time = 13;</code>
-     *
      * <pre>
      * UNIX time in seconds since the epoch. If set, then any keys created before this date are assumed to be no longer
      * wanted. Money sent to them will be re-spent automatically to the first key that was created after this time. It
      * can be used to recover a compromised wallet, or just as part of preventative defence-in-depth measures.
      * </pre>
+     *
+     * <code>optional uint64 key_rotation_time = 13;</code>
      */
     long getKeyRotationTime();
 
@@ -14381,89 +17045,52 @@ org.bitcoinj.wallet.Protos.ExtensionOrBuilder getExtensionOrBuilder(
      */
     org.bitcoinj.wallet.Protos.TagOrBuilder getTagsOrBuilder(
         int index);
-
-    /**
-     * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-     *
-     * <pre>
-     * transaction signers added to the wallet
-     * </pre>
-     */
-    java.util.List<org.bitcoinj.wallet.Protos.TransactionSigner> 
-        getTransactionSignersList();
-    /**
-     * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-     *
-     * <pre>
-     * transaction signers added to the wallet
-     * </pre>
-     */
-    org.bitcoinj.wallet.Protos.TransactionSigner getTransactionSigners(int index);
-    /**
-     * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-     *
-     * <pre>
-     * transaction signers added to the wallet
-     * </pre>
-     */
-    int getTransactionSignersCount();
-    /**
-     * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-     *
-     * <pre>
-     * transaction signers added to the wallet
-     * </pre>
-     */
-    java.util.List<? extends org.bitcoinj.wallet.Protos.TransactionSignerOrBuilder> 
-        getTransactionSignersOrBuilderList();
-    /**
-     * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-     *
-     * <pre>
-     * transaction signers added to the wallet
-     * </pre>
-     */
-    org.bitcoinj.wallet.Protos.TransactionSignerOrBuilder getTransactionSignersOrBuilder(
-        int index);
   }
   /**
-   * Protobuf type {@code wallet.Wallet}
-   *
    * <pre>
    ** A bitcoin wallet 
    * </pre>
+   *
+   * Protobuf type {@code wallet.Wallet}
    */
-  public static final class Wallet extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class Wallet extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:wallet.Wallet)
       WalletOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Wallet.newBuilder() to construct.
-    private Wallet(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private Wallet(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private Wallet(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Wallet defaultInstance;
-    public static Wallet getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public Wallet getDefaultInstanceForType() {
-      return defaultInstance;
+    private Wallet() {
+      networkIdentifier_ = "";
+      lastSeenBlockHash_ = com.google.protobuf.ByteString.EMPTY;
+      lastSeenBlockHeight_ = 0;
+      lastSeenBlockTimeSecs_ = 0L;
+      key_ = java.util.Collections.emptyList();
+      transaction_ = java.util.Collections.emptyList();
+      watchedScript_ = java.util.Collections.emptyList();
+      encryptionType_ = 1;
+      version_ = 1;
+      extension_ = java.util.Collections.emptyList();
+      description_ = "";
+      keyRotationTime_ = 0L;
+      tags_ = java.util.Collections.emptyList();
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private Wallet(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -14475,13 +17102,6 @@ private Wallet(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 10: {
               com.google.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
@@ -14498,7 +17118,8 @@ private Wallet(
                 key_ = new java.util.ArrayList<org.bitcoinj.wallet.Protos.Key>();
                 mutable_bitField0_ |= 0x00000010;
               }
-              key_.add(input.readMessage(org.bitcoinj.wallet.Protos.Key.PARSER, extensionRegistry));
+              key_.add(
+                  input.readMessage(org.bitcoinj.wallet.Protos.Key.PARSER, extensionRegistry));
               break;
             }
             case 34: {
@@ -14506,17 +17127,19 @@ private Wallet(
                 transaction_ = new java.util.ArrayList<org.bitcoinj.wallet.Protos.Transaction>();
                 mutable_bitField0_ |= 0x00000020;
               }
-              transaction_.add(input.readMessage(org.bitcoinj.wallet.Protos.Transaction.PARSER, extensionRegistry));
+              transaction_.add(
+                  input.readMessage(org.bitcoinj.wallet.Protos.Transaction.PARSER, extensionRegistry));
               break;
             }
             case 40: {
               int rawValue = input.readEnum();
+                @SuppressWarnings("deprecation")
               org.bitcoinj.wallet.Protos.Wallet.EncryptionType value = org.bitcoinj.wallet.Protos.Wallet.EncryptionType.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(5, rawValue);
               } else {
                 bitField0_ |= 0x00000010;
-                encryptionType_ = value;
+                encryptionType_ = rawValue;
               }
               break;
             }
@@ -14543,7 +17166,8 @@ private Wallet(
                 extension_ = new java.util.ArrayList<org.bitcoinj.wallet.Protos.Extension>();
                 mutable_bitField0_ |= 0x00000400;
               }
-              extension_.add(input.readMessage(org.bitcoinj.wallet.Protos.Extension.PARSER, extensionRegistry));
+              extension_.add(
+                  input.readMessage(org.bitcoinj.wallet.Protos.Extension.PARSER, extensionRegistry));
               break;
             }
             case 90: {
@@ -14572,7 +17196,8 @@ private Wallet(
                 watchedScript_ = new java.util.ArrayList<org.bitcoinj.wallet.Protos.Script>();
                 mutable_bitField0_ |= 0x00000040;
               }
-              watchedScript_.add(input.readMessage(org.bitcoinj.wallet.Protos.Script.PARSER, extensionRegistry));
+              watchedScript_.add(
+                  input.readMessage(org.bitcoinj.wallet.Protos.Script.PARSER, extensionRegistry));
               break;
             }
             case 130: {
@@ -14580,15 +17205,15 @@ private Wallet(
                 tags_ = new java.util.ArrayList<org.bitcoinj.wallet.Protos.Tag>();
                 mutable_bitField0_ |= 0x00002000;
               }
-              tags_.add(input.readMessage(org.bitcoinj.wallet.Protos.Tag.PARSER, extensionRegistry));
+              tags_.add(
+                  input.readMessage(org.bitcoinj.wallet.Protos.Tag.PARSER, extensionRegistry));
               break;
             }
-            case 138: {
-              if (!((mutable_bitField0_ & 0x00004000) == 0x00004000)) {
-                transactionSigners_ = new java.util.ArrayList<org.bitcoinj.wallet.Protos.TransactionSigner>();
-                mutable_bitField0_ |= 0x00004000;
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
               }
-              transactionSigners_.add(input.readMessage(org.bitcoinj.wallet.Protos.TransactionSigner.PARSER, extensionRegistry));
               break;
             }
           }
@@ -14597,7 +17222,7 @@ private Wallet(
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
           key_ = java.util.Collections.unmodifiableList(key_);
@@ -14614,9 +17239,6 @@ private Wallet(
         if (((mutable_bitField0_ & 0x00002000) == 0x00002000)) {
           tags_ = java.util.Collections.unmodifiableList(tags_);
         }
-        if (((mutable_bitField0_ & 0x00004000) == 0x00004000)) {
-          transactionSigners_ = java.util.Collections.unmodifiableList(transactionSigners_);
-        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -14626,31 +17248,15 @@ private Wallet(
       return org.bitcoinj.wallet.Protos.internal_static_wallet_Wallet_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoinj.wallet.Protos.internal_static_wallet_Wallet_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoinj.wallet.Protos.Wallet.class, org.bitcoinj.wallet.Protos.Wallet.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<Wallet> PARSER =
-        new com.google.protobuf.AbstractParser<Wallet>() {
-      public Wallet parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Wallet(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Wallet> getParserForType() {
-      return PARSER;
-    }
-
     /**
-     * Protobuf enum {@code wallet.Wallet.EncryptionType}
-     *
      * <pre>
      **
      * The encryption type of the wallet.
@@ -14658,48 +17264,60 @@ public com.google.protobuf.Parser<Wallet> getParserForType() {
      * encryption support are grandfathered in as this wallet type.
      * When a wallet is ENCRYPTED_SCRYPT_AES the keys are either encrypted with the wallet password or are unencrypted.
      * </pre>
+     *
+     * Protobuf enum {@code wallet.Wallet.EncryptionType}
      */
     public enum EncryptionType
         implements com.google.protobuf.ProtocolMessageEnum {
       /**
-       * <code>UNENCRYPTED = 1;</code>
-       *
        * <pre>
        * All keys in the wallet are unencrypted
        * </pre>
+       *
+       * <code>UNENCRYPTED = 1;</code>
        */
-      UNENCRYPTED(0, 1),
+      UNENCRYPTED(1),
       /**
-       * <code>ENCRYPTED_SCRYPT_AES = 2;</code>
-       *
        * <pre>
        * All keys are encrypted with a passphrase based KDF of scrypt and AES encryption
        * </pre>
+       *
+       * <code>ENCRYPTED_SCRYPT_AES = 2;</code>
        */
-      ENCRYPTED_SCRYPT_AES(1, 2),
+      ENCRYPTED_SCRYPT_AES(2),
       ;
 
       /**
-       * <code>UNENCRYPTED = 1;</code>
-       *
        * <pre>
        * All keys in the wallet are unencrypted
        * </pre>
+       *
+       * <code>UNENCRYPTED = 1;</code>
        */
       public static final int UNENCRYPTED_VALUE = 1;
       /**
-       * <code>ENCRYPTED_SCRYPT_AES = 2;</code>
-       *
        * <pre>
        * All keys are encrypted with a passphrase based KDF of scrypt and AES encryption
        * </pre>
+       *
+       * <code>ENCRYPTED_SCRYPT_AES = 2;</code>
        */
       public static final int ENCRYPTED_SCRYPT_AES_VALUE = 2;
 
 
-      public final int getNumber() { return value; }
+      public final int getNumber() {
+        return value;
+      }
 
+      /**
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
       public static EncryptionType valueOf(int value) {
+        return forNumber(value);
+      }
+
+      public static EncryptionType forNumber(int value) {
         switch (value) {
           case 1: return UNENCRYPTED;
           case 2: return ENCRYPTED_SCRYPT_AES;
@@ -14711,17 +17329,17 @@ public static EncryptionType valueOf(int value) {
           internalGetValueMap() {
         return internalValueMap;
       }
-      private static com.google.protobuf.Internal.EnumLiteMap<EncryptionType>
-          internalValueMap =
+      private static final com.google.protobuf.Internal.EnumLiteMap<
+          EncryptionType> internalValueMap =
             new com.google.protobuf.Internal.EnumLiteMap<EncryptionType>() {
               public EncryptionType findValueByNumber(int number) {
-                return EncryptionType.valueOf(number);
+                return EncryptionType.forNumber(number);
               }
             };
 
       public final com.google.protobuf.Descriptors.EnumValueDescriptor
           getValueDescriptor() {
-        return getDescriptor().getValues().get(index);
+        return getDescriptor().getValues().get(ordinal());
       }
       public final com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptorForType() {
@@ -14743,11 +17361,9 @@ public static EncryptionType valueOf(
         return VALUES[desc.getIndex()];
       }
 
-      private final int index;
       private final int value;
 
-      private EncryptionType(int index, int value) {
-        this.index = index;
+      private EncryptionType(int value) {
         this.value = value;
       }
 
@@ -14756,23 +17372,23 @@ private EncryptionType(int index, int value) {
 
     private int bitField0_;
     public static final int NETWORK_IDENTIFIER_FIELD_NUMBER = 1;
-    private java.lang.Object networkIdentifier_;
+    private volatile java.lang.Object networkIdentifier_;
     /**
-     * <code>required string network_identifier = 1;</code>
-     *
      * <pre>
      * the network used by this wallet
      * </pre>
+     *
+     * <code>required string network_identifier = 1;</code>
      */
     public boolean hasNetworkIdentifier() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required string network_identifier = 1;</code>
-     *
      * <pre>
      * the network used by this wallet
      * </pre>
+     *
+     * <code>required string network_identifier = 1;</code>
      */
     public java.lang.String getNetworkIdentifier() {
       java.lang.Object ref = networkIdentifier_;
@@ -14789,11 +17405,11 @@ public java.lang.String getNetworkIdentifier() {
       }
     }
     /**
-     * <code>required string network_identifier = 1;</code>
-     *
      * <pre>
      * the network used by this wallet
      * </pre>
+     *
+     * <code>required string network_identifier = 1;</code>
      */
     public com.google.protobuf.ByteString
         getNetworkIdentifierBytes() {
@@ -14812,21 +17428,21 @@ public java.lang.String getNetworkIdentifier() {
     public static final int LAST_SEEN_BLOCK_HASH_FIELD_NUMBER = 2;
     private com.google.protobuf.ByteString lastSeenBlockHash_;
     /**
-     * <code>optional bytes last_seen_block_hash = 2;</code>
-     *
      * <pre>
      * The SHA256 hash of the head of the best chain seen by this wallet.
      * </pre>
+     *
+     * <code>optional bytes last_seen_block_hash = 2;</code>
      */
     public boolean hasLastSeenBlockHash() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>optional bytes last_seen_block_hash = 2;</code>
-     *
      * <pre>
      * The SHA256 hash of the head of the best chain seen by this wallet.
      * </pre>
+     *
+     * <code>optional bytes last_seen_block_hash = 2;</code>
      */
     public com.google.protobuf.ByteString getLastSeenBlockHash() {
       return lastSeenBlockHash_;
@@ -14835,21 +17451,21 @@ public com.google.protobuf.ByteString getLastSeenBlockHash() {
     public static final int LAST_SEEN_BLOCK_HEIGHT_FIELD_NUMBER = 12;
     private int lastSeenBlockHeight_;
     /**
-     * <code>optional uint32 last_seen_block_height = 12;</code>
-     *
      * <pre>
      * The height in the chain of the last seen block.
      * </pre>
+     *
+     * <code>optional uint32 last_seen_block_height = 12;</code>
      */
     public boolean hasLastSeenBlockHeight() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * <code>optional uint32 last_seen_block_height = 12;</code>
-     *
      * <pre>
      * The height in the chain of the last seen block.
      * </pre>
+     *
+     * <code>optional uint32 last_seen_block_height = 12;</code>
      */
     public int getLastSeenBlockHeight() {
       return lastSeenBlockHeight_;
@@ -14976,7 +17592,7 @@ public org.bitcoinj.wallet.Protos.ScriptOrBuilder getWatchedScriptOrBuilder(
     }
 
     public static final int ENCRYPTION_TYPE_FIELD_NUMBER = 5;
-    private org.bitcoinj.wallet.Protos.Wallet.EncryptionType encryptionType_;
+    private int encryptionType_;
     /**
      * <code>optional .wallet.Wallet.EncryptionType encryption_type = 5 [default = UNENCRYPTED];</code>
      */
@@ -14987,7 +17603,9 @@ public boolean hasEncryptionType() {
      * <code>optional .wallet.Wallet.EncryptionType encryption_type = 5 [default = UNENCRYPTED];</code>
      */
     public org.bitcoinj.wallet.Protos.Wallet.EncryptionType getEncryptionType() {
-      return encryptionType_;
+      @SuppressWarnings("deprecation")
+      org.bitcoinj.wallet.Protos.Wallet.EncryptionType result = org.bitcoinj.wallet.Protos.Wallet.EncryptionType.valueOf(encryptionType_);
+      return result == null ? org.bitcoinj.wallet.Protos.Wallet.EncryptionType.UNENCRYPTED : result;
     }
 
     public static final int ENCRYPTION_PARAMETERS_FIELD_NUMBER = 6;
@@ -15002,37 +17620,37 @@ public boolean hasEncryptionParameters() {
      * <code>optional .wallet.ScryptParameters encryption_parameters = 6;</code>
      */
     public org.bitcoinj.wallet.Protos.ScryptParameters getEncryptionParameters() {
-      return encryptionParameters_;
+      return encryptionParameters_ == null ? org.bitcoinj.wallet.Protos.ScryptParameters.getDefaultInstance() : encryptionParameters_;
     }
     /**
      * <code>optional .wallet.ScryptParameters encryption_parameters = 6;</code>
      */
     public org.bitcoinj.wallet.Protos.ScryptParametersOrBuilder getEncryptionParametersOrBuilder() {
-      return encryptionParameters_;
+      return encryptionParameters_ == null ? org.bitcoinj.wallet.Protos.ScryptParameters.getDefaultInstance() : encryptionParameters_;
     }
 
     public static final int VERSION_FIELD_NUMBER = 7;
     private int version_;
     /**
-     * <code>optional int32 version = 7 [default = 1];</code>
-     *
      * <pre>
      * The version number of the wallet - used to detect wallets that were produced in the future
      * (i.e. the wallet may contain some future format this protobuf or parser code does not know about).
      * A version that's higher than the default is considered from the future.
      * </pre>
+     *
+     * <code>optional int32 version = 7 [default = 1];</code>
      */
     public boolean hasVersion() {
       return ((bitField0_ & 0x00000040) == 0x00000040);
     }
     /**
-     * <code>optional int32 version = 7 [default = 1];</code>
-     *
      * <pre>
      * The version number of the wallet - used to detect wallets that were produced in the future
      * (i.e. the wallet may contain some future format this protobuf or parser code does not know about).
      * A version that's higher than the default is considered from the future.
      * </pre>
+     *
+     * <code>optional int32 version = 7 [default = 1];</code>
      */
     public int getVersion() {
       return version_;
@@ -15074,23 +17692,23 @@ public org.bitcoinj.wallet.Protos.ExtensionOrBuilder getExtensionOrBuilder(
     }
 
     public static final int DESCRIPTION_FIELD_NUMBER = 11;
-    private java.lang.Object description_;
+    private volatile java.lang.Object description_;
     /**
-     * <code>optional string description = 11;</code>
-     *
      * <pre>
      * A UTF8 encoded text description of the wallet that is intended for end user provided text.
      * </pre>
+     *
+     * <code>optional string description = 11;</code>
      */
     public boolean hasDescription() {
       return ((bitField0_ & 0x00000080) == 0x00000080);
     }
     /**
-     * <code>optional string description = 11;</code>
-     *
      * <pre>
      * A UTF8 encoded text description of the wallet that is intended for end user provided text.
      * </pre>
+     *
+     * <code>optional string description = 11;</code>
      */
     public java.lang.String getDescription() {
       java.lang.Object ref = description_;
@@ -15107,11 +17725,11 @@ public java.lang.String getDescription() {
       }
     }
     /**
-     * <code>optional string description = 11;</code>
-     *
      * <pre>
      * A UTF8 encoded text description of the wallet that is intended for end user provided text.
      * </pre>
+     *
+     * <code>optional string description = 11;</code>
      */
     public com.google.protobuf.ByteString
         getDescriptionBytes() {
@@ -15130,25 +17748,25 @@ public java.lang.String getDescription() {
     public static final int KEY_ROTATION_TIME_FIELD_NUMBER = 13;
     private long keyRotationTime_;
     /**
-     * <code>optional uint64 key_rotation_time = 13;</code>
-     *
      * <pre>
      * UNIX time in seconds since the epoch. If set, then any keys created before this date are assumed to be no longer
      * wanted. Money sent to them will be re-spent automatically to the first key that was created after this time. It
      * can be used to recover a compromised wallet, or just as part of preventative defence-in-depth measures.
      * </pre>
+     *
+     * <code>optional uint64 key_rotation_time = 13;</code>
      */
     public boolean hasKeyRotationTime() {
       return ((bitField0_ & 0x00000100) == 0x00000100);
     }
     /**
-     * <code>optional uint64 key_rotation_time = 13;</code>
-     *
      * <pre>
      * UNIX time in seconds since the epoch. If set, then any keys created before this date are assumed to be no longer
      * wanted. Money sent to them will be re-spent automatically to the first key that was created after this time. It
      * can be used to recover a compromised wallet, or just as part of preventative defence-in-depth measures.
      * </pre>
+     *
+     * <code>optional uint64 key_rotation_time = 13;</code>
      */
     public long getKeyRotationTime() {
       return keyRotationTime_;
@@ -15189,79 +17807,8 @@ public org.bitcoinj.wallet.Protos.TagOrBuilder getTagsOrBuilder(
       return tags_.get(index);
     }
 
-    public static final int TRANSACTION_SIGNERS_FIELD_NUMBER = 17;
-    private java.util.List<org.bitcoinj.wallet.Protos.TransactionSigner> transactionSigners_;
-    /**
-     * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-     *
-     * <pre>
-     * transaction signers added to the wallet
-     * </pre>
-     */
-    public java.util.List<org.bitcoinj.wallet.Protos.TransactionSigner> getTransactionSignersList() {
-      return transactionSigners_;
-    }
-    /**
-     * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-     *
-     * <pre>
-     * transaction signers added to the wallet
-     * </pre>
-     */
-    public java.util.List<? extends org.bitcoinj.wallet.Protos.TransactionSignerOrBuilder> 
-        getTransactionSignersOrBuilderList() {
-      return transactionSigners_;
-    }
-    /**
-     * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-     *
-     * <pre>
-     * transaction signers added to the wallet
-     * </pre>
-     */
-    public int getTransactionSignersCount() {
-      return transactionSigners_.size();
-    }
-    /**
-     * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-     *
-     * <pre>
-     * transaction signers added to the wallet
-     * </pre>
-     */
-    public org.bitcoinj.wallet.Protos.TransactionSigner getTransactionSigners(int index) {
-      return transactionSigners_.get(index);
-    }
-    /**
-     * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-     *
-     * <pre>
-     * transaction signers added to the wallet
-     * </pre>
-     */
-    public org.bitcoinj.wallet.Protos.TransactionSignerOrBuilder getTransactionSignersOrBuilder(
-        int index) {
-      return transactionSigners_.get(index);
-    }
-
-    private void initFields() {
-      networkIdentifier_ = "";
-      lastSeenBlockHash_ = com.google.protobuf.ByteString.EMPTY;
-      lastSeenBlockHeight_ = 0;
-      lastSeenBlockTimeSecs_ = 0L;
-      key_ = java.util.Collections.emptyList();
-      transaction_ = java.util.Collections.emptyList();
-      watchedScript_ = java.util.Collections.emptyList();
-      encryptionType_ = org.bitcoinj.wallet.Protos.Wallet.EncryptionType.UNENCRYPTED;
-      encryptionParameters_ = org.bitcoinj.wallet.Protos.ScryptParameters.getDefaultInstance();
-      version_ = 1;
-      extension_ = java.util.Collections.emptyList();
-      description_ = "";
-      keyRotationTime_ = 0L;
-      tags_ = java.util.Collections.emptyList();
-      transactionSigners_ = java.util.Collections.emptyList();
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -15307,21 +17854,15 @@ public final boolean isInitialized() {
           return false;
         }
       }
-      for (int i = 0; i < getTransactionSignersCount(); i++) {
-        if (!getTransactionSigners(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
       memoizedIsInitialized = 1;
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeBytes(1, getNetworkIdentifierBytes());
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, networkIdentifier_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeBytes(2, lastSeenBlockHash_);
@@ -15333,10 +17874,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         output.writeMessage(4, transaction_.get(i));
       }
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        output.writeEnum(5, encryptionType_.getNumber());
+        output.writeEnum(5, encryptionType_);
       }
       if (((bitField0_ & 0x00000020) == 0x00000020)) {
-        output.writeMessage(6, encryptionParameters_);
+        output.writeMessage(6, getEncryptionParameters());
       }
       if (((bitField0_ & 0x00000040) == 0x00000040)) {
         output.writeInt32(7, version_);
@@ -15345,7 +17886,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         output.writeMessage(10, extension_.get(i));
       }
       if (((bitField0_ & 0x00000080) == 0x00000080)) {
-        output.writeBytes(11, getDescriptionBytes());
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 11, description_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         output.writeUInt32(12, lastSeenBlockHeight_);
@@ -15362,21 +17903,17 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       for (int i = 0; i < tags_.size(); i++) {
         output.writeMessage(16, tags_.get(i));
       }
-      for (int i = 0; i < transactionSigners_.size(); i++) {
-        output.writeMessage(17, transactionSigners_.get(i));
-      }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(1, getNetworkIdentifierBytes());
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, networkIdentifier_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
@@ -15392,11 +17929,11 @@ public int getSerializedSize() {
       }
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(5, encryptionType_.getNumber());
+          .computeEnumSize(5, encryptionType_);
       }
       if (((bitField0_ & 0x00000020) == 0x00000020)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, encryptionParameters_);
+          .computeMessageSize(6, getEncryptionParameters());
       }
       if (((bitField0_ & 0x00000040) == 0x00000040)) {
         size += com.google.protobuf.CodedOutputStream
@@ -15407,8 +17944,7 @@ public int getSerializedSize() {
           .computeMessageSize(10, extension_.get(i));
       }
       if (((bitField0_ & 0x00000080) == 0x00000080)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(11, getDescriptionBytes());
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, description_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         size += com.google.protobuf.CodedOutputStream
@@ -15430,22 +17966,161 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(16, tags_.get(i));
       }
-      for (int i = 0; i < transactionSigners_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(17, transactionSigners_.get(i));
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoinj.wallet.Protos.Wallet)) {
+        return super.equals(obj);
+      }
+      org.bitcoinj.wallet.Protos.Wallet other = (org.bitcoinj.wallet.Protos.Wallet) obj;
+
+      boolean result = true;
+      result = result && (hasNetworkIdentifier() == other.hasNetworkIdentifier());
+      if (hasNetworkIdentifier()) {
+        result = result && getNetworkIdentifier()
+            .equals(other.getNetworkIdentifier());
+      }
+      result = result && (hasLastSeenBlockHash() == other.hasLastSeenBlockHash());
+      if (hasLastSeenBlockHash()) {
+        result = result && getLastSeenBlockHash()
+            .equals(other.getLastSeenBlockHash());
+      }
+      result = result && (hasLastSeenBlockHeight() == other.hasLastSeenBlockHeight());
+      if (hasLastSeenBlockHeight()) {
+        result = result && (getLastSeenBlockHeight()
+            == other.getLastSeenBlockHeight());
+      }
+      result = result && (hasLastSeenBlockTimeSecs() == other.hasLastSeenBlockTimeSecs());
+      if (hasLastSeenBlockTimeSecs()) {
+        result = result && (getLastSeenBlockTimeSecs()
+            == other.getLastSeenBlockTimeSecs());
+      }
+      result = result && getKeyList()
+          .equals(other.getKeyList());
+      result = result && getTransactionList()
+          .equals(other.getTransactionList());
+      result = result && getWatchedScriptList()
+          .equals(other.getWatchedScriptList());
+      result = result && (hasEncryptionType() == other.hasEncryptionType());
+      if (hasEncryptionType()) {
+        result = result && encryptionType_ == other.encryptionType_;
+      }
+      result = result && (hasEncryptionParameters() == other.hasEncryptionParameters());
+      if (hasEncryptionParameters()) {
+        result = result && getEncryptionParameters()
+            .equals(other.getEncryptionParameters());
+      }
+      result = result && (hasVersion() == other.hasVersion());
+      if (hasVersion()) {
+        result = result && (getVersion()
+            == other.getVersion());
+      }
+      result = result && getExtensionList()
+          .equals(other.getExtensionList());
+      result = result && (hasDescription() == other.hasDescription());
+      if (hasDescription()) {
+        result = result && getDescription()
+            .equals(other.getDescription());
+      }
+      result = result && (hasKeyRotationTime() == other.hasKeyRotationTime());
+      if (hasKeyRotationTime()) {
+        result = result && (getKeyRotationTime()
+            == other.getKeyRotationTime());
+      }
+      result = result && getTagsList()
+          .equals(other.getTagsList());
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasNetworkIdentifier()) {
+        hash = (37 * hash) + NETWORK_IDENTIFIER_FIELD_NUMBER;
+        hash = (53 * hash) + getNetworkIdentifier().hashCode();
+      }
+      if (hasLastSeenBlockHash()) {
+        hash = (37 * hash) + LAST_SEEN_BLOCK_HASH_FIELD_NUMBER;
+        hash = (53 * hash) + getLastSeenBlockHash().hashCode();
+      }
+      if (hasLastSeenBlockHeight()) {
+        hash = (37 * hash) + LAST_SEEN_BLOCK_HEIGHT_FIELD_NUMBER;
+        hash = (53 * hash) + getLastSeenBlockHeight();
+      }
+      if (hasLastSeenBlockTimeSecs()) {
+        hash = (37 * hash) + LAST_SEEN_BLOCK_TIME_SECS_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getLastSeenBlockTimeSecs());
+      }
+      if (getKeyCount() > 0) {
+        hash = (37 * hash) + KEY_FIELD_NUMBER;
+        hash = (53 * hash) + getKeyList().hashCode();
+      }
+      if (getTransactionCount() > 0) {
+        hash = (37 * hash) + TRANSACTION_FIELD_NUMBER;
+        hash = (53 * hash) + getTransactionList().hashCode();
+      }
+      if (getWatchedScriptCount() > 0) {
+        hash = (37 * hash) + WATCHED_SCRIPT_FIELD_NUMBER;
+        hash = (53 * hash) + getWatchedScriptList().hashCode();
+      }
+      if (hasEncryptionType()) {
+        hash = (37 * hash) + ENCRYPTION_TYPE_FIELD_NUMBER;
+        hash = (53 * hash) + encryptionType_;
+      }
+      if (hasEncryptionParameters()) {
+        hash = (37 * hash) + ENCRYPTION_PARAMETERS_FIELD_NUMBER;
+        hash = (53 * hash) + getEncryptionParameters().hashCode();
+      }
+      if (hasVersion()) {
+        hash = (37 * hash) + VERSION_FIELD_NUMBER;
+        hash = (53 * hash) + getVersion();
+      }
+      if (getExtensionCount() > 0) {
+        hash = (37 * hash) + EXTENSION_FIELD_NUMBER;
+        hash = (53 * hash) + getExtensionList().hashCode();
+      }
+      if (hasDescription()) {
+        hash = (37 * hash) + DESCRIPTION_FIELD_NUMBER;
+        hash = (53 * hash) + getDescription().hashCode();
+      }
+      if (hasKeyRotationTime()) {
+        hash = (37 * hash) + KEY_ROTATION_TIME_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getKeyRotationTime());
+      }
+      if (getTagsCount() > 0) {
+        hash = (37 * hash) + TAGS_FIELD_NUMBER;
+        hash = (53 * hash) + getTagsList().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoinj.wallet.Protos.Wallet parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.wallet.Protos.Wallet parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoinj.wallet.Protos.Wallet parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -15469,58 +18144,71 @@ public static org.bitcoinj.wallet.Protos.Wallet parseFrom(
     }
     public static org.bitcoinj.wallet.Protos.Wallet parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoinj.wallet.Protos.Wallet parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoinj.wallet.Protos.Wallet parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoinj.wallet.Protos.Wallet parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoinj.wallet.Protos.Wallet parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoinj.wallet.Protos.Wallet parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoinj.wallet.Protos.Wallet prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code wallet.Wallet}
-     *
      * <pre>
      ** A bitcoin wallet 
      * </pre>
+     *
+     * Protobuf type {@code wallet.Wallet}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:wallet.Wallet)
         org.bitcoinj.wallet.Protos.WalletOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -15528,7 +18216,8 @@ public static final class Builder extends
         return org.bitcoinj.wallet.Protos.internal_static_wallet_Wallet_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoinj.wallet.Protos.internal_static_wallet_Wallet_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -15541,25 +18230,22 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
           getKeyFieldBuilder();
           getTransactionFieldBuilder();
           getWatchedScriptFieldBuilder();
           getEncryptionParametersFieldBuilder();
           getExtensionFieldBuilder();
           getTagsFieldBuilder();
-          getTransactionSignersFieldBuilder();
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         networkIdentifier_ = "";
@@ -15588,10 +18274,10 @@ public Builder clear() {
         } else {
           watchedScriptBuilder_.clear();
         }
-        encryptionType_ = org.bitcoinj.wallet.Protos.Wallet.EncryptionType.UNENCRYPTED;
+        encryptionType_ = 1;
         bitField0_ = (bitField0_ & ~0x00000080);
         if (encryptionParametersBuilder_ == null) {
-          encryptionParameters_ = org.bitcoinj.wallet.Protos.ScryptParameters.getDefaultInstance();
+          encryptionParameters_ = null;
         } else {
           encryptionParametersBuilder_.clear();
         }
@@ -15614,28 +18300,21 @@ public Builder clear() {
         } else {
           tagsBuilder_.clear();
         }
-        if (transactionSignersBuilder_ == null) {
-          transactionSigners_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00004000);
-        } else {
-          transactionSignersBuilder_.clear();
-        }
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoinj.wallet.Protos.internal_static_wallet_Wallet_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoinj.wallet.Protos.Wallet getDefaultInstanceForType() {
         return org.bitcoinj.wallet.Protos.Wallet.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoinj.wallet.Protos.Wallet build() {
         org.bitcoinj.wallet.Protos.Wallet result = buildPartial();
         if (!result.isInitialized()) {
@@ -15644,6 +18323,7 @@ public org.bitcoinj.wallet.Protos.Wallet build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoinj.wallet.Protos.Wallet buildPartial() {
         org.bitcoinj.wallet.Protos.Wallet result = new org.bitcoinj.wallet.Protos.Wallet(this);
         int from_bitField0_ = bitField0_;
@@ -15733,20 +18413,44 @@ public org.bitcoinj.wallet.Protos.Wallet buildPartial() {
         } else {
           result.tags_ = tagsBuilder_.build();
         }
-        if (transactionSignersBuilder_ == null) {
-          if (((bitField0_ & 0x00004000) == 0x00004000)) {
-            transactionSigners_ = java.util.Collections.unmodifiableList(transactionSigners_);
-            bitField0_ = (bitField0_ & ~0x00004000);
-          }
-          result.transactionSigners_ = transactionSigners_;
-        } else {
-          result.transactionSigners_ = transactionSignersBuilder_.build();
-        }
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoinj.wallet.Protos.Wallet) {
           return mergeFrom((org.bitcoinj.wallet.Protos.Wallet)other);
@@ -15791,7 +18495,7 @@ public Builder mergeFrom(org.bitcoinj.wallet.Protos.Wallet other) {
               key_ = other.key_;
               bitField0_ = (bitField0_ & ~0x00000010);
               keyBuilder_ = 
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getKeyFieldBuilder() : null;
             } else {
               keyBuilder_.addAllMessages(other.key_);
@@ -15817,7 +18521,7 @@ public Builder mergeFrom(org.bitcoinj.wallet.Protos.Wallet other) {
               transaction_ = other.transaction_;
               bitField0_ = (bitField0_ & ~0x00000020);
               transactionBuilder_ = 
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getTransactionFieldBuilder() : null;
             } else {
               transactionBuilder_.addAllMessages(other.transaction_);
@@ -15843,7 +18547,7 @@ public Builder mergeFrom(org.bitcoinj.wallet.Protos.Wallet other) {
               watchedScript_ = other.watchedScript_;
               bitField0_ = (bitField0_ & ~0x00000040);
               watchedScriptBuilder_ = 
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getWatchedScriptFieldBuilder() : null;
             } else {
               watchedScriptBuilder_.addAllMessages(other.watchedScript_);
@@ -15878,7 +18582,7 @@ public Builder mergeFrom(org.bitcoinj.wallet.Protos.Wallet other) {
               extension_ = other.extension_;
               bitField0_ = (bitField0_ & ~0x00000400);
               extensionBuilder_ = 
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getExtensionFieldBuilder() : null;
             } else {
               extensionBuilder_.addAllMessages(other.extension_);
@@ -15912,93 +18616,57 @@ public Builder mergeFrom(org.bitcoinj.wallet.Protos.Wallet other) {
               tags_ = other.tags_;
               bitField0_ = (bitField0_ & ~0x00002000);
               tagsBuilder_ = 
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getTagsFieldBuilder() : null;
             } else {
               tagsBuilder_.addAllMessages(other.tags_);
             }
           }
         }
-        if (transactionSignersBuilder_ == null) {
-          if (!other.transactionSigners_.isEmpty()) {
-            if (transactionSigners_.isEmpty()) {
-              transactionSigners_ = other.transactionSigners_;
-              bitField0_ = (bitField0_ & ~0x00004000);
-            } else {
-              ensureTransactionSignersIsMutable();
-              transactionSigners_.addAll(other.transactionSigners_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.transactionSigners_.isEmpty()) {
-            if (transactionSignersBuilder_.isEmpty()) {
-              transactionSignersBuilder_.dispose();
-              transactionSignersBuilder_ = null;
-              transactionSigners_ = other.transactionSigners_;
-              bitField0_ = (bitField0_ & ~0x00004000);
-              transactionSignersBuilder_ = 
-                com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getTransactionSignersFieldBuilder() : null;
-            } else {
-              transactionSignersBuilder_.addAllMessages(other.transactionSigners_);
-            }
-          }
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasNetworkIdentifier()) {
-          
           return false;
         }
         for (int i = 0; i < getKeyCount(); i++) {
           if (!getKey(i).isInitialized()) {
-            
             return false;
           }
         }
         for (int i = 0; i < getTransactionCount(); i++) {
           if (!getTransaction(i).isInitialized()) {
-            
             return false;
           }
         }
         for (int i = 0; i < getWatchedScriptCount(); i++) {
           if (!getWatchedScript(i).isInitialized()) {
-            
             return false;
           }
         }
         if (hasEncryptionParameters()) {
           if (!getEncryptionParameters().isInitialized()) {
-            
             return false;
           }
         }
         for (int i = 0; i < getExtensionCount(); i++) {
           if (!getExtension(i).isInitialized()) {
-            
             return false;
           }
         }
         for (int i = 0; i < getTagsCount(); i++) {
           if (!getTags(i).isInitialized()) {
-            
-            return false;
-          }
-        }
-        for (int i = 0; i < getTransactionSignersCount(); i++) {
-          if (!getTransactionSigners(i).isInitialized()) {
-            
             return false;
           }
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -16008,7 +18676,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoinj.wallet.Protos.Wallet) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -16020,21 +18688,21 @@ public Builder mergeFrom(
 
       private java.lang.Object networkIdentifier_ = "";
       /**
-       * <code>required string network_identifier = 1;</code>
-       *
        * <pre>
        * the network used by this wallet
        * </pre>
+       *
+       * <code>required string network_identifier = 1;</code>
        */
       public boolean hasNetworkIdentifier() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>required string network_identifier = 1;</code>
-       *
        * <pre>
        * the network used by this wallet
        * </pre>
+       *
+       * <code>required string network_identifier = 1;</code>
        */
       public java.lang.String getNetworkIdentifier() {
         java.lang.Object ref = networkIdentifier_;
@@ -16051,11 +18719,11 @@ public java.lang.String getNetworkIdentifier() {
         }
       }
       /**
-       * <code>required string network_identifier = 1;</code>
-       *
        * <pre>
        * the network used by this wallet
        * </pre>
+       *
+       * <code>required string network_identifier = 1;</code>
        */
       public com.google.protobuf.ByteString
           getNetworkIdentifierBytes() {
@@ -16071,11 +18739,11 @@ public java.lang.String getNetworkIdentifier() {
         }
       }
       /**
-       * <code>required string network_identifier = 1;</code>
-       *
        * <pre>
        * the network used by this wallet
        * </pre>
+       *
+       * <code>required string network_identifier = 1;</code>
        */
       public Builder setNetworkIdentifier(
           java.lang.String value) {
@@ -16088,11 +18756,11 @@ public Builder setNetworkIdentifier(
         return this;
       }
       /**
-       * <code>required string network_identifier = 1;</code>
-       *
        * <pre>
        * the network used by this wallet
        * </pre>
+       *
+       * <code>required string network_identifier = 1;</code>
        */
       public Builder clearNetworkIdentifier() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -16101,11 +18769,11 @@ public Builder clearNetworkIdentifier() {
         return this;
       }
       /**
-       * <code>required string network_identifier = 1;</code>
-       *
        * <pre>
        * the network used by this wallet
        * </pre>
+       *
+       * <code>required string network_identifier = 1;</code>
        */
       public Builder setNetworkIdentifierBytes(
           com.google.protobuf.ByteString value) {
@@ -16120,31 +18788,31 @@ public Builder setNetworkIdentifierBytes(
 
       private com.google.protobuf.ByteString lastSeenBlockHash_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>optional bytes last_seen_block_hash = 2;</code>
-       *
        * <pre>
        * The SHA256 hash of the head of the best chain seen by this wallet.
        * </pre>
+       *
+       * <code>optional bytes last_seen_block_hash = 2;</code>
        */
       public boolean hasLastSeenBlockHash() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>optional bytes last_seen_block_hash = 2;</code>
-       *
        * <pre>
        * The SHA256 hash of the head of the best chain seen by this wallet.
        * </pre>
+       *
+       * <code>optional bytes last_seen_block_hash = 2;</code>
        */
       public com.google.protobuf.ByteString getLastSeenBlockHash() {
         return lastSeenBlockHash_;
       }
       /**
-       * <code>optional bytes last_seen_block_hash = 2;</code>
-       *
        * <pre>
        * The SHA256 hash of the head of the best chain seen by this wallet.
        * </pre>
+       *
+       * <code>optional bytes last_seen_block_hash = 2;</code>
        */
       public Builder setLastSeenBlockHash(com.google.protobuf.ByteString value) {
         if (value == null) {
@@ -16156,11 +18824,11 @@ public Builder setLastSeenBlockHash(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>optional bytes last_seen_block_hash = 2;</code>
-       *
        * <pre>
        * The SHA256 hash of the head of the best chain seen by this wallet.
        * </pre>
+       *
+       * <code>optional bytes last_seen_block_hash = 2;</code>
        */
       public Builder clearLastSeenBlockHash() {
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -16171,31 +18839,31 @@ public Builder clearLastSeenBlockHash() {
 
       private int lastSeenBlockHeight_ ;
       /**
-       * <code>optional uint32 last_seen_block_height = 12;</code>
-       *
        * <pre>
        * The height in the chain of the last seen block.
        * </pre>
+       *
+       * <code>optional uint32 last_seen_block_height = 12;</code>
        */
       public boolean hasLastSeenBlockHeight() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>optional uint32 last_seen_block_height = 12;</code>
-       *
        * <pre>
        * The height in the chain of the last seen block.
        * </pre>
+       *
+       * <code>optional uint32 last_seen_block_height = 12;</code>
        */
       public int getLastSeenBlockHeight() {
         return lastSeenBlockHeight_;
       }
       /**
-       * <code>optional uint32 last_seen_block_height = 12;</code>
-       *
        * <pre>
        * The height in the chain of the last seen block.
        * </pre>
+       *
+       * <code>optional uint32 last_seen_block_height = 12;</code>
        */
       public Builder setLastSeenBlockHeight(int value) {
         bitField0_ |= 0x00000004;
@@ -16204,11 +18872,11 @@ public Builder setLastSeenBlockHeight(int value) {
         return this;
       }
       /**
-       * <code>optional uint32 last_seen_block_height = 12;</code>
-       *
        * <pre>
        * The height in the chain of the last seen block.
        * </pre>
+       *
+       * <code>optional uint32 last_seen_block_height = 12;</code>
        */
       public Builder clearLastSeenBlockHeight() {
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -16258,7 +18926,7 @@ private void ensureKeyIsMutable() {
          }
       }
 
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.bitcoinj.wallet.Protos.Key, org.bitcoinj.wallet.Protos.Key.Builder, org.bitcoinj.wallet.Protos.KeyOrBuilder> keyBuilder_;
 
       /**
@@ -16474,11 +19142,11 @@ public org.bitcoinj.wallet.Protos.Key.Builder addKeyBuilder(
            getKeyBuilderList() {
         return getKeyFieldBuilder().getBuilderList();
       }
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.bitcoinj.wallet.Protos.Key, org.bitcoinj.wallet.Protos.Key.Builder, org.bitcoinj.wallet.Protos.KeyOrBuilder> 
           getKeyFieldBuilder() {
         if (keyBuilder_ == null) {
-          keyBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+          keyBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               org.bitcoinj.wallet.Protos.Key, org.bitcoinj.wallet.Protos.Key.Builder, org.bitcoinj.wallet.Protos.KeyOrBuilder>(
                   key_,
                   ((bitField0_ & 0x00000010) == 0x00000010),
@@ -16498,7 +19166,7 @@ private void ensureTransactionIsMutable() {
          }
       }
 
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.bitcoinj.wallet.Protos.Transaction, org.bitcoinj.wallet.Protos.Transaction.Builder, org.bitcoinj.wallet.Protos.TransactionOrBuilder> transactionBuilder_;
 
       /**
@@ -16714,11 +19382,11 @@ public org.bitcoinj.wallet.Protos.Transaction.Builder addTransactionBuilder(
            getTransactionBuilderList() {
         return getTransactionFieldBuilder().getBuilderList();
       }
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.bitcoinj.wallet.Protos.Transaction, org.bitcoinj.wallet.Protos.Transaction.Builder, org.bitcoinj.wallet.Protos.TransactionOrBuilder> 
           getTransactionFieldBuilder() {
         if (transactionBuilder_ == null) {
-          transactionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+          transactionBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               org.bitcoinj.wallet.Protos.Transaction, org.bitcoinj.wallet.Protos.Transaction.Builder, org.bitcoinj.wallet.Protos.TransactionOrBuilder>(
                   transaction_,
                   ((bitField0_ & 0x00000020) == 0x00000020),
@@ -16738,7 +19406,7 @@ private void ensureWatchedScriptIsMutable() {
          }
       }
 
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.bitcoinj.wallet.Protos.Script, org.bitcoinj.wallet.Protos.Script.Builder, org.bitcoinj.wallet.Protos.ScriptOrBuilder> watchedScriptBuilder_;
 
       /**
@@ -16954,11 +19622,11 @@ public org.bitcoinj.wallet.Protos.Script.Builder addWatchedScriptBuilder(
            getWatchedScriptBuilderList() {
         return getWatchedScriptFieldBuilder().getBuilderList();
       }
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.bitcoinj.wallet.Protos.Script, org.bitcoinj.wallet.Protos.Script.Builder, org.bitcoinj.wallet.Protos.ScriptOrBuilder> 
           getWatchedScriptFieldBuilder() {
         if (watchedScriptBuilder_ == null) {
-          watchedScriptBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+          watchedScriptBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               org.bitcoinj.wallet.Protos.Script, org.bitcoinj.wallet.Protos.Script.Builder, org.bitcoinj.wallet.Protos.ScriptOrBuilder>(
                   watchedScript_,
                   ((bitField0_ & 0x00000040) == 0x00000040),
@@ -16969,7 +19637,7 @@ public org.bitcoinj.wallet.Protos.Script.Builder addWatchedScriptBuilder(
         return watchedScriptBuilder_;
       }
 
-      private org.bitcoinj.wallet.Protos.Wallet.EncryptionType encryptionType_ = org.bitcoinj.wallet.Protos.Wallet.EncryptionType.UNENCRYPTED;
+      private int encryptionType_ = 1;
       /**
        * <code>optional .wallet.Wallet.EncryptionType encryption_type = 5 [default = UNENCRYPTED];</code>
        */
@@ -16980,7 +19648,9 @@ public boolean hasEncryptionType() {
        * <code>optional .wallet.Wallet.EncryptionType encryption_type = 5 [default = UNENCRYPTED];</code>
        */
       public org.bitcoinj.wallet.Protos.Wallet.EncryptionType getEncryptionType() {
-        return encryptionType_;
+        @SuppressWarnings("deprecation")
+        org.bitcoinj.wallet.Protos.Wallet.EncryptionType result = org.bitcoinj.wallet.Protos.Wallet.EncryptionType.valueOf(encryptionType_);
+        return result == null ? org.bitcoinj.wallet.Protos.Wallet.EncryptionType.UNENCRYPTED : result;
       }
       /**
        * <code>optional .wallet.Wallet.EncryptionType encryption_type = 5 [default = UNENCRYPTED];</code>
@@ -16990,7 +19660,7 @@ public Builder setEncryptionType(org.bitcoinj.wallet.Protos.Wallet.EncryptionTyp
           throw new NullPointerException();
         }
         bitField0_ |= 0x00000080;
-        encryptionType_ = value;
+        encryptionType_ = value.getNumber();
         onChanged();
         return this;
       }
@@ -16999,13 +19669,13 @@ public Builder setEncryptionType(org.bitcoinj.wallet.Protos.Wallet.EncryptionTyp
        */
       public Builder clearEncryptionType() {
         bitField0_ = (bitField0_ & ~0x00000080);
-        encryptionType_ = org.bitcoinj.wallet.Protos.Wallet.EncryptionType.UNENCRYPTED;
+        encryptionType_ = 1;
         onChanged();
         return this;
       }
 
-      private org.bitcoinj.wallet.Protos.ScryptParameters encryptionParameters_ = org.bitcoinj.wallet.Protos.ScryptParameters.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
+      private org.bitcoinj.wallet.Protos.ScryptParameters encryptionParameters_ = null;
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoinj.wallet.Protos.ScryptParameters, org.bitcoinj.wallet.Protos.ScryptParameters.Builder, org.bitcoinj.wallet.Protos.ScryptParametersOrBuilder> encryptionParametersBuilder_;
       /**
        * <code>optional .wallet.ScryptParameters encryption_parameters = 6;</code>
@@ -17018,7 +19688,7 @@ public boolean hasEncryptionParameters() {
        */
       public org.bitcoinj.wallet.Protos.ScryptParameters getEncryptionParameters() {
         if (encryptionParametersBuilder_ == null) {
-          return encryptionParameters_;
+          return encryptionParameters_ == null ? org.bitcoinj.wallet.Protos.ScryptParameters.getDefaultInstance() : encryptionParameters_;
         } else {
           return encryptionParametersBuilder_.getMessage();
         }
@@ -17059,6 +19729,7 @@ public Builder setEncryptionParameters(
       public Builder mergeEncryptionParameters(org.bitcoinj.wallet.Protos.ScryptParameters value) {
         if (encryptionParametersBuilder_ == null) {
           if (((bitField0_ & 0x00000100) == 0x00000100) &&
+              encryptionParameters_ != null &&
               encryptionParameters_ != org.bitcoinj.wallet.Protos.ScryptParameters.getDefaultInstance()) {
             encryptionParameters_ =
               org.bitcoinj.wallet.Protos.ScryptParameters.newBuilder(encryptionParameters_).mergeFrom(value).buildPartial();
@@ -17077,7 +19748,7 @@ public Builder mergeEncryptionParameters(org.bitcoinj.wallet.Protos.ScryptParame
        */
       public Builder clearEncryptionParameters() {
         if (encryptionParametersBuilder_ == null) {
-          encryptionParameters_ = org.bitcoinj.wallet.Protos.ScryptParameters.getDefaultInstance();
+          encryptionParameters_ = null;
           onChanged();
         } else {
           encryptionParametersBuilder_.clear();
@@ -17100,17 +19771,18 @@ public org.bitcoinj.wallet.Protos.ScryptParametersOrBuilder getEncryptionParamet
         if (encryptionParametersBuilder_ != null) {
           return encryptionParametersBuilder_.getMessageOrBuilder();
         } else {
-          return encryptionParameters_;
+          return encryptionParameters_ == null ?
+              org.bitcoinj.wallet.Protos.ScryptParameters.getDefaultInstance() : encryptionParameters_;
         }
       }
       /**
        * <code>optional .wallet.ScryptParameters encryption_parameters = 6;</code>
        */
-      private com.google.protobuf.SingleFieldBuilder<
+      private com.google.protobuf.SingleFieldBuilderV3<
           org.bitcoinj.wallet.Protos.ScryptParameters, org.bitcoinj.wallet.Protos.ScryptParameters.Builder, org.bitcoinj.wallet.Protos.ScryptParametersOrBuilder> 
           getEncryptionParametersFieldBuilder() {
         if (encryptionParametersBuilder_ == null) {
-          encryptionParametersBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+          encryptionParametersBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               org.bitcoinj.wallet.Protos.ScryptParameters, org.bitcoinj.wallet.Protos.ScryptParameters.Builder, org.bitcoinj.wallet.Protos.ScryptParametersOrBuilder>(
                   getEncryptionParameters(),
                   getParentForChildren(),
@@ -17122,37 +19794,37 @@ public org.bitcoinj.wallet.Protos.ScryptParametersOrBuilder getEncryptionParamet
 
       private int version_ = 1;
       /**
-       * <code>optional int32 version = 7 [default = 1];</code>
-       *
        * <pre>
        * The version number of the wallet - used to detect wallets that were produced in the future
        * (i.e. the wallet may contain some future format this protobuf or parser code does not know about).
        * A version that's higher than the default is considered from the future.
        * </pre>
+       *
+       * <code>optional int32 version = 7 [default = 1];</code>
        */
       public boolean hasVersion() {
         return ((bitField0_ & 0x00000200) == 0x00000200);
       }
       /**
-       * <code>optional int32 version = 7 [default = 1];</code>
-       *
        * <pre>
        * The version number of the wallet - used to detect wallets that were produced in the future
        * (i.e. the wallet may contain some future format this protobuf or parser code does not know about).
        * A version that's higher than the default is considered from the future.
        * </pre>
+       *
+       * <code>optional int32 version = 7 [default = 1];</code>
        */
       public int getVersion() {
         return version_;
       }
       /**
-       * <code>optional int32 version = 7 [default = 1];</code>
-       *
        * <pre>
        * The version number of the wallet - used to detect wallets that were produced in the future
        * (i.e. the wallet may contain some future format this protobuf or parser code does not know about).
        * A version that's higher than the default is considered from the future.
        * </pre>
+       *
+       * <code>optional int32 version = 7 [default = 1];</code>
        */
       public Builder setVersion(int value) {
         bitField0_ |= 0x00000200;
@@ -17161,13 +19833,13 @@ public Builder setVersion(int value) {
         return this;
       }
       /**
-       * <code>optional int32 version = 7 [default = 1];</code>
-       *
        * <pre>
        * The version number of the wallet - used to detect wallets that were produced in the future
        * (i.e. the wallet may contain some future format this protobuf or parser code does not know about).
        * A version that's higher than the default is considered from the future.
        * </pre>
+       *
+       * <code>optional int32 version = 7 [default = 1];</code>
        */
       public Builder clearVersion() {
         bitField0_ = (bitField0_ & ~0x00000200);
@@ -17185,7 +19857,7 @@ private void ensureExtensionIsMutable() {
          }
       }
 
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.bitcoinj.wallet.Protos.Extension, org.bitcoinj.wallet.Protos.Extension.Builder, org.bitcoinj.wallet.Protos.ExtensionOrBuilder> extensionBuilder_;
 
       /**
@@ -17401,11 +20073,11 @@ public org.bitcoinj.wallet.Protos.Extension.Builder addExtensionBuilder(
            getExtensionBuilderList() {
         return getExtensionFieldBuilder().getBuilderList();
       }
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.bitcoinj.wallet.Protos.Extension, org.bitcoinj.wallet.Protos.Extension.Builder, org.bitcoinj.wallet.Protos.ExtensionOrBuilder> 
           getExtensionFieldBuilder() {
         if (extensionBuilder_ == null) {
-          extensionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+          extensionBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               org.bitcoinj.wallet.Protos.Extension, org.bitcoinj.wallet.Protos.Extension.Builder, org.bitcoinj.wallet.Protos.ExtensionOrBuilder>(
                   extension_,
                   ((bitField0_ & 0x00000400) == 0x00000400),
@@ -17418,21 +20090,21 @@ public org.bitcoinj.wallet.Protos.Extension.Builder addExtensionBuilder(
 
       private java.lang.Object description_ = "";
       /**
-       * <code>optional string description = 11;</code>
-       *
        * <pre>
        * A UTF8 encoded text description of the wallet that is intended for end user provided text.
        * </pre>
+       *
+       * <code>optional string description = 11;</code>
        */
       public boolean hasDescription() {
         return ((bitField0_ & 0x00000800) == 0x00000800);
       }
       /**
-       * <code>optional string description = 11;</code>
-       *
        * <pre>
        * A UTF8 encoded text description of the wallet that is intended for end user provided text.
        * </pre>
+       *
+       * <code>optional string description = 11;</code>
        */
       public java.lang.String getDescription() {
         java.lang.Object ref = description_;
@@ -17449,11 +20121,11 @@ public java.lang.String getDescription() {
         }
       }
       /**
-       * <code>optional string description = 11;</code>
-       *
        * <pre>
        * A UTF8 encoded text description of the wallet that is intended for end user provided text.
        * </pre>
+       *
+       * <code>optional string description = 11;</code>
        */
       public com.google.protobuf.ByteString
           getDescriptionBytes() {
@@ -17469,11 +20141,11 @@ public java.lang.String getDescription() {
         }
       }
       /**
-       * <code>optional string description = 11;</code>
-       *
        * <pre>
        * A UTF8 encoded text description of the wallet that is intended for end user provided text.
        * </pre>
+       *
+       * <code>optional string description = 11;</code>
        */
       public Builder setDescription(
           java.lang.String value) {
@@ -17486,11 +20158,11 @@ public Builder setDescription(
         return this;
       }
       /**
-       * <code>optional string description = 11;</code>
-       *
        * <pre>
        * A UTF8 encoded text description of the wallet that is intended for end user provided text.
        * </pre>
+       *
+       * <code>optional string description = 11;</code>
        */
       public Builder clearDescription() {
         bitField0_ = (bitField0_ & ~0x00000800);
@@ -17499,11 +20171,11 @@ public Builder clearDescription() {
         return this;
       }
       /**
-       * <code>optional string description = 11;</code>
-       *
        * <pre>
        * A UTF8 encoded text description of the wallet that is intended for end user provided text.
        * </pre>
+       *
+       * <code>optional string description = 11;</code>
        */
       public Builder setDescriptionBytes(
           com.google.protobuf.ByteString value) {
@@ -17518,37 +20190,37 @@ public Builder setDescriptionBytes(
 
       private long keyRotationTime_ ;
       /**
-       * <code>optional uint64 key_rotation_time = 13;</code>
-       *
        * <pre>
        * UNIX time in seconds since the epoch. If set, then any keys created before this date are assumed to be no longer
        * wanted. Money sent to them will be re-spent automatically to the first key that was created after this time. It
        * can be used to recover a compromised wallet, or just as part of preventative defence-in-depth measures.
        * </pre>
+       *
+       * <code>optional uint64 key_rotation_time = 13;</code>
        */
       public boolean hasKeyRotationTime() {
         return ((bitField0_ & 0x00001000) == 0x00001000);
       }
       /**
-       * <code>optional uint64 key_rotation_time = 13;</code>
-       *
        * <pre>
        * UNIX time in seconds since the epoch. If set, then any keys created before this date are assumed to be no longer
        * wanted. Money sent to them will be re-spent automatically to the first key that was created after this time. It
        * can be used to recover a compromised wallet, or just as part of preventative defence-in-depth measures.
        * </pre>
+       *
+       * <code>optional uint64 key_rotation_time = 13;</code>
        */
       public long getKeyRotationTime() {
         return keyRotationTime_;
       }
       /**
-       * <code>optional uint64 key_rotation_time = 13;</code>
-       *
        * <pre>
        * UNIX time in seconds since the epoch. If set, then any keys created before this date are assumed to be no longer
        * wanted. Money sent to them will be re-spent automatically to the first key that was created after this time. It
        * can be used to recover a compromised wallet, or just as part of preventative defence-in-depth measures.
        * </pre>
+       *
+       * <code>optional uint64 key_rotation_time = 13;</code>
        */
       public Builder setKeyRotationTime(long value) {
         bitField0_ |= 0x00001000;
@@ -17557,13 +20229,13 @@ public Builder setKeyRotationTime(long value) {
         return this;
       }
       /**
-       * <code>optional uint64 key_rotation_time = 13;</code>
-       *
        * <pre>
        * UNIX time in seconds since the epoch. If set, then any keys created before this date are assumed to be no longer
        * wanted. Money sent to them will be re-spent automatically to the first key that was created after this time. It
        * can be used to recover a compromised wallet, or just as part of preventative defence-in-depth measures.
        * </pre>
+       *
+       * <code>optional uint64 key_rotation_time = 13;</code>
        */
       public Builder clearKeyRotationTime() {
         bitField0_ = (bitField0_ & ~0x00001000);
@@ -17581,7 +20253,7 @@ private void ensureTagsIsMutable() {
          }
       }
 
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.bitcoinj.wallet.Protos.Tag, org.bitcoinj.wallet.Protos.Tag.Builder, org.bitcoinj.wallet.Protos.TagOrBuilder> tagsBuilder_;
 
       /**
@@ -17797,11 +20469,11 @@ public org.bitcoinj.wallet.Protos.Tag.Builder addTagsBuilder(
            getTagsBuilderList() {
         return getTagsFieldBuilder().getBuilderList();
       }
-      private com.google.protobuf.RepeatedFieldBuilder<
+      private com.google.protobuf.RepeatedFieldBuilderV3<
           org.bitcoinj.wallet.Protos.Tag, org.bitcoinj.wallet.Protos.Tag.Builder, org.bitcoinj.wallet.Protos.TagOrBuilder> 
           getTagsFieldBuilder() {
         if (tagsBuilder_ == null) {
-          tagsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+          tagsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               org.bitcoinj.wallet.Protos.Tag, org.bitcoinj.wallet.Protos.Tag.Builder, org.bitcoinj.wallet.Protos.TagOrBuilder>(
                   tags_,
                   ((bitField0_ & 0x00002000) == 0x00002000),
@@ -17811,328 +20483,57 @@ public org.bitcoinj.wallet.Protos.Tag.Builder addTagsBuilder(
         }
         return tagsBuilder_;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
 
-      private java.util.List<org.bitcoinj.wallet.Protos.TransactionSigner> transactionSigners_ =
-        java.util.Collections.emptyList();
-      private void ensureTransactionSignersIsMutable() {
-        if (!((bitField0_ & 0x00004000) == 0x00004000)) {
-          transactionSigners_ = new java.util.ArrayList<org.bitcoinj.wallet.Protos.TransactionSigner>(transactionSigners_);
-          bitField0_ |= 0x00004000;
-         }
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
       }
 
-      private com.google.protobuf.RepeatedFieldBuilder<
-          org.bitcoinj.wallet.Protos.TransactionSigner, org.bitcoinj.wallet.Protos.TransactionSigner.Builder, org.bitcoinj.wallet.Protos.TransactionSignerOrBuilder> transactionSignersBuilder_;
 
-      /**
-       * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-       *
-       * <pre>
-       * transaction signers added to the wallet
-       * </pre>
-       */
-      public java.util.List<org.bitcoinj.wallet.Protos.TransactionSigner> getTransactionSignersList() {
-        if (transactionSignersBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(transactionSigners_);
-        } else {
-          return transactionSignersBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-       *
-       * <pre>
-       * transaction signers added to the wallet
-       * </pre>
-       */
-      public int getTransactionSignersCount() {
-        if (transactionSignersBuilder_ == null) {
-          return transactionSigners_.size();
-        } else {
-          return transactionSignersBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-       *
-       * <pre>
-       * transaction signers added to the wallet
-       * </pre>
-       */
-      public org.bitcoinj.wallet.Protos.TransactionSigner getTransactionSigners(int index) {
-        if (transactionSignersBuilder_ == null) {
-          return transactionSigners_.get(index);
-        } else {
-          return transactionSignersBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-       *
-       * <pre>
-       * transaction signers added to the wallet
-       * </pre>
-       */
-      public Builder setTransactionSigners(
-          int index, org.bitcoinj.wallet.Protos.TransactionSigner value) {
-        if (transactionSignersBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureTransactionSignersIsMutable();
-          transactionSigners_.set(index, value);
-          onChanged();
-        } else {
-          transactionSignersBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-       *
-       * <pre>
-       * transaction signers added to the wallet
-       * </pre>
-       */
-      public Builder setTransactionSigners(
-          int index, org.bitcoinj.wallet.Protos.TransactionSigner.Builder builderForValue) {
-        if (transactionSignersBuilder_ == null) {
-          ensureTransactionSignersIsMutable();
-          transactionSigners_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          transactionSignersBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-       *
-       * <pre>
-       * transaction signers added to the wallet
-       * </pre>
-       */
-      public Builder addTransactionSigners(org.bitcoinj.wallet.Protos.TransactionSigner value) {
-        if (transactionSignersBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureTransactionSignersIsMutable();
-          transactionSigners_.add(value);
-          onChanged();
-        } else {
-          transactionSignersBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-       *
-       * <pre>
-       * transaction signers added to the wallet
-       * </pre>
-       */
-      public Builder addTransactionSigners(
-          int index, org.bitcoinj.wallet.Protos.TransactionSigner value) {
-        if (transactionSignersBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureTransactionSignersIsMutable();
-          transactionSigners_.add(index, value);
-          onChanged();
-        } else {
-          transactionSignersBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-       *
-       * <pre>
-       * transaction signers added to the wallet
-       * </pre>
-       */
-      public Builder addTransactionSigners(
-          org.bitcoinj.wallet.Protos.TransactionSigner.Builder builderForValue) {
-        if (transactionSignersBuilder_ == null) {
-          ensureTransactionSignersIsMutable();
-          transactionSigners_.add(builderForValue.build());
-          onChanged();
-        } else {
-          transactionSignersBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-       *
-       * <pre>
-       * transaction signers added to the wallet
-       * </pre>
-       */
-      public Builder addTransactionSigners(
-          int index, org.bitcoinj.wallet.Protos.TransactionSigner.Builder builderForValue) {
-        if (transactionSignersBuilder_ == null) {
-          ensureTransactionSignersIsMutable();
-          transactionSigners_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          transactionSignersBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-       *
-       * <pre>
-       * transaction signers added to the wallet
-       * </pre>
-       */
-      public Builder addAllTransactionSigners(
-          java.lang.Iterable<? extends org.bitcoinj.wallet.Protos.TransactionSigner> values) {
-        if (transactionSignersBuilder_ == null) {
-          ensureTransactionSignersIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, transactionSigners_);
-          onChanged();
-        } else {
-          transactionSignersBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-       *
-       * <pre>
-       * transaction signers added to the wallet
-       * </pre>
-       */
-      public Builder clearTransactionSigners() {
-        if (transactionSignersBuilder_ == null) {
-          transactionSigners_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00004000);
-          onChanged();
-        } else {
-          transactionSignersBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-       *
-       * <pre>
-       * transaction signers added to the wallet
-       * </pre>
-       */
-      public Builder removeTransactionSigners(int index) {
-        if (transactionSignersBuilder_ == null) {
-          ensureTransactionSignersIsMutable();
-          transactionSigners_.remove(index);
-          onChanged();
-        } else {
-          transactionSignersBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-       *
-       * <pre>
-       * transaction signers added to the wallet
-       * </pre>
-       */
-      public org.bitcoinj.wallet.Protos.TransactionSigner.Builder getTransactionSignersBuilder(
-          int index) {
-        return getTransactionSignersFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-       *
-       * <pre>
-       * transaction signers added to the wallet
-       * </pre>
-       */
-      public org.bitcoinj.wallet.Protos.TransactionSignerOrBuilder getTransactionSignersOrBuilder(
-          int index) {
-        if (transactionSignersBuilder_ == null) {
-          return transactionSigners_.get(index);  } else {
-          return transactionSignersBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-       *
-       * <pre>
-       * transaction signers added to the wallet
-       * </pre>
-       */
-      public java.util.List<? extends org.bitcoinj.wallet.Protos.TransactionSignerOrBuilder> 
-           getTransactionSignersOrBuilderList() {
-        if (transactionSignersBuilder_ != null) {
-          return transactionSignersBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(transactionSigners_);
-        }
-      }
-      /**
-       * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-       *
-       * <pre>
-       * transaction signers added to the wallet
-       * </pre>
-       */
-      public org.bitcoinj.wallet.Protos.TransactionSigner.Builder addTransactionSignersBuilder() {
-        return getTransactionSignersFieldBuilder().addBuilder(
-            org.bitcoinj.wallet.Protos.TransactionSigner.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-       *
-       * <pre>
-       * transaction signers added to the wallet
-       * </pre>
-       */
-      public org.bitcoinj.wallet.Protos.TransactionSigner.Builder addTransactionSignersBuilder(
-          int index) {
-        return getTransactionSignersFieldBuilder().addBuilder(
-            index, org.bitcoinj.wallet.Protos.TransactionSigner.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .wallet.TransactionSigner transaction_signers = 17;</code>
-       *
-       * <pre>
-       * transaction signers added to the wallet
-       * </pre>
-       */
-      public java.util.List<org.bitcoinj.wallet.Protos.TransactionSigner.Builder> 
-           getTransactionSignersBuilderList() {
-        return getTransactionSignersFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilder<
-          org.bitcoinj.wallet.Protos.TransactionSigner, org.bitcoinj.wallet.Protos.TransactionSigner.Builder, org.bitcoinj.wallet.Protos.TransactionSignerOrBuilder> 
-          getTransactionSignersFieldBuilder() {
-        if (transactionSignersBuilder_ == null) {
-          transactionSignersBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.bitcoinj.wallet.Protos.TransactionSigner, org.bitcoinj.wallet.Protos.TransactionSigner.Builder, org.bitcoinj.wallet.Protos.TransactionSignerOrBuilder>(
-                  transactionSigners_,
-                  ((bitField0_ & 0x00004000) == 0x00004000),
-                  getParentForChildren(),
-                  isClean());
-          transactionSigners_ = null;
-        }
-        return transactionSignersBuilder_;
+      // @@protoc_insertion_point(builder_scope:wallet.Wallet)
+    }
+
+    // @@protoc_insertion_point(class_scope:wallet.Wallet)
+    private static final org.bitcoinj.wallet.Protos.Wallet DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new org.bitcoinj.wallet.Protos.Wallet();
+    }
+
+    public static org.bitcoinj.wallet.Protos.Wallet getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<Wallet>
+        PARSER = new com.google.protobuf.AbstractParser<Wallet>() {
+      @java.lang.Override
+      public Wallet parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new Wallet(input, extensionRegistry);
       }
+    };
 
-      // @@protoc_insertion_point(builder_scope:wallet.Wallet)
+    public static com.google.protobuf.Parser<Wallet> parser() {
+      return PARSER;
     }
 
-    static {
-      defaultInstance = new Wallet(true);
-      defaultInstance.initFields();
+    @java.lang.Override
+    public com.google.protobuf.Parser<Wallet> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoinj.wallet.Protos.Wallet getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:wallet.Wallet)
   }
 
   public interface ExchangeRateOrBuilder extends
@@ -18140,103 +20541,100 @@ public interface ExchangeRateOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>required int64 coin_value = 1;</code>
-     *
      * <pre>
      * This much of satoshis (1E-8 fractions)…
      * </pre>
+     *
+     * <code>required int64 coin_value = 1;</code>
      */
     boolean hasCoinValue();
     /**
-     * <code>required int64 coin_value = 1;</code>
-     *
      * <pre>
      * This much of satoshis (1E-8 fractions)…
      * </pre>
+     *
+     * <code>required int64 coin_value = 1;</code>
      */
     long getCoinValue();
 
     /**
-     * <code>required int64 fiat_value = 2;</code>
-     *
      * <pre>
      * …is worth this much of fiat (1E-4 fractions).
      * </pre>
+     *
+     * <code>required int64 fiat_value = 2;</code>
      */
     boolean hasFiatValue();
     /**
-     * <code>required int64 fiat_value = 2;</code>
-     *
      * <pre>
      * …is worth this much of fiat (1E-4 fractions).
      * </pre>
+     *
+     * <code>required int64 fiat_value = 2;</code>
      */
     long getFiatValue();
 
     /**
-     * <code>required string fiat_currency_code = 3;</code>
-     *
      * <pre>
      * ISO 4217 currency code (if available) of the fiat currency.
      * </pre>
+     *
+     * <code>required string fiat_currency_code = 3;</code>
      */
     boolean hasFiatCurrencyCode();
     /**
-     * <code>required string fiat_currency_code = 3;</code>
-     *
      * <pre>
      * ISO 4217 currency code (if available) of the fiat currency.
      * </pre>
+     *
+     * <code>required string fiat_currency_code = 3;</code>
      */
     java.lang.String getFiatCurrencyCode();
     /**
-     * <code>required string fiat_currency_code = 3;</code>
-     *
      * <pre>
      * ISO 4217 currency code (if available) of the fiat currency.
      * </pre>
+     *
+     * <code>required string fiat_currency_code = 3;</code>
      */
     com.google.protobuf.ByteString
         getFiatCurrencyCodeBytes();
   }
   /**
-   * Protobuf type {@code wallet.ExchangeRate}
-   *
    * <pre>
    ** An exchange rate between Bitcoin and some fiat currency. 
    * </pre>
+   *
+   * Protobuf type {@code wallet.ExchangeRate}
    */
-  public static final class ExchangeRate extends
-      com.google.protobuf.GeneratedMessage implements
+  public  static final class ExchangeRate extends
+      com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:wallet.ExchangeRate)
       ExchangeRateOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ExchangeRate.newBuilder() to construct.
-    private ExchangeRate(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+    private ExchangeRate(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private ExchangeRate(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final ExchangeRate defaultInstance;
-    public static ExchangeRate getDefaultInstance() {
-      return defaultInstance;
     }
-
-    public ExchangeRate getDefaultInstanceForType() {
-      return defaultInstance;
+    private ExchangeRate() {
+      coinValue_ = 0L;
+      fiatValue_ = 0L;
+      fiatCurrencyCode_ = "";
     }
 
-    private final com.google.protobuf.UnknownFieldSet unknownFields;
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
-        getUnknownFields() {
+    getUnknownFields() {
       return this.unknownFields;
     }
     private ExchangeRate(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      initFields();
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -18248,13 +20646,6 @@ private ExchangeRate(
             case 0:
               done = true;
               break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
             case 8: {
               bitField0_ |= 0x00000001;
               coinValue_ = input.readInt64();
@@ -18271,13 +20662,20 @@ private ExchangeRate(
               fiatCurrencyCode_ = bs;
               break;
             }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
         throw e.setUnfinishedMessage(this);
       } catch (java.io.IOException e) {
         throw new com.google.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
+            e).setUnfinishedMessage(this);
       } finally {
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -18288,47 +20686,33 @@ private ExchangeRate(
       return org.bitcoinj.wallet.Protos.internal_static_wallet_ExchangeRate_descriptor;
     }
 
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.bitcoinj.wallet.Protos.internal_static_wallet_ExchangeRate_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.bitcoinj.wallet.Protos.ExchangeRate.class, org.bitcoinj.wallet.Protos.ExchangeRate.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<ExchangeRate> PARSER =
-        new com.google.protobuf.AbstractParser<ExchangeRate>() {
-      public ExchangeRate parsePartialFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ExchangeRate(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<ExchangeRate> getParserForType() {
-      return PARSER;
-    }
-
     private int bitField0_;
     public static final int COIN_VALUE_FIELD_NUMBER = 1;
     private long coinValue_;
     /**
-     * <code>required int64 coin_value = 1;</code>
-     *
      * <pre>
      * This much of satoshis (1E-8 fractions)…
      * </pre>
+     *
+     * <code>required int64 coin_value = 1;</code>
      */
     public boolean hasCoinValue() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required int64 coin_value = 1;</code>
-     *
      * <pre>
      * This much of satoshis (1E-8 fractions)…
      * </pre>
+     *
+     * <code>required int64 coin_value = 1;</code>
      */
     public long getCoinValue() {
       return coinValue_;
@@ -18337,44 +20721,44 @@ public long getCoinValue() {
     public static final int FIAT_VALUE_FIELD_NUMBER = 2;
     private long fiatValue_;
     /**
-     * <code>required int64 fiat_value = 2;</code>
-     *
      * <pre>
      * …is worth this much of fiat (1E-4 fractions).
      * </pre>
+     *
+     * <code>required int64 fiat_value = 2;</code>
      */
     public boolean hasFiatValue() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>required int64 fiat_value = 2;</code>
-     *
      * <pre>
      * …is worth this much of fiat (1E-4 fractions).
      * </pre>
+     *
+     * <code>required int64 fiat_value = 2;</code>
      */
     public long getFiatValue() {
       return fiatValue_;
     }
 
     public static final int FIAT_CURRENCY_CODE_FIELD_NUMBER = 3;
-    private java.lang.Object fiatCurrencyCode_;
+    private volatile java.lang.Object fiatCurrencyCode_;
     /**
-     * <code>required string fiat_currency_code = 3;</code>
-     *
      * <pre>
      * ISO 4217 currency code (if available) of the fiat currency.
      * </pre>
+     *
+     * <code>required string fiat_currency_code = 3;</code>
      */
     public boolean hasFiatCurrencyCode() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * <code>required string fiat_currency_code = 3;</code>
-     *
      * <pre>
      * ISO 4217 currency code (if available) of the fiat currency.
      * </pre>
+     *
+     * <code>required string fiat_currency_code = 3;</code>
      */
     public java.lang.String getFiatCurrencyCode() {
       java.lang.Object ref = fiatCurrencyCode_;
@@ -18391,11 +20775,11 @@ public java.lang.String getFiatCurrencyCode() {
       }
     }
     /**
-     * <code>required string fiat_currency_code = 3;</code>
-     *
      * <pre>
      * ISO 4217 currency code (if available) of the fiat currency.
      * </pre>
+     *
+     * <code>required string fiat_currency_code = 3;</code>
      */
     public com.google.protobuf.ByteString
         getFiatCurrencyCodeBytes() {
@@ -18411,12 +20795,8 @@ public java.lang.String getFiatCurrencyCode() {
       }
     }
 
-    private void initFields() {
-      coinValue_ = 0L;
-      fiatValue_ = 0L;
-      fiatCurrencyCode_ = "";
-    }
     private byte memoizedIsInitialized = -1;
+    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -18438,9 +20818,9 @@ public final boolean isInitialized() {
       return true;
     }
 
+    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt64(1, coinValue_);
       }
@@ -18448,14 +20828,14 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         output.writeInt64(2, fiatValue_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeBytes(3, getFiatCurrencyCodeBytes());
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, fiatCurrencyCode_);
       }
-      getUnknownFields().writeTo(output);
+      unknownFields.writeTo(output);
     }
 
-    private int memoizedSerializedSize = -1;
+    @java.lang.Override
     public int getSerializedSize() {
-      int size = memoizedSerializedSize;
+      int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
@@ -18468,21 +20848,80 @@ public int getSerializedSize() {
           .computeInt64Size(2, fiatValue_);
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(3, getFiatCurrencyCodeBytes());
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, fiatCurrencyCode_);
       }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof org.bitcoinj.wallet.Protos.ExchangeRate)) {
+        return super.equals(obj);
+      }
+      org.bitcoinj.wallet.Protos.ExchangeRate other = (org.bitcoinj.wallet.Protos.ExchangeRate) obj;
+
+      boolean result = true;
+      result = result && (hasCoinValue() == other.hasCoinValue());
+      if (hasCoinValue()) {
+        result = result && (getCoinValue()
+            == other.getCoinValue());
+      }
+      result = result && (hasFiatValue() == other.hasFiatValue());
+      if (hasFiatValue()) {
+        result = result && (getFiatValue()
+            == other.getFiatValue());
+      }
+      result = result && (hasFiatCurrencyCode() == other.hasFiatCurrencyCode());
+      if (hasFiatCurrencyCode()) {
+        result = result && getFiatCurrencyCode()
+            .equals(other.getFiatCurrencyCode());
+      }
+      result = result && unknownFields.equals(other.unknownFields);
+      return result;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasCoinValue()) {
+        hash = (37 * hash) + COIN_VALUE_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getCoinValue());
+      }
+      if (hasFiatValue()) {
+        hash = (37 * hash) + FIAT_VALUE_FIELD_NUMBER;
+        hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+            getFiatValue());
+      }
+      if (hasFiatCurrencyCode()) {
+        hash = (37 * hash) + FIAT_CURRENCY_CODE_FIELD_NUMBER;
+        hash = (53 * hash) + getFiatCurrencyCode().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
     }
 
+    public static org.bitcoinj.wallet.Protos.ExchangeRate parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.bitcoinj.wallet.Protos.ExchangeRate parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
     public static org.bitcoinj.wallet.Protos.ExchangeRate parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -18506,58 +20945,71 @@ public static org.bitcoinj.wallet.Protos.ExchangeRate parseFrom(
     }
     public static org.bitcoinj.wallet.Protos.ExchangeRate parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoinj.wallet.Protos.ExchangeRate parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoinj.wallet.Protos.ExchangeRate parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
     }
     public static org.bitcoinj.wallet.Protos.ExchangeRate parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static org.bitcoinj.wallet.Protos.ExchangeRate parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return PARSER.parseFrom(input);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
     }
     public static org.bitcoinj.wallet.Protos.ExchangeRate parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static Builder newBuilder() { return Builder.create(); }
+    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
     public static Builder newBuilder(org.bitcoinj.wallet.Protos.ExchangeRate prototype) {
-      return newBuilder().mergeFrom(prototype);
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
     }
-    public Builder toBuilder() { return newBuilder(this); }
 
     @java.lang.Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
     /**
-     * Protobuf type {@code wallet.ExchangeRate}
-     *
      * <pre>
      ** An exchange rate between Bitcoin and some fiat currency. 
      * </pre>
+     *
+     * Protobuf type {@code wallet.ExchangeRate}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:wallet.ExchangeRate)
         org.bitcoinj.wallet.Protos.ExchangeRateOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -18565,7 +21017,8 @@ public static final class Builder extends
         return org.bitcoinj.wallet.Protos.internal_static_wallet_ExchangeRate_descriptor;
       }
 
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.bitcoinj.wallet.Protos.internal_static_wallet_ExchangeRate_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -18578,18 +21031,16 @@ private Builder() {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
       private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
         }
       }
-      private static Builder create() {
-        return new Builder();
-      }
-
+      @java.lang.Override
       public Builder clear() {
         super.clear();
         coinValue_ = 0L;
@@ -18601,19 +21052,18 @@ public Builder clear() {
         return this;
       }
 
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
+      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return org.bitcoinj.wallet.Protos.internal_static_wallet_ExchangeRate_descriptor;
       }
 
+      @java.lang.Override
       public org.bitcoinj.wallet.Protos.ExchangeRate getDefaultInstanceForType() {
         return org.bitcoinj.wallet.Protos.ExchangeRate.getDefaultInstance();
       }
 
+      @java.lang.Override
       public org.bitcoinj.wallet.Protos.ExchangeRate build() {
         org.bitcoinj.wallet.Protos.ExchangeRate result = buildPartial();
         if (!result.isInitialized()) {
@@ -18622,6 +21072,7 @@ public org.bitcoinj.wallet.Protos.ExchangeRate build() {
         return result;
       }
 
+      @java.lang.Override
       public org.bitcoinj.wallet.Protos.ExchangeRate buildPartial() {
         org.bitcoinj.wallet.Protos.ExchangeRate result = new org.bitcoinj.wallet.Protos.ExchangeRate(this);
         int from_bitField0_ = bitField0_;
@@ -18643,6 +21094,39 @@ public org.bitcoinj.wallet.Protos.ExchangeRate buildPartial() {
         return result;
       }
 
+      @java.lang.Override
+      public Builder clone() {
+        return (Builder) super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return (Builder) super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return (Builder) super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return (Builder) super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return (Builder) super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof org.bitcoinj.wallet.Protos.ExchangeRate) {
           return mergeFrom((org.bitcoinj.wallet.Protos.ExchangeRate)other);
@@ -18665,26 +21149,26 @@ public Builder mergeFrom(org.bitcoinj.wallet.Protos.ExchangeRate other) {
           fiatCurrencyCode_ = other.fiatCurrencyCode_;
           onChanged();
         }
-        this.mergeUnknownFields(other.getUnknownFields());
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
 
+      @java.lang.Override
       public final boolean isInitialized() {
         if (!hasCoinValue()) {
-          
           return false;
         }
         if (!hasFiatValue()) {
-          
           return false;
         }
         if (!hasFiatCurrencyCode()) {
-          
           return false;
         }
         return true;
       }
 
+      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -18694,7 +21178,7 @@ public Builder mergeFrom(
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
           parsedMessage = (org.bitcoinj.wallet.Protos.ExchangeRate) e.getUnfinishedMessage();
-          throw e;
+          throw e.unwrapIOException();
         } finally {
           if (parsedMessage != null) {
             mergeFrom(parsedMessage);
@@ -18706,31 +21190,31 @@ public Builder mergeFrom(
 
       private long coinValue_ ;
       /**
-       * <code>required int64 coin_value = 1;</code>
-       *
        * <pre>
        * This much of satoshis (1E-8 fractions)…
        * </pre>
+       *
+       * <code>required int64 coin_value = 1;</code>
        */
       public boolean hasCoinValue() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>required int64 coin_value = 1;</code>
-       *
        * <pre>
        * This much of satoshis (1E-8 fractions)…
        * </pre>
+       *
+       * <code>required int64 coin_value = 1;</code>
        */
       public long getCoinValue() {
         return coinValue_;
       }
       /**
-       * <code>required int64 coin_value = 1;</code>
-       *
        * <pre>
        * This much of satoshis (1E-8 fractions)…
        * </pre>
+       *
+       * <code>required int64 coin_value = 1;</code>
        */
       public Builder setCoinValue(long value) {
         bitField0_ |= 0x00000001;
@@ -18739,11 +21223,11 @@ public Builder setCoinValue(long value) {
         return this;
       }
       /**
-       * <code>required int64 coin_value = 1;</code>
-       *
        * <pre>
        * This much of satoshis (1E-8 fractions)…
        * </pre>
+       *
+       * <code>required int64 coin_value = 1;</code>
        */
       public Builder clearCoinValue() {
         bitField0_ = (bitField0_ & ~0x00000001);
@@ -18754,31 +21238,31 @@ public Builder clearCoinValue() {
 
       private long fiatValue_ ;
       /**
-       * <code>required int64 fiat_value = 2;</code>
-       *
        * <pre>
        * …is worth this much of fiat (1E-4 fractions).
        * </pre>
+       *
+       * <code>required int64 fiat_value = 2;</code>
        */
       public boolean hasFiatValue() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>required int64 fiat_value = 2;</code>
-       *
        * <pre>
        * …is worth this much of fiat (1E-4 fractions).
        * </pre>
+       *
+       * <code>required int64 fiat_value = 2;</code>
        */
       public long getFiatValue() {
         return fiatValue_;
       }
       /**
-       * <code>required int64 fiat_value = 2;</code>
-       *
        * <pre>
        * …is worth this much of fiat (1E-4 fractions).
        * </pre>
+       *
+       * <code>required int64 fiat_value = 2;</code>
        */
       public Builder setFiatValue(long value) {
         bitField0_ |= 0x00000002;
@@ -18787,11 +21271,11 @@ public Builder setFiatValue(long value) {
         return this;
       }
       /**
-       * <code>required int64 fiat_value = 2;</code>
-       *
        * <pre>
        * …is worth this much of fiat (1E-4 fractions).
        * </pre>
+       *
+       * <code>required int64 fiat_value = 2;</code>
        */
       public Builder clearFiatValue() {
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -18802,21 +21286,21 @@ public Builder clearFiatValue() {
 
       private java.lang.Object fiatCurrencyCode_ = "";
       /**
-       * <code>required string fiat_currency_code = 3;</code>
-       *
        * <pre>
        * ISO 4217 currency code (if available) of the fiat currency.
        * </pre>
+       *
+       * <code>required string fiat_currency_code = 3;</code>
        */
       public boolean hasFiatCurrencyCode() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>required string fiat_currency_code = 3;</code>
-       *
        * <pre>
        * ISO 4217 currency code (if available) of the fiat currency.
        * </pre>
+       *
+       * <code>required string fiat_currency_code = 3;</code>
        */
       public java.lang.String getFiatCurrencyCode() {
         java.lang.Object ref = fiatCurrencyCode_;
@@ -18833,11 +21317,11 @@ public java.lang.String getFiatCurrencyCode() {
         }
       }
       /**
-       * <code>required string fiat_currency_code = 3;</code>
-       *
        * <pre>
        * ISO 4217 currency code (if available) of the fiat currency.
        * </pre>
+       *
+       * <code>required string fiat_currency_code = 3;</code>
        */
       public com.google.protobuf.ByteString
           getFiatCurrencyCodeBytes() {
@@ -18853,11 +21337,11 @@ public java.lang.String getFiatCurrencyCode() {
         }
       }
       /**
-       * <code>required string fiat_currency_code = 3;</code>
-       *
        * <pre>
        * ISO 4217 currency code (if available) of the fiat currency.
        * </pre>
+       *
+       * <code>required string fiat_currency_code = 3;</code>
        */
       public Builder setFiatCurrencyCode(
           java.lang.String value) {
@@ -18870,11 +21354,11 @@ public Builder setFiatCurrencyCode(
         return this;
       }
       /**
-       * <code>required string fiat_currency_code = 3;</code>
-       *
        * <pre>
        * ISO 4217 currency code (if available) of the fiat currency.
        * </pre>
+       *
+       * <code>required string fiat_currency_code = 3;</code>
        */
       public Builder clearFiatCurrencyCode() {
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -18883,11 +21367,11 @@ public Builder clearFiatCurrencyCode() {
         return this;
       }
       /**
-       * <code>required string fiat_currency_code = 3;</code>
-       *
        * <pre>
        * ISO 4217 currency code (if available) of the fiat currency.
        * </pre>
+       *
+       * <code>required string fiat_currency_code = 3;</code>
        */
       public Builder setFiatCurrencyCodeBytes(
           com.google.protobuf.ByteString value) {
@@ -18899,182 +21383,227 @@ public Builder setFiatCurrencyCodeBytes(
         onChanged();
         return this;
       }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
 
       // @@protoc_insertion_point(builder_scope:wallet.ExchangeRate)
     }
 
+    // @@protoc_insertion_point(class_scope:wallet.ExchangeRate)
+    private static final org.bitcoinj.wallet.Protos.ExchangeRate DEFAULT_INSTANCE;
     static {
-      defaultInstance = new ExchangeRate(true);
-      defaultInstance.initFields();
+      DEFAULT_INSTANCE = new org.bitcoinj.wallet.Protos.ExchangeRate();
+    }
+
+    public static org.bitcoinj.wallet.Protos.ExchangeRate getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    @java.lang.Deprecated public static final com.google.protobuf.Parser<ExchangeRate>
+        PARSER = new com.google.protobuf.AbstractParser<ExchangeRate>() {
+      @java.lang.Override
+      public ExchangeRate parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new ExchangeRate(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<ExchangeRate> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<ExchangeRate> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public org.bitcoinj.wallet.Protos.ExchangeRate getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
     }
 
-    // @@protoc_insertion_point(class_scope:wallet.ExchangeRate)
   }
 
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_wallet_PeerAddress_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_wallet_PeerAddress_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_wallet_EncryptedData_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_wallet_EncryptedData_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_wallet_DeterministicKey_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_wallet_DeterministicKey_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_wallet_Key_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_wallet_Key_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_wallet_Script_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_wallet_Script_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_wallet_ScriptWitness_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_wallet_ScriptWitness_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_wallet_TransactionInput_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_wallet_TransactionInput_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_wallet_TransactionOutput_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_wallet_TransactionOutput_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_wallet_TransactionConfidence_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_wallet_TransactionConfidence_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_wallet_Transaction_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_wallet_Transaction_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_wallet_ScryptParameters_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_wallet_ScryptParameters_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_wallet_Extension_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_wallet_Extension_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_wallet_Tag_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_wallet_Tag_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_wallet_TransactionSigner_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_wallet_TransactionSigner_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_wallet_Wallet_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_wallet_Wallet_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_wallet_ExchangeRate_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_wallet_ExchangeRate_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
     return descriptor;
   }
-  private static com.google.protobuf.Descriptors.FileDescriptor
+  private static  com.google.protobuf.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\014wallet.proto\022\006wallet\"A\n\013PeerAddress\022\022\n" +
+      "\n\014wallet.proto\022\006wallet\"S\n\013PeerAddress\022\022\n" +
       "\nip_address\030\001 \002(\014\022\014\n\004port\030\002 \002(\r\022\020\n\010servi" +
-      "ces\030\003 \002(\004\"M\n\rEncryptedData\022\035\n\025initialisa" +
-      "tion_vector\030\001 \002(\014\022\035\n\025encrypted_private_k" +
-      "ey\030\002 \002(\014\"\231\001\n\020DeterministicKey\022\022\n\nchain_c" +
-      "ode\030\001 \002(\014\022\014\n\004path\030\002 \003(\r\022\026\n\016issued_subkey" +
-      "s\030\003 \001(\r\022\026\n\016lookahead_size\030\004 \001(\r\022\023\n\013isFol" +
-      "lowing\030\005 \001(\010\022\036\n\023sigsRequiredToSpend\030\006 \001(" +
-      "\r:\0011\"\232\003\n\003Key\022\036\n\004type\030\001 \002(\0162\020.wallet.Key." +
-      "Type\022\024\n\014secret_bytes\030\002 \001(\014\022-\n\016encrypted_",
-      "data\030\006 \001(\0132\025.wallet.EncryptedData\022\022\n\npub" +
-      "lic_key\030\003 \001(\014\022\r\n\005label\030\004 \001(\t\022\032\n\022creation" +
-      "_timestamp\030\005 \001(\003\0223\n\021deterministic_key\030\007 " +
-      "\001(\0132\030.wallet.DeterministicKey\022\032\n\022determi" +
-      "nistic_seed\030\010 \001(\014\022;\n\034encrypted_determini" +
-      "stic_seed\030\t \001(\0132\025.wallet.EncryptedData\"a" +
-      "\n\004Type\022\014\n\010ORIGINAL\020\001\022\030\n\024ENCRYPTED_SCRYPT" +
-      "_AES\020\002\022\032\n\026DETERMINISTIC_MNEMONIC\020\003\022\025\n\021DE" +
-      "TERMINISTIC_KEY\020\004\"5\n\006Script\022\017\n\007program\030\001" +
-      " \002(\014\022\032\n\022creation_timestamp\030\002 \002(\003\"\222\001\n\020Tra",
-      "nsactionInput\022\"\n\032transaction_out_point_h" +
-      "ash\030\001 \002(\014\022#\n\033transaction_out_point_index" +
-      "\030\002 \002(\r\022\024\n\014script_bytes\030\003 \002(\014\022\020\n\010sequence" +
-      "\030\004 \001(\r\022\r\n\005value\030\005 \001(\003\"\177\n\021TransactionOutp" +
-      "ut\022\r\n\005value\030\001 \002(\003\022\024\n\014script_bytes\030\002 \002(\014\022" +
-      "!\n\031spent_by_transaction_hash\030\003 \001(\014\022\"\n\032sp" +
-      "ent_by_transaction_index\030\004 \001(\005\"\267\003\n\025Trans" +
-      "actionConfidence\0220\n\004type\030\001 \001(\0162\".wallet." +
-      "TransactionConfidence.Type\022\032\n\022appeared_a" +
-      "t_height\030\002 \001(\005\022\036\n\026overriding_transaction",
-      "\030\003 \001(\014\022\r\n\005depth\030\004 \001(\005\022)\n\014broadcast_by\030\006 " +
-      "\003(\0132\023.wallet.PeerAddress\022\033\n\023last_broadca" +
-      "sted_at\030\010 \001(\003\0224\n\006source\030\007 \001(\0162$.wallet.T" +
-      "ransactionConfidence.Source\"`\n\004Type\022\013\n\007U" +
-      "NKNOWN\020\000\022\014\n\010BUILDING\020\001\022\013\n\007PENDING\020\002\022\025\n\021N" +
-      "OT_IN_BEST_CHAIN\020\003\022\010\n\004DEAD\020\004\022\017\n\013IN_CONFL" +
-      "ICT\020\005\"A\n\006Source\022\022\n\016SOURCE_UNKNOWN\020\000\022\022\n\016S" +
-      "OURCE_NETWORK\020\001\022\017\n\013SOURCE_SELF\020\002\"\303\005\n\013Tra" +
-      "nsaction\022\017\n\007version\030\001 \002(\005\022\014\n\004hash\030\002 \002(\014\022" +
-      "&\n\004pool\030\003 \001(\0162\030.wallet.Transaction.Pool\022",
-      "\021\n\tlock_time\030\004 \001(\r\022\022\n\nupdated_at\030\005 \001(\003\0223" +
-      "\n\021transaction_input\030\006 \003(\0132\030.wallet.Trans" +
-      "actionInput\0225\n\022transaction_output\030\007 \003(\0132" +
-      "\031.wallet.TransactionOutput\022\022\n\nblock_hash" +
-      "\030\010 \003(\014\022 \n\030block_relativity_offsets\030\013 \003(\005" +
-      "\0221\n\nconfidence\030\t \001(\0132\035.wallet.Transactio" +
-      "nConfidence\0225\n\007purpose\030\n \001(\0162\033.wallet.Tr" +
-      "ansaction.Purpose:\007UNKNOWN\022+\n\rexchange_r" +
-      "ate\030\014 \001(\0132\024.wallet.ExchangeRate\022\014\n\004memo\030" +
-      "\r \001(\t\"Y\n\004Pool\022\013\n\007UNSPENT\020\004\022\t\n\005SPENT\020\005\022\014\n",
-      "\010INACTIVE\020\002\022\010\n\004DEAD\020\n\022\013\n\007PENDING\020\020\022\024\n\020PE" +
-      "NDING_INACTIVE\020\022\"\243\001\n\007Purpose\022\013\n\007UNKNOWN\020" +
-      "\000\022\020\n\014USER_PAYMENT\020\001\022\020\n\014KEY_ROTATION\020\002\022\034\n" +
-      "\030ASSURANCE_CONTRACT_CLAIM\020\003\022\035\n\031ASSURANCE" +
-      "_CONTRACT_PLEDGE\020\004\022\033\n\027ASSURANCE_CONTRACT" +
-      "_STUB\020\005\022\r\n\tRAISE_FEE\020\006\"N\n\020ScryptParamete" +
-      "rs\022\014\n\004salt\030\001 \002(\014\022\020\n\001n\030\002 \001(\003:\00516384\022\014\n\001r\030" +
-      "\003 \001(\005:\0018\022\014\n\001p\030\004 \001(\005:\0011\"8\n\tExtension\022\n\n\002i" +
-      "d\030\001 \002(\t\022\014\n\004data\030\002 \002(\014\022\021\n\tmandatory\030\003 \002(\010" +
-      "\" \n\003Tag\022\013\n\003tag\030\001 \002(\t\022\014\n\004data\030\002 \002(\014\"5\n\021Tr",
-      "ansactionSigner\022\022\n\nclass_name\030\001 \002(\t\022\014\n\004d" +
-      "ata\030\002 \001(\014\"\351\004\n\006Wallet\022\032\n\022network_identifi" +
-      "er\030\001 \002(\t\022\034\n\024last_seen_block_hash\030\002 \001(\014\022\036" +
-      "\n\026last_seen_block_height\030\014 \001(\r\022!\n\031last_s" +
-      "een_block_time_secs\030\016 \001(\003\022\030\n\003key\030\003 \003(\0132\013" +
-      ".wallet.Key\022(\n\013transaction\030\004 \003(\0132\023.walle" +
-      "t.Transaction\022&\n\016watched_script\030\017 \003(\0132\016." +
-      "wallet.Script\022C\n\017encryption_type\030\005 \001(\0162\035" +
-      ".wallet.Wallet.EncryptionType:\013UNENCRYPT" +
-      "ED\0227\n\025encryption_parameters\030\006 \001(\0132\030.wall",
-      "et.ScryptParameters\022\022\n\007version\030\007 \001(\005:\0011\022" +
-      "$\n\textension\030\n \003(\0132\021.wallet.Extension\022\023\n" +
-      "\013description\030\013 \001(\t\022\031\n\021key_rotation_time\030" +
-      "\r \001(\004\022\031\n\004tags\030\020 \003(\0132\013.wallet.Tag\0226\n\023tran" +
-      "saction_signers\030\021 \003(\0132\031.wallet.Transacti" +
-      "onSigner\";\n\016EncryptionType\022\017\n\013UNENCRYPTE" +
-      "D\020\001\022\030\n\024ENCRYPTED_SCRYPT_AES\020\002\"R\n\014Exchang" +
-      "eRate\022\022\n\ncoin_value\030\001 \002(\003\022\022\n\nfiat_value\030" +
-      "\002 \002(\003\022\032\n\022fiat_currency_code\030\003 \002(\tB\035\n\023org" +
-      ".bitcoinj.walletB\006Protos"
+      "ces\030\003 \002(\004\022\020\n\010hostname\030c \001(\t\"M\n\rEncrypted" +
+      "Data\022\035\n\025initialisation_vector\030\001 \002(\014\022\035\n\025e" +
+      "ncrypted_private_key\030\002 \002(\014\"\231\001\n\020Determini" +
+      "sticKey\022\022\n\nchain_code\030\001 \002(\014\022\014\n\004path\030\002 \003(" +
+      "\r\022\026\n\016issued_subkeys\030\003 \001(\r\022\026\n\016lookahead_s" +
+      "ize\030\004 \001(\r\022\023\n\013isFollowing\030\005 \001(\010\022\036\n\023sigsRe" +
+      "quiredToSpend\030\006 \001(\r:\0011\"\231\004\n\003Key\022\036\n\004type\030\001" +
+      " \002(\0162\020.wallet.Key.Type\022\024\n\014secret_bytes\030\002" +
+      " \001(\014\022-\n\016encrypted_data\030\006 \001(\0132\025.wallet.En" +
+      "cryptedData\022\022\n\npublic_key\030\003 \001(\014\022\r\n\005label" +
+      "\030\004 \001(\t\022\032\n\022creation_timestamp\030\005 \001(\003\0223\n\021de" +
+      "terministic_key\030\007 \001(\0132\030.wallet.Determini" +
+      "sticKey\022\032\n\022deterministic_seed\030\010 \001(\014\022;\n\034e" +
+      "ncrypted_deterministic_seed\030\t \001(\0132\025.wall" +
+      "et.EncryptedData\022\030\n\014account_path\030\n \003(\rB\002" +
+      "\020\001\0228\n\022output_script_type\030\013 \001(\0162\034.wallet." +
+      "Key.OutputScriptType\"a\n\004Type\022\014\n\010ORIGINAL" +
+      "\020\001\022\030\n\024ENCRYPTED_SCRYPT_AES\020\002\022\032\n\026DETERMIN" +
+      "ISTIC_MNEMONIC\020\003\022\025\n\021DETERMINISTIC_KEY\020\004\"" +
+      ")\n\020OutputScriptType\022\t\n\005P2PKH\020\001\022\n\n\006P2WPKH" +
+      "\020\002\"5\n\006Script\022\017\n\007program\030\001 \002(\014\022\032\n\022creatio" +
+      "n_timestamp\030\002 \002(\003\"\035\n\rScriptWitness\022\014\n\004da" +
+      "ta\030\001 \003(\014\"\272\001\n\020TransactionInput\022\"\n\032transac" +
+      "tion_out_point_hash\030\001 \002(\014\022#\n\033transaction" +
+      "_out_point_index\030\002 \002(\r\022\024\n\014script_bytes\030\003" +
+      " \002(\014\022\020\n\010sequence\030\004 \001(\r\022\r\n\005value\030\005 \001(\003\022&\n" +
+      "\007witness\030\006 \001(\0132\025.wallet.ScriptWitness\"\177\n" +
+      "\021TransactionOutput\022\r\n\005value\030\001 \002(\003\022\024\n\014scr" +
+      "ipt_bytes\030\002 \002(\014\022!\n\031spent_by_transaction_" +
+      "hash\030\003 \001(\014\022\"\n\032spent_by_transaction_index" +
+      "\030\004 \001(\005\"\267\003\n\025TransactionConfidence\0220\n\004type" +
+      "\030\001 \001(\0162\".wallet.TransactionConfidence.Ty" +
+      "pe\022\032\n\022appeared_at_height\030\002 \001(\005\022\036\n\026overri" +
+      "ding_transaction\030\003 \001(\014\022\r\n\005depth\030\004 \001(\005\022)\n" +
+      "\014broadcast_by\030\006 \003(\0132\023.wallet.PeerAddress" +
+      "\022\033\n\023last_broadcasted_at\030\010 \001(\003\0224\n\006source\030" +
+      "\007 \001(\0162$.wallet.TransactionConfidence.Sou" +
+      "rce\"`\n\004Type\022\013\n\007UNKNOWN\020\000\022\014\n\010BUILDING\020\001\022\013" +
+      "\n\007PENDING\020\002\022\025\n\021NOT_IN_BEST_CHAIN\020\003\022\010\n\004DE" +
+      "AD\020\004\022\017\n\013IN_CONFLICT\020\005\"A\n\006Source\022\022\n\016SOURC" +
+      "E_UNKNOWN\020\000\022\022\n\016SOURCE_NETWORK\020\001\022\017\n\013SOURC" +
+      "E_SELF\020\002\"\347\005\n\013Transaction\022\017\n\007version\030\001 \002(" +
+      "\005\022\014\n\004hash\030\002 \002(\014\022&\n\004pool\030\003 \001(\0162\030.wallet.T" +
+      "ransaction.Pool\022\021\n\tlock_time\030\004 \001(\r\022\022\n\nup" +
+      "dated_at\030\005 \001(\003\022\"\n\031included_in_best_chain" +
+      "_at\030\350\007 \001(\003\0223\n\021transaction_input\030\006 \003(\0132\030." +
+      "wallet.TransactionInput\0225\n\022transaction_o" +
+      "utput\030\007 \003(\0132\031.wallet.TransactionOutput\022\022" +
+      "\n\nblock_hash\030\010 \003(\014\022 \n\030block_relativity_o" +
+      "ffsets\030\013 \003(\005\0221\n\nconfidence\030\t \001(\0132\035.walle" +
+      "t.TransactionConfidence\0225\n\007purpose\030\n \001(\016" +
+      "2\033.wallet.Transaction.Purpose:\007UNKNOWN\022+" +
+      "\n\rexchange_rate\030\014 \001(\0132\024.wallet.ExchangeR" +
+      "ate\022\014\n\004memo\030\r \001(\t\"Y\n\004Pool\022\013\n\007UNSPENT\020\004\022\t" +
+      "\n\005SPENT\020\005\022\014\n\010INACTIVE\020\002\022\010\n\004DEAD\020\n\022\013\n\007PEN" +
+      "DING\020\020\022\024\n\020PENDING_INACTIVE\020\022\"\243\001\n\007Purpose" +
+      "\022\013\n\007UNKNOWN\020\000\022\020\n\014USER_PAYMENT\020\001\022\020\n\014KEY_R" +
+      "OTATION\020\002\022\034\n\030ASSURANCE_CONTRACT_CLAIM\020\003\022" +
+      "\035\n\031ASSURANCE_CONTRACT_PLEDGE\020\004\022\033\n\027ASSURA" +
+      "NCE_CONTRACT_STUB\020\005\022\r\n\tRAISE_FEE\020\006\"N\n\020Sc" +
+      "ryptParameters\022\014\n\004salt\030\001 \002(\014\022\020\n\001n\030\002 \001(\003:" +
+      "\00516384\022\014\n\001r\030\003 \001(\005:\0018\022\014\n\001p\030\004 \001(\005:\0011\"8\n\tEx" +
+      "tension\022\n\n\002id\030\001 \002(\t\022\014\n\004data\030\002 \002(\014\022\021\n\tman" +
+      "datory\030\003 \002(\010\" \n\003Tag\022\013\n\003tag\030\001 \002(\t\022\014\n\004data" +
+      "\030\002 \002(\014\"\261\004\n\006Wallet\022\032\n\022network_identifier\030" +
+      "\001 \002(\t\022\034\n\024last_seen_block_hash\030\002 \001(\014\022\036\n\026l" +
+      "ast_seen_block_height\030\014 \001(\r\022!\n\031last_seen" +
+      "_block_time_secs\030\016 \001(\003\022\030\n\003key\030\003 \003(\0132\013.wa" +
+      "llet.Key\022(\n\013transaction\030\004 \003(\0132\023.wallet.T" +
+      "ransaction\022&\n\016watched_script\030\017 \003(\0132\016.wal" +
+      "let.Script\022C\n\017encryption_type\030\005 \001(\0162\035.wa" +
+      "llet.Wallet.EncryptionType:\013UNENCRYPTED\022" +
+      "7\n\025encryption_parameters\030\006 \001(\0132\030.wallet." +
+      "ScryptParameters\022\022\n\007version\030\007 \001(\005:\0011\022$\n\t" +
+      "extension\030\n \003(\0132\021.wallet.Extension\022\023\n\013de" +
+      "scription\030\013 \001(\t\022\031\n\021key_rotation_time\030\r \001" +
+      "(\004\022\031\n\004tags\030\020 \003(\0132\013.wallet.Tag\";\n\016Encrypt" +
+      "ionType\022\017\n\013UNENCRYPTED\020\001\022\030\n\024ENCRYPTED_SC" +
+      "RYPT_AES\020\002\"R\n\014ExchangeRate\022\022\n\ncoin_value" +
+      "\030\001 \002(\003\022\022\n\nfiat_value\030\002 \002(\003\022\032\n\022fiat_curre" +
+      "ncy_code\030\003 \002(\tB\035\n\023org.bitcoinj.walletB\006P" +
+      "rotos"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -19091,91 +21620,91 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors(
     internal_static_wallet_PeerAddress_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_wallet_PeerAddress_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_wallet_PeerAddress_descriptor,
-        new java.lang.String[] { "IpAddress", "Port", "Services", });
+        new java.lang.String[] { "IpAddress", "Port", "Services", "Hostname", });
     internal_static_wallet_EncryptedData_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_wallet_EncryptedData_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_wallet_EncryptedData_descriptor,
         new java.lang.String[] { "InitialisationVector", "EncryptedPrivateKey", });
     internal_static_wallet_DeterministicKey_descriptor =
       getDescriptor().getMessageTypes().get(2);
     internal_static_wallet_DeterministicKey_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_wallet_DeterministicKey_descriptor,
         new java.lang.String[] { "ChainCode", "Path", "IssuedSubkeys", "LookaheadSize", "IsFollowing", "SigsRequiredToSpend", });
     internal_static_wallet_Key_descriptor =
       getDescriptor().getMessageTypes().get(3);
     internal_static_wallet_Key_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_wallet_Key_descriptor,
-        new java.lang.String[] { "Type", "SecretBytes", "EncryptedData", "PublicKey", "Label", "CreationTimestamp", "DeterministicKey", "DeterministicSeed", "EncryptedDeterministicSeed", });
+        new java.lang.String[] { "Type", "SecretBytes", "EncryptedData", "PublicKey", "Label", "CreationTimestamp", "DeterministicKey", "DeterministicSeed", "EncryptedDeterministicSeed", "AccountPath", "OutputScriptType", });
     internal_static_wallet_Script_descriptor =
       getDescriptor().getMessageTypes().get(4);
     internal_static_wallet_Script_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_wallet_Script_descriptor,
         new java.lang.String[] { "Program", "CreationTimestamp", });
-    internal_static_wallet_TransactionInput_descriptor =
+    internal_static_wallet_ScriptWitness_descriptor =
       getDescriptor().getMessageTypes().get(5);
+    internal_static_wallet_ScriptWitness_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_wallet_ScriptWitness_descriptor,
+        new java.lang.String[] { "Data", });
+    internal_static_wallet_TransactionInput_descriptor =
+      getDescriptor().getMessageTypes().get(6);
     internal_static_wallet_TransactionInput_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_wallet_TransactionInput_descriptor,
-        new java.lang.String[] { "TransactionOutPointHash", "TransactionOutPointIndex", "ScriptBytes", "Sequence", "Value", });
+        new java.lang.String[] { "TransactionOutPointHash", "TransactionOutPointIndex", "ScriptBytes", "Sequence", "Value", "Witness", });
     internal_static_wallet_TransactionOutput_descriptor =
-      getDescriptor().getMessageTypes().get(6);
+      getDescriptor().getMessageTypes().get(7);
     internal_static_wallet_TransactionOutput_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_wallet_TransactionOutput_descriptor,
         new java.lang.String[] { "Value", "ScriptBytes", "SpentByTransactionHash", "SpentByTransactionIndex", });
     internal_static_wallet_TransactionConfidence_descriptor =
-      getDescriptor().getMessageTypes().get(7);
+      getDescriptor().getMessageTypes().get(8);
     internal_static_wallet_TransactionConfidence_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_wallet_TransactionConfidence_descriptor,
         new java.lang.String[] { "Type", "AppearedAtHeight", "OverridingTransaction", "Depth", "BroadcastBy", "LastBroadcastedAt", "Source", });
     internal_static_wallet_Transaction_descriptor =
-      getDescriptor().getMessageTypes().get(8);
+      getDescriptor().getMessageTypes().get(9);
     internal_static_wallet_Transaction_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_wallet_Transaction_descriptor,
-        new java.lang.String[] { "Version", "Hash", "Pool", "LockTime", "UpdatedAt", "TransactionInput", "TransactionOutput", "BlockHash", "BlockRelativityOffsets", "Confidence", "Purpose", "ExchangeRate", "Memo", });
+        new java.lang.String[] { "Version", "Hash", "Pool", "LockTime", "UpdatedAt", "IncludedInBestChainAt", "TransactionInput", "TransactionOutput", "BlockHash", "BlockRelativityOffsets", "Confidence", "Purpose", "ExchangeRate", "Memo", });
     internal_static_wallet_ScryptParameters_descriptor =
-      getDescriptor().getMessageTypes().get(9);
+      getDescriptor().getMessageTypes().get(10);
     internal_static_wallet_ScryptParameters_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_wallet_ScryptParameters_descriptor,
         new java.lang.String[] { "Salt", "N", "R", "P", });
     internal_static_wallet_Extension_descriptor =
-      getDescriptor().getMessageTypes().get(10);
+      getDescriptor().getMessageTypes().get(11);
     internal_static_wallet_Extension_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_wallet_Extension_descriptor,
         new java.lang.String[] { "Id", "Data", "Mandatory", });
     internal_static_wallet_Tag_descriptor =
-      getDescriptor().getMessageTypes().get(11);
+      getDescriptor().getMessageTypes().get(12);
     internal_static_wallet_Tag_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_wallet_Tag_descriptor,
         new java.lang.String[] { "Tag", "Data", });
-    internal_static_wallet_TransactionSigner_descriptor =
-      getDescriptor().getMessageTypes().get(12);
-    internal_static_wallet_TransactionSigner_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_wallet_TransactionSigner_descriptor,
-        new java.lang.String[] { "ClassName", "Data", });
     internal_static_wallet_Wallet_descriptor =
       getDescriptor().getMessageTypes().get(13);
     internal_static_wallet_Wallet_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_wallet_Wallet_descriptor,
-        new java.lang.String[] { "NetworkIdentifier", "LastSeenBlockHash", "LastSeenBlockHeight", "LastSeenBlockTimeSecs", "Key", "Transaction", "WatchedScript", "EncryptionType", "EncryptionParameters", "Version", "Extension", "Description", "KeyRotationTime", "Tags", "TransactionSigners", });
+        new java.lang.String[] { "NetworkIdentifier", "LastSeenBlockHash", "LastSeenBlockHeight", "LastSeenBlockTimeSecs", "Key", "Transaction", "WatchedScript", "EncryptionType", "EncryptionParameters", "Version", "Extension", "Description", "KeyRotationTime", "Tags", });
     internal_static_wallet_ExchangeRate_descriptor =
       getDescriptor().getMessageTypes().get(14);
     internal_static_wallet_ExchangeRate_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_wallet_ExchangeRate_descriptor,
         new java.lang.String[] { "CoinValue", "FiatValue", "FiatCurrencyCode", });
   }
diff --git a/core/src/main/java/org/bitcoinj/wallet/RedeemData.java b/core/src/main/java/org/bitcoinj/wallet/RedeemData.java
index 2f8e8cc11b2..ff0426949c9 100644
--- a/core/src/main/java/org/bitcoinj/wallet/RedeemData.java
+++ b/core/src/main/java/org/bitcoinj/wallet/RedeemData.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014 Kosta Korenkov
+ * Copyright 2019 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +19,9 @@
 
 import org.bitcoinj.core.ECKey;
 import org.bitcoinj.script.Script;
+import org.bitcoinj.script.ScriptPattern;
+
+import com.google.common.base.MoreObjects;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -28,7 +32,7 @@
 /**
  * This class aggregates data required to spend transaction output.
  *
- * For pay-to-address and pay-to-pubkey transactions it will have only a single key and CHECKSIG program as redeemScript.
+ * For P2PKH and P2PK transactions it will have only a single key and CHECKSIG program as redeemScript.
  * For multisignature transactions there will be multiple keys one of which will be a full key and the rest are watch only,
  * redeem script will be a CHECKMULTISIG program. Keys will be sorted in the same order they appear in
  * a program (lexicographical order).
@@ -39,7 +43,7 @@ public class RedeemData {
 
     private RedeemData(List<ECKey> keys, Script redeemScript) {
         this.redeemScript = redeemScript;
-        List<ECKey> sortedKeys = new ArrayList<ECKey>(keys);
+        List<ECKey> sortedKeys = new ArrayList<>(keys);
         Collections.sort(sortedKeys, ECKey.PUBKEY_COMPARATOR);
         this.keys = sortedKeys;
     }
@@ -49,12 +53,13 @@ public static RedeemData of(List<ECKey> keys, Script redeemScript) {
     }
 
     /**
-     * Creates RedeemData for pay-to-address or pay-to-pubkey input. Provided key is a single private key needed
-     * to spend such inputs and provided program should be a proper CHECKSIG program.
+     * Creates RedeemData for P2PKH, P2WPKH or P2PK input. Provided key is a single private key needed
+     * to spend such inputs.
      */
-    public static RedeemData of(ECKey key, Script program) {
-        checkArgument(program.isSentToAddress() || program.isSentToRawPubKey());
-        return key != null ? new RedeemData(Collections.singletonList(key), program) : null;
+    public static RedeemData of(ECKey key, Script redeemScript) {
+        checkArgument(ScriptPattern.isP2PKH(redeemScript)
+                || ScriptPattern.isP2WPKH(redeemScript) || ScriptPattern.isP2PK(redeemScript));
+        return key != null ? new RedeemData(Collections.singletonList(key), redeemScript) : null;
     }
 
     /**
@@ -66,4 +71,12 @@ public ECKey getFullKey() {
                 return key;
         return null;
     }
+
+    @Override
+    public String toString() {
+        final MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(this).omitNullValues();
+        helper.add("redeemScript", redeemScript);
+        helper.add("keys", keys);
+        return helper.toString();
+    }
 }
diff --git a/core/src/main/java/org/bitcoinj/wallet/SendRequest.java b/core/src/main/java/org/bitcoinj/wallet/SendRequest.java
index ef0046320db..cfc217ed886 100644
--- a/core/src/main/java/org/bitcoinj/wallet/SendRequest.java
+++ b/core/src/main/java/org/bitcoinj/wallet/SendRequest.java
@@ -25,6 +25,7 @@
 
 import org.bitcoin.protocols.payments.Protos.PaymentDetails;
 import org.bitcoinj.core.Address;
+import org.bitcoinj.core.LegacyAddress;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.Context;
 import org.bitcoinj.core.ECKey;
@@ -36,7 +37,7 @@
 import org.bitcoinj.utils.ExchangeRate;
 import org.bitcoinj.wallet.KeyChain.KeyPurpose;
 import org.bitcoinj.wallet.Wallet.MissingSigsMode;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import com.google.common.base.MoreObjects;
 
@@ -58,14 +59,14 @@ public class SendRequest {
      *
      * <p>If there are already inputs to the transaction, make sure their out point has a connected output,
      * otherwise their value will be added to fee.  Also ensure they are either signed or are spendable by a wallet
-     * key, otherwise the behavior of {@link Wallet#completeTx(Wallet.SendRequest)} is undefined (likely
+     * key, otherwise the behavior of {@link Wallet#completeTx(SendRequest)} is undefined (likely
      * RuntimeException).</p>
      */
     public Transaction tx;
 
     /**
      * When emptyWallet is set, all coins selected by the coin selector are sent to the first output in tx
-     * (its value is ignored and set to {@link org.bitcoinj.wallet.Wallet#getBalance()} - the fees required
+     * (its value is ignored and set to {@link Wallet#getBalance()} - the fees required
      * for the transaction). Any additional outputs are removed.
      */
     public boolean emptyWallet = false;
@@ -84,13 +85,33 @@ public class SendRequest {
      * a way for people to prioritize their transactions over others and is used as a way to make denial of service
      * attacks expensive.</p>
      *
-     * <p>This is a dynamic fee (in satoshis) which will be added to the transaction for each kilobyte in size
+     * <p>This is a constant fee (in satoshis) which will be added to the transaction. It is recommended that it be
+     * at least {@link Transaction#REFERENCE_DEFAULT_MIN_TX_FEE} if it is set, as default Bitcoin Core will
+     * otherwise simply treat the transaction as if there were no fee at all.</p>
+     *
+     * <p>You might also consider adding a {@link SendRequest#feePerKb} to set the fee per kb of transaction size
+     * (rounded down to the nearest kb) as that is how transactions are sorted when added to a block by miners.</p>
+     */
+    public Coin fee = null;
+
+    /**
+     * <p>A transaction can have a fee attached, which is defined as the difference between the input values
+     * and output values. Any value taken in that is not provided to an output can be claimed by a miner. This
+     * is how mining is incentivized in later years of the Bitcoin system when inflation drops. It also provides
+     * a way for people to prioritize their transactions over others and is used as a way to make denial of service
+     * attacks expensive.</p>
+     *
+     * <p>This is a dynamic fee (in satoshis) which will be added to the transaction for each virtual kilobyte in size
      * including the first. This is useful as as miners usually sort pending transactions by their fee per unit size
      * when choosing which transactions to add to a block. Note that, to keep this equivalent to Bitcoin Core
-     * definition, a kilobyte is defined as 1000 bytes, not 1024.</p>
+     * definition, a virtual kilobyte is defined as 1000 virtual bytes, not 1024.</p>
      */
     public Coin feePerKb = Context.get().getFeePerKb();
 
+    public void setFeePerVkb(Coin feePerVkb) {
+        this.feePerKb = feePerVkb;
+    }
+
     /**
      * <p>Requires that there be enough fee for a default Bitcoin Core to at least relay the transaction.
      * (ie ensure the transaction will not be outright rejected by the network). Defaults to true, you should
@@ -115,7 +136,7 @@ public class SendRequest {
     public KeyParameter aesKey = null;
 
     /**
-     * If not null, the {@link org.bitcoinj.wallet.CoinSelector} to use instead of the wallets default. Coin selectors are
+     * If not null, the {@link CoinSelector} to use instead of the wallets default. Coin selectors are
      * responsible for choosing which transaction outputs (coins) in a wallet to use given the desired send value
      * amount.
      */
@@ -146,6 +167,12 @@ public class SendRequest {
      */
     public String memo = null;
 
+    /**
+     * If false (default value), tx fee is paid by the sender If true, tx fee is paid by the recipient/s. If there is
+     * more than one recipient, the tx fee is split equally between them regardless of output value and size.
+     */
+    public boolean recipientsPayFees = false;
+
     // Tracks if this has been passed to wallet.completeTx already: just a safety check.
     boolean completed;
 
@@ -256,12 +283,14 @@ public String toString() {
         MoreObjects.ToStringHelper helper = MoreObjects.toStringHelper(this).omitNullValues();
         helper.add("emptyWallet", emptyWallet);
         helper.add("changeAddress", changeAddress);
+        helper.add("fee", fee);
         helper.add("feePerKb", feePerKb);
         helper.add("ensureMinRequiredFee", ensureMinRequiredFee);
         helper.add("signInputs", signInputs);
         helper.add("aesKey", aesKey != null ? "set" : null); // careful to not leak the key
         helper.add("coinSelector", coinSelector);
         helper.add("shuffleOutputs", shuffleOutputs);
+        helper.add("recipientsPayFees", recipientsPayFees);
         return helper.toString();
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/bitcoinj/wallet/UnreadableWalletException.java b/core/src/main/java/org/bitcoinj/wallet/UnreadableWalletException.java
index 8c9d7d58e27..be799cea7ed 100644
--- a/core/src/main/java/org/bitcoinj/wallet/UnreadableWalletException.java
+++ b/core/src/main/java/org/bitcoinj/wallet/UnreadableWalletException.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/wallet/Wallet.java b/core/src/main/java/org/bitcoinj/wallet/Wallet.java
index 89b0b708593..a7cd09f05b6 100644
--- a/core/src/main/java/org/bitcoinj/wallet/Wallet.java
+++ b/core/src/main/java/org/bitcoinj/wallet/Wallet.java
@@ -24,10 +24,10 @@
 import com.google.common.util.concurrent.*;
 import com.google.protobuf.*;
 import net.jcip.annotations.*;
-import org.bitcoin.protocols.payments.Protos.*;
 import org.bitcoinj.core.listeners.*;
-import org.bitcoinj.core.AbstractBlockChain;
 import org.bitcoinj.core.Address;
+import org.bitcoinj.core.Base58;
+import org.bitcoinj.core.AbstractBlockChain;
 import org.bitcoinj.core.BlockChain;
 import org.bitcoinj.core.BloomFilter;
 import org.bitcoinj.core.Coin;
@@ -35,12 +35,12 @@
 import org.bitcoinj.core.ECKey;
 import org.bitcoinj.core.FilteredBlock;
 import org.bitcoinj.core.InsufficientMoneyException;
+import org.bitcoinj.core.LegacyAddress;
 import org.bitcoinj.core.Message;
 import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.core.Peer;
 import org.bitcoinj.core.PeerFilterProvider;
 import org.bitcoinj.core.PeerGroup;
-import org.bitcoinj.core.ScriptException;
 import org.bitcoinj.core.Sha256Hash;
 import org.bitcoinj.core.StoredBlock;
 import org.bitcoinj.core.Transaction;
@@ -55,11 +55,11 @@
 import org.bitcoinj.core.UTXOProvider;
 import org.bitcoinj.core.UTXOProviderException;
 import org.bitcoinj.core.Utils;
-import org.bitcoinj.core.VarInt;
 import org.bitcoinj.core.VerificationException;
 import org.bitcoinj.core.TransactionConfidence.*;
 import org.bitcoinj.crypto.*;
 import org.bitcoinj.script.*;
+import org.bitcoinj.script.Script.ScriptType;
 import org.bitcoinj.signers.*;
 import org.bitcoinj.utils.*;
 import org.bitcoinj.wallet.Protos.Wallet.*;
@@ -69,14 +69,15 @@
 import org.bitcoinj.wallet.listeners.WalletChangeEventListener;
 import org.bitcoinj.wallet.listeners.WalletCoinsReceivedEventListener;
 import org.bitcoinj.wallet.listeners.WalletCoinsSentEventListener;
-import org.bitcoinj.wallet.listeners.WalletEventListener;
 import org.bitcoinj.wallet.listeners.WalletReorganizeEventListener;
 import org.slf4j.*;
-import org.spongycastle.crypto.params.*;
+import org.bouncycastle.crypto.params.*;
 
 import javax.annotation.*;
 import java.io.*;
 import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.security.SecureRandom;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
@@ -119,7 +120,7 @@
  * auto-save feature that simplifies this for you although you're still responsible for manually triggering a save when
  * your app is about to quit because the auto-save feature waits a moment before actually committing to disk to avoid IO
  * thrashing when the wallet is changing very fast (eg due to a block chain sync). See
- * {@link Wallet#autosaveToFile(java.io.File, long, java.util.concurrent.TimeUnit, org.bitcoinj.wallet.WalletFiles.Listener)}
+ * {@link Wallet#autosaveToFile(File, long, TimeUnit, WalletFiles.Listener)}
  * for more information about this.</p>
  */
 public class Wallet extends BaseTaggableObject
@@ -192,17 +193,17 @@ protected boolean removeEldestEntry(Map.Entry<Sha256Hash, Transaction> eldest) {
     private long lastBlockSeenTimeSecs;
 
     private final CopyOnWriteArrayList<ListenerRegistration<WalletChangeEventListener>> changeListeners
-        = new CopyOnWriteArrayList<ListenerRegistration<WalletChangeEventListener>>();
+        = new CopyOnWriteArrayList<>();
     private final CopyOnWriteArrayList<ListenerRegistration<WalletCoinsReceivedEventListener>> coinsReceivedListeners
-        = new CopyOnWriteArrayList<ListenerRegistration<WalletCoinsReceivedEventListener>>();
+        = new CopyOnWriteArrayList<>();
     private final CopyOnWriteArrayList<ListenerRegistration<WalletCoinsSentEventListener>> coinsSentListeners
-        = new CopyOnWriteArrayList<ListenerRegistration<WalletCoinsSentEventListener>>();
+        = new CopyOnWriteArrayList<>();
     private final CopyOnWriteArrayList<ListenerRegistration<WalletReorganizeEventListener>> reorganizeListeners
-        = new CopyOnWriteArrayList<ListenerRegistration<WalletReorganizeEventListener>>();
+        = new CopyOnWriteArrayList<>();
     private final CopyOnWriteArrayList<ListenerRegistration<ScriptsChangeEventListener>> scriptChangeListeners
-        = new CopyOnWriteArrayList<ListenerRegistration<ScriptsChangeEventListener>>();
+        = new CopyOnWriteArrayList<>();
     private final CopyOnWriteArrayList<ListenerRegistration<TransactionConfidenceEventListener>> transactionConfidenceListeners
-        = new CopyOnWriteArrayList<ListenerRegistration<TransactionConfidenceEventListener>>();
+        = new CopyOnWriteArrayList<>();
 
     // A listener that relays confidence changes from the transaction confidence object to the wallet event listener,
     // as a convenience to API users so they don't have to register on every transaction themselves.
@@ -244,7 +245,7 @@ protected boolean removeEldestEntry(Map.Entry<Sha256Hash, Transaction> eldest) {
     private final HashMap<String, WalletExtension> extensions;
 
     // Objects that perform transaction signing. Applied subsequently one after another
-    @GuardedBy("lock") private List<TransactionSigner> signers;
+    @GuardedBy("lock") private volatile List<TransactionSigner> signers;
 
     // If this is set then the wallet selects spendable candidate outputs from a UTXO provider.
     @Nullable private volatile UTXOProvider vUTXOProvider;
@@ -253,87 +254,241 @@ protected boolean removeEldestEntry(Map.Entry<Sha256Hash, Transaction> eldest) {
      * Creates a new, empty wallet with a randomly chosen seed and no transactions. Make sure to provide for sufficient
      * backup! Any keys will be derived from the seed. If you want to restore a wallet from disk instead, see
      * {@link #loadFromFile}.
+     * @param params network parameters
+     * @param outputScriptType type of addresses (aka output scripts) to generate for receiving
+     */
+    public static Wallet createDeterministic(NetworkParameters params, Script.ScriptType outputScriptType) {
+        return createDeterministic(Context.getOrCreate(params), outputScriptType);
+    }
+
+    /**
+     * Creates a new, empty wallet with a randomly chosen seed and no transactions. Make sure to provide for sufficient
+     * backup! Any keys will be derived from the seed. If you want to restore a wallet from disk instead, see
+     * {@link #loadFromFile}.
+     * @param params network parameters
+     * @deprecated Use {@link #createDeterministic(NetworkParameters, ScriptType)}
      */
+    @Deprecated
     public Wallet(NetworkParameters params) {
-        this(Context.getOrCreate(params));
+        this(params, KeyChainGroup.builder(params).fromRandom(Script.ScriptType.P2PKH).build());
     }
 
     /**
      * Creates a new, empty wallet with a randomly chosen seed and no transactions. Make sure to provide for sufficient
      * backup! Any keys will be derived from the seed. If you want to restore a wallet from disk instead, see
      * {@link #loadFromFile}.
+     * @param outputScriptType type of addresses (aka output scripts) to generate for receiving
      */
+    public static Wallet createDeterministic(Context context, Script.ScriptType outputScriptType) {
+        return new Wallet(context, KeyChainGroup.builder(context.getParams()).fromRandom(outputScriptType).build());
+    }
+
+    /**
+     * Creates a new, empty wallet with a randomly chosen seed and no transactions. Make sure to provide for sufficient
+     * backup! Any keys will be derived from the seed. If you want to restore a wallet from disk instead, see
+     * {@link #loadFromFile}.
+     * @deprecated Use {@link #createDeterministic(Context, ScriptType)}
+     */
+    @Deprecated
     public Wallet(Context context) {
-        this(context, new KeyChainGroup(context.getParams()));
+        this(context, KeyChainGroup.builder(context.getParams()).fromRandom(Script.ScriptType.P2PKH).build());
     }
 
+    /**
+     * Creates a new, empty wallet with just a basic keychain and no transactions. No deterministic chains will be created
+     * automatically. This is meant for when you just want to import a few keys and operate on them.
+     * @param params network parameters
+     */
+    public static Wallet createBasic(NetworkParameters params) {
+        return new Wallet(params, KeyChainGroup.createBasic(params));
+    }
+
+    /**
+     * @param params network parameters
+     * @param seed deterministic seed
+     * @param outputScriptType type of addresses (aka output scripts) to generate for receiving
+     * @return a wallet from a deterministic seed with a default account path
+     */
+    public static Wallet fromSeed(NetworkParameters params, DeterministicSeed seed,
+            Script.ScriptType outputScriptType) {
+        return fromSeed(params, seed, outputScriptType, KeyChainGroupStructure.DEFAULT);
+    }
+
+    /**
+     * @param params network parameters
+     * @param seed deterministic seed
+     * @param outputScriptType type of addresses (aka output scripts) to generate for receiving
+     * @param structure structure for your wallet
+     * @return a wallet from a deterministic seed with a default account path
+     */
+    public static Wallet fromSeed(NetworkParameters params, DeterministicSeed seed, Script.ScriptType outputScriptType,
+            KeyChainGroupStructure structure) {
+        return new Wallet(params, KeyChainGroup.builder(params, structure).fromSeed(seed, outputScriptType).build());
+    }
+
+    /**
+     * @param params network parameters
+     * @param seed deterministic seed
+     * @return a wallet from a deterministic seed with a
+     * {@link DeterministicKeyChain#ACCOUNT_ZERO_PATH 0 hardened path}
+     * @deprecated Use {@link #fromSeed(NetworkParameters, DeterministicSeed, ScriptType, KeyChainGroupStructure)}
+     */
+    @Deprecated
     public static Wallet fromSeed(NetworkParameters params, DeterministicSeed seed) {
-        return new Wallet(params, new KeyChainGroup(params, seed));
+        return fromSeed(params, seed, Script.ScriptType.P2PKH);
+    }
+
+    /**
+     * @param params network parameters
+     * @param seed deterministic seed
+     * @param outputScriptType type of addresses (aka output scripts) to generate for receiving
+     * @param accountPath account path to generate receiving addresses on
+     * @return an instance of a wallet from a deterministic seed.
+     */
+    public static Wallet fromSeed(NetworkParameters params, DeterministicSeed seed, Script.ScriptType outputScriptType,
+            ImmutableList<ChildNumber> accountPath) {
+        DeterministicKeyChain chain = DeterministicKeyChain.builder().seed(seed).outputScriptType(outputScriptType)
+                .accountPath(accountPath).build();
+        return new Wallet(params, KeyChainGroup.builder(params).addChain(chain).build());
     }
 
     /**
-     * Creates a wallet that tracks payments to and from the HD key hierarchy rooted by the given watching key. A
-     * watching key corresponds to account zero in the recommended BIP32 key hierarchy.
+     * @param params network parameters
+     * @param seed deterministic seed
+     * @param accountPath account path
+     * @return an instance of a wallet from a deterministic seed.
+     * @deprecated Use {@link #fromSeed(NetworkParameters, DeterministicSeed, ScriptType, ImmutableList)}
      */
+    @Deprecated
+    public static Wallet fromSeed(NetworkParameters params, DeterministicSeed seed, ImmutableList<ChildNumber> accountPath) {
+        return fromSeed(params, seed, Script.ScriptType.P2PKH, accountPath);
+    }
+
+    /**
+     * Creates a wallet that tracks payments to and from the HD key hierarchy rooted by the given watching key. This HAS
+     * to be an account key as returned by {@link DeterministicKeyChain#getWatchingKey()}.
+     */
+    public static Wallet fromWatchingKey(NetworkParameters params, DeterministicKey watchKey,
+            Script.ScriptType outputScriptType) {
+        DeterministicKeyChain chain = DeterministicKeyChain.builder().watch(watchKey).outputScriptType(outputScriptType)
+                .build();
+        return new Wallet(params, KeyChainGroup.builder(params).addChain(chain).build());
+    }
+
+    /**
+     * Creates a wallet that tracks payments to and from the HD key hierarchy rooted by the given watching key. This HAS
+     * to be an account key as returned by {@link DeterministicKeyChain#getWatchingKey()}.
+     * @deprecated Use {@link #fromWatchingKey(NetworkParameters, DeterministicKey, ScriptType)}
+     */
+    @Deprecated
     public static Wallet fromWatchingKey(NetworkParameters params, DeterministicKey watchKey) {
-        return new Wallet(params, new KeyChainGroup(params, watchKey));
+        return fromWatchingKey(params, watchKey, Script.ScriptType.P2PKH);
     }
 
     /**
-     * Creates a wallet that tracks payments to and from the HD key hierarchy rooted by the given watching key. A
-     * watching key corresponds to account zero in the recommended BIP32 key hierarchy. The key is specified in base58
-     * notation and the creation time of the key. If you don't know the creation time, you can pass
-     * {@link DeterministicHierarchy#BIP32_STANDARDISATION_TIME_SECS}.
+     * Creates a wallet that tracks payments to and from the HD key hierarchy rooted by the given watching key. The
+     * account path is specified. The key is specified in base58 notation and the creation time of the key. If you don't
+     * know the creation time, you can pass {@link DeterministicHierarchy#BIP32_STANDARDISATION_TIME_SECS}.
      */
     public static Wallet fromWatchingKeyB58(NetworkParameters params, String watchKeyB58, long creationTimeSeconds) {
         final DeterministicKey watchKey = DeterministicKey.deserializeB58(null, watchKeyB58, params);
         watchKey.setCreationTimeSeconds(creationTimeSeconds);
-        return fromWatchingKey(params, watchKey);
+        return fromWatchingKey(params, watchKey, outputScriptTypeFromB58(params, watchKeyB58));
+    }
+
+    /**
+     * Creates a wallet that tracks payments to and from the HD key hierarchy rooted by the given spending key. This HAS
+     * to be an account key as returned by {@link DeterministicKeyChain#getWatchingKey()}. This wallet can also spend.
+     */
+    public static Wallet fromSpendingKey(NetworkParameters params, DeterministicKey spendKey,
+            Script.ScriptType outputScriptType) {
+        DeterministicKeyChain chain = DeterministicKeyChain.builder().spend(spendKey).outputScriptType(outputScriptType)
+                .build();
+        return new Wallet(params, KeyChainGroup.builder(params).addChain(chain).build());
+    }
+
+    /**
+     * Creates a wallet that tracks payments to and from the HD key hierarchy rooted by the given spending key. This HAS
+     * to be an account key as returned by {@link DeterministicKeyChain#getWatchingKey()}. This wallet can also spend.
+     * @deprecated Use {@link #fromSpendingKey(NetworkParameters, DeterministicKey, ScriptType)}
+     */
+    @Deprecated
+    public static Wallet fromSpendingKey(NetworkParameters params, DeterministicKey spendKey) {
+        return fromSpendingKey(params, spendKey, Script.ScriptType.P2PKH);
     }
 
     /**
-     * Creates a wallet containing a given set of keys. All further keys will be derived from the oldest key.
+     * Creates a wallet that tracks payments to and from the HD key hierarchy rooted by the given spending key.
+     * The key is specified in base58 notation and the creation time of the key. If you don't know the creation time,
+     * you can pass {@link DeterministicHierarchy#BIP32_STANDARDISATION_TIME_SECS}.
      */
+    public static Wallet fromSpendingKeyB58(NetworkParameters params, String spendingKeyB58, long creationTimeSeconds) {
+        final DeterministicKey spendKey = DeterministicKey.deserializeB58(null, spendingKeyB58, params);
+        spendKey.setCreationTimeSeconds(creationTimeSeconds);
+        return fromSpendingKey(params, spendKey, outputScriptTypeFromB58(params, spendingKeyB58));
+    }
+
+    /**
+     * Creates a wallet that tracks payments to and from the HD key hierarchy rooted by the given spending key. This HAS
+     * to be an account key as returned by {@link DeterministicKeyChain#getWatchingKey()}.
+     */
+    public static Wallet fromMasterKey(NetworkParameters params, DeterministicKey masterKey,
+            Script.ScriptType outputScriptType, ChildNumber accountNumber) {
+        DeterministicKey accountKey = HDKeyDerivation.deriveChildKey(masterKey, accountNumber);
+        accountKey = accountKey.dropParent();
+        accountKey.setCreationTimeSeconds(masterKey.getCreationTimeSeconds());
+        DeterministicKeyChain chain = DeterministicKeyChain.builder().spend(accountKey)
+                .outputScriptType(outputScriptType).build();
+        return new Wallet(params, KeyChainGroup.builder(params).addChain(chain).build());
+    }
+
+    /**
+     * @deprecated Use {@link #createBasic(NetworkParameters)}, then {@link #importKeys(List)}.
+     */
+    @Deprecated
     public static Wallet fromKeys(NetworkParameters params, List<ECKey> keys) {
         for (ECKey key : keys)
             checkArgument(!(key instanceof DeterministicKey));
 
-        KeyChainGroup group = new KeyChainGroup(params);
+        KeyChainGroup group = KeyChainGroup.builder(params).build();
         group.importKeys(keys);
         return new Wallet(params, group);
     }
 
+    private static Script.ScriptType outputScriptTypeFromB58(NetworkParameters params, String base58) {
+        int header = ByteBuffer.wrap(Base58.decodeChecked(base58)).getInt();
+        if (header == params.getBip32HeaderP2PKHpub() || header == params.getBip32HeaderP2PKHpriv())
+            return Script.ScriptType.P2PKH;
+        else if (header == params.getBip32HeaderP2WPKHpub() || header == params.getBip32HeaderP2WPKHpriv())
+            return Script.ScriptType.P2WPKH;
+        else
+            throw new IllegalArgumentException(base58.substring(0, 4));
+    }
+
     public Wallet(NetworkParameters params, KeyChainGroup keyChainGroup) {
         this(Context.getOrCreate(params), keyChainGroup);
     }
 
     private Wallet(Context context, KeyChainGroup keyChainGroup) {
-        this.context = context;
-        this.params = context.getParams();
+        this.context = checkNotNull(context);
+        this.params = checkNotNull(context.getParams());
         this.keyChainGroup = checkNotNull(keyChainGroup);
-        if (params.getId().equals(NetworkParameters.ID_UNITTESTNET))
-            this.keyChainGroup.setLookaheadSize(5);  // Cut down excess computation for unit tests.
-        // If this keyChainGroup was created fresh just now (new wallet), make HD so a backup can be made immediately
-        // without having to call current/freshReceiveKey. If there are already keys in the chain of any kind then
-        // we're probably being deserialized so leave things alone: the API user can upgrade later.
-        if (this.keyChainGroup.numKeys() == 0)
-            this.keyChainGroup.createAndActivateNewHDChain();
         watchedScripts = Sets.newHashSet();
-        unspent = new HashMap<Sha256Hash, Transaction>();
-        spent = new HashMap<Sha256Hash, Transaction>();
-        pending = new HashMap<Sha256Hash, Transaction>();
-        dead = new HashMap<Sha256Hash, Transaction>();
-        transactions = new HashMap<Sha256Hash, Transaction>();
-        extensions = new HashMap<String, WalletExtension>();
+        unspent = new HashMap<>();
+        spent = new HashMap<>();
+        pending = new HashMap<>();
+        dead = new HashMap<>();
+        transactions = new HashMap<>();
+        extensions = new HashMap<>();
         // Use a linked hash map to ensure ordering of event listeners is correct.
-        confidenceChanged = new LinkedHashMap<Transaction, TransactionConfidence.Listener.ChangeReason>();
-        signers = new ArrayList<TransactionSigner>();
+        confidenceChanged = new LinkedHashMap<>();
+        signers = new ArrayList<>();
         addTransactionSigner(new LocalTransactionSigner());
         createTransientState();
     }
 
     private void createTransientState() {
-        ignoreNextNewBlock = new HashSet<Sha256Hash>();
+        ignoreNextNewBlock = new HashSet<>();
         txConfidenceListener = new TransactionConfidence.Listener() {
             @Override
             public void onConfidenceChanged(TransactionConfidence confidence, TransactionConfidence.Listener.ChangeReason reason) {
@@ -364,10 +519,28 @@ public NetworkParameters getNetworkParameters() {
     }
 
     /**
-     * Gets the active keychain via {@link KeyChainGroup#getActiveKeyChain()}
+     * Gets the active keychains via {@link KeyChainGroup#getActiveKeyChains(long)}.
+     */
+    public List<DeterministicKeyChain> getActiveKeyChains() {
+        keyChainGroupLock.lock();
+        try {
+            long keyRotationTimeSecs = vKeyRotationTimestamp;
+            return keyChainGroup.getActiveKeyChains(keyRotationTimeSecs);
+        } finally {
+            keyChainGroupLock.unlock();
+        }
+    }
+
+    /**
+     * Gets the default active keychain via {@link KeyChainGroup#getActiveKeyChain()}.
      */
     public DeterministicKeyChain getActiveKeyChain() {
-        return keyChainGroup.getActiveKeyChain();
+        keyChainGroupLock.lock();
+        try {
+            return keyChainGroup.getActiveKeyChain();
+        } finally {
+            keyChainGroupLock.unlock();
+        }
     }
 
     /**
@@ -397,21 +570,20 @@ public List<TransactionSigner> getTransactionSigners() {
         }
     }
 
-    /******************************************************************************************************************/
+    // ***************************************************************************************************************
 
     //region Key Management
 
     /**
      * Returns a key that hasn't been seen in a transaction yet, and which is suitable for displaying in a wallet
      * user interface as "a convenient key to receive funds on" when the purpose parameter is
-     * {@link org.bitcoinj.wallet.KeyChain.KeyPurpose#RECEIVE_FUNDS}. The returned key is stable until
+     * {@link KeyChain.KeyPurpose#RECEIVE_FUNDS}. The returned key is stable until
      * it's actually seen in a pending or confirmed transaction, at which point this method will start returning
      * a different key (for each purpose independently).
      */
     public DeterministicKey currentKey(KeyChain.KeyPurpose purpose) {
         keyChainGroupLock.lock();
         try {
-            maybeUpgradeToHD();
             return keyChainGroup.currentKey(purpose);
         } finally {
             keyChainGroupLock.unlock();
@@ -419,20 +591,19 @@ public DeterministicKey currentKey(KeyChain.KeyPurpose purpose) {
     }
 
     /**
-     * An alias for calling {@link #currentKey(org.bitcoinj.wallet.KeyChain.KeyPurpose)} with
-     * {@link org.bitcoinj.wallet.KeyChain.KeyPurpose#RECEIVE_FUNDS} as the parameter.
+     * An alias for calling {@link #currentKey(KeyChain.KeyPurpose)} with
+     * {@link KeyChain.KeyPurpose#RECEIVE_FUNDS} as the parameter.
      */
     public DeterministicKey currentReceiveKey() {
         return currentKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
     }
 
     /**
-     * Returns address for a {@link #currentKey(org.bitcoinj.wallet.KeyChain.KeyPurpose)}
+     * Returns address for a {@link #currentKey(KeyChain.KeyPurpose)}
      */
     public Address currentAddress(KeyChain.KeyPurpose purpose) {
         keyChainGroupLock.lock();
         try {
-            maybeUpgradeToHD();
             return keyChainGroup.currentAddress(purpose);
         } finally {
             keyChainGroupLock.unlock();
@@ -440,8 +611,8 @@ public Address currentAddress(KeyChain.KeyPurpose purpose) {
     }
 
     /**
-     * An alias for calling {@link #currentAddress(org.bitcoinj.wallet.KeyChain.KeyPurpose)} with
-     * {@link org.bitcoinj.wallet.KeyChain.KeyPurpose#RECEIVE_FUNDS} as the parameter.
+     * An alias for calling {@link #currentAddress(KeyChain.KeyPurpose)} with
+     * {@link KeyChain.KeyPurpose#RECEIVE_FUNDS} as the parameter.
      */
     public Address currentReceiveAddress() {
         return currentAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS);
@@ -450,8 +621,8 @@ public Address currentReceiveAddress() {
     /**
      * Returns a key that has not been returned by this method before (fresh). You can think of this as being
      * a newly created key, although the notion of "create" is not really valid for a
-     * {@link org.bitcoinj.wallet.DeterministicKeyChain}. When the parameter is
-     * {@link org.bitcoinj.wallet.KeyChain.KeyPurpose#RECEIVE_FUNDS} the returned key is suitable for being put
+     * {@link DeterministicKeyChain}. When the parameter is
+     * {@link KeyChain.KeyPurpose#RECEIVE_FUNDS} the returned key is suitable for being put
      * into a receive coins wizard type UI. You should use this when the user is definitely going to hand this key out
      * to someone who wishes to send money.
      */
@@ -462,8 +633,8 @@ public DeterministicKey freshKey(KeyChain.KeyPurpose purpose) {
     /**
      * Returns a key/s that has not been returned by this method before (fresh). You can think of this as being
      * a newly created key/s, although the notion of "create" is not really valid for a
-     * {@link org.bitcoinj.wallet.DeterministicKeyChain}. When the parameter is
-     * {@link org.bitcoinj.wallet.KeyChain.KeyPurpose#RECEIVE_FUNDS} the returned key is suitable for being put
+     * {@link DeterministicKeyChain}. When the parameter is
+     * {@link KeyChain.KeyPurpose#RECEIVE_FUNDS} the returned key is suitable for being put
      * into a receive coins wizard type UI. You should use this when the user is definitely going to hand this key/s out
      * to someone who wishes to send money.
      */
@@ -471,7 +642,6 @@ public List<DeterministicKey> freshKeys(KeyChain.KeyPurpose purpose, int numberO
         List<DeterministicKey> keys;
         keyChainGroupLock.lock();
         try {
-            maybeUpgradeToHD();
             keys = keyChainGroup.freshKeys(purpose, numberOfKeys);
         } finally {
             keyChainGroupLock.unlock();
@@ -483,36 +653,55 @@ public List<DeterministicKey> freshKeys(KeyChain.KeyPurpose purpose, int numberO
     }
 
     /**
-     * An alias for calling {@link #freshKey(org.bitcoinj.wallet.KeyChain.KeyPurpose)} with
-     * {@link org.bitcoinj.wallet.KeyChain.KeyPurpose#RECEIVE_FUNDS} as the parameter.
+     * An alias for calling {@link #freshKey(KeyChain.KeyPurpose)} with
+     * {@link KeyChain.KeyPurpose#RECEIVE_FUNDS} as the parameter.
      */
     public DeterministicKey freshReceiveKey() {
         return freshKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
     }
 
     /**
-     * Returns address for a {@link #freshKey(org.bitcoinj.wallet.KeyChain.KeyPurpose)}
+     * Returns address for a {@link #freshKey(KeyChain.KeyPurpose)}
      */
     public Address freshAddress(KeyChain.KeyPurpose purpose) {
-        Address key;
+        Address address;
         keyChainGroupLock.lock();
         try {
-            key = keyChainGroup.freshAddress(purpose);
+            address = keyChainGroup.freshAddress(purpose);
         } finally {
             keyChainGroupLock.unlock();
         }
         saveNow();
-        return key;
+        return address;
     }
 
     /**
-     * An alias for calling {@link #freshAddress(org.bitcoinj.wallet.KeyChain.KeyPurpose)} with
-     * {@link org.bitcoinj.wallet.KeyChain.KeyPurpose#RECEIVE_FUNDS} as the parameter.
+     * An alias for calling {@link #freshAddress(KeyChain.KeyPurpose)} with
+     * {@link KeyChain.KeyPurpose#RECEIVE_FUNDS} as the parameter.
      */
     public Address freshReceiveAddress() {
         return freshAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS);
     }
 
+    /**
+     * <p>Returns a fresh receive address for a given {@link Script.ScriptType}.</p>
+     * <p>This method is meant for when you really need a fallback address. Normally, you should be
+     * using {@link #freshAddress(KeyChain.KeyPurpose)} or
+     * {@link #currentAddress(KeyChain.KeyPurpose)}.</p>
+     */
+    public Address freshReceiveAddress(Script.ScriptType scriptType) {
+        Address address;
+        keyChainGroupLock.lock();
+        try {
+            long keyRotationTimeSecs = vKeyRotationTimestamp;
+            address = keyChainGroup.freshAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS, scriptType, keyRotationTimeSecs);
+        } finally {
+            keyChainGroupLock.unlock();
+        }
+        saveNow();
+        return address;
+    }
+
     /**
      * Returns only the keys that have been issued by {@link #freshReceiveKey()}, {@link #freshReceiveAddress()},
      * {@link #currentReceiveKey()} or {@link #currentReceiveAddress()}.
@@ -520,7 +709,11 @@ public Address freshReceiveAddress() {
     public List<ECKey> getIssuedReceiveKeys() {
         keyChainGroupLock.lock();
         try {
-            return keyChainGroup.getActiveKeyChain().getIssuedReceiveKeys();
+            List<ECKey> keys = new LinkedList<>();
+            long keyRotationTimeSecs = vKeyRotationTimestamp;
+            for (final DeterministicKeyChain chain : keyChainGroup.getActiveKeyChains(keyRotationTimeSecs))
+                keys.addAll(chain.getIssuedReceiveKeys());
+            return keys;
         } finally {
             keyChainGroupLock.unlock();
         }
@@ -531,11 +724,37 @@ public List<ECKey> getIssuedReceiveKeys() {
      * {@link #currentReceiveKey()} or {@link #currentReceiveAddress()}.
      */
     public List<Address> getIssuedReceiveAddresses() {
-        final List<ECKey> keys = getIssuedReceiveKeys();
-        List<Address> addresses = new ArrayList<Address>(keys.size());
-        for (ECKey key : keys)
-            addresses.add(key.toAddress(getParams()));
-        return addresses;
+        keyChainGroupLock.lock();
+        try {
+            List<Address> addresses = new ArrayList<>();
+            long keyRotationTimeSecs = vKeyRotationTimestamp;
+            for (final DeterministicKeyChain chain : keyChainGroup.getActiveKeyChains(keyRotationTimeSecs)) {
+                Script.ScriptType outputScriptType = chain.getOutputScriptType();
+                for (ECKey key : chain.getIssuedReceiveKeys())
+                    addresses.add(Address.fromKey(getParams(), key, outputScriptType));
+            }
+            return addresses;
+        } finally {
+            keyChainGroupLock.unlock();
+        }
+    }
+
+    /** @deprecated Use {@link #upgradeToDeterministic(ScriptType, KeyParameter)} */
+    @Deprecated
+    public void upgradeToDeterministic(@Nullable KeyParameter aesKey) {
+        upgradeToDeterministic(Script.ScriptType.P2PKH, aesKey);
+    }
+
+    /**
+     * Upgrades the wallet to be deterministic (BIP32). You should call this, possibly providing the users encryption
+     * key, after loading a wallet produced by previous versions of bitcoinj. If the wallet is encrypted the key
+     * <b>must</b> be provided, due to the way the seed is derived deterministically from private key bytes: failing
+     * to do this will result in an exception being thrown. For non-encrypted wallets, the upgrade will be done for
+     * you automatically the first time a new key is requested (this happens when spending due to the change address).
+     */
+    public void upgradeToDeterministic(Script.ScriptType outputScriptType, @Nullable KeyParameter aesKey)
+            throws DeterministicUpgradeRequiresPassword {
+        upgradeToDeterministic(outputScriptType, KeyChainGroupStructure.DEFAULT, aesKey);
     }
 
     /**
@@ -545,55 +764,45 @@ public List<Address> getIssuedReceiveAddresses() {
      * to do this will result in an exception being thrown. For non-encrypted wallets, the upgrade will be done for
      * you automatically the first time a new key is requested (this happens when spending due to the change address).
      */
-    public void upgradeToDeterministic(@Nullable KeyParameter aesKey) throws DeterministicUpgradeRequiresPassword {
+    public void upgradeToDeterministic(Script.ScriptType outputScriptType, KeyChainGroupStructure structure,
+            @Nullable KeyParameter aesKey) throws DeterministicUpgradeRequiresPassword {
         keyChainGroupLock.lock();
         try {
-            keyChainGroup.upgradeToDeterministic(vKeyRotationTimestamp, aesKey);
+            long keyRotationTimeSecs = vKeyRotationTimestamp;
+            keyChainGroup.upgradeToDeterministic(outputScriptType, structure, keyRotationTimeSecs, aesKey);
         } finally {
             keyChainGroupLock.unlock();
         }
     }
 
+    /** @deprecated Use {@link #isDeterministicUpgradeRequired(ScriptType)} */
+    @Deprecated
+    public boolean isDeterministicUpgradeRequired() {
+        return isDeterministicUpgradeRequired(Script.ScriptType.P2PKH);
+    }
+
     /**
      * Returns true if the wallet contains random keys and no HD chains, in which case you should call
-     * {@link #upgradeToDeterministic(org.spongycastle.crypto.params.KeyParameter)} before attempting to do anything
+     * {@link #upgradeToDeterministic(ScriptType, KeyParameter)} before attempting to do anything
      * that would require a new address or key.
      */
-    public boolean isDeterministicUpgradeRequired() {
+    public boolean isDeterministicUpgradeRequired(Script.ScriptType outputScriptType) {
         keyChainGroupLock.lock();
         try {
-            return keyChainGroup.isDeterministicUpgradeRequired();
+            long keyRotationTimeSecs = vKeyRotationTimestamp;
+            return keyChainGroup.isDeterministicUpgradeRequired(outputScriptType, keyRotationTimeSecs);
         } finally {
             keyChainGroupLock.unlock();
         }
     }
 
-    private void maybeUpgradeToHD() throws DeterministicUpgradeRequiresPassword {
-        maybeUpgradeToHD(null);
-    }
-
-    @GuardedBy("keyChainGroupLock")
-    private void maybeUpgradeToHD(@Nullable KeyParameter aesKey) throws DeterministicUpgradeRequiresPassword {
-        checkState(keyChainGroupLock.isHeldByCurrentThread());
-        if (keyChainGroup.isDeterministicUpgradeRequired()) {
-            log.info("Upgrade to HD wallets is required, attempting to do so.");
-            try {
-                upgradeToDeterministic(aesKey);
-            } catch (DeterministicUpgradeRequiresPassword e) {
-                log.error("Failed to auto upgrade due to encryption. You should call wallet.upgradeToDeterministic " +
-                        "with the users AES key to avoid this error.");
-                throw e;
-            }
-        }
-    }
-
     /**
      * Returns a snapshot of the watched scripts. This view is not live.
      */
     public List<Script> getWatchedScripts() {
         keyChainGroupLock.lock();
         try {
-            return new ArrayList<Script>(watchedScripts);
+            return new ArrayList<>(watchedScripts);
         } finally {
             keyChainGroupLock.unlock();
         }
@@ -651,23 +860,6 @@ public List<ECKey> getImportedKeys() {
     public Address currentChangeAddress() {
         return currentAddress(KeyChain.KeyPurpose.CHANGE);
     }
-    /**
-     * @deprecated use {@link #currentChangeAddress()} instead.
-     */
-    public Address getChangeAddress() {
-        return currentChangeAddress();
-    }
-
-    /**
-     * <p>Deprecated alias for {@link #importKey(ECKey)}.</p>
-     *
-     * <p><b>Replace with either {@link #freshReceiveKey()} if your call is addKey(new ECKey()), or with {@link #importKey(ECKey)}
-     * which does the same thing this method used to, but with a better name.</b></p>
-     */
-    @Deprecated
-    public boolean addKey(ECKey key) {
-        return importKey(key);
-    }
 
     /**
      * <p>Imports the given ECKey to the wallet.</p>
@@ -679,15 +871,9 @@ public boolean importKey(ECKey key) {
         return importKeys(Lists.newArrayList(key)) == 1;
     }
 
-    /** Replace with {@link #importKeys(java.util.List)}, which does the same thing but with a better name. */
-    @Deprecated
-    public int addKeys(List<ECKey> keys) {
-        return importKeys(keys);
-    }
-
     /**
      * Imports the given keys to the wallet.
-     * If {@link Wallet#autosaveToFile(java.io.File, long, java.util.concurrent.TimeUnit, org.bitcoinj.wallet.WalletFiles.Listener)}
+     * If {@link Wallet#autosaveToFile(File, long, TimeUnit, WalletFiles.Listener)}
      * has been called, triggers an auto save bypassing the normal coalescing delay and event handlers.
      * Returns the number of keys added, after duplicates are ignored. The onKeyAdded event will be called for each key
      * in the list that was not already present.
@@ -738,13 +924,13 @@ public int importKeysAndEncrypt(final List<ECKey> keys, KeyParameter aesKey) {
     /**
      * Add a pre-configured keychain to the wallet.  Useful for setting up a complex keychain,
      * such as for a married wallet.  For example:
-     * <pre>
+     * {@code
      * MarriedKeyChain chain = MarriedKeyChain.builder()
      *     .random(new SecureRandom())
      *     .followingKeys(followingKeys)
      *     .threshold(2).build();
      * wallet.addAndActivateHDChain(chain);
-     * </p>
+     * }
      */
     public void addAndActivateHDChain(DeterministicKeyChain chain) {
         keyChainGroupLock.lock();
@@ -755,17 +941,7 @@ public void addAndActivateHDChain(DeterministicKeyChain chain) {
         }
     }
 
-    /** See {@link org.bitcoinj.wallet.DeterministicKeyChain#setLookaheadSize(int)} for more info on this. */
-    public void setKeyChainGroupLookaheadSize(int lookaheadSize) {
-        keyChainGroupLock.lock();
-        try {
-            keyChainGroup.setLookaheadSize(lookaheadSize);
-        } finally {
-            keyChainGroupLock.unlock();
-        }
-    }
-
-    /** See {@link org.bitcoinj.wallet.DeterministicKeyChain#setLookaheadSize(int)} for more info on this. */
+    /** See {@link DeterministicKeyChain#setLookaheadSize(int)} for more info on this. */
     public int getKeyChainGroupLookaheadSize() {
         keyChainGroupLock.lock();
         try {
@@ -775,22 +951,10 @@ public int getKeyChainGroupLookaheadSize() {
         }
     }
 
-    /** See {@link org.bitcoinj.wallet.DeterministicKeyChain#setLookaheadThreshold(int)} for more info on this. */
-    public void setKeyChainGroupLookaheadThreshold(int num) {
-        keyChainGroupLock.lock();
-        try {
-            maybeUpgradeToHD();
-            keyChainGroup.setLookaheadThreshold(num);
-        } finally {
-            keyChainGroupLock.unlock();
-        }
-    }
-
-    /** See {@link org.bitcoinj.wallet.DeterministicKeyChain#setLookaheadThreshold(int)} for more info on this. */
+    /** See {@link DeterministicKeyChain#setLookaheadThreshold(int)} for more info on this. */
     public int getKeyChainGroupLookaheadThreshold() {
         keyChainGroupLock.lock();
         try {
-            maybeUpgradeToHD();
             return keyChainGroup.getLookaheadThreshold();
         } finally {
             keyChainGroupLock.unlock();
@@ -806,7 +970,6 @@ public int getKeyChainGroupLookaheadThreshold() {
     public DeterministicKey getWatchingKey() {
         keyChainGroupLock.lock();
         try {
-            maybeUpgradeToHD();
             return keyChainGroup.getActiveKeyChain().getWatchingKey();
         } finally {
             keyChainGroupLock.unlock();
@@ -823,7 +986,6 @@ public DeterministicKey getWatchingKey() {
     public boolean isWatching() {
         keyChainGroupLock.lock();
         try {
-            maybeUpgradeToHD();
             return keyChainGroup.isWatching();
         } finally {
             keyChainGroupLock.unlock();
@@ -961,9 +1123,9 @@ public boolean removeWatchedScripts(final List<Script> scripts) {
     public List<Address> getWatchedAddresses() {
         keyChainGroupLock.lock();
         try {
-            List<Address> addresses = new LinkedList<Address>();
+            List<Address> addresses = new LinkedList<>();
             for (Script script : watchedScripts)
-                if (script.isSentToAddress())
+                if (ScriptPattern.isP2PKH(script))
                     addresses.add(script.getToAddress(params));
             return addresses;
         } finally {
@@ -971,6 +1133,12 @@ public List<Address> getWatchedAddresses() {
         }
     }
 
+    /** @deprecated Use {@link #findKeyFromPubKeyHash(byte[], ScriptType)} */
+    @Deprecated
+    public ECKey findKeyFromPubHash(byte[] pubKeyHash) {
+        return findKeyFromPubKeyHash(pubKeyHash, Script.ScriptType.P2PKH);
+    }
+
     /**
      * Locates a keypair from the basicKeyChain given the hash of the public key. This is needed when finding out which
      * key we need to use to redeem a transaction output.
@@ -979,10 +1147,10 @@ public List<Address> getWatchedAddresses() {
      */
     @Override
     @Nullable
-    public ECKey findKeyFromPubHash(byte[] pubkeyHash) {
+    public ECKey findKeyFromPubKeyHash(byte[] pubKeyHash, @Nullable Script.ScriptType scriptType) {
         keyChainGroupLock.lock();
         try {
-            return keyChainGroup.findKeyFromPubHash(pubkeyHash);
+            return keyChainGroup.findKeyFromPubKeyHash(pubKeyHash, scriptType);
         } finally {
             keyChainGroupLock.unlock();
         }
@@ -998,13 +1166,32 @@ public boolean hasKey(ECKey key) {
         }
     }
 
-    /** {@inheritDoc} */
+    /**
+     * Returns true if the address is belongs to this wallet.
+     */
+    public boolean isAddressMine(Address address) {
+        final ScriptType scriptType = address.getOutputScriptType();
+        if (scriptType == ScriptType.P2PKH || scriptType == ScriptType.P2WPKH)
+            return isPubKeyHashMine(address.getHash(), scriptType);
+        else if (scriptType == ScriptType.P2SH)
+            return isPayToScriptHashMine(address.getHash());
+        else if (scriptType == ScriptType.P2WSH)
+            return false;
+        else
+            throw new IllegalArgumentException(address.toString());
+    }
+
+    /** @deprecated Use {@link #isPubKeyHashMine(byte[], ScriptType)} */
+    @Deprecated
+    public boolean isPubKeyHashMine(byte[] pubKeyHash) {
+        return isPubKeyHashMine(pubKeyHash, Script.ScriptType.P2PKH);
+    }
+
     @Override
-    public boolean isPubKeyHashMine(byte[] pubkeyHash) {
-        return findKeyFromPubHash(pubkeyHash) != null;
+    public boolean isPubKeyHashMine(byte[] pubKeyHash, @Nullable Script.ScriptType scriptType) {
+        return findKeyFromPubKeyHash(pubKeyHash, scriptType) != null;
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean isWatchedScript(Script script) {
         keyChainGroupLock.lock();
@@ -1015,25 +1202,36 @@ public boolean isWatchedScript(Script script) {
         }
     }
 
+    /**
+     * Locates a keypair from the wallet given the corresponding address.
+     * @return ECKey or null if no such key was found.
+     */
+    public ECKey findKeyFromAddress(Address address) {
+        final ScriptType scriptType = address.getOutputScriptType();
+        if (scriptType == ScriptType.P2PKH || scriptType == ScriptType.P2WPKH)
+            return findKeyFromPubKeyHash(address.getHash(), scriptType);
+        else
+            return null;
+    }
+
     /**
      * Locates a keypair from the basicKeyChain given the raw public key bytes.
      * @return ECKey or null if no such key was found.
      */
     @Override
     @Nullable
-    public ECKey findKeyFromPubKey(byte[] pubkey) {
+    public ECKey findKeyFromPubKey(byte[] pubKey) {
         keyChainGroupLock.lock();
         try {
-            return keyChainGroup.findKeyFromPubKey(pubkey);
+            return keyChainGroup.findKeyFromPubKey(pubKey);
         } finally {
             keyChainGroupLock.unlock();
         }
     }
 
-    /** {@inheritDoc} */
     @Override
-    public boolean isPubKeyMine(byte[] pubkey) {
-        return findKeyFromPubKey(pubkey) != null;
+    public boolean isPubKeyMine(byte[] pubKey) {
+        return findKeyFromPubKey(pubKey) != null;
     }
 
     /**
@@ -1051,7 +1249,6 @@ public RedeemData findRedeemDataFromScriptHash(byte[] payToScriptHash) {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean isPayToScriptHashMine(byte[] payToScriptHash) {
         return findRedeemDataFromScriptHash(payToScriptHash) != null;
@@ -1059,7 +1256,7 @@ public boolean isPayToScriptHashMine(byte[] payToScriptHash) {
 
     /**
      * Marks all keys used in the transaction output as used in the wallet.
-     * See {@link org.bitcoinj.wallet.DeterministicKeyChain#markKeyAsUsed(DeterministicKey)} for more info on this.
+     * See {@link DeterministicKeyChain#markKeyAsUsed(DeterministicKey)} for more info on this.
      */
     private void markKeysAsUsed(Transaction tx) {
         keyChainGroupLock.lock();
@@ -1067,15 +1264,19 @@ private void markKeysAsUsed(Transaction tx) {
             for (TransactionOutput o : tx.getOutputs()) {
                 try {
                     Script script = o.getScriptPubKey();
-                    if (script.isSentToRawPubKey()) {
-                        byte[] pubkey = script.getPubKey();
+                    if (ScriptPattern.isP2PK(script)) {
+                        byte[] pubkey = ScriptPattern.extractKeyFromP2PK(script);
                         keyChainGroup.markPubKeyAsUsed(pubkey);
-                    } else if (script.isSentToAddress()) {
-                        byte[] pubkeyHash = script.getPubKeyHash();
+                    } else if (ScriptPattern.isP2PKH(script)) {
+                        byte[] pubkeyHash = ScriptPattern.extractHashFromP2PKH(script);
                         keyChainGroup.markPubKeyHashAsUsed(pubkeyHash);
-                    } else if (script.isPayToScriptHash()) {
-                        Address a = Address.fromP2SHScript(tx.getParams(), script);
+                    } else if (ScriptPattern.isP2SH(script)) {
+                        LegacyAddress a = LegacyAddress.fromScriptHash(tx.getParams(),
+                                ScriptPattern.extractHashFromP2SH(script));
                         keyChainGroup.markP2SHAddressAsUsed(a);
+                    } else if (ScriptPattern.isP2WH(script)) {
+                        byte[] pubkeyHash = ScriptPattern.extractHashFromP2WH(script);
+                        keyChainGroup.markPubKeyHashAsUsed(pubkeyHash);
                     }
                 } catch (ScriptException e) {
                     // Just means we didn't understand the output of this transaction: ignore it.
@@ -1110,7 +1311,6 @@ public DeterministicSeed getKeyChainSeed() {
     public DeterministicKey getKeyByPath(List<ChildNumber> path) {
         keyChainGroupLock.lock();
         try {
-            maybeUpgradeToHD();
             return keyChainGroup.getActiveKeyChain().getKeyByPath(path, false);
         } finally {
             keyChainGroupLock.unlock();
@@ -1118,8 +1318,8 @@ public DeterministicKey getKeyByPath(List<ChildNumber> path) {
     }
 
     /**
-     * Convenience wrapper around {@link Wallet#encrypt(org.bitcoinj.crypto.KeyCrypter,
-     * org.spongycastle.crypto.params.KeyParameter)} which uses the default Scrypt key derivation algorithm and
+     * Convenience wrapper around {@link Wallet#encrypt(KeyCrypter,
+     * org.bouncycastle.crypto.params.KeyParameter)} which uses the default Scrypt key derivation algorithm and
      * parameters to derive a key from the given password.
      */
     public void encrypt(CharSequence password) {
@@ -1135,7 +1335,7 @@ public void encrypt(CharSequence password) {
 
     /**
      * Encrypt the wallet using the KeyCrypter and the AES key. A good default KeyCrypter to use is
-     * {@link org.bitcoinj.crypto.KeyCrypterScrypt}.
+     * {@link KeyCrypterScrypt}.
      *
      * @param keyCrypter The KeyCrypter that specifies how to encrypt/ decrypt a key
      * @param aesKey AES key to use (normally created using KeyCrypter#deriveKey and cached as it is time consuming to create from a password)
@@ -1274,7 +1474,7 @@ public void changeEncryptionKey(KeyCrypter keyCrypter, KeyParameter currentAesKe
 
     //endregion
 
-    /******************************************************************************************************************/
+    // ***************************************************************************************************************
 
     //region Serialization support
 
@@ -1405,10 +1605,10 @@ public RiskAnalysis.Analyzer getRiskAnalyzer() {
      * In this way disk IO can be rate limited. It's a good idea to set this as otherwise the wallet can change very
      * frequently, eg if there are a lot of transactions in it or during block sync, and there will be a lot of redundant
      * writes. Note that when a new key is added, that always results in an immediate save regardless of
-     * delayTime. <b>You should still save the wallet manually when your program is about to shut down as the JVM
-     * will not wait for the background thread.</b></p>
+     * delayTime. <b>You should still save the wallet manually using {@link Wallet#saveToFile(File)} when your program
+     * is about to shut down as the JVM will not wait for the background thread.</b></p>
      *
-     * <p>An event listener can be provided. If a delay >0 was specified, it will be called on a background thread
+     * <p>An event listener can be provided. If a delay greater than 0 was specified, it will be called on a background thread
      * with the wallet locked when an auto-save occurs. If delay is zero or you do something that always triggers
      * an immediate save, like adding a key, the event listener will be invoked on the calling threads.</p>
      *
@@ -1435,7 +1635,7 @@ public WalletFiles autosaveToFile(File f, long delayTime, TimeUnit timeUnit,
     /**
      * <p>
      * Disables auto-saving, after it had been enabled with
-     * {@link Wallet#autosaveToFile(java.io.File, long, java.util.concurrent.TimeUnit, org.bitcoinj.wallet.WalletFiles.Listener)}
+     * {@link Wallet#autosaveToFile(File, long, TimeUnit, WalletFiles.Listener)}
      * before. This method blocks until finished.
      * </p>
      */
@@ -1546,9 +1746,9 @@ public void isConsistentOrThrow() throws IllegalStateException {
         try {
             Set<Transaction> transactions = getTransactions(true);
 
-            Set<Sha256Hash> hashes = new HashSet<Sha256Hash>();
+            Set<Sha256Hash> hashes = new HashSet<>();
             for (Transaction tx : transactions) {
-                hashes.add(tx.getHash());
+                hashes.add(tx.getTxId());
             }
 
             int size1 = transactions.size();
@@ -1563,13 +1763,13 @@ public void isConsistentOrThrow() throws IllegalStateException {
 
             for (Transaction tx : unspent.values()) {
                 if (!isTxConsistent(tx, false)) {
-                    throw new IllegalStateException("Inconsistent unspent tx: " + tx.getHashAsString());
+                    throw new IllegalStateException("Inconsistent unspent tx: " + tx.getTxId());
                 }
             }
 
             for (Transaction tx : spent.values()) {
                 if (!isTxConsistent(tx, true)) {
-                    throw new IllegalStateException("Inconsistent spent tx: " + tx.getHashAsString());
+                    throw new IllegalStateException("Inconsistent spent tx: " + tx.getTxId());
                 }
             }
         } finally {
@@ -1612,7 +1812,7 @@ public static Wallet loadFromFileStream(InputStream stream, @Nullable WalletExte
 
     //endregion
 
-    /******************************************************************************************************************/
+    // ***************************************************************************************************************
 
     //region Inbound transaction reception and processing
 
@@ -1645,7 +1845,7 @@ public boolean notifyTransactionIsInBlock(Sha256Hash txHash, StoredBlock block,
                 tx = riskDropped.get(txHash);
                 if (tx != null) {
                     // If this happens our risk analysis is probably wrong and should be improved.
-                    log.info("Risk analysis dropped tx {} but was included in block anyway", tx.getHash());
+                    log.info("Risk analysis dropped tx {} but was included in block anyway", tx.getTxId());
                 } else {
                     // False positive that was broadcast to us and ignored by us because it was irrelevant to our keys.
                     return false;
@@ -1665,7 +1865,7 @@ public boolean notifyTransactionIsInBlock(Sha256Hash txHash, StoredBlock block,
      * and if you trust the sender of the transaction you can choose to assume they are in fact valid and will not
      * be double spent as an optimization.</p>
      *
-     * <p>This is the same as {@link Wallet#receivePending(Transaction, java.util.List)} but allows you to override the
+     * <p>This is the same as {@link Wallet#receivePending(Transaction, List)} but allows you to override the
      * {@link Wallet#isPendingTransactionRelevant(Transaction)} sanity-check to keep track of transactions that are not
      * spendable or spend our coins. This can be useful when you want to keep track of transaction confidence on
      * arbitrary transactions. Note that transactions added in this way will still be relayed to peers and appear in
@@ -1682,7 +1882,7 @@ public void receivePending(Transaction tx, @Nullable List<Transaction> dependenc
             // between pools.
             EnumSet<Pool> containingPools = getContainingPools(tx);
             if (!containingPools.equals(EnumSet.noneOf(Pool.class))) {
-                log.debug("Received tx we already saw in a block or created ourselves: " + tx.getHashAsString());
+                log.debug("Received tx we already saw in a block or created ourselves: " + tx.getTxId());
                 return;
             }
             // Repeat the check of relevancy here, even though the caller may have already done so - this is to avoid
@@ -1691,17 +1891,15 @@ public void receivePending(Transaction tx, @Nullable List<Transaction> dependenc
                 return;
             if (isTransactionRisky(tx, dependencies) && !acceptRiskyTransactions) {
                 // isTransactionRisky already logged the reason.
-                riskDropped.put(tx.getHash(), tx);
+                riskDropped.put(tx.getTxId(), tx);
                 log.warn("There are now {} risk dropped transactions being kept in memory", riskDropped.size());
                 return;
             }
             Coin valueSentToMe = tx.getValueSentToMe(this);
             Coin valueSentFromMe = tx.getValueSentFromMe(this);
-            if (log.isInfoEnabled()) {
-                log.info(String.format(Locale.US, "Received a pending transaction %s that spends %s from our own wallet," +
-                        " and sends us %s", tx.getHashAsString(), valueSentFromMe.toFriendlyString(),
-                        valueSentToMe.toFriendlyString()));
-            }
+            if (log.isInfoEnabled())
+                log.info("Received a pending transaction {} that spends {} from our own wallet, and sends us {}",
+                        tx.getTxId(), valueSentFromMe.toFriendlyString(), valueSentToMe.toFriendlyString());
             if (tx.getConfidence().getSource().equals(TransactionConfidence.Source.UNKNOWN)) {
                 log.warn("Wallet received transaction with an unknown source. Consider tagging it!");
             }
@@ -1758,7 +1956,7 @@ public void receivePending(Transaction tx, @Nullable List<Transaction> dependenc
     /**
      * This method is used by a {@link Peer} to find out if a transaction that has been announced is interesting,
      * that is, whether we should bother downloading its dependencies and exploring the transaction to decide how
-     * risky it is. If this method returns true then {@link Wallet#receivePending(Transaction, java.util.List)}
+     * risky it is. If this method returns true then {@link Wallet#receivePending(Transaction, List)}
      * will soon be called with the transactions dependencies as well.
      */
     public boolean isPendingTransactionRelevant(Transaction tx) throws ScriptException {
@@ -1768,7 +1966,7 @@ public boolean isPendingTransactionRelevant(Transaction tx) throws ScriptExcepti
             // between pools.
             EnumSet<Pool> containingPools = getContainingPools(tx);
             if (!containingPools.equals(EnumSet.noneOf(Pool.class))) {
-                log.debug("Received tx we already saw in a block or created ourselves: " + tx.getHashAsString());
+                log.debug("Received tx we already saw in a block or created ourselves: " + tx.getTxId());
                 return false;
             }
             // We only care about transactions that:
@@ -1813,13 +2011,15 @@ private Set<Transaction> findDoubleSpendsAgainst(Transaction tx, Map<Sha256Hash,
         checkState(lock.isHeldByCurrentThread());
         if (tx.isCoinBase()) return Sets.newHashSet();
         // Compile a set of outpoints that are spent by tx.
-        HashSet<TransactionOutPoint> outpoints = new HashSet<TransactionOutPoint>();
+        HashSet<TransactionOutPoint> outpoints = new HashSet<>();
         for (TransactionInput input : tx.getInputs()) {
             outpoints.add(input.getOutpoint());
         }
         // Now for each pending transaction, see if it shares any outpoints with this tx.
         Set<Transaction> doubleSpendTxns = Sets.newHashSet();
         for (Transaction p : candidates.values()) {
+            if (p.equals(tx))
+                continue;
             for (TransactionInput input : p.getInputs()) {
                 // This relies on the fact that TransactionOutPoint equality is defined at the protocol not object
                 // level - outpoints from two different inputs that point to the same output compare the same.
@@ -1838,18 +2038,18 @@ private Set<Transaction> findDoubleSpendsAgainst(Transaction tx, Map<Sha256Hash,
      * and all txns spending the outputs of those txns, recursively.
      */
     void addTransactionsDependingOn(Set<Transaction> txSet, Set<Transaction> txPool) {
-        Map<Sha256Hash, Transaction> txQueue = new LinkedHashMap<Sha256Hash, Transaction>();
+        Map<Sha256Hash, Transaction> txQueue = new LinkedHashMap<>();
         for (Transaction tx : txSet) {
-            txQueue.put(tx.getHash(), tx);
+            txQueue.put(tx.getTxId(), tx);
         }
         while(!txQueue.isEmpty()) {
             Transaction tx = txQueue.remove(txQueue.keySet().iterator().next());
             for (Transaction anotherTx : txPool) {
                 if (anotherTx.equals(tx)) continue;
                 for (TransactionInput input : anotherTx.getInputs()) {
-                    if (input.getOutpoint().getHash().equals(tx.getHash())) {
-                        if (txQueue.get(anotherTx.getHash()) == null) {
-                            txQueue.put(anotherTx.getHash(), anotherTx);
+                    if (input.getOutpoint().getHash().equals(tx.getTxId())) {
+                        if (txQueue.get(anotherTx.getTxId()) == null) {
+                            txQueue.put(anotherTx.getTxId(), anotherTx);
                             txSet.add(anotherTx);
                         }
                     }
@@ -1899,7 +2099,7 @@ private void receive(Transaction tx, StoredBlock block, BlockChain.NewBlockType
         checkState(lock.isHeldByCurrentThread());
 
         Coin prevBalance = getBalance();
-        Sha256Hash txHash = tx.getHash();
+        Sha256Hash txHash = tx.getTxId();
         boolean bestChain = blockType == BlockChain.NewBlockType.BEST_CHAIN;
         boolean sideChain = blockType == BlockChain.NewBlockType.SIDE_CHAIN;
 
@@ -1908,7 +2108,7 @@ private void receive(Transaction tx, StoredBlock block, BlockChain.NewBlockType
         Coin valueDifference = valueSentToMe.subtract(valueSentFromMe);
 
         log.info("Received tx{} for {}: {} [{}] in block {}", sideChain ? " on a side chain" : "",
-                valueDifference.toFriendlyString(), tx.getHashAsString(), relativityOffset,
+                valueDifference.toFriendlyString(), tx.getTxId(), relativityOffset,
                 block != null ? block.getHeader().getHash() : "(unit test)");
 
         // Inform the key chains that the issued keys were observed in a transaction, so they know to
@@ -1920,7 +2120,7 @@ private void receive(Transaction tx, StoredBlock block, BlockChain.NewBlockType
         // If this transaction is already in the wallet we may need to move it into a different pool. At the very
         // least we need to ensure we're manipulating the canonical object rather than a duplicate.
         {
-            Transaction tmp = transactions.get(tx.getHash());
+            Transaction tmp = transactions.get(tx.getTxId());
             if (tmp != null)
                 tx = tmp;
         }
@@ -1957,7 +2157,7 @@ private void receive(Transaction tx, StoredBlock block, BlockChain.NewBlockType
             } else {
                 // Ignore the case where a tx appears on a side chain at the same time as the best chain (this is
                 // quite normal and expected).
-                Sha256Hash hash = tx.getHash();
+                Sha256Hash hash = tx.getTxId();
                 if (!unspent.containsKey(hash) && !spent.containsKey(hash) && !dead.containsKey(hash)) {
                     // Otherwise put it (possibly back) into pending.
                     // Committing it updates the spent flags and inserts into the pool as well.
@@ -2053,7 +2253,7 @@ private boolean isNotSpendingTxnsInConfidenceType(Transaction tx, ConfidenceType
      * as there is no guarantee on the order of the returned txns besides what was already stated.
      */
     List<Transaction> sortTxnsByDependency(Set<Transaction> inputSet) {
-        ArrayList<Transaction> result = new ArrayList<Transaction>(inputSet);
+        ArrayList<Transaction> result = new ArrayList<>(inputSet);
         for (int i = 0; i < result.size()-1; i++) {
             boolean txAtISpendsOtherTxInTheList;
             do {
@@ -2074,7 +2274,7 @@ List<Transaction> sortTxnsByDependency(Set<Transaction> inputSet) {
     /** Finds whether txA spends txB */
     boolean spends(Transaction txA, Transaction txB) {
         for (TransactionInput txInput : txA.getInputs()) {
-            if (txInput.getOutpoint().getHash().equals(txB.getHash())) {
+            if (txInput.getOutpoint().getHash().equals(txB.getTxId())) {
                 return true;
             }
         }
@@ -2095,9 +2295,8 @@ private void informConfidenceListenersIfNotReorganizing() {
     /**
      * <p>Called by the {@link BlockChain} when a new block on the best chain is seen, AFTER relevant wallet
      * transactions are extracted and sent to us UNLESS the new block caused a re-org, in which case this will
-     * not be called (the {@link Wallet#reorganize(StoredBlock, java.util.List, java.util.List)} method will
+     * not be called (the {@link Wallet#reorganize(StoredBlock, List, List)} method will
      * call this one in that case).</p>
-     * <p/>
      * <p>Used to update confidence data in each transaction and last seen block hash. Triggers auto saving.
      * Invokes the onWalletChanged event listener if there were any affected transactions.</p>
      */
@@ -2111,16 +2310,17 @@ public void notifyNewBestBlock(StoredBlock block) throws VerificationException {
         try {
             // Store the new block hash.
             setLastBlockSeenHash(newBlockHash);
-            setLastBlockSeenHeight(block.getHeight());
+            final int blockHeight = block.getHeight();
+            setLastBlockSeenHeight(blockHeight);
             setLastBlockSeenTimeSecs(block.getHeader().getTimeSeconds());
             // Notify all the BUILDING transactions of the new block.
             // This is so that they can update their depth.
             Set<Transaction> transactions = getTransactions(true);
             for (Transaction tx : transactions) {
-                if (ignoreNextNewBlock.contains(tx.getHash())) {
+                if (ignoreNextNewBlock.contains(tx.getTxId())) {
                     // tx was already processed in receive() due to it appearing in this block, so we don't want to
                     // increment the tx confidence depth twice, it'd result in miscounting.
-                    ignoreNextNewBlock.remove(tx.getHash());
+                    ignoreNextNewBlock.remove(tx.getTxId());
                 } else {
                     TransactionConfidence confidence = tx.getConfidence();
                     if (confidence.getConfidenceType() == ConfidenceType.BUILDING) {
@@ -2131,7 +2331,7 @@ public void notifyNewBestBlock(StoredBlock block) throws VerificationException {
                         // included once again. We could have a separate was-in-chain-and-now-isn't confidence type
                         // but this way is backwards compatible with existing software, and the new state probably
                         // wouldn't mean anything different to just remembering peers anyway.
-                        if (confidence.incrementDepthInBlocks() > context.getEventHorizon())
+                        if (confidence.incrementDepthInBlocks(blockHeight) > context.getEventHorizon())
                             confidence.clearBroadcastBy();
                         confidenceChanged.put(tx, TransactionConfidence.Listener.ChangeReason.DEPTH);
                     }
@@ -2159,12 +2359,12 @@ public void notifyNewBestBlock(StoredBlock block) throws VerificationException {
      */
     private void processTxFromBestChain(Transaction tx, boolean forceAddToPool) throws VerificationException {
         checkState(lock.isHeldByCurrentThread());
-        checkState(!pending.containsKey(tx.getHash()));
+        checkState(!pending.containsKey(tx.getTxId()));
 
         // This TX may spend our existing outputs even though it was not pending. This can happen in unit
         // tests, if keys are moved between wallets, if we're catching up to the chain given only a set of keys,
-        // or if a dead coinbase transaction has moved back onto the main chain.
-        boolean isDeadCoinbase = tx.isCoinBase() && dead.containsKey(tx.getHash());
+        // or if a dead coinbase transaction has moved back onto the best chain.
+        boolean isDeadCoinbase = tx.isCoinBase() && dead.containsKey(tx.getTxId());
         if (isDeadCoinbase) {
             // There is a dead coinbase tx being received on the best chain. A coinbase tx is made dead when it moves
             // to a side chain but it can be switched back on a reorg and resurrected back to spent or unspent.
@@ -2173,9 +2373,9 @@ private void processTxFromBestChain(Transaction tx, boolean forceAddToPool) thro
             // entirely by this point. We could and maybe should rebroadcast them so the network remembers and tries
             // to confirm them again. But this is a deeply unusual edge case that due to the maturity rule should never
             // happen in practice, thus for simplicities sake we ignore it here.
-            log.info("  coinbase tx <-dead: confidence {}", tx.getHashAsString(),
+            log.info("  coinbase tx <-dead: confidence {}", tx.getTxId(),
                     tx.getConfidence().getConfidenceType().name());
-            dead.remove(tx.getHash());
+            dead.remove(tx.getTxId());
         }
 
         // Update tx and other unspent/pending transactions by connecting inputs/outputs.
@@ -2185,22 +2385,24 @@ private void processTxFromBestChain(Transaction tx, boolean forceAddToPool) thro
         // against our pending transactions. Note that a tx may double spend our pending transactions and also send
         // us money/spend our money.
         boolean hasOutputsToMe = tx.getValueSentToMe(this).signum() > 0;
+        boolean hasOutputsFromMe = false;
         if (hasOutputsToMe) {
             // Needs to go into either unspent or spent (if the outputs were already spent by a pending tx).
             if (tx.isEveryOwnedOutputSpent(this)) {
-                log.info("  tx {} ->spent (by pending)", tx.getHashAsString());
+                log.info("  tx {} ->spent (by pending)", tx.getTxId());
                 addWalletTransaction(Pool.SPENT, tx);
             } else {
-                log.info("  tx {} ->unspent", tx.getHashAsString());
+                log.info("  tx {} ->unspent", tx.getTxId());
                 addWalletTransaction(Pool.UNSPENT, tx);
             }
         } else if (tx.getValueSentFromMe(this).signum() > 0) {
+            hasOutputsFromMe = true;
             // Didn't send us any money, but did spend some. Keep it around for record keeping purposes.
-            log.info("  tx {} ->spent", tx.getHashAsString());
+            log.info("  tx {} ->spent", tx.getTxId());
             addWalletTransaction(Pool.SPENT, tx);
         } else if (forceAddToPool) {
             // Was manually added to pending, so we should keep it to notify the user of confidence information
-            log.info("  tx {} ->spent (manually added)", tx.getHashAsString());
+            log.info("  tx {} ->spent (manually added)", tx.getTxId());
             addWalletTransaction(Pool.SPENT, tx);
         }
 
@@ -2210,6 +2412,19 @@ private void processTxFromBestChain(Transaction tx, boolean forceAddToPool) thro
             // no need to addTransactionsDependingOn(doubleSpendTxns) because killTxns() already kills dependencies;
             killTxns(doubleSpendTxns, tx);
         }
+        if (!hasOutputsToMe
+            && !hasOutputsFromMe
+            && !forceAddToPool
+            && !findDoubleSpendsAgainst(tx, transactions).isEmpty())
+        {
+            // disconnect irrelevant inputs (otherwise might cause protobuf serialization issue)
+            for (TransactionInput input : tx.getInputs()) {
+                TransactionOutput output = input.getConnectedOutput();
+                if (output != null && !output.isMineOrWatched(this)) {
+                    input.disconnect();
+                }
+            }
+        }
     }
 
     /**
@@ -2222,7 +2437,7 @@ private void processTxFromBestChain(Transaction tx, boolean forceAddToPool) thro
      * up with the block chain. It can also happen if a block includes a transaction we never saw at broadcast time.
      * If this tx double spends, it takes precedence over our pending transactions and the pending tx goes dead.</p>
      *
-     * <p>The other context it can be called is from {@link Wallet#receivePending(Transaction, java.util.List)},
+     * <p>The other context it can be called is from {@link Wallet#receivePending(Transaction, List)},
      * ie we saw a tx be broadcast or one was submitted directly that spends our own coins. If this tx double spends
      * it does NOT take precedence because the winner will be resolved by the miners - we assume that our version will
      * win, if we are wrong then when a block appears the tx will go dead.</p>
@@ -2233,7 +2448,7 @@ private void processTxFromBestChain(Transaction tx, boolean forceAddToPool) thro
     private void updateForSpends(Transaction tx, boolean fromChain) throws VerificationException {
         checkState(lock.isHeldByCurrentThread());
         if (fromChain)
-            checkState(!pending.containsKey(tx.getHash()));
+            checkState(!pending.containsKey(tx.getTxId()));
         for (TransactionInput input : tx.getInputs()) {
             TransactionInput.ConnectionResult result = input.connect(unspent, TransactionInput.ConnectMode.ABORT_ON_CONFLICT);
             if (result == TransactionInput.ConnectionResult.NO_SUCH_TX) {
@@ -2264,16 +2479,16 @@ private void updateForSpends(Transaction tx, boolean fromChain) throws Verificat
                     // so the exact nature of the mutation can be examined.
                     log.warn("Saw two pending transactions double spend each other");
                     log.warn("  offending input is input {}", tx.getInputs().indexOf(input));
-                    log.warn("{}: {}", tx.getHash(), Utils.HEX.encode(tx.unsafeBitcoinSerialize()));
+                    log.warn("{}: {}", tx.getTxId(), Utils.HEX.encode(tx.unsafeBitcoinSerialize()));
                     Transaction other = output.getSpentBy().getParentTransaction();
-                    log.warn("{}: {}", other.getHash(), Utils.HEX.encode(other.unsafeBitcoinSerialize()));
+                    log.warn("{}: {}", other.getTxId(), Utils.HEX.encode(other.unsafeBitcoinSerialize()));
                 }
             } else if (result == TransactionInput.ConnectionResult.SUCCESS) {
                 // Otherwise we saw a transaction spend our coins, but we didn't try and spend them ourselves yet.
                 // The outputs are already marked as spent by the connect call above, so check if there are any more for
                 // us to use. Move if not.
                 Transaction connected = checkNotNull(input.getConnectedTransaction());
-                log.info("  marked {} as spent by {}", input.getOutpoint(), tx.getHashAsString());
+                log.info("  marked {} as spent by {}", input.getOutpoint(), tx.getTxId());
                 maybeMovePool(connected, "prevtx");
                 // Just because it's connected doesn't mean it's actually ours: sometimes we have total visibility.
                 if (output.isMineOrWatched(this)) {
@@ -2297,7 +2512,7 @@ private void updateForSpends(Transaction tx, boolean fromChain) throws Verificat
                 }
                 if (result == TransactionInput.ConnectionResult.SUCCESS) {
                     log.info("Connected pending tx input {}:{}",
-                            pendingTx.getHashAsString(), pendingTx.getInputs().indexOf(input));
+                            pendingTx.getTxId(), pendingTx.getInputs().indexOf(input));
                     // The unspents map might not have it if we never saw this tx until it was included in the chain
                     // and thus becomes spent the moment we become aware of it.
                     if (myUnspents.remove(input.getConnectedOutput()))
@@ -2315,23 +2530,23 @@ private void updateForSpends(Transaction tx, boolean fromChain) throws Verificat
 
     // Updates the wallet when a double spend occurs. overridingTx can be null for the case of coinbases
     private void killTxns(Set<Transaction> txnsToKill, @Nullable Transaction overridingTx) {
-        LinkedList<Transaction> work = new LinkedList<Transaction>(txnsToKill);
+        LinkedList<Transaction> work = new LinkedList<>(txnsToKill);
         while (!work.isEmpty()) {
             final Transaction tx = work.poll();
-            log.warn("TX {} killed{}", tx.getHashAsString(),
-                    overridingTx != null ? " by " + overridingTx.getHashAsString() : "");
+            log.warn("TX {} killed{}", tx.getTxId(),
+                    overridingTx != null ? " by " + overridingTx.getTxId() : "");
             log.warn("Disconnecting each input and moving connected transactions.");
             // TX could be pending (finney attack), or in unspent/spent (coinbase killed by reorg).
-            pending.remove(tx.getHash());
-            unspent.remove(tx.getHash());
-            spent.remove(tx.getHash());
+            pending.remove(tx.getTxId());
+            unspent.remove(tx.getTxId());
+            spent.remove(tx.getTxId());
             addWalletTransaction(Pool.DEAD, tx);
             for (TransactionInput deadInput : tx.getInputs()) {
                 Transaction connected = deadInput.getConnectedTransaction();
                 if (connected == null) continue;
                 if (connected.getConfidence().getConfidenceType() != ConfidenceType.DEAD && deadInput.getConnectedOutput().getSpentBy() != null && deadInput.getConnectedOutput().getSpentBy().equals(deadInput)) {
                     checkState(myUnspents.add(deadInput.getConnectedOutput()));
-                    log.info("Added to UNSPENTS: {} in {}", deadInput.getConnectedOutput(), deadInput.getConnectedOutput().getParentTransaction().getHash());
+                    log.info("Added to UNSPENTS: {} in {}", deadInput.getConnectedOutput(), deadInput.getConnectedOutput().getParentTransaction().getTxId());
                 }
                 deadInput.disconnect();
                 maybeMovePool(connected, "kill");
@@ -2345,7 +2560,7 @@ private void killTxns(Set<Transaction> txnsToKill, @Nullable Transaction overrid
                 TransactionInput connected = deadOutput.getSpentBy();
                 if (connected == null) continue;
                 final Transaction parentTransaction = connected.getParentTransaction();
-                log.info("This death invalidated dependent tx {}", parentTransaction.getHash());
+                log.info("This death invalidated dependent tx {}", parentTransaction.getTxId());
                 work.push(parentTransaction);
             }
         }
@@ -2377,34 +2592,42 @@ private void maybeMovePool(Transaction tx, String context) {
         checkState(lock.isHeldByCurrentThread());
         if (tx.isEveryOwnedOutputSpent(this)) {
             // There's nothing left I can spend in this transaction.
-            if (unspent.remove(tx.getHash()) != null) {
+            if (unspent.remove(tx.getTxId()) != null) {
                 if (log.isInfoEnabled()) {
-                    log.info("  {} {} <-unspent ->spent", tx.getHashAsString(), context);
+                    log.info("  {} {} <-unspent ->spent", tx.getTxId(), context);
                 }
-                spent.put(tx.getHash(), tx);
+                spent.put(tx.getTxId(), tx);
             }
         } else {
-            if (spent.remove(tx.getHash()) != null) {
+            if (spent.remove(tx.getTxId()) != null) {
                 if (log.isInfoEnabled()) {
-                    log.info("  {} {} <-spent ->unspent", tx.getHashAsString(), context);
+                    log.info("  {} {} <-spent ->unspent", tx.getTxId(), context);
                 }
-                unspent.put(tx.getHash(), tx);
+                unspent.put(tx.getTxId(), tx);
             }
         }
     }
 
     /**
-     * Calls {@link Wallet#commitTx} if tx is not already in the pending pool
+     * Updates the wallet with the given transaction: puts it into the pending pool, sets the spent flags and runs
+     * the onCoinsSent/onCoinsReceived event listener.
+     * <p>
+     * Triggers an auto save (if enabled.)
+     * <p>
+     * Unlike {@link Wallet#commitTx} this method does not throw an exception if the transaction
+     * was already added to the wallet, instead it will return {@code false}
      *
+     * @param tx transaction to commit
      * @return true if the tx was added to the wallet, or false if it was already in the pending pool
+     * @throws VerificationException If transaction fails to verify
      */
     public boolean maybeCommitTx(Transaction tx) throws VerificationException {
         tx.verify();
         lock.lock();
         try {
-            if (pending.containsKey(tx.getHash()))
+            if (pending.containsKey(tx.getTxId()))
                 return false;
-            log.info("commitTx of {}", tx.getHashAsString());
+            log.info("commitTx of {}", tx.getTxId());
             Coin balance = getBalance();
             tx.setUpdateTime(Utils.now());
             // Put any outputs that are sending money back to us into the unspents map, and calculate their total value.
@@ -2427,7 +2650,7 @@ public boolean maybeCommitTx(Transaction tx) throws VerificationException {
                 !isNotSpendingTxnsInConfidenceType(tx, ConfidenceType.DEAD)) {
                 // tx is a double spend against a tx already in the best chain or spends outputs of a DEAD tx.
                 // Add tx to the dead pool and schedule confidence listener notifications.
-                log.info("->dead: {}", tx.getHashAsString());
+                log.info("->dead: {}", tx.getTxId());
                 tx.getConfidence().setConfidenceType(ConfidenceType.DEAD);
                 confidenceChanged.put(tx, TransactionConfidence.Listener.ChangeReason.TYPE);
                 addWalletTransaction(Pool.DEAD, tx);
@@ -2436,7 +2659,7 @@ public boolean maybeCommitTx(Transaction tx) throws VerificationException {
                 // tx is a double spend against a pending tx or spends outputs of a tx already IN_CONFLICT.
                 // Add tx to the pending pool. Update the confidence type of tx, the txns in conflict with tx and all
                 // their dependencies to IN_CONFLICT and schedule confidence listener notifications.
-                log.info("->pending (IN_CONFLICT): {}", tx.getHashAsString());
+                log.info("->pending (IN_CONFLICT): {}", tx.getTxId());
                 addWalletTransaction(Pool.PENDING, tx);
                 doubleSpendPendingTxns.add(tx);
                 addTransactionsDependingOn(doubleSpendPendingTxns, getTransactions(true));
@@ -2447,7 +2670,7 @@ public boolean maybeCommitTx(Transaction tx) throws VerificationException {
             } else {
                 // No conflict detected.
                 // Add to the pending pool and schedule confidence listener notifications.
-                log.info("->pending: {}", tx.getHashAsString());
+                log.info("->pending: {}", tx.getTxId());
                 tx.getConfidence().setConfidenceType(ConfidenceType.PENDING);
                 confidenceChanged.put(tx, TransactionConfidence.Listener.ChangeReason.TYPE);
                 addWalletTransaction(Pool.PENDING, tx);
@@ -2484,15 +2707,21 @@ public boolean maybeCommitTx(Transaction tx) throws VerificationException {
     }
 
     /**
-     * <p>Updates the wallet with the given transaction: puts it into the pending pool, sets the spent flags and runs
-     * the onCoinsSent/onCoinsReceived event listener. Used in two situations:</p>
-     *
+     * Updates the wallet with the given transaction: puts it into the pending pool, sets the spent flags and runs
+     * the onCoinsSent/onCoinsReceived event listener. Used in two situations:
+     * <p>
      * <ol>
      *     <li>When we have just successfully transmitted the tx we created to the network.</li>
      *     <li>When we receive a pending transaction that didn't appear in the chain yet, and we did not create it.</li>
      * </ol>
+     * <p>
+     * Triggers an auto save (if enabled.)
+     * <p>
+     * Unlike {@link Wallet#maybeCommitTx} {@code commitTx} throws an exception if the transaction
+     * was already added to the wallet.
      *
-     * <p>Triggers an auto save.</p>
+     * @param tx transaction to commit
+     * @throws VerificationException if transaction was already in the pending pool
      */
     public void commitTx(Transaction tx) throws VerificationException {
         checkArgument(maybeCommitTx(tx), "commitTx called on the same transaction twice");
@@ -2500,36 +2729,10 @@ public void commitTx(Transaction tx) throws VerificationException {
 
     //endregion
 
-    /******************************************************************************************************************/
+    // ***************************************************************************************************************
 
     //region Event listeners
 
-    /**
-     * Adds an event listener object. Methods on this object are called when something interesting happens,
-     * like receiving money. Runs the listener methods in the user thread.
-     */
-    public void addEventListener(WalletEventListener listener) {
-        addChangeEventListener(Threading.USER_THREAD, listener);
-        addCoinsReceivedEventListener(Threading.USER_THREAD, listener);
-        addCoinsSentEventListener(Threading.USER_THREAD, listener);
-        addKeyChainEventListener(Threading.USER_THREAD, listener);
-        addReorganizeEventListener(Threading.USER_THREAD, listener);
-        addScriptChangeEventListener(Threading.USER_THREAD, listener);
-        addTransactionConfidenceEventListener(Threading.USER_THREAD, listener);
-    }
-
-    /** Use the more specific listener methods instead */
-    @Deprecated
-    public void addEventListener(WalletEventListener listener, Executor executor) {
-        addCoinsReceivedEventListener(executor, listener);
-        addCoinsSentEventListener(executor, listener);
-        addChangeEventListener(executor, listener);
-        addKeyChainEventListener(executor, listener);
-        addReorganizeEventListener(executor, listener);
-        addScriptChangeEventListener(executor, listener);
-        addTransactionConfidenceEventListener(executor, listener);
-    }
-
     /**
      * Adds an event listener object. Methods on this object are called when something interesting happens,
      * like receiving money. Runs the listener methods in the user thread.
@@ -2544,7 +2747,7 @@ public void addChangeEventListener(WalletChangeEventListener listener) {
      */
     public void addChangeEventListener(Executor executor, WalletChangeEventListener listener) {
         // This is thread safe, so we don't need to take the lock.
-        changeListeners.add(new ListenerRegistration<WalletChangeEventListener>(listener, executor));
+        changeListeners.add(new ListenerRegistration<>(listener, executor));
     }
 
     /**
@@ -2561,7 +2764,7 @@ public void addCoinsReceivedEventListener(WalletCoinsReceivedEventListener liste
      */
     public void addCoinsReceivedEventListener(Executor executor, WalletCoinsReceivedEventListener listener) {
         // This is thread safe, so we don't need to take the lock.
-        coinsReceivedListeners.add(new ListenerRegistration<WalletCoinsReceivedEventListener>(listener, executor));
+        coinsReceivedListeners.add(new ListenerRegistration<>(listener, executor));
     }
 
     /**
@@ -2578,7 +2781,7 @@ public void addCoinsSentEventListener(WalletCoinsSentEventListener listener) {
      */
     public void addCoinsSentEventListener(Executor executor, WalletCoinsSentEventListener listener) {
         // This is thread safe, so we don't need to take the lock.
-        coinsSentListeners.add(new ListenerRegistration<WalletCoinsSentEventListener>(listener, executor));
+        coinsSentListeners.add(new ListenerRegistration<>(listener, executor));
     }
 
     /**
@@ -2611,7 +2814,7 @@ public void addReorganizeEventListener(WalletReorganizeEventListener listener) {
      */
     public void addReorganizeEventListener(Executor executor, WalletReorganizeEventListener listener) {
         // This is thread safe, so we don't need to take the lock.
-        reorganizeListeners.add(new ListenerRegistration<WalletReorganizeEventListener>(listener, executor));
+        reorganizeListeners.add(new ListenerRegistration<>(listener, executor));
     }
 
     /**
@@ -2628,7 +2831,7 @@ public void addScriptsChangeEventListener(ScriptsChangeEventListener listener) {
      */
     public void addScriptChangeEventListener(Executor executor, ScriptsChangeEventListener listener) {
         // This is thread safe, so we don't need to take the lock.
-        scriptChangeListeners.add(new ListenerRegistration<ScriptsChangeEventListener>(listener, executor));
+        scriptChangeListeners.add(new ListenerRegistration<>(listener, executor));
     }
 
     /**
@@ -2645,22 +2848,7 @@ public void addTransactionConfidenceEventListener(TransactionConfidenceEventList
      */
     public void addTransactionConfidenceEventListener(Executor executor, TransactionConfidenceEventListener listener) {
         // This is thread safe, so we don't need to take the lock.
-        transactionConfidenceListeners.add(new ListenerRegistration<TransactionConfidenceEventListener>(listener, executor));
-    }
-
-    /**
-     * Removes the given event listener object. Returns true if the listener was removed, false if that listener
-     * was never added.
-     * @deprecated use the fine-grain event listeners instead.
-     */
-    @Deprecated
-    public boolean removeEventListener(WalletEventListener listener) {
-        return removeChangeEventListener(listener) ||
-            removeCoinsReceivedEventListener(listener) ||
-            removeCoinsSentEventListener(listener) ||
-            removeKeyChainEventListener(listener) ||
-            removeReorganizeEventListener(listener) ||
-            removeTransactionConfidenceEventListener(listener);
+        transactionConfidenceListeners.add(new ListenerRegistration<>(listener, executor));
     }
 
     /**
@@ -2801,7 +2989,7 @@ public void run() {
 
     //endregion
 
-    /******************************************************************************************************************/
+    // ***************************************************************************************************************
 
     //region Vending transactions and other internal state
 
@@ -2812,7 +3000,7 @@ public void run() {
     public Set<Transaction> getTransactions(boolean includeDead) {
         lock.lock();
         try {
-            Set<Transaction> all = new HashSet<Transaction>();
+            Set<Transaction> all = new HashSet<>();
             all.addAll(unspent.values());
             all.addAll(spent.values());
             all.addAll(pending.values());
@@ -2830,7 +3018,7 @@ public Set<Transaction> getTransactions(boolean includeDead) {
     public Iterable<WalletTransaction> getWalletTransactions() {
         lock.lock();
         try {
-            Set<WalletTransaction> all = new HashSet<WalletTransaction>();
+            Set<WalletTransaction> all = new HashSet<>();
             addWalletTransactionsToSet(all, Pool.UNSPENT, unspent.values());
             addWalletTransactionsToSet(all, Pool.SPENT, spent.values());
             addWalletTransactionsToSet(all, Pool.DEAD, dead.values());
@@ -2867,19 +3055,19 @@ public void addWalletTransaction(WalletTransaction wtx) {
      */
     private void addWalletTransaction(Pool pool, Transaction tx) {
         checkState(lock.isHeldByCurrentThread());
-        transactions.put(tx.getHash(), tx);
+        transactions.put(tx.getTxId(), tx);
         switch (pool) {
         case UNSPENT:
-            checkState(unspent.put(tx.getHash(), tx) == null);
+            checkState(unspent.put(tx.getTxId(), tx) == null);
             break;
         case SPENT:
-            checkState(spent.put(tx.getHash(), tx) == null);
+            checkState(spent.put(tx.getTxId(), tx) == null);
             break;
         case PENDING:
-            checkState(pending.put(tx.getHash(), tx) == null);
+            checkState(pending.put(tx.getTxId(), tx) == null);
             break;
         case DEAD:
-            checkState(dead.put(tx.getHash(), tx) == null);
+            checkState(dead.put(tx.getTxId(), tx) == null);
             break;
         default:
             throw new RuntimeException("Unknown wallet transaction type " + pool);
@@ -2903,12 +3091,11 @@ public List<Transaction> getTransactionsByTime() {
     }
 
     /**
-     * Returns an list of N transactions, ordered by increasing age. Transactions on side chains are not included.
-     * Dead transactions (overridden by double spends) are optionally included. <p>
-     * <p/>
-     * Note: the current implementation is O(num transactions in wallet). Regardless of how many transactions are
+     * <p>Returns an list of N transactions, ordered by increasing age. Transactions on side chains are not included.
+     * Dead transactions (overridden by double spends) are optionally included.</p>
+     * <p>Note: the current implementation is O(num transactions in wallet). Regardless of how many transactions are
      * requested, the cost is always the same. In future, requesting smaller numbers of transactions may be faster
-     * depending on how the wallet is implemented (eg if backed by a database).
+     * depending on how the wallet is implemented (eg if backed by a database).</p>
      */
     public List<Transaction> getRecentTransactions(int numTransactions, boolean includeDead) {
         lock.lock();
@@ -2919,7 +3106,7 @@ public List<Transaction> getRecentTransactions(int numTransactions, boolean incl
             if (numTransactions > size || numTransactions == 0) {
                 numTransactions = size;
             }
-            ArrayList<Transaction> all = new ArrayList<Transaction>(getTransactions(includeDead));
+            ArrayList<Transaction> all = new ArrayList<>(getTransactions(includeDead));
             // Order by update time.
             Collections.sort(all, Transaction.SORT_TX_BY_UPDATE_TIME);
             if (numTransactions == all.size()) {
@@ -2946,7 +3133,6 @@ public Transaction getTransaction(Sha256Hash hash) {
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public Map<Sha256Hash, Transaction> getTransactionPool(Pool pool) {
         lock.lock();
@@ -2970,7 +3156,7 @@ public Map<Sha256Hash, Transaction> getTransactionPool(Pool pool) {
 
     /**
      * Prepares the wallet for a blockchain replay. Removes all transactions (as they would get in the way of the
-     * replay) and makes the wallet think it has never seen a block. {@link WalletEventListener#onWalletChanged} will
+     * replay) and makes the wallet think it has never seen a block. {@link WalletChangeEventListener#onWalletChanged} will
      * be fired.
      */
     public void reset() {
@@ -3056,7 +3242,7 @@ public void cleanup() {
             for (Iterator<Transaction> i = pending.values().iterator(); i.hasNext();) {
                 Transaction tx = i.next();
                 if (isTransactionRisky(tx, null) && !acceptRiskyTransactions) {
-                    log.debug("Found risky transaction {} in wallet during cleanup.", tx.getHashAsString());
+                    log.debug("Found risky transaction {} in wallet during cleanup.", tx.getTxId());
                     if (!tx.isAnyOutputSpent()) {
                         // Sync myUnspents with the change.
                         for (TransactionInput input : tx.getInputs()) {
@@ -3070,13 +3256,13 @@ public void cleanup() {
                             myUnspents.remove(output);
 
                         i.remove();
-                        transactions.remove(tx.getHash());
+                        transactions.remove(tx.getTxId());
                         dirty = true;
-                        log.info("Removed transaction {} from pending pool during cleanup.", tx.getHashAsString());
+                        log.info("Removed transaction {} from pending pool during cleanup.", tx.getTxId());
                     } else {
                         log.info(
                                 "Cannot remove transaction {} from pending pool during cleanup, as it's already spent partially.",
-                                tx.getHashAsString());
+                                tx.getTxId());
                     }
                 }
             }
@@ -3095,7 +3281,7 @@ EnumSet<Pool> getContainingPools(Transaction tx) {
         lock.lock();
         try {
             EnumSet<Pool> result = EnumSet.noneOf(Pool.class);
-            Sha256Hash txHash = tx.getHash();
+            Sha256Hash txHash = tx.getTxId();
             if (unspent.containsKey(txHash)) {
                 result.add(Pool.UNSPENT);
             }
@@ -3158,40 +3344,66 @@ public boolean poolContainsTxHash(final WalletTransaction.Pool pool, final Sha25
     public List<TransactionOutput> getUnspents() {
         lock.lock();
         try {
-            return new ArrayList<TransactionOutput>(myUnspents);
+            return new ArrayList<>(myUnspents);
         } finally {
             lock.unlock();
         }
     }
 
+    public String printAllPubKeysAsHex() {
+        return keyChainGroup.printAllPubKeysAsHex();
+    }
+
     @Override
     public String toString() {
-        return toString(false, true, true, null);
+        return toString(false, false, null, true, true, null);
+    }
+
+    /**
+     * @deprecated Use {@link #toString(boolean, boolean, KeyParameter, boolean, boolean, AbstractBlockChain)} instead.
+     */
+    @Deprecated
+    public String toString(boolean includePrivateKeys, boolean includeTransactions, boolean includeExtensions,
+            @Nullable AbstractBlockChain chain) {
+        return toString(false, includePrivateKeys, null, includeTransactions, includeExtensions, chain);
     }
 
+    /**
+     * @deprecated Use {@link #toString(boolean, boolean, KeyParameter, boolean, boolean, AbstractBlockChain)} instead.
+     */
+    @Deprecated
+    public String toString(boolean includePrivateKeys, @Nullable KeyParameter aesKey, boolean includeTransactions,
+            boolean includeExtensions, @Nullable AbstractBlockChain chain) {
+        return toString(false, includePrivateKeys, aesKey, includeTransactions, includeExtensions, chain);
+    }
 
     /**
      * Formats the wallet as a human readable piece of text. Intended for debugging, the format is not meant to be
      * stable or human readable.
+     * @param includeLookahead Wether lookahead keys should be included.
      * @param includePrivateKeys Whether raw private key data should be included.
+     * @param aesKey for decrypting private key data for if the wallet is encrypted.
      * @param includeTransactions Whether to print transaction data.
      * @param includeExtensions Whether to print extension data.
      * @param chain If set, will be used to estimate lock times for block timelocked transactions.
      */
-    public String toString(boolean includePrivateKeys, boolean includeTransactions, boolean includeExtensions,
-                           @Nullable AbstractBlockChain chain) {
+    public String toString(boolean includeLookahead, boolean includePrivateKeys, @Nullable KeyParameter aesKey,
+            boolean includeTransactions, boolean includeExtensions, @Nullable AbstractBlockChain chain) {
         lock.lock();
         keyChainGroupLock.lock();
         try {
-            StringBuilder builder = new StringBuilder();
-            Coin estimatedBalance = getBalance(BalanceType.ESTIMATED);
-            Coin availableBalance = getBalance(BalanceType.AVAILABLE_SPENDABLE);
-            builder.append("Wallet containing ").append(estimatedBalance.toFriendlyString()).append(" (spendable: ")
-                    .append(availableBalance.toFriendlyString()).append(") in:\n");
-            builder.append("  ").append(pending.size()).append(" pending transactions\n");
-            builder.append("  ").append(unspent.size()).append(" unspent transactions\n");
-            builder.append("  ").append(spent.size()).append(" spent transactions\n");
-            builder.append("  ").append(dead.size()).append(" dead transactions\n");
+            StringBuilder builder = new StringBuilder("Wallet\n");
+            if (includePrivateKeys)
+                builder.append("  WARNING: includes private keys!\n");
+            builder.append("Balances:\n");
+            for (BalanceType balanceType : BalanceType.values())
+                builder.append("  ").append(getBalance(balanceType).toFriendlyString()).append(' ').append(balanceType)
+                        .append('\n');
+            builder.append("Transactions:\n");
+            builder.append("  ").append(pending.size()).append(" pending\n");
+            builder.append("  ").append(unspent.size()).append(" unspent\n");
+            builder.append("  ").append(spent.size()).append(" spent\n");
+            builder.append("  ").append(dead.size()).append(" dead\n");
             final Date lastBlockSeenTime = getLastBlockSeenTime();
             builder.append("Last seen best block: ").append(getLastBlockSeenHeight()).append(" (")
                     .append(lastBlockSeenTime == null ? "time unknown" : Utils.dateTimeFormat(lastBlockSeenTime))
@@ -3209,7 +3421,7 @@ public String toString(boolean includePrivateKeys, boolean includeTransactions,
             final Date keyRotationTime = getKeyRotationTime();
             if (keyRotationTime != null)
                 builder.append("Key rotation time:      ").append(Utils.dateTimeFormat(keyRotationTime)).append('\n');
-            builder.append(keyChainGroup.toString(includePrivateKeys));
+            builder.append(keyChainGroup.toString(includeLookahead, includePrivateKeys, aesKey));
 
             if (!watchedScripts.isEmpty()) {
                 builder.append("\nWatched scripts:\n");
@@ -3256,7 +3468,7 @@ private void toStringHelper(StringBuilder builder, Map<Sha256Hash, Transaction>
 
         final Collection<Transaction> txns;
         if (sortOrder != null) {
-            txns = new TreeSet<Transaction>(sortOrder);
+            txns = new TreeSet<>(sortOrder);
             txns.addAll(transactionMap.values());
         } else {
             txns = transactionMap.values();
@@ -3264,17 +3476,18 @@ private void toStringHelper(StringBuilder builder, Map<Sha256Hash, Transaction>
 
         for (Transaction tx : txns) {
             try {
-                builder.append("Sends ");
+                builder.append(tx.getValue(this).toFriendlyString());
+                builder.append(" total value (sends ");
                 builder.append(tx.getValueSentFromMe(this).toFriendlyString());
                 builder.append(" and receives ");
                 builder.append(tx.getValueSentToMe(this).toFriendlyString());
-                builder.append(", total value ");
-                builder.append(tx.getValue(this).toFriendlyString());
-                builder.append(".\n");
+                builder.append(")\n");
             } catch (ScriptException e) {
                 // Ignore and don't print this line.
             }
-            builder.append(tx.toString(chain));
+            if (tx.hasConfidence())
+                builder.append("  confidence: ").append(tx.getConfidence()).append('\n');
+            builder.append(tx.toString(chain, "  "));
         }
     }
 
@@ -3292,7 +3505,7 @@ public Collection<Transaction> getPendingTransactions() {
 
     /**
      * Returns the earliest creation time of keys or watched scripts in this wallet, in seconds since the epoch, ie the min
-     * of {@link org.bitcoinj.core.ECKey#getCreationTimeSeconds()}. This can return zero if at least one key does
+     * of {@link ECKey#getCreationTimeSeconds()}. This can return zero if at least one key does
      * not have that data (was created before key timestamping was implemented). <p>
      *
      * This method is most often used in conjunction with {@link PeerGroup#setFastCatchupTimeSecs(long)} in order to
@@ -3425,7 +3638,7 @@ public void setDescription(String description) {
     }
 
     /**
-     * Get the description of the wallet. See {@link Wallet#setDescription(String))}
+     * Get the description of the wallet. See {@link Wallet#setDescription(String)}
      */
     public String getDescription() {
         return description;
@@ -3433,7 +3646,7 @@ public String getDescription() {
 
     //endregion
 
-    /******************************************************************************************************************/
+    // ***************************************************************************************************************
 
     //region Balance and balance futures
 
@@ -3471,18 +3684,6 @@ public enum BalanceType {
         AVAILABLE_SPENDABLE
     }
 
-    /** @deprecated Use {@link #getBalance()} instead as including watched balances is now the default behaviour */
-    @Deprecated
-    public Coin getWatchedBalance() {
-        return getBalance();
-    }
-
-    /** @deprecated Use {@link #getBalance(CoinSelector)} instead as including watched balances is now the default behaviour */
-    @Deprecated
-    public Coin getWatchedBalance(CoinSelector selector) {
-        return getBalance(selector);
-    }
-
     /**
      * Returns the AVAILABLE balance of this wallet. See {@link BalanceType#AVAILABLE} for details on what this
      * means.
@@ -3549,7 +3750,7 @@ private static class BalanceFutureRequest {
      * money to fail! Finally please be aware that any listeners on the future will run either on the calling thread
      * if it completes immediately, or eventually on a background thread if the balance is not yet at the right
      * level. If you do something that means you know the balance should be sufficient to trigger the future,
-     * you can use {@link org.bitcoinj.utils.Threading#waitForUserCode()} to block until the future had a
+     * you can use {@link Threading#waitForUserCode()} to block until the future had a
      * chance to be updated.</p>
      */
     public ListenableFuture<Coin> getBalanceFuture(final Coin value, final BalanceType type) {
@@ -3675,7 +3876,7 @@ public Coin getTotalSent() {
 
     //endregion
 
-    /******************************************************************************************************************/
+    // ***************************************************************************************************************
 
     //region Creating and sending transactions
 
@@ -3701,7 +3902,7 @@ public enum MissingSigsMode {
          */
         USE_DUMMY_SIG,
         /**
-         * If signature is missing, {@link org.bitcoinj.signers.TransactionSigner.MissingSignatureException}
+         * If signature is missing, {@link TransactionSigner.MissingSignatureException}
          * will be thrown for P2SH and {@link ECKey.MissingPrivateKeyException} for other tx types.
          */
         THROW
@@ -3717,7 +3918,7 @@ public enum MissingSigsMode {
      * and lets you see the proposed transaction before anything is done with it.</p>
      *
      * <p>This is a helper method that is equivalent to using {@link SendRequest#to(Address, Coin)}
-     * followed by {@link Wallet#completeTx(Wallet.SendRequest)} and returning the requests transaction object.
+     * followed by {@link Wallet#completeTx(SendRequest)} and returning the requests transaction object.
      * Note that this means a fee may be automatically added if required, if you want more control over the process,
      * just do those two steps yourself.</p>
      *
@@ -3750,7 +3951,7 @@ public Transaction createSend(Address address, Coin value) throws InsufficientMo
      * Sends coins to the given address but does not broadcast the resulting pending transaction. It is still stored
      * in the wallet, so when the wallet is added to a {@link PeerGroup} or {@link Peer} the transaction will be
      * announced to the network. The given {@link SendRequest} is completed first using
-     * {@link Wallet#completeTx(Wallet.SendRequest)} to make it valid.
+     * {@link Wallet#completeTx(SendRequest)} to make it valid.
      *
      * @return the Transaction that was created
      * @throws InsufficientMoneyException if the request could not be completed due to not enough balance.
@@ -3928,8 +4129,8 @@ public void completeTx(SendRequest req) throws InsufficientMoneyException {
                 value = value.add(output.getValue());
             }
 
-            log.info("Completing send tx with {} outputs totalling {} (not including fees)",
-                    req.tx.getOutputs().size(), value.toFriendlyString());
+            log.info("Completing send tx with {} outputs totalling {} and a fee of {}/vkB", req.tx.getOutputs().size(),
+                    value.toFriendlyString(), req.feePerKb.toFriendlyString());
 
             // If any inputs have already been added, we don't need to get their value from wallet
             Coin totalInput = Coin.ZERO;
@@ -3940,7 +4141,7 @@ public void completeTx(SendRequest req) throws InsufficientMoneyException {
                     log.warn("SendRequest transaction already has inputs but we don't know how much they are worth - they will be added to fee.");
             value = value.subtract(totalInput);
 
-            List<TransactionInput> originalInputs = new ArrayList<TransactionInput>(req.tx.getInputs());
+            List<TransactionInput> originalInputs = new ArrayList<>(req.tx.getInputs());
 
             // Check for dusty sends and the OP_RETURN limit.
             if (req.ensureMinRequiredFee && !req.emptyWallet) { // Min fee checking is handled later for emptyWallet.
@@ -3948,7 +4149,7 @@ public void completeTx(SendRequest req) throws InsufficientMoneyException {
                 for (TransactionOutput output : req.tx.getOutputs()) {
                     if (output.isDust())
                         throw new DustySendRequested();
-                    if (output.getScriptPubKey().isOpReturn())
+                    if (ScriptPattern.isOpReturn(output.getScriptPubKey()))
                         ++opReturnCount;
                 }
                 if (opReturnCount > 1) // Only 1 OP_RETURN per transaction allowed.
@@ -3963,11 +4164,13 @@ public void completeTx(SendRequest req) throws InsufficientMoneyException {
 
             CoinSelection bestCoinSelection;
             TransactionOutput bestChangeOutput = null;
+            List<Coin> updatedOutputValues = null;
             if (!req.emptyWallet) {
                 // This can throw InsufficientMoneyException.
                 FeeCalculation feeCalculation = calculateFee(req, value, originalInputs, req.ensureMinRequiredFee, candidates);
                 bestCoinSelection = feeCalculation.bestCoinSelection;
                 bestChangeOutput = feeCalculation.bestChangeOutput;
+                updatedOutputValues = feeCalculation.updatedOutputValues;
             } else {
                 // We're being asked to empty the wallet. What this means is ensuring "tx" has only a single output
                 // of the total value we can currently spend as determined by the selector, and then subtracting the fee.
@@ -3983,11 +4186,18 @@ public void completeTx(SendRequest req) throws InsufficientMoneyException {
                 req.tx.addInput(output);
 
             if (req.emptyWallet) {
+                final Coin baseFee = req.fee == null ? Coin.ZERO : req.fee;
                 final Coin feePerKb = req.feePerKb == null ? Coin.ZERO : req.feePerKb;
-                if (!adjustOutputDownwardsForFee(req.tx, bestCoinSelection, feePerKb, req.ensureMinRequiredFee))
+                if (!adjustOutputDownwardsForFee(req.tx, bestCoinSelection, baseFee, feePerKb, req.ensureMinRequiredFee))
                     throw new CouldNotAdjustDownwards();
             }
 
+            if (updatedOutputValues != null) {
+                for (int i = 0; i < updatedOutputValues.size(); i++) {
+                    req.tx.getOutput(i).setValue(updatedOutputValues.get(i));
+                }
+            }
+
             if (bestChangeOutput != null) {
                 req.tx.addOutput(bestChangeOutput);
                 log.info("  with {} change", bestChangeOutput.getValue().toFriendlyString());
@@ -4024,6 +4234,7 @@ public void completeTx(SendRequest req) throws InsufficientMoneyException {
             req.tx.setExchangeRate(req.exchangeRate);
             req.tx.setMemo(req.memo);
             req.completed = true;
+            req.fee = calculatedFee;
             log.info("  completed: {}", req.tx);
         } finally {
             lock.unlock();
@@ -4050,16 +4261,19 @@ public void signTransaction(SendRequest req) {
             int numInputs = tx.getInputs().size();
             for (int i = 0; i < numInputs; i++) {
                 TransactionInput txIn = tx.getInput(i);
-                if (txIn.getConnectedOutput() == null) {
+                TransactionOutput connectedOutput = txIn.getConnectedOutput();
+                if (connectedOutput == null) {
                     // Missing connected output, assuming already signed.
                     continue;
                 }
+                Script scriptPubKey = connectedOutput.getScriptPubKey();
 
                 try {
                     // We assume if its already signed, its hopefully got a SIGHASH type that will not invalidate when
                     // we sign missing pieces (to check this would require either assuming any signatures are signing
                     // standard output types or a way to get processed signatures out of script execution)
-                    txIn.getScriptSig().correctlySpends(tx, i, txIn.getConnectedOutput().getScriptPubKey());
+                    txIn.getScriptSig().correctlySpends(tx, i, txIn.getWitness(), connectedOutput.getValue(),
+                            connectedOutput.getScriptPubKey(), Script.ALL_VERIFY_FLAGS);
                     log.warn("Input {} already correctly spends output, assuming SIGHASH type used will be safe and skipping signing.", i);
                     continue;
                 } catch (ScriptException e) {
@@ -4067,10 +4281,10 @@ public void signTransaction(SendRequest req) {
                     // Expected.
                 }
 
-                Script scriptPubKey = txIn.getConnectedOutput().getScriptPubKey();
                 RedeemData redeemData = txIn.getConnectedRedeemData(maybeDecryptingKeyBag);
                 checkNotNull(redeemData, "Transaction exists in wallet that we cannot redeem: %s", txIn.getOutpoint().getHash());
                 txIn.setScriptSig(scriptPubKey.createEmptyInputScript(redeemData.keys.get(0), redeemData.redeemScript));
+                txIn.setWitness(scriptPubKey.createEmptyWitness(redeemData.keys.get(0)));
             }
 
             TransactionSigner.ProposedTransaction proposal = new TransactionSigner.ProposedTransaction(tx);
@@ -4087,10 +4301,10 @@ public void signTransaction(SendRequest req) {
     }
 
     /** Reduce the value of the first output of a transaction to pay the given feePerKb as appropriate for its size. */
-    private boolean adjustOutputDownwardsForFee(Transaction tx, CoinSelection coinSelection, Coin feePerKb,
+    private boolean adjustOutputDownwardsForFee(Transaction tx, CoinSelection coinSelection, Coin baseFee, Coin feePerKb,
             boolean ensureMinRequiredFee) {
-        final int size = tx.unsafeBitcoinSerialize().length + estimateBytesForSigning(coinSelection);
-        Coin fee = feePerKb.multiply(size).divide(1000);
+        final int vsize = tx.getVsize() + estimateVirtualBytesForSigning(coinSelection);
+        Coin fee = baseFee.add(feePerKb.multiply(vsize).divide(1000));
         if (ensureMinRequiredFee && fee.compareTo(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE) < 0)
             fee = Transaction.REFERENCE_DEFAULT_MIN_TX_FEE;
         TransactionOutput output = tx.getOutput(0);
@@ -4106,12 +4320,6 @@ public List<TransactionOutput> calculateAllSpendCandidates() {
         return calculateAllSpendCandidates(true, true);
     }
 
-    /** @deprecated Use {@link #calculateAllSpendCandidates(boolean, boolean)} or the zero-parameter form instead. */
-    @Deprecated
-    public List<TransactionOutput> calculateAllSpendCandidates(boolean excludeImmatureCoinbases) {
-        return calculateAllSpendCandidates(excludeImmatureCoinbases, true);
-    }
-
     /**
      * Returns a list of all outputs that are being tracked by this wallet either from the {@link UTXOProvider}
      * (in this case the existence or not of private keys is ignored), or the wallets internal storage (the default)
@@ -4125,7 +4333,7 @@ public List<TransactionOutput> calculateAllSpendCandidates(boolean excludeImmatu
         try {
             List<TransactionOutput> candidates;
             if (vUTXOProvider == null) {
-                candidates = new ArrayList<TransactionOutput>(myUnspents.size());
+                candidates = new ArrayList<>(myUnspents.size());
                 for (TransactionOutput output : myUnspents) {
                     if (excludeUnsignable && !canSignFor(output.getScriptPubKey())) continue;
                     Transaction transaction = checkNotNull(output.getParentTransaction());
@@ -4147,31 +4355,36 @@ public List<TransactionOutput> calculateAllSpendCandidates(boolean excludeImmatu
      * false if the form of the script is not known or if the script is OP_RETURN.
      */
     public boolean canSignFor(Script script) {
-        if (script.isSentToRawPubKey()) {
-            byte[] pubkey = script.getPubKey();
+        if (ScriptPattern.isP2PK(script)) {
+            byte[] pubkey = ScriptPattern.extractKeyFromP2PK(script);
             ECKey key = findKeyFromPubKey(pubkey);
             return key != null && (key.isEncrypted() || key.hasPrivKey());
-        } if (script.isPayToScriptHash()) {
-            RedeemData data = findRedeemDataFromScriptHash(script.getPubKeyHash());
+        } else if (ScriptPattern.isP2SH(script)) {
+            RedeemData data = findRedeemDataFromScriptHash(ScriptPattern.extractHashFromP2SH(script));
             return data != null && canSignFor(data.redeemScript);
-        } else if (script.isSentToAddress()) {
-            ECKey key = findKeyFromPubHash(script.getPubKeyHash());
+        } else if (ScriptPattern.isP2PKH(script)) {
+            ECKey key = findKeyFromPubKeyHash(ScriptPattern.extractHashFromP2PKH(script),
+                    Script.ScriptType.P2PKH);
             return key != null && (key.isEncrypted() || key.hasPrivKey());
-        } else if (script.isSentToMultiSig()) {
+        } else if (ScriptPattern.isP2WPKH(script)) {
+            ECKey key = findKeyFromPubKeyHash(ScriptPattern.extractHashFromP2WH(script),
+                    Script.ScriptType.P2WPKH);
+            return key != null && (key.isEncrypted() || key.hasPrivKey()) && key.isCompressed();
+        } else if (ScriptPattern.isSentToMultisig(script)) {
             for (ECKey pubkey : script.getPubKeys()) {
                 ECKey key = findKeyFromPubKey(pubkey.getPubKey());
                 if (key != null && (key.isEncrypted() || key.hasPrivKey()))
                     return true;
             }
-        } else if (script.isSentToCLTVPaymentChannel()) {
+        } else if (ScriptPattern.isSentToCltvPaymentChannel(script)) {
             // Any script for which we are the recipient or sender counts.
-            byte[] sender = script.getCLTVPaymentChannelSenderPubKey();
+            byte[] sender = ScriptPattern.extractSenderPubKeyFromCltvPaymentChannel(script);
             ECKey senderKey = findKeyFromPubKey(sender);
             if (senderKey != null && (senderKey.isEncrypted() || senderKey.hasPrivKey())) {
                 return true;
             }
-            byte[] recipient = script.getCLTVPaymentChannelRecipientPubKey();
-            ECKey recipientKey = findKeyFromPubKey(sender);
+            byte[] recipient = ScriptPattern.extractRecipientPubKeyFromCltvPaymentChannel(script);
+            ECKey recipientKey = findKeyFromPubKey(recipient);
             if (recipientKey != null && (recipientKey.isEncrypted() || recipientKey.hasPrivKey())) {
                 return true;
             }
@@ -4228,15 +4441,10 @@ protected LinkedList<TransactionOutput> calculateAllSpendCandidatesFromUTXOProvi
      */
     protected List<UTXO> getStoredOutputsFromUTXOProvider() throws UTXOProviderException {
         UTXOProvider utxoProvider = checkNotNull(vUTXOProvider, "No UTXO provider has been set");
-        List<UTXO> candidates = new ArrayList<UTXO>();
+        List<UTXO> candidates = new ArrayList<>();
         List<ECKey> keys = getImportedKeys();
         keys.addAll(getActiveKeyChain().getLeafKeys());
-        List<Address> addresses = new ArrayList<Address>();
-        for (ECKey key : keys) {
-            Address address = new Address(params, key.getPubKeyHash());
-            addresses.add(address);
-        }
-        candidates.addAll(utxoProvider.getOpenTransactionOutputs(addresses));
+        candidates.addAll(utxoProvider.getOpenTransactionOutputs(keys));
         return candidates;
     }
 
@@ -4266,7 +4474,7 @@ public void setCoinSelector(CoinSelector coinSelector) {
     }
 
     /**
-     * Convenience wrapper for <tt>setCoinSelector(Wallet.AllowUnconfirmedCoinSelector.get())</tt>. If this method
+     * Convenience wrapper for {@code setCoinSelector(Wallet.AllowUnconfirmedCoinSelector.get())}. If this method
      * is called on the wallet then transactions will be used for spending regardless of their confidence. This can
      * be dangerous - only use this if you absolutely know what you're doing!
      */
@@ -4308,8 +4516,7 @@ public void setUTXOProvider(@Nullable UTXOProvider provider) {
 
     //endregion
 
-    /******************************************************************************************************************/
-
+    // ***************************************************************************************************************
     /**
      * A custom {@link TransactionOutput} that is free standing. This contains all the information
      * required for spending without actually having all the linked data (i.e parent tx).
@@ -4359,10 +4566,7 @@ public Sha256Hash getParentTransactionHash() {
         }
     }
 
-    /******************************************************************************************************************/
-
-
-    /******************************************************************************************************************/
+    // ***************************************************************************************************************
 
     private static class TxOffsetPair implements Comparable<TxOffsetPair> {
         public final Transaction tx;
@@ -4426,7 +4630,7 @@ public void reorganize(StoredBlock splitPoint, List<StoredBlock> oldBlocks, List
             for (Sha256Hash blockHash : mapBlockTx.keySet())
                 Collections.sort(mapBlockTx.get(blockHash));
 
-            List<Sha256Hash> oldBlockHashes = new ArrayList<Sha256Hash>(oldBlocks.size());
+            List<Sha256Hash> oldBlockHashes = new ArrayList<>(oldBlocks.size());
             log.info("Old part of chain (top to bottom):");
             for (StoredBlock b : oldBlocks) {
                 log.info("  {}", b.getHeader().getHashAsString());
@@ -4444,7 +4648,7 @@ public void reorganize(StoredBlock splitPoint, List<StoredBlock> oldBlocks, List
             for (Sha256Hash blockHash : oldBlockHashes) {
                 for (TxOffsetPair pair : mapBlockTx.get(blockHash)) {
                     Transaction tx = pair.tx;
-                    final Sha256Hash txHash = tx.getHash();
+                    final Sha256Hash txHash = tx.getTxId();
                     if (tx.isCoinBase()) {
                         // All the transactions that we have in our wallet which spent this coinbase are now invalid
                         // and will never confirm. Hopefully this should never happen - that's the point of the maturity
@@ -4454,7 +4658,7 @@ public void reorganize(StoredBlock splitPoint, List<StoredBlock> oldBlocks, List
                         // graph we can never reliably kill all transactions we might have that were rooted in
                         // this coinbase tx. Some can just go pending forever, like the Bitcoin Core. However we
                         // can do our best.
-                        log.warn("Coinbase killed by re-org: {}", tx.getHashAsString());
+                        log.warn("Coinbase killed by re-org: {}", tx.getTxId());
                         killTxns(ImmutableSet.of(tx), null);
                     } else {
                         for (TransactionOutput output : tx.getOutputs()) {
@@ -4479,7 +4683,7 @@ public void reorganize(StoredBlock splitPoint, List<StoredBlock> oldBlocks, List
                 // Coinbase transactions on the old part of the chain are dead for good and won't come back unless
                 // there's another re-org.
                 if (tx.isCoinBase()) continue;
-                log.info("  ->pending {}", tx.getHash());
+                log.info("  ->pending {}", tx.getTxId());
 
                 tx.getConfidence().setConfidenceType(ConfidenceType.PENDING);  // Wipe height/depth/work data.
                 confidenceChanged.put(tx, TransactionConfidence.Listener.ChangeReason.TYPE);
@@ -4512,7 +4716,7 @@ public void reorganize(StoredBlock splitPoint, List<StoredBlock> oldBlocks, List
             for (StoredBlock block : newBlocks) {
                 log.info("Replaying block {}", block.getHeader().getHashAsString());
                 for (TxOffsetPair pair : mapBlockTx.get(block.getHeader().getHash())) {
-                    log.info("  tx {}", pair.tx.getHash());
+                    log.info("  tx {}", pair.tx.getTxId());
                     try {
                         receive(pair.tx, block, BlockChain.NewBlockType.BEST_CHAIN, pair.offset);
                     } catch (ScriptException e) {
@@ -4572,7 +4776,7 @@ public void beginBloomFilterCalculation() {
     private void calcBloomOutPointsLocked() {
         // TODO: This could be done once and then kept up to date.
         bloomOutPoints.clear();
-        Set<Transaction> all = new HashSet<Transaction>();
+        Set<Transaction> all = new HashSet<>();
         all.addAll(unspent.values());
         all.addAll(spent.values());
         all.addAll(pending.values());
@@ -4628,7 +4832,13 @@ public boolean isRequiringUpdateAllBloomFilter() {
         // before calling, but because this is public API we must still lock again regardless.
         keyChainGroupLock.lock();
         try {
-            return !watchedScripts.isEmpty();
+            if (!watchedScripts.isEmpty())
+                return true;
+            if (keyChainGroup.chains != null)
+                for (DeterministicKeyChain chain : keyChainGroup.chains)
+                    if (chain.getOutputScriptType() == Script.ScriptType.P2WPKH)
+                        return true;
+            return false;
         } finally {
             keyChainGroupLock.unlock();
         }
@@ -4655,7 +4865,7 @@ public BloomFilter getBloomFilter(double falsePositiveRate) {
      * <p>This is used to generate a BloomFilter which can be {@link BloomFilter#merge(BloomFilter)}d with another.
      * It could also be used if you have a specific target for the filter's size.</p>
      * 
-     * <p>See the docs for {@link BloomFilter(int, double)} for a brief explanation of anonymity when using bloom
+     * <p>See the docs for {@link BloomFilter#BloomFilter(int, double, long, BloomFilter.BloomUpdate)} for a brief explanation of anonymity when using bloom
      * filters.</p>
      */
     @Override @GuardedBy("keyChainGroupLock")
@@ -4668,13 +4878,13 @@ public BloomFilter getBloomFilter(int size, double falsePositiveRate, long nTwea
                     // Only add long (at least 64 bit) data to the bloom filter.
                     // If any long constants become popular in scripts, we will need logic
                     // here to exclude them.
-                    if (!chunk.isOpCode() && chunk.data.length >= MINIMUM_BLOOM_DATA_LENGTH) {
+                    if (!chunk.isOpCode() && (chunk.data != null) && chunk.data.length >= MINIMUM_BLOOM_DATA_LENGTH) {
                         filter.insert(chunk.data);
                     }
                 }
             }
             for (TransactionOutPoint point : bloomOutPoints)
-                filter.insert(point.unsafeBitcoinSerialize());
+                filter.insert(point);
             return filter;
         } finally {
             endBloomFilterCalculation();
@@ -4684,8 +4894,9 @@ public BloomFilter getBloomFilter(int size, double falsePositiveRate, long nTwea
     // Returns true if the output is one that won't be selected by a data element matching in the scriptSig.
     private boolean isTxOutputBloomFilterable(TransactionOutput out) {
         Script script = out.getScriptPubKey();
-        boolean isScriptTypeSupported = script.isSentToRawPubKey() || script.isPayToScriptHash();
-        return (isScriptTypeSupported && myUnspents.contains(out)) || watchedScripts.contains(script);
+        boolean isScriptTypeSupported = ScriptPattern.isP2PK(script) || ScriptPattern.isP2SH(script)
+                || ScriptPattern.isP2WPKH(script) || ScriptPattern.isP2WSH(script);
+        return (isScriptTypeSupported && out.isMine(this)) || watchedScripts.contains(script);
     }
 
     /**
@@ -4696,6 +4907,8 @@ private boolean isTxOutputBloomFilterable(TransactionOutput out) {
     public boolean checkForFilterExhaustion(FilteredBlock block) {
         keyChainGroupLock.lock();
         try {
+            if (!keyChainGroup.isSupportsDeterministicChains())
+                return false;
             int epoch = keyChainGroup.getCombinedKeyLookaheadEpochs();
             for (Transaction tx : block.getAssociatedTransactions().values()) {
                 markKeysAsUsed(tx);
@@ -4713,7 +4926,7 @@ public boolean checkForFilterExhaustion(FilteredBlock block) {
 
     //endregion
 
-    /******************************************************************************************************************/
+    // ***************************************************************************************************************
 
     //region Extensions to the wallet format.
 
@@ -4812,222 +5025,164 @@ public void setTag(String tag, ByteString value) {
     /******************************************************************************************************************/
 
     private static class FeeCalculation {
+        // Selected UTXOs to spend
         public CoinSelection bestCoinSelection;
+        // Change output (may be null if no change)
         public TransactionOutput bestChangeOutput;
+        // List of output values adjusted downwards when recipients pay fees (may be null if no adjustment needed).
+        public List<Coin> updatedOutputValues;
     }
 
     //region Fee calculation code
 
-    public FeeCalculation calculateFee(SendRequest req, Coin value, List<TransactionInput> originalInputs,
+    private FeeCalculation calculateFee(SendRequest req, Coin value, List<TransactionInput> originalInputs,
                                        boolean needAtLeastReferenceFee, List<TransactionOutput> candidates) throws InsufficientMoneyException {
         checkState(lock.isHeldByCurrentThread());
-        // There are 3 possibilities for what adding change might do:
-        // 1) No effect
-        // 2) Causes increase in fee (change < 0.01 COINS)
-        // 3) Causes the transaction to have a dust output or change < fee increase (ie change will be thrown away)
-        // If we get either of the last 2, we keep note of what the inputs looked like at the time and try to
-        // add inputs as we go up the list (keeping track of minimum inputs for each category).  At the end, we pick
-        // the best input set as the one which generates the lowest total fee.
-        Coin additionalValueForNextCategory = null;
-        CoinSelection selection3 = null;
-        CoinSelection selection2 = null;
-        TransactionOutput selection2Change = null;
-        CoinSelection selection1 = null;
-        TransactionOutput selection1Change = null;
-        // We keep track of the last size of the transaction we calculated but only if the act of adding inputs and
-        // change resulted in the size crossing a 1000 byte boundary. Otherwise it stays at zero.
-        int lastCalculatedSize = 0;
-        Coin valueNeeded, valueMissing = null;
+        FeeCalculation result;
+        Coin fee = Coin.ZERO;
         while (true) {
-            resetTxInputs(req, originalInputs);
-
-            Coin fees = req.feePerKb.multiply(lastCalculatedSize).divide(1000);
-            if (needAtLeastReferenceFee && fees.compareTo(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE) < 0)
-                fees = Transaction.REFERENCE_DEFAULT_MIN_TX_FEE;
-
-            valueNeeded = value.add(fees);
-            if (additionalValueForNextCategory != null)
-                valueNeeded = valueNeeded.add(additionalValueForNextCategory);
-            Coin additionalValueSelected = additionalValueForNextCategory;
+            result = new FeeCalculation();
+            Transaction tx = new Transaction(params);
+            addSuppliedInputs(tx, req.tx.getInputs());
 
-            // Of the coins we could spend, pick some that we actually will spend.
+            Coin valueNeeded = value;
+            if (!req.recipientsPayFees) {
+                valueNeeded = valueNeeded.add(fee);
+            }
+            if (req.recipientsPayFees) {
+                result.updatedOutputValues = new ArrayList<>();
+            }
+            for (int i = 0; i < req.tx.getOutputs().size(); i++) {
+                TransactionOutput output = new TransactionOutput(params, tx,
+                        req.tx.getOutputs().get(i).bitcoinSerialize(), 0);
+                if (req.recipientsPayFees) {
+                    // Subtract fee equally from each selected recipient
+                    output.setValue(output.getValue().subtract(fee.divide(req.tx.getOutputs().size())));
+                    // first receiver pays the remainder not divisible by output count
+                    if (i == 0) {
+                        output.setValue(
+                                output.getValue().subtract(fee.divideAndRemainder(req.tx.getOutputs().size())[1])); // Subtract fee equally from each selected recipient
+                    }
+                    result.updatedOutputValues.add(output.getValue());
+                    if (output.getMinNonDustValue().isGreaterThan(output.getValue())) {
+                        throw new CouldNotAdjustDownwards();
+                    }
+                }
+                tx.addOutput(output);
+            }
             CoinSelector selector = req.coinSelector == null ? coinSelector : req.coinSelector;
             // selector is allowed to modify candidates list.
-            CoinSelection selection = selector.select(valueNeeded, new LinkedList<TransactionOutput>(candidates));
+            CoinSelection selection = selector.select(valueNeeded, new LinkedList<>(candidates));
+            result.bestCoinSelection = selection;
             // Can we afford this?
             if (selection.valueGathered.compareTo(valueNeeded) < 0) {
-                valueMissing = valueNeeded.subtract(selection.valueGathered);
-                break;
+                Coin valueMissing = valueNeeded.subtract(selection.valueGathered);
+                throw new InsufficientMoneyException(valueMissing);
             }
-            checkState(selection.gathered.size() > 0 || originalInputs.size() > 0);
-
-            // We keep track of an upper bound on transaction size to calculate fees that need to be added.
-            // Note that the difference between the upper bound and lower bound is usually small enough that it
-            // will be very rare that we pay a fee we do not need to.
-            //
-            // We can't be sure a selection is valid until we check fee per kb at the end, so we just store
-            // them here temporarily.
-            boolean eitherCategory2Or3 = false;
-            boolean isCategory3 = false;
-
             Coin change = selection.valueGathered.subtract(valueNeeded);
-            if (additionalValueSelected != null)
-                change = change.add(additionalValueSelected);
-
-            // If change is < 0.01 BTC, we will need to have at least minfee to be accepted by the network
-            if (req.ensureMinRequiredFee && !change.equals(Coin.ZERO) &&
-                    change.compareTo(Coin.CENT) < 0 && fees.compareTo(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE) < 0) {
-                // This solution may fit into category 2, but it may also be category 3, we'll check that later
-                eitherCategory2Or3 = true;
-                additionalValueForNextCategory = Coin.CENT;
-                // If the change is smaller than the fee we want to add, this will be negative
-                change = change.subtract(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.subtract(fees));
-            }
-
-            int size = 0;
-            TransactionOutput changeOutput = null;
-            if (change.signum() > 0) {
+            if (change.isGreaterThan(Coin.ZERO)) {
                 // The value of the inputs is greater than what we want to send. Just like in real life then,
                 // we need to take back some coins ... this is called "change". Add another output that sends the change
                 // back to us. The address comes either from the request or currentChangeAddress() as a default.
                 Address changeAddress = req.changeAddress;
                 if (changeAddress == null)
                     changeAddress = currentChangeAddress();
-                changeOutput = new TransactionOutput(params, req.tx, change, changeAddress);
-                // If the change output would result in this transaction being rejected as dust, just drop the change and make it a fee
-                if (req.ensureMinRequiredFee && changeOutput.isDust()) {
-                    // This solution definitely fits in category 3
-                    isCategory3 = true;
-                    additionalValueForNextCategory = Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.add(
-                                                     changeOutput.getMinNonDustValue().add(Coin.SATOSHI));
-                } else {
-                    size += changeOutput.unsafeBitcoinSerialize().length + VarInt.sizeOf(req.tx.getOutputs().size()) - VarInt.sizeOf(req.tx.getOutputs().size() - 1);
-                    // This solution is either category 1 or 2
-                    if (!eitherCategory2Or3) // must be category 1
-                        additionalValueForNextCategory = null;
+                TransactionOutput changeOutput = new TransactionOutput(params, tx, change, changeAddress);
+                if (req.recipientsPayFees && changeOutput.isDust()) {
+                    // We do not move dust-change to fees, because the sender would end up paying more than requested.
+                    // This would be against the purpose of the all-inclusive feature.
+                    // So instead we raise the change and deduct from the first recipient.
+                    Coin missingToNotBeDust = changeOutput.getMinNonDustValue().subtract(changeOutput.getValue());
+                    changeOutput.setValue(changeOutput.getValue().add(missingToNotBeDust));
+                    TransactionOutput firstOutput = tx.getOutputs().get(0);
+                    firstOutput.setValue(firstOutput.getValue().subtract(missingToNotBeDust));
+                    result.updatedOutputValues.set(0, firstOutput.getValue());
+                    if (firstOutput.isDust()) {
+                        throw new CouldNotAdjustDownwards();
+                    }
                 }
-            } else {
-                if (eitherCategory2Or3) {
-                    // This solution definitely fits in category 3 (we threw away change because it was smaller than MIN_TX_FEE)
-                    isCategory3 = true;
-                    additionalValueForNextCategory = Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.add(Coin.SATOSHI);
+                if (changeOutput.isDust()) {
+                    // Never create dust outputs; if we would, just
+                    // add the dust to the fee.
+                    // Oscar comment: This seems like a way to make the condition below "if
+                    // (!fee.isLessThan(feeNeeded))" to become true.
+                    // This is a non-easy to understand way to do that.
+                    // Maybe there are other effects I am missing
+                    fee = fee.add(changeOutput.getValue());
+                } else {
+                    tx.addOutput(changeOutput);
+                    result.bestChangeOutput = changeOutput;
                 }
             }
 
-            // Now add unsigned inputs for the selected coins.
-            for (TransactionOutput output : selection.gathered) {
-                TransactionInput input = req.tx.addInput(output);
+            for (TransactionOutput selectedOutput : selection.gathered) {
+                TransactionInput input = tx.addInput(selectedOutput);
                 // If the scriptBytes don't default to none, our size calculations will be thrown off.
                 checkState(input.getScriptBytes().length == 0);
+                checkState(!input.hasWitness());
             }
 
-            // Estimate transaction size and loop again if we need more fee per kb. The serialized tx doesn't
-            // include things we haven't added yet like input signatures/scripts or the change output.
-            size += req.tx.unsafeBitcoinSerialize().length;
-            size += estimateBytesForSigning(selection);
-            if (size > lastCalculatedSize && req.feePerKb.signum() > 0) {
-                lastCalculatedSize = size;
-                // We need more fees anyway, just try again with the same additional value
-                additionalValueForNextCategory = additionalValueSelected;
-                continue;
-            }
-
-            if (isCategory3) {
-                if (selection3 == null)
-                    selection3 = selection;
-            } else if (eitherCategory2Or3) {
-                // If we are in selection2, we will require at least CENT additional. If we do that, there is no way
-                // we can end up back here because CENT additional will always get us to 1
-                checkState(selection2 == null);
-                checkState(additionalValueForNextCategory.equals(Coin.CENT));
-                selection2 = selection;
-                selection2Change = checkNotNull(changeOutput); // If we get no change in category 2, we are actually in category 3
-            } else {
-                // Once we get a category 1 (change kept), we should break out of the loop because we can't do better
-                checkState(selection1 == null);
-                checkState(additionalValueForNextCategory == null);
-                selection1 = selection;
-                selection1Change = changeOutput;
-            }
+            final int vsize = tx.getVsize() + estimateVirtualBytesForSigning(selection);
 
-            if (additionalValueForNextCategory != null) {
-                if (additionalValueSelected != null)
-                    checkState(additionalValueForNextCategory.compareTo(additionalValueSelected) > 0);
-                continue;
+            Coin baseFeeNeeded = req.fee == null ? Coin.ZERO : req.fee;
+            Coin feePerKbNeeded = req.feePerKb;
+            Coin feeNeeded = baseFeeNeeded.add(feePerKbNeeded.multiply(vsize).divide(1000));
+            Coin minFeeNeeded = Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.multiply(vsize).divide(1000);
+            if (needAtLeastReferenceFee && feeNeeded.isLessThan(minFeeNeeded)) {
+                feeNeeded = minFeeNeeded;
             }
-            break;
-        }
-
-        resetTxInputs(req, originalInputs);
-
-        if (selection3 == null && selection2 == null && selection1 == null) {
-            checkNotNull(valueMissing);
-            log.warn("Insufficient value in wallet for send: needed {} more", valueMissing.toFriendlyString());
-            throw new InsufficientMoneyException(valueMissing);
-        }
-
-        Coin lowestFee = null;
-        FeeCalculation result = new FeeCalculation();
-        if (selection1 != null) {
-            if (selection1Change != null)
-                lowestFee = selection1.valueGathered.subtract(selection1Change.getValue());
-            else
-                lowestFee = selection1.valueGathered;
-            result.bestCoinSelection = selection1;
-            result.bestChangeOutput = selection1Change;
-        }
 
-        if (selection2 != null) {
-            Coin fee = selection2.valueGathered.subtract(checkNotNull(selection2Change).getValue());
-            if (lowestFee == null || fee.compareTo(lowestFee) < 0) {
-                lowestFee = fee;
-                result.bestCoinSelection = selection2;
-                result.bestChangeOutput = selection2Change;
+            if (!fee.isLessThan(feeNeeded)) {
+                // Done, enough fee included.
+                break;
             }
-        }
 
-        if (selection3 != null) {
-            if (lowestFee == null || selection3.valueGathered.compareTo(lowestFee) < 0) {
-                result.bestCoinSelection = selection3;
-                result.bestChangeOutput = null;
-            }
+            // Include more fee and try again.
+            fee = feeNeeded;
         }
         return result;
+
     }
 
-    private void resetTxInputs(SendRequest req, List<TransactionInput> originalInputs) {
-        req.tx.clearInputs();
+    private void addSuppliedInputs(Transaction tx, List<TransactionInput> originalInputs) {
         for (TransactionInput input : originalInputs)
-            req.tx.addInput(input);
+            tx.addInput(new TransactionInput(params, tx, input.bitcoinSerialize()));
     }
 
-    private int estimateBytesForSigning(CoinSelection selection) {
-        int size = 0;
+    private int estimateVirtualBytesForSigning(CoinSelection selection) {
+        int vsize = 0;
         for (TransactionOutput output : selection.gathered) {
             try {
                 Script script = output.getScriptPubKey();
                 ECKey key = null;
                 Script redeemScript = null;
-                if (script.isSentToAddress()) {
-                    key = findKeyFromPubHash(script.getPubKeyHash());
+                if (ScriptPattern.isP2PKH(script)) {
+                    key = findKeyFromPubKeyHash(ScriptPattern.extractHashFromP2PKH(script), Script.ScriptType.P2PKH);
+                    checkNotNull(key, "Coin selection includes unspendable outputs");
+                    vsize += script.getNumberOfBytesRequiredToSpend(key, redeemScript);
+                } else if (ScriptPattern.isP2WPKH(script)) {
+                    key = findKeyFromPubKeyHash(ScriptPattern.extractHashFromP2WH(script), Script.ScriptType.P2WPKH);
                     checkNotNull(key, "Coin selection includes unspendable outputs");
-                } else if (script.isPayToScriptHash()) {
-                    redeemScript = findRedeemDataFromScriptHash(script.getPubKeyHash()).redeemScript;
+                    vsize += (script.getNumberOfBytesRequiredToSpend(key, redeemScript) + 3) / 4; // round up
+                } else if (ScriptPattern.isP2SH(script)) {
+                    redeemScript = findRedeemDataFromScriptHash(ScriptPattern.extractHashFromP2SH(script)).redeemScript;
                     checkNotNull(redeemScript, "Coin selection includes unspendable outputs");
+                    vsize += script.getNumberOfBytesRequiredToSpend(key, redeemScript);
+                } else {
+                    vsize += script.getNumberOfBytesRequiredToSpend(key, redeemScript);
                 }
-                size += script.getNumberOfBytesRequiredToSpend(key, redeemScript);
             } catch (ScriptException e) {
                 // If this happens it means an output script in a wallet tx could not be understood. That should never
                 // happen, if it does it means the wallet has got into an inconsistent state.
                 throw new IllegalStateException(e);
             }
         }
-        return size;
+        return vsize;
     }
 
     //endregion
 
-    /******************************************************************************************************************/
+    // ***************************************************************************************************************
 
     //region Wallet maintenance transactions
 
@@ -5068,26 +5223,63 @@ public void setTransactionBroadcaster(@Nullable org.bitcoinj.core.TransactionBro
         // Don't hold the wallet lock whilst doing this, so if the broadcaster accesses the wallet at some point there
         // is no inversion.
         for (Transaction tx : toBroadcast) {
-            checkState(tx.getConfidence().getConfidenceType() == ConfidenceType.PENDING);
+            ConfidenceType confidenceType = tx.getConfidence().getConfidenceType();
+            checkState(confidenceType == ConfidenceType.PENDING || confidenceType == ConfidenceType.IN_CONFLICT,
+                    "Expected PENDING or IN_CONFLICT, was %s.", confidenceType);
             // Re-broadcast even if it's marked as already seen for two reasons
             // 1) Old wallets may have transactions marked as broadcast by 1 peer when in reality the network
             //    never saw it, due to bugs.
             // 2) It can't really hurt.
-            log.info("New broadcaster so uploading waiting tx {}", tx.getHash());
+            log.info("New broadcaster so uploading waiting tx {}", tx.getTxId());
             broadcaster.broadcastTransaction(tx);
         }
     }
 
     /**
-     * When a key rotation time is set, and money controlled by keys created before the given timestamp T will be
-     * automatically respent to any key that was created after T. This can be used to recover from a situation where
-     * a set of keys is believed to be compromised. Once the time is set transactions will be created and broadcast
-     * immediately. New coins that come in after calling this method will be automatically respent immediately. The
-     * rotation time is persisted to the wallet. You can stop key rotation by calling this method again with zero
-     * as the argument.
+     * <p>
+     * When a key rotation time is set, any money controlled by keys created before the given timestamp T will be
+     * respent to any key that was created after T. This can be used to recover from a situation where a set of keys is
+     * believed to be compromised. The rotation time is persisted to the wallet. You can stop key rotation by calling
+     * this method again with {@code null} as the argument.
+     * </p>
+     *
+     * <p>
+     * Once set up, calling {@link #doMaintenance(KeyParameter, boolean)} will create and possibly send rotation
+     * transactions: but it won't be done automatically (because you might have to ask for the users password). This may
+     * need to be repeated regularly in case new coins keep coming in on rotating addresses/keys.
+     * </p>
+     *
+     * <p>
+     * The given time cannot be in the future.
+     * </p>
+     */
+    public void setKeyRotationTime(@Nullable Date time) {
+        setKeyRotationTime(time != null ? time.getTime() / 1000 : 0);
+    }
+
+    /**
+     * <p>
+     * When a key rotation time is set, any money controlled by keys created before the given timestamp T will be
+     * respent to any key that was created after T. This can be used to recover from a situation where a set of keys is
+     * believed to be compromised. The rotation time is persisted to the wallet. You can stop key rotation by calling
+     * this method again with {@code 0} as the argument.
+     * </p>
+     * 
+     * <p>
+     * Once set up, calling {@link #doMaintenance(KeyParameter, boolean)} will create and possibly send rotation
+     * transactions: but it won't be done automatically (because you might have to ask for the users password). This may
+     * need to be repeated regularly in case new coins keep coming in on rotating addresses/keys.
+     * </p>
+     *
+     * <p>
+     * The given time cannot be in the future.
+     * </p>
      */
-    public void setKeyRotationTime(Date time) {
-        setKeyRotationTime(time.getTime() / 1000);
+    public void setKeyRotationTime(long unixTimeSeconds) {
+        checkArgument(unixTimeSeconds <= Utils.currentTimeSeconds(), "Given time (%s) cannot be in the future.",
+                Utils.dateTimeFormat(unixTimeSeconds * 1000));
+        vKeyRotationTimestamp = unixTimeSeconds;
+        saveNow();
     }
 
     /**
@@ -5102,33 +5294,29 @@ public void setKeyRotationTime(Date time) {
             return null;
     }
 
-    /**
-     * <p>When a key rotation time is set, any money controlled by keys created before the given timestamp T will be
-     * automatically respent to any key that was created after T. This can be used to recover from a situation where
-     * a set of keys is believed to be compromised. You can stop key rotation by calling this method again with zero
-     * as the argument. Once set up, calling {@link #doMaintenance(org.spongycastle.crypto.params.KeyParameter, boolean)}
-     * will create and possibly send rotation transactions: but it won't be done automatically (because you might have
-     * to ask for the users password).</p>
-     *
-     * <p>The given time cannot be in the future.</p>
-     */
-    public void setKeyRotationTime(long unixTimeSeconds) {
-        checkArgument(unixTimeSeconds <= Utils.currentTimeSeconds(), "Given time (%s) cannot be in the future.",
-                Utils.dateTimeFormat(unixTimeSeconds * 1000));
-        vKeyRotationTimestamp = unixTimeSeconds;
-        saveNow();
-    }
-
     /** Returns whether the keys creation time is before the key rotation time, if one was set. */
     public boolean isKeyRotating(ECKey key) {
         long time = vKeyRotationTimestamp;
         return time != 0 && key.getCreationTimeSeconds() < time;
     }
 
-    /** @deprecated Renamed to doMaintenance */
-    @Deprecated
-    public ListenableFuture<List<Transaction>> maybeDoMaintenance(@Nullable KeyParameter aesKey, boolean andSend) throws DeterministicUpgradeRequiresPassword {
-        return doMaintenance(aesKey, andSend);
+    /**
+     * A wallet app should call this from time to time in order to let the wallet craft and send transactions needed
+     * to re-organise coins internally. A good time to call this would be after receiving coins for an unencrypted
+     * wallet, or after sending money for an encrypted wallet. If you have an encrypted wallet and just want to know
+     * if some maintenance needs doing, call this method with andSend set to false and look at the returned list of
+     * transactions. Maintenance might also include internal changes that involve some processing or work but
+     * which don't require making transactions - these will happen automatically unless the password is required
+     * in which case an exception will be thrown.
+     * @param aesKey the users password, if any.
+     * @param signAndSend if true, send the transactions via the tx broadcaster and return them, if false just return them.
+     *
+     * @return A list of transactions that the wallet just made/will make for internal maintenance. Might be empty.
+     * @throws org.bitcoinj.wallet.DeterministicUpgradeRequiresPassword if key rotation requires the users password.
+     */
+    public ListenableFuture<List<Transaction>> doMaintenance(@Nullable KeyParameter aesKey, boolean signAndSend)
+            throws DeterministicUpgradeRequiresPassword {
+        return doMaintenance(KeyChainGroupStructure.DEFAULT, aesKey, signAndSend);
     }
 
     /**
@@ -5139,18 +5327,20 @@ public ListenableFuture<List<Transaction>> maybeDoMaintenance(@Nullable KeyParam
      * transactions. Maintenance might also include internal changes that involve some processing or work but
      * which don't require making transactions - these will happen automatically unless the password is required
      * in which case an exception will be thrown.
-     *
+     * @param structure to derive the account path from if a new seed needs to be created
      * @param aesKey the users password, if any.
      * @param signAndSend if true, send the transactions via the tx broadcaster and return them, if false just return them.
+     *
      * @return A list of transactions that the wallet just made/will make for internal maintenance. Might be empty.
      * @throws org.bitcoinj.wallet.DeterministicUpgradeRequiresPassword if key rotation requires the users password.
      */
-    public ListenableFuture<List<Transaction>> doMaintenance(@Nullable KeyParameter aesKey, boolean signAndSend) throws DeterministicUpgradeRequiresPassword {
+    public ListenableFuture<List<Transaction>> doMaintenance(KeyChainGroupStructure structure,
+            @Nullable KeyParameter aesKey, boolean signAndSend) throws DeterministicUpgradeRequiresPassword {
         List<Transaction> txns;
         lock.lock();
         keyChainGroupLock.lock();
         try {
-            txns = maybeRotateKeys(aesKey, signAndSend);
+            txns = maybeRotateKeys(structure, aesKey, signAndSend);
             if (!signAndSend)
                 return Futures.immediateFuture(txns);
         } finally {
@@ -5158,7 +5348,7 @@ public ListenableFuture<List<Transaction>> doMaintenance(@Nullable KeyParameter
             lock.unlock();
         }
         checkState(!lock.isHeldByCurrentThread());
-        ArrayList<ListenableFuture<Transaction>> futures = new ArrayList<ListenableFuture<Transaction>>(txns.size());
+        ArrayList<ListenableFuture<Transaction>> futures = new ArrayList<>(txns.size());
         TransactionBroadcaster broadcaster = vTransactionBroadcaster;
         for (Transaction tx : txns) {
             try {
@@ -5174,7 +5364,7 @@ public void onSuccess(Transaction transaction) {
                     public void onFailure(Throwable throwable) {
                         log.error("Failed to broadcast key rotation tx", throwable);
                     }
-                });
+                }, MoreExecutors.directExecutor());
             } catch (Exception e) {
                 log.error("Failed to broadcast rekey tx", e);
             }
@@ -5184,7 +5374,8 @@ public void onFailure(Throwable throwable) {
 
     // Checks to see if any coins are controlled by rotating keys and if so, spends them.
     @GuardedBy("keyChainGroupLock")
-    private List<Transaction> maybeRotateKeys(@Nullable KeyParameter aesKey, boolean sign) throws DeterministicUpgradeRequiresPassword {
+    private List<Transaction> maybeRotateKeys(KeyChainGroupStructure structure, @Nullable KeyParameter aesKey,
+            boolean sign) throws DeterministicUpgradeRequiresPassword {
         checkState(lock.isHeldByCurrentThread());
         checkState(keyChainGroupLock.isHeldByCurrentThread());
         List<Transaction> results = Lists.newLinkedList();
@@ -5194,25 +5385,56 @@ private List<Transaction> maybeRotateKeys(@Nullable KeyParameter aesKey, boolean
 
         // We might have to create a new HD hierarchy if the previous ones are now rotating.
         boolean allChainsRotating = true;
-        for (DeterministicKeyChain chain : keyChainGroup.getDeterministicKeyChains()) {
-            if (chain.getEarliestKeyCreationTime() >= keyRotationTimestamp) {
-                allChainsRotating = false;
-                break;
+        Script.ScriptType preferredScriptType = Script.ScriptType.P2PKH;
+        if (keyChainGroup.isSupportsDeterministicChains()) {
+            for (DeterministicKeyChain chain : keyChainGroup.getDeterministicKeyChains()) {
+                if (chain.getEarliestKeyCreationTime() >= keyRotationTimestamp)
+                    allChainsRotating = false;
+                else
+                    preferredScriptType = chain.getOutputScriptType();
             }
         }
         if (allChainsRotating) {
             try {
                 if (keyChainGroup.getImportedKeys().isEmpty()) {
-                    log.info("All HD chains are currently rotating and we have no random keys, creating fresh HD chain ...");
-                    keyChainGroup.createAndActivateNewHDChain();
+                    log.info(
+                            "All deterministic chains are currently rotating and we have no random keys, creating fresh {} chain: backup required after this.",
+                            preferredScriptType);
+                    KeyChainGroup newChains = KeyChainGroup.builder(params, structure).fromRandom(preferredScriptType)
+                            .build();
+                    if (keyChainGroup.isEncrypted()) {
+                        if (aesKey == null)
+                            throw new DeterministicUpgradeRequiresPassword();
+                        KeyCrypter keyCrypter = keyChainGroup.getKeyCrypter();
+                        keyChainGroup.decrypt(aesKey);
+                        keyChainGroup.mergeActiveKeyChains(newChains, keyRotationTimestamp);
+                        keyChainGroup.encrypt(keyCrypter, aesKey);
+                    } else {
+                        keyChainGroup.mergeActiveKeyChains(newChains, keyRotationTimestamp);
+                    }
                 } else {
-                    log.info("All HD chains are currently rotating, attempting to create a new one from the next oldest non-rotating key material ...");
-                    keyChainGroup.upgradeToDeterministic(keyRotationTimestamp, aesKey);
-                    log.info(" ... upgraded to HD again, based on next best oldest key.");
+                    log.info(
+                            "All deterministic chains are currently rotating, creating a new {} one from the next oldest non-rotating key material...",
+                            preferredScriptType);
+                    keyChainGroup.upgradeToDeterministic(preferredScriptType, structure, keyRotationTimestamp, aesKey);
+                    log.info("...upgraded to HD again, based on next best oldest key.");
                 }
             } catch (AllRandomKeysRotating rotating) {
-                log.info(" ... no non-rotating random keys available, generating entirely new HD tree: backup required after this.");
-                keyChainGroup.createAndActivateNewHDChain();
+                log.info(
+                        "No non-rotating random keys available, generating entirely new {} tree: backup required after this.",
+                        preferredScriptType);
+                KeyChainGroup newChains = KeyChainGroup.builder(params, structure).fromRandom(preferredScriptType)
+                        .build();
+                if (keyChainGroup.isEncrypted()) {
+                    if (aesKey == null)
+                        throw new DeterministicUpgradeRequiresPassword();
+                    KeyCrypter keyCrypter = keyChainGroup.getKeyCrypter();
+                    keyChainGroup.decrypt(aesKey);
+                    keyChainGroup.mergeActiveKeyChains(newChains, keyRotationTimestamp);
+                    keyChainGroup.encrypt(keyCrypter, aesKey);
+                } else {
+                    keyChainGroup.mergeActiveKeyChains(newChains, keyRotationTimestamp);
+                }
             }
             saveNow();
         }
@@ -5247,14 +5469,13 @@ private Transaction rekeyOneBatch(long timeSecs, @Nullable KeyParameter aesKey,
             // TODO: Make this use the standard SendRequest.
             CoinSelection toMove = selector.select(Coin.ZERO, calculateAllSpendCandidates());
             if (toMove.valueGathered.equals(Coin.ZERO)) return null;  // Nothing to do.
-            maybeUpgradeToHD(aesKey);
             Transaction rekeyTx = new Transaction(params);
             for (TransactionOutput output : toMove.gathered) {
                 rekeyTx.addInput(output);
             }
             // When not signing, don't waste addresses.
             rekeyTx.addOutput(toMove.valueGathered, sign ? freshReceiveAddress() : currentReceiveAddress());
-            if (!adjustOutputDownwardsForFee(rekeyTx, toMove, Transaction.DEFAULT_TX_FEE, true)) {
+            if (!adjustOutputDownwardsForFee(rekeyTx, toMove, Coin.ZERO, Transaction.DEFAULT_TX_FEE, true)) {
                 log.error("Failed to adjust rekey tx for fees.");
                 return null;
             }
diff --git a/core/src/main/java/org/bitcoinj/wallet/WalletFiles.java b/core/src/main/java/org/bitcoinj/wallet/WalletFiles.java
index 13ea5e90357..03448731c12 100644
--- a/core/src/main/java/org/bitcoinj/wallet/WalletFiles.java
+++ b/core/src/main/java/org/bitcoinj/wallet/WalletFiles.java
@@ -102,6 +102,11 @@ public WalletFiles(final Wallet wallet, File file, long delay, TimeUnit delayTim
         };
     }
 
+    /** Get the {@link Wallet} this {@link WalletFiles} is managing. */
+    public Wallet getWallet() {
+        return wallet;
+    }
+
     /**
      * The given listener will be called on the autosave thread before and after the wallet is saved to disk.
      */
@@ -113,6 +118,8 @@ public void setListener(@Nonnull Listener listener) {
     public void saveNow() throws IOException {
         // Can be called by any thread. However the wallet is locked whilst saving, so we can have two saves in flight
         // but they will serialize (using different temp files).
+        if (executor.isShutdown())
+            return;
         Date lastBlockSeenTime = wallet.getLastBlockSeenTime();
         log.info("Saving wallet; last seen block is height {}, date {}, hash {}", wallet.getLastBlockSeenHeight(),
                 lastBlockSeenTime != null ? Utils.dateTimeFormat(lastBlockSeenTime) : "unknown",
@@ -136,7 +143,7 @@ private void saveNowInternal() throws IOException {
 
     /** Queues up a save in the background. Useful for not very important wallet changes. */
     public void saveLater() {
-        if (savePending.getAndSet(true))
+        if (executor.isShutdown() || savePending.getAndSet(true))
             return;   // Already pending.
         executor.schedule(saver, delay, delayTimeUnit);
     }
diff --git a/core/src/main/java/org/bitcoinj/wallet/WalletProtobufSerializer.java b/core/src/main/java/org/bitcoinj/wallet/WalletProtobufSerializer.java
index 324863b6f5e..bf171634074 100644
--- a/core/src/main/java/org/bitcoinj/wallet/WalletProtobufSerializer.java
+++ b/core/src/main/java/org/bitcoinj/wallet/WalletProtobufSerializer.java
@@ -17,13 +17,22 @@
 
 package org.bitcoinj.wallet;
 
-import org.bitcoinj.core.*;
+import com.google.protobuf.Message;
+import org.bitcoinj.core.Coin;
+import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.core.PeerAddress;
+import org.bitcoinj.core.Sha256Hash;
+import org.bitcoinj.core.Transaction;
+import org.bitcoinj.core.TransactionConfidence;
 import org.bitcoinj.core.TransactionConfidence.ConfidenceType;
+import org.bitcoinj.core.TransactionInput;
+import org.bitcoinj.core.TransactionOutPoint;
+import org.bitcoinj.core.TransactionOutput;
+import org.bitcoinj.core.TransactionWitness;
 import org.bitcoinj.crypto.KeyCrypter;
 import org.bitcoinj.crypto.KeyCrypterScrypt;
 import org.bitcoinj.script.Script;
-import org.bitcoinj.signers.LocalTransactionSigner;
-import org.bitcoinj.signers.TransactionSigner;
+import org.bitcoinj.script.ScriptException;
 import org.bitcoinj.utils.ExchangeRate;
 import org.bitcoinj.utils.Fiat;
 import org.bitcoinj.wallet.Protos.Wallet.EncryptionType;
@@ -31,6 +40,7 @@
 import com.google.common.collect.Lists;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.CodedInputStream;
+import com.google.protobuf.CodedOutputStream;
 import com.google.protobuf.TextFormat;
 import com.google.protobuf.WireFormat;
 
@@ -38,6 +48,9 @@
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nullable;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -50,15 +63,15 @@
 
 /**
  * Serialize and de-serialize a wallet to a byte stream containing a
- * <a href="http://code.google.com/apis/protocolbuffers/docs/overview.html">protocol buffer</a>. Protocol buffers are
+ * <a href="https://developers.google.com/protocol-buffers/docs/overview">protocol buffer</a>. Protocol buffers are
  * a data interchange format developed by Google with an efficient binary representation, a type safe specification
  * language and compilers that generate code to work with those data structures for many languages. Protocol buffers
  * can have their format evolved over time: conceptually they represent data using (tag, length, value) tuples. The
- * format is defined by the <tt>wallet.proto</tt> file in the bitcoinj source distribution.<p>
+ * format is defined by the {@code wallet.proto} file in the bitcoinj source distribution.<p>
  *
  * This class is used through its static methods. The most common operations are writeWallet and readWallet, which do
- * the obvious operations on Output/InputStreams. You can use a {@link java.io.ByteArrayInputStream} and equivalent
- * {@link java.io.ByteArrayOutputStream} if you'd like byte arrays instead. The protocol buffer can also be manipulated
+ * the obvious operations on Output/InputStreams. You can use a {@link ByteArrayInputStream} and equivalent
+ * {@link ByteArrayOutputStream} if you'd like byte arrays instead. The protocol buffer can also be manipulated
  * in its object form if you'd like to modify the flattened data structure before serialization to binary.<p>
  *
  * You can extend the wallet format with additional fields specific to your application if you want, but make sure
@@ -78,6 +91,8 @@ public class WalletProtobufSerializer {
     protected Map<ByteString, Transaction> txMap;
 
     private boolean requireMandatoryExtensions = true;
+    private boolean requireAllExtensionsKnown = false;
+    private int walletWriteBufferSize = CodedOutputStream.DEFAULT_BUFFER_SIZE;
 
     public interface WalletFactory {
         Wallet create(NetworkParameters params, KeyChainGroup keyChainGroup);
@@ -96,7 +111,7 @@ public Wallet create(NetworkParameters params, KeyChainGroup keyChainGroup) {
     }
 
     public WalletProtobufSerializer(WalletFactory factory) {
-        txMap = new HashMap<ByteString, Transaction>();
+        txMap = new HashMap<>();
         this.factory = factory;
         this.keyChainFactory = new DefaultKeyChainFactory();
     }
@@ -114,19 +129,36 @@ public void setRequireMandatoryExtensions(boolean value) {
         requireMandatoryExtensions = value;
     }
 
+    /**
+     * If this property is set to true, the wallet will fail to load if  any found extensions are unknown..
+     */
+    public void setRequireAllExtensionsKnown(boolean value) {
+        requireAllExtensionsKnown = value;
+    }
+
+    /**
+     * Change buffer size for writing wallet to output stream. Default is {@link com.google.protobuf.CodedOutputStream#DEFAULT_BUFFER_SIZE}
+     * @param walletWriteBufferSize - buffer size in bytes
+     */
+    public void setWalletWriteBufferSize(int walletWriteBufferSize) {
+        this.walletWriteBufferSize = walletWriteBufferSize;
+    }
+
     /**
      * Formats the given wallet (transactions and keys) to the given output stream in protocol buffer format.<p>
      *
-     * Equivalent to <tt>walletToProto(wallet).writeTo(output);</tt>
+     * Equivalent to {@code walletToProto(wallet).writeTo(output);}
      */
     public void writeWallet(Wallet wallet, OutputStream output) throws IOException {
         Protos.Wallet walletProto = walletToProto(wallet);
-        walletProto.writeTo(output);
+        final CodedOutputStream codedOutput = CodedOutputStream.newInstance(output, this.walletWriteBufferSize);
+        walletProto.writeTo(codedOutput);
+        codedOutput.flush();
     }
 
     /**
      * Returns the given wallet formatted as text. The text format is that used by protocol buffers and although it
-     * can also be parsed using {@link TextFormat#merge(CharSequence, com.google.protobuf.Message.Builder)},
+     * can also be parsed using {@link TextFormat#merge(CharSequence, Message.Builder)},
      * it is designed more for debugging than storage. It is not well specified and wallets are largely binary data
      * structures anyway, consisting as they do of keys (large random numbers) and {@link Transaction}s which also
      * mostly contain keys and hashes.
@@ -202,16 +234,6 @@ public Protos.Wallet walletToProto(Wallet wallet) {
             walletBuilder.addTags(tag);
         }
 
-        for (TransactionSigner signer : wallet.getTransactionSigners()) {
-            // do not serialize LocalTransactionSigner as it's being added implicitly
-            if (signer instanceof LocalTransactionSigner)
-                continue;
-            Protos.TransactionSigner.Builder protoSigner = Protos.TransactionSigner.newBuilder();
-            protoSigner.setClassName(signer.getClass().getName());
-            protoSigner.setData(ByteString.copyFrom(signer.serialize()));
-            walletBuilder.addTransactionSigners(protoSigner);
-        }
-
         // Populate the wallet version.
         walletBuilder.setVersion(wallet.getVersion());
 
@@ -233,13 +255,17 @@ private static Protos.Transaction makeTxProto(WalletTransaction wtx) {
         Protos.Transaction.Builder txBuilder = Protos.Transaction.newBuilder();
 
         txBuilder.setPool(getProtoPool(wtx))
-                 .setHash(hashToByteString(tx.getHash()))
+                 .setHash(hashToByteString(tx.getTxId()))
                  .setVersion((int) tx.getVersion());
 
         if (tx.getUpdateTime() != null) {
             txBuilder.setUpdatedAt(tx.getUpdateTime().getTime());
         }
 
+        if (tx.getIncludedInBestChainAt() != null) {
+            txBuilder.setIncludedInBestChainAt(tx.getIncludedInBestChainAt().getTime());
+        }
+
         if (tx.getLockTime() > 0) {
             txBuilder.setLockTime((int)tx.getLockTime());
         }
@@ -254,6 +280,14 @@ private static Protos.Transaction makeTxProto(WalletTransaction wtx) {
                 inputBuilder.setSequence((int) input.getSequenceNumber());
             if (input.getValue() != null)
                 inputBuilder.setValue(input.getValue().value);
+            if (input.hasWitness()) {
+                TransactionWitness witness = input.getWitness();
+                Protos.ScriptWitness.Builder witnessBuilder = Protos.ScriptWitness.newBuilder();
+                int pushCount = witness.getPushCount();
+                for (int i = 0; i < pushCount; i++)
+                    witnessBuilder.addData(ByteString.copyFrom(witness.getPush(i)));
+                inputBuilder.setWitness(witnessBuilder);
+            }
             txBuilder.addTransactionInput(inputBuilder);
         }
 
@@ -264,10 +298,9 @@ private static Protos.Transaction makeTxProto(WalletTransaction wtx) {
                 .setValue(output.getValue().value);
             final TransactionInput spentBy = output.getSpentBy();
             if (spentBy != null) {
-                Sha256Hash spendingHash = spentBy.getParentTransaction().getHash();
-                int spentByTransactionIndex = spentBy.getParentTransaction().getInputs().indexOf(spentBy);
+                Sha256Hash spendingHash = spentBy.getParentTransaction().getTxId();
                 outputBuilder.setSpentByTransactionHash(hashToByteString(spendingHash))
-                             .setSpentByTransactionIndex(spentByTransactionIndex);
+                             .setSpentByTransactionIndex(spentBy.getIndex());
             }
             txBuilder.addTransactionOutput(outputBuilder);
         }
@@ -339,7 +372,7 @@ private static void writeConfidence(Protos.Transaction.Builder txBuilder,
                 // Copy in the overriding transaction, if available.
                 // (A dead coinbase transaction has no overriding transaction).
                 if (confidence.getOverridingTransaction() != null) {
-                    Sha256Hash overridingHash = confidence.getOverridingTransaction().getHash();
+                    Sha256Hash overridingHash = confidence.getOverridingTransaction().getTxId();
                     confidenceBuilder.setOverridingTransaction(hashToByteString(overridingHash));
                 }
             }
@@ -356,9 +389,10 @@ private static void writeConfidence(Protos.Transaction.Builder txBuilder,
 
         for (PeerAddress address : confidence.getBroadcastBy()) {
             Protos.PeerAddress proto = Protos.PeerAddress.newBuilder()
-                    .setIpAddress(ByteString.copyFrom(address.getAddr().getAddress()))
+                    .setIpAddress(ByteString.copyFrom(address.getAddr() != null ? address.getAddr().getAddress() : new byte[]{}))
                     .setPort(address.getPort())
                     .setServices(address.getServices().longValue())
+                    .setHostname(address.getHostname() != null ? address.getHostname() : "")
                     .build();
             confidenceBuilder.addBroadcastBy(proto);
         }
@@ -398,7 +432,7 @@ public Wallet readWallet(InputStream input, @Nullable WalletExtension... walletE
      * Wallet object with {@code forceReset} set {@code true}. It won't work.</p>
      *
      * <p>If {@code forceReset} is {@code true}, then no transactions are loaded from the wallet, and it is configured
-     * to replay transactions from the blockchain (as if the wallet had been loaded and {@link Wallet.reset}
+     * to replay transactions from the blockchain (as if the wallet had been loaded and {@link Wallet#reset()}
      * had been called immediately thereafter).
      *
      * <p>A wallet can be unreadable for various reasons, such as inability to open the file, corrupt data, internally
@@ -447,7 +481,7 @@ public Wallet readWallet(NetworkParameters params, @Nullable WalletExtension[] e
      * Wallet object with {@code forceReset} set {@code true}. It won't work.</p>
      *
      * <p>If {@code forceReset} is {@code true}, then no transactions are loaded from the wallet, and it is configured
-     * to replay transactions from the blockchain (as if the wallet had been loaded and {@link Wallet.reset}
+     * to replay transactions from the blockchain (as if the wallet had been loaded and {@link Wallet#reset()}
      * had been called immediately thereafter).
      *
      * <p>A wallet can be unreadable for various reasons, such as inability to open the file, corrupt data, internally
@@ -534,18 +568,6 @@ public Wallet readWallet(NetworkParameters params, @Nullable WalletExtension[] e
             wallet.setTag(tag.getTag(), tag.getData());
         }
 
-        for (Protos.TransactionSigner signerProto : walletProto.getTransactionSignersList()) {
-            try {
-                Class signerClass = Class.forName(signerProto.getClassName());
-                TransactionSigner signer = (TransactionSigner)signerClass.newInstance();
-                signer.deserialize(signerProto.getData().toByteArray());
-                wallet.addTransactionSigner(signer);
-            } catch (Exception e) {
-                throw new UnreadableWalletException("Unable to deserialize TransactionSigner instance: " +
-                        signerProto.getClassName(), e);
-            }
-        }
-
         if (walletProto.hasVersion()) {
             wallet.setVersion(walletProto.getVersion());
         }
@@ -557,7 +579,7 @@ public Wallet readWallet(NetworkParameters params, @Nullable WalletExtension[] e
     }
 
     private void loadExtensions(Wallet wallet, WalletExtension[] extensionsList, Protos.Wallet walletProto) throws UnreadableWalletException {
-        final Map<String, WalletExtension> extensions = new HashMap<String, WalletExtension>();
+        final Map<String, WalletExtension> extensions = new HashMap<>();
         for (WalletExtension e : extensionsList)
             extensions.put(e.getWalletExtensionID(), e);
         // The Wallet object, if subclassed, might have added some extensions to itself already. In that case, don't
@@ -572,6 +594,8 @@ private void loadExtensions(Wallet wallet, WalletExtension[] extensionsList, Pro
                         throw new UnreadableWalletException("Unknown mandatory extension in wallet: " + id);
                     else
                         log.error("Unknown extension in wallet {}, ignoring", id);
+                } else if (requireAllExtensionsKnown) {
+                    throw new UnreadableWalletException("Unknown extension in wallet: " + id);
                 }
             } else {
                 log.info("Loading wallet extension {}", id);
@@ -581,6 +605,11 @@ private void loadExtensions(Wallet wallet, WalletExtension[] extensionsList, Pro
                     if (extProto.getMandatory() && requireMandatoryExtensions) {
                         log.error("Error whilst reading mandatory extension {}, failing to read wallet", id);
                         throw new UnreadableWalletException("Could not parse mandatory extension in wallet: " + id);
+                    } else if (requireAllExtensionsKnown) {
+                        log.error("Error whilst reading extension {}, failing to read wallet", id);
+                        throw new UnreadableWalletException("Could not parse extension in wallet: " + id);
+                    } else {
+                        log.warn("Error whilst reading extension {}, ignoring extension", id, e);
                     }
                 }
             }
@@ -589,7 +618,7 @@ private void loadExtensions(Wallet wallet, WalletExtension[] extensionsList, Pro
 
     /**
      * Returns the loaded protocol buffer from the given byte stream. You normally want
-     * {@link Wallet#loadFromFile(java.io.File, WalletExtension...)} instead - this method is designed for low level
+     * {@link Wallet#loadFromFile(File, WalletExtension...)} instead - this method is designed for low level
      * work involving the wallet file format itself.
      */
     public static Protos.Wallet parseToProto(InputStream input) throws IOException {
@@ -600,10 +629,17 @@ public static Protos.Wallet parseToProto(InputStream input) throws IOException {
 
     private void readTransaction(Protos.Transaction txProto, NetworkParameters params) throws UnreadableWalletException {
         Transaction tx = new Transaction(params);
+
+        tx.setVersion(txProto.getVersion());
+
         if (txProto.hasUpdatedAt()) {
             tx.setUpdateTime(new Date(txProto.getUpdatedAt()));
         }
 
+        if (txProto.hasIncludedInBestChainAt()) {
+            tx.setIncludedInBestChainAt(new Date(txProto.getIncludedInBestChainAt()));
+        }
+
         for (Protos.TransactionOutput outputProto : txProto.getTransactionOutputList()) {
             Coin value = Coin.valueOf(outputProto.getValue());
             byte[] scriptBytes = outputProto.getScriptBytes().toByteArray();
@@ -621,6 +657,15 @@ private void readTransaction(Protos.Transaction txProto, NetworkParameters param
             TransactionInput input = new TransactionInput(params, tx, scriptBytes, outpoint, value);
             if (inputProto.hasSequence())
                 input.setSequenceNumber(0xffffffffL & inputProto.getSequence());
+            if (inputProto.hasWitness()) {
+                Protos.ScriptWitness witnessProto = inputProto.getWitness();
+                if (witnessProto.getDataCount() > 0) {
+                    TransactionWitness witness = new TransactionWitness(witnessProto.getDataCount());
+                    for (int j = 0; j < witnessProto.getDataCount(); j++)
+                        witness.setPush(j, witnessProto.getData(j).toByteArray());
+                    input.setWitness(witness);
+                }
+            }
             tx.addInput(input);
         }
 
@@ -663,8 +708,8 @@ private void readTransaction(Protos.Transaction txProto, NetworkParameters param
 
         // Transaction should now be complete.
         Sha256Hash protoHash = byteStringToHash(txProto.getHash());
-        if (!tx.getHash().equals(protoHash))
-            throw new UnreadableWalletException(String.format(Locale.US, "Transaction did not deserialize completely: %s vs %s", tx.getHash(), protoHash));
+        if (!tx.getTxId().equals(protoHash))
+            throw new UnreadableWalletException(String.format(Locale.US, "Transaction did not deserialize completely: %s vs %s", tx.getTxId(), protoHash));
         if (txMap.containsKey(txProto.getHash()))
             throw new UnreadableWalletException("Wallet contained duplicate transaction " + byteStringToHash(txProto.getHash()));
         txMap.put(txProto.getHash(), tx);
@@ -698,7 +743,7 @@ private WalletTransaction connectTransactionOutputs(final NetworkParameters para
                 Transaction spendingTx = txMap.get(spentByTransactionHash);
                 if (spendingTx == null) {
                     throw new UnreadableWalletException(String.format(Locale.US, "Could not connect %s to %s",
-                            tx.getHashAsString(), byteStringToHash(spentByTransactionHash)));
+                            tx.getTxId(), byteStringToHash(spentByTransactionHash)));
                 }
                 final int spendingIndex = transactionOutput.getSpentByTransactionIndex();
                 TransactionInput input = checkNotNull(spendingTx.getInput(spendingIndex));
@@ -721,7 +766,7 @@ private void readConfidence(final NetworkParameters params, final Transaction tx
         // We are lenient here because tx confidence is not an essential part of the wallet.
         // If the tx has an unknown type of confidence, ignore.
         if (!confidenceProto.hasType()) {
-            log.warn("Unknown confidence type for tx {}", tx.getHashAsString());
+            log.warn("Unknown confidence type for tx {}", tx.getTxId());
             return;
         }
         ConfidenceType confidenceType;
@@ -740,41 +785,50 @@ private void readConfidence(final NetworkParameters params, final Transaction tx
         confidence.setConfidenceType(confidenceType);
         if (confidenceProto.hasAppearedAtHeight()) {
             if (confidence.getConfidenceType() != ConfidenceType.BUILDING) {
-                log.warn("Have appearedAtHeight but not BUILDING for tx {}", tx.getHashAsString());
+                log.warn("Have appearedAtHeight but not BUILDING for tx {}", tx.getTxId());
                 return;
             }
             confidence.setAppearedAtChainHeight(confidenceProto.getAppearedAtHeight());
         }
         if (confidenceProto.hasDepth()) {
             if (confidence.getConfidenceType() != ConfidenceType.BUILDING) {
-                log.warn("Have depth but not BUILDING for tx {}", tx.getHashAsString());
+                log.warn("Have depth but not BUILDING for tx {}", tx.getTxId());
                 return;
             }
             confidence.setDepthInBlocks(confidenceProto.getDepth());
         }
         if (confidenceProto.hasOverridingTransaction()) {
             if (confidence.getConfidenceType() != ConfidenceType.DEAD) {
-                log.warn("Have overridingTransaction but not OVERRIDDEN for tx {}", tx.getHashAsString());
+                log.warn("Have overridingTransaction but not OVERRIDDEN for tx {}", tx.getTxId());
                 return;
             }
             Transaction overridingTransaction =
                 txMap.get(confidenceProto.getOverridingTransaction());
             if (overridingTransaction == null) {
-                log.warn("Have overridingTransaction that is not in wallet for tx {}", tx.getHashAsString());
+                log.warn("Have overridingTransaction that is not in wallet for tx {}", tx.getTxId());
                 return;
             }
             confidence.setOverridingTransaction(overridingTransaction);
         }
         for (Protos.PeerAddress proto : confidenceProto.getBroadcastByList()) {
-            InetAddress ip;
-            try {
-                ip = InetAddress.getByAddress(proto.getIpAddress().toByteArray());
-            } catch (UnknownHostException e) {
-                throw new UnreadableWalletException("Peer IP address does not have the right length", e);
+            InetAddress ip = null;
+            if (proto.getIpAddress().toByteArray().length != 0) {
+                try {
+                    ip = InetAddress.getByAddress(proto.getIpAddress().toByteArray());
+                } catch (UnknownHostException e) {
+                    throw new UnreadableWalletException("Peer IP address does not have the right length", e);
+                }
             }
             int port = proto.getPort();
-            PeerAddress address = new PeerAddress(params, ip, port);
-            address.setServices(BigInteger.valueOf(proto.getServices()));
+            int protocolVersion = params.getProtocolVersionNum(NetworkParameters.ProtocolVersion.CURRENT);
+            BigInteger services = BigInteger.valueOf(proto.getServices());
+            String hostname = proto.hasHostname() ? proto.getHostname() : "";
+            PeerAddress address;
+            if (ip != null) {
+                address = new PeerAddress(params, ip, port, protocolVersion, services);
+            } else {
+                address = new PeerAddress(params, hostname, port, protocolVersion, services);
+            }
             confidence.markBroadcastBy(address);
         }
         if (confidenceProto.hasLastBroadcastedAt())
diff --git a/core/src/main/java/org/bitcoinj/wallet/WalletTransaction.java b/core/src/main/java/org/bitcoinj/wallet/WalletTransaction.java
index b7d4cdf8c7f..b3445fc3a37 100644
--- a/core/src/main/java/org/bitcoinj/wallet/WalletTransaction.java
+++ b/core/src/main/java/org/bitcoinj/wallet/WalletTransaction.java
@@ -21,7 +21,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
- * Stores data about a transaction that is only relevant to the {@link org.bitcoinj.wallet.Wallet} class.
+ * Stores data about a transaction that is only relevant to the {@link Wallet} class.
  */
 public class WalletTransaction {
     public enum Pool {
diff --git a/core/src/main/java/org/bitcoinj/wallet/listeners/AbstractKeyChainEventListener.java b/core/src/main/java/org/bitcoinj/wallet/listeners/AbstractKeyChainEventListener.java
index 1581455f11e..08d387691bd 100644
--- a/core/src/main/java/org/bitcoinj/wallet/listeners/AbstractKeyChainEventListener.java
+++ b/core/src/main/java/org/bitcoinj/wallet/listeners/AbstractKeyChainEventListener.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/main/java/org/bitcoinj/wallet/listeners/AbstractWalletEventListener.java b/core/src/main/java/org/bitcoinj/wallet/listeners/AbstractWalletEventListener.java
deleted file mode 100644
index b6987c141a9..00000000000
--- a/core/src/main/java/org/bitcoinj/wallet/listeners/AbstractWalletEventListener.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.bitcoinj.wallet.listeners;
-
-import org.bitcoinj.core.Coin;
-import org.bitcoinj.core.ECKey;
-import org.bitcoinj.core.Transaction;
-import org.bitcoinj.script.Script;
-import org.bitcoinj.wallet.Wallet;
-
-import java.util.List;
-
-/**
- * Deprecated: implement the more specific event listener interfaces instead.
- */
-@Deprecated
-public abstract class AbstractWalletEventListener extends AbstractKeyChainEventListener implements WalletEventListener {
-    @Override
-    public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coin newBalance) {
-        onChange();
-    }
-
-    @Override
-    public void onCoinsSent(Wallet wallet, Transaction tx, Coin prevBalance, Coin newBalance) {
-        onChange();
-    }
-
-    @Override
-    public void onReorganize(Wallet wallet) {
-        onChange();
-    }
-
-    @Override
-    public void onTransactionConfidenceChanged(Wallet wallet, Transaction tx) {
-        onChange();
-    }
-
-    @Override
-    public void onKeysAdded(List<ECKey> keys) {
-        onChange();
-    }
-
-    @Override
-    public void onScriptsChanged(Wallet wallet, List<Script> scripts, boolean isAddingScripts) {
-        onChange();
-    }
-
-    @Override
-    public void onWalletChanged(Wallet wallet) {
-        onChange();
-    }
-
-    /**
-     * Default method called on change events.
-     */
-    public void onChange() {
-    }
-}
diff --git a/core/src/main/java/org/bitcoinj/wallet/listeners/ScriptsChangeEventListener.java b/core/src/main/java/org/bitcoinj/wallet/listeners/ScriptsChangeEventListener.java
index 56451eb2205..8ceb916b469 100644
--- a/core/src/main/java/org/bitcoinj/wallet/listeners/ScriptsChangeEventListener.java
+++ b/core/src/main/java/org/bitcoinj/wallet/listeners/ScriptsChangeEventListener.java
@@ -23,7 +23,7 @@
 
 /**
  * <p>Implementors are called when the contents of the wallet changes, for instance due to receiving/sending money
- * or a block chain re-organize. It may be convenient to derive from {@link AbstractWalletEventListener} instead.</p>
+ * or a block chain re-organize.</p>
  */
 public interface ScriptsChangeEventListener {
     /**
diff --git a/core/src/main/java/org/bitcoinj/wallet/listeners/WalletChangeEventListener.java b/core/src/main/java/org/bitcoinj/wallet/listeners/WalletChangeEventListener.java
index b75b99e0719..e521b7b4893 100644
--- a/core/src/main/java/org/bitcoinj/wallet/listeners/WalletChangeEventListener.java
+++ b/core/src/main/java/org/bitcoinj/wallet/listeners/WalletChangeEventListener.java
@@ -20,7 +20,7 @@
 
 /**
  * <p>Implementors are called when the contents of the wallet changes, for instance due to receiving/sending money
- * or a block chain re-organize. It may be convenient to derive from {@link AbstractWalletEventListener} instead.</p>
+ * or a block chain re-organize.</p>
  */
 public interface WalletChangeEventListener {
     /**
diff --git a/core/src/main/java/org/bitcoinj/wallet/listeners/WalletCoinsReceivedEventListener.java b/core/src/main/java/org/bitcoinj/wallet/listeners/WalletCoinsReceivedEventListener.java
index 3242146af8a..86ed9802560 100644
--- a/core/src/main/java/org/bitcoinj/wallet/listeners/WalletCoinsReceivedEventListener.java
+++ b/core/src/main/java/org/bitcoinj/wallet/listeners/WalletCoinsReceivedEventListener.java
@@ -18,11 +18,12 @@
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.Transaction;
+import org.bitcoinj.core.TransactionConfidence;
 import org.bitcoinj.wallet.Wallet;
 
 /**
  * <p>Implementors are called when the contents of the wallet changes, for instance due to receiving/sending money
- * or a block chain re-organize. It may be convenient to derive from {@link AbstractWalletEventListener} instead.</p>
+ * or a block chain re-organize.</p>
  */
 public interface WalletCoinsReceivedEventListener {
     /**
@@ -30,7 +31,7 @@ public interface WalletCoinsReceivedEventListener {
      * was broadcast across the network or because a block was received. If a transaction is seen when it was broadcast,
      * onCoinsReceived won't be called again when a block containing it is received. If you want to know when such a
      * transaction receives its first confirmation, register a {@link TransactionConfidence} event listener using
-     * the object retrieved via {@link org.bitcoinj.core.Transaction#getConfidence()}. It's safe to modify the
+     * the object retrieved via {@link Transaction#getConfidence()}. It's safe to modify the
      * wallet in this callback, for example, by spending the transaction just received.
      *
      * @param wallet      The wallet object that received the coins
diff --git a/core/src/main/java/org/bitcoinj/wallet/listeners/WalletCoinsSentEventListener.java b/core/src/main/java/org/bitcoinj/wallet/listeners/WalletCoinsSentEventListener.java
index 105f95c8462..712d8410727 100644
--- a/core/src/main/java/org/bitcoinj/wallet/listeners/WalletCoinsSentEventListener.java
+++ b/core/src/main/java/org/bitcoinj/wallet/listeners/WalletCoinsSentEventListener.java
@@ -22,7 +22,7 @@
 
 /**
  * <p>Implementors are called when the contents of the wallet changes, for instance due to receiving/sending money
- * or a block chain re-organize. It may be convenient to derive from {@link AbstractWalletEventListener} instead.</p>
+ * or a block chain re-organize.</p>
  */
 public interface WalletCoinsSentEventListener {
 
diff --git a/core/src/main/java/org/bitcoinj/wallet/package-info.java b/core/src/main/java/org/bitcoinj/wallet/package-info.java
index a863bd6eb3d..ce2b069f326 100644
--- a/core/src/main/java/org/bitcoinj/wallet/package-info.java
+++ b/core/src/main/java/org/bitcoinj/wallet/package-info.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/paymentchannel.proto b/core/src/main/proto/paymentchannel.proto
similarity index 99%
rename from core/src/paymentchannel.proto
rename to core/src/main/proto/paymentchannel.proto
index 0b860e6e029..ddea1a2a33d 100644
--- a/core/src/paymentchannel.proto
+++ b/core/src/main/proto/paymentchannel.proto
@@ -19,9 +19,11 @@
  
 /* Notes:
  * - Endianness: All byte arrays that represent numbers (such as hashes and private keys) are Big Endian
- * - To regenerate after editing, run mvn clean package -DupdateProtobuf
+ * - To regenerate after editing, run gradle generateProto
  */
 
+syntax = "proto2";
+
 package paymentchannels;
 
 option java_package = "org.bitcoin.paymentchannel";
diff --git a/core/src/paymentrequest.proto b/core/src/main/proto/paymentrequest.proto
similarity index 97%
rename from core/src/paymentrequest.proto
rename to core/src/main/proto/paymentrequest.proto
index e01d514cddb..c980f7b86a2 100644
--- a/core/src/paymentrequest.proto
+++ b/core/src/main/proto/paymentrequest.proto
@@ -19,7 +19,7 @@
 
 /* Notes:
  * - Endianness: All byte arrays that represent numbers (such as hashes and private keys) are Big Endian
- * - To regenerate after editing, run mvn clean package -DupdateProtobuf
+ * - To regenerate after editing, run gradle generateProto
  */
 
 //
@@ -30,7 +30,10 @@
 // https://en.bitcoin.it/wiki/Payment_Request
 //
 
+syntax = "proto2";
+
 package payments;
+
 option java_package = "org.bitcoin.protocols.payments";
 option java_outer_classname = "Protos";
 
diff --git a/core/src/peerseeds.proto b/core/src/main/proto/peerseeds.proto
similarity index 97%
rename from core/src/peerseeds.proto
rename to core/src/main/proto/peerseeds.proto
index c9c6ca7ef66..57ccb192739 100644
--- a/core/src/peerseeds.proto
+++ b/core/src/main/proto/peerseeds.proto
@@ -1,9 +1,11 @@
-package org.bitcoin.crawler;
-
 //
 // A simple protocol for describing signed sets of IP addresses. Intended to be distributed via HTTP[S] or in files.
 //
 
+syntax = "proto2";
+
+package org.bitcoin.crawler;
+
 option java_package = "org.bitcoin.crawler";
 option java_outer_classname = "PeerSeedProtos";
 
diff --git a/core/src/storedclientpaymentchannel.proto b/core/src/main/proto/storedclientpaymentchannel.proto
similarity index 96%
rename from core/src/storedclientpaymentchannel.proto
rename to core/src/main/proto/storedclientpaymentchannel.proto
index 1ca38420429..3ba91932f2b 100644
--- a/core/src/storedclientpaymentchannel.proto
+++ b/core/src/main/proto/storedclientpaymentchannel.proto
@@ -19,15 +19,16 @@
  
 /* Notes:
  * - Endianness: All byte arrays that represent numbers (such as hashes and private keys) are Big Endian
- * - To regenerate after editing, run mvn clean package -DupdateProtobuf
+ * - To regenerate after editing, run gradle generateProto
  */
 
+syntax = "proto2";
+
 package paymentchannels;
 
 option java_package = "org.bitcoinj.protocols.channels";
 option java_outer_classname = "ClientState";
 
-
 // A set of StoredPaymentChannel's
 message StoredClientPaymentChannels {
     repeated StoredClientPaymentChannel channels = 1;
diff --git a/core/src/storedserverpaymentchannel.proto b/core/src/main/proto/storedserverpaymentchannel.proto
similarity index 95%
rename from core/src/storedserverpaymentchannel.proto
rename to core/src/main/proto/storedserverpaymentchannel.proto
index 6187261fbe1..4eb809ea7d8 100644
--- a/core/src/storedserverpaymentchannel.proto
+++ b/core/src/main/proto/storedserverpaymentchannel.proto
@@ -19,15 +19,16 @@
  
 /* Notes:
  * - Endianness: All byte arrays that represent numbers (such as hashes and private keys) are Big Endian
- * - To regenerate after editing, run mvn clean package -DupdateProtobuf
+ * - To regenerate after editing, run gradle generateProto
  */
 
+syntax = "proto2";
+
 package paymentchannels;
 
 option java_package = "org.bitcoinj.protocols.channels";
 option java_outer_classname = "ServerState";
 
-
 // A set of StoredPaymentChannel's
 message StoredServerPaymentChannels {
     repeated StoredServerPaymentChannel channels = 1;
diff --git a/core/src/wallet.proto b/core/src/main/proto/wallet.proto
similarity index 95%
rename from core/src/wallet.proto
rename to core/src/main/proto/wallet.proto
index 190070273c1..3b69a67719c 100644
--- a/core/src/wallet.proto
+++ b/core/src/main/proto/wallet.proto
@@ -20,9 +20,11 @@
  
 /* Notes:
  * - Endianness: All byte arrays that represent numbers (such as hashes and private keys) are Big Endian
- * - To regenerate after editing, run: mvn generate-sources -DupdateProtobuf
+ * - To regenerate after editing, run: gradle generateProto
  */
 
+syntax = "proto2";
+
 package wallet;
 
 option java_package = "org.bitcoinj.wallet";
@@ -32,6 +34,7 @@ message PeerAddress {
   required bytes ip_address = 1;
   required uint32 port = 2;
   required uint64 services = 3;
+  optional string hostname = 99;
 }
 
 message EncryptedData {
@@ -132,6 +135,16 @@ message Key {
 
   // Encrypted version of the seed
   optional EncryptedData encrypted_deterministic_seed = 9;
+
+  // The path to the root. Only applicable to a DETERMINISTIC_MNEMONIC key entry.
+  repeated uint32 account_path = 10 [packed = true];
+
+  enum OutputScriptType {
+    P2PKH = 1;
+    P2WPKH = 2;
+  }
+  // Type of addresses (aka output scripts) to generate for receiving.
+  optional OutputScriptType output_script_type = 11;
 }
 
 message Script {
@@ -142,6 +155,10 @@ message Script {
   required int64 creation_timestamp = 2;
 }
 
+message ScriptWitness {
+    repeated bytes data = 1;
+}
+
 message TransactionInput {
   // Hash of the transaction this input is using.
   required bytes transaction_out_point_hash = 1;
@@ -153,6 +170,8 @@ message TransactionInput {
   optional uint32 sequence = 4;
   // Value of connected output, if known
   optional int64 value = 5;
+  // script witness
+  optional ScriptWitness witness = 6;
 }
 
 message TransactionOutput {
@@ -254,6 +273,7 @@ message Transaction {
 
   optional uint32 lock_time = 4; // The nLockTime field is useful for contracts.
   optional int64 updated_at = 5; // millis since epoch the transaction was last updated
+  optional int64 included_in_best_chain_at = 1000; // millis since epoch the transaction was included on the best chain
 
   repeated TransactionInput transaction_input = 6;
   repeated TransactionOutput transaction_output = 7;
@@ -327,16 +347,6 @@ message Tag {
     required bytes data = 2;
 }
 
-/**
- * Data required to reconstruct TransactionSigner.
- */
-message TransactionSigner {
-	// fully qualified class name of TransactionSigner implementation
-	required string class_name = 1;
-	// arbitrary data required for signer to function
-	optional bytes data = 2;
-}
-
 /** A bitcoin wallet */
 message Wallet {
   /**
@@ -390,8 +400,7 @@ message Wallet {
 
   repeated Tag tags = 16;
 
-  // transaction signers added to the wallet
-  repeated TransactionSigner transaction_signers = 17;
+  // (field number 17 was used by transaction_signers)
 
   // Next tag: 18
 }
diff --git a/core/src/main/resources/org.bitcoin.production.checkpoints.txt b/core/src/main/resources/org.bitcoin.production.checkpoints.txt
index d64c66537e4..6f54d898581 100644
--- a/core/src/main/resources/org.bitcoin.production.checkpoints.txt
+++ b/core/src/main/resources/org.bitcoin.production.checkpoints.txt
@@ -1,6 +1,6 @@
 TXT CHECKPOINTS 1
 0
-197
+276
 AAAAAAAAB+EH4QfhAAAH4AEAAABjl7tqvU/FIcDT9gcbVlA4nwtFUbxAtOawZzBpAAAAAKzkcK7NqciBjI/ldojNKncrWleVSgDfBCCn3VRrbSxXaw5/Sf//AB0z8Bkv
 AAAAAAAAD8EPwQ/BAAAPwAEAAADfP83Sx8MZ9RsrnZCvqzAwqB2Ma+ZesNAJrTfwAAAAACwESaNKhvRgz6WuE7UFdFk1xwzfRY/OIdIOPzX5yaAdjnWUSf//AB0GrNq5
 AAAAAAAAF6EXoRehAAAXoAEAAADonWzAaUAKd30XT3NnHKobZMnLOuHdzm/xtehsAAAAAD8cUJA6NBIHHcqPHLc4IrfHw+6mjCGu3e+wRO81EvpnMVqrSf//AB1ffy8G
@@ -198,3 +198,82 @@ AA47uLb+n9qZN5rSAAX3wAQAAADn3BPGQhTIArt8qQkINh9JExTc03nzYAoAAAAAAAAAAC4SBqkpKQ20
 AA76M7POkqug+Z9NAAX/oAQAAAAHKZZL8pX2fjMkS4/MHTd+3Iy6+KVziQMAAAAAAAAAAKSFN4eizDLUmtQ5PfjBNPpmfmpaQcJ+wjCSqsN+dzFhKvGVVhuzCRhZxxSe
 AA/KDQ5jmSg3XpPsAAYHgAQAAAAZex89L6zCAW+MKtz3OioFPZF0GUfsuAQAAAAAAAAAADLy7iIjtSj6g5Q+8aIgDxvKKG1lW4AEriAH4zQlNwM6OWSnVvAoCRg6ZpfC
 ABCmKY/w5K9ccX99AAYPYAQAAADE/juFAwCo8NeGCeT0q8etEEIc7y5XXQcAAAAAAAAAAN17xvJ5b6zUu6ZM4I8ALN6/1Ga9wQD/uegKKCxXpIeROMS2VhShBxgC8+Oh
+ABGubW6S48XcALNeAAYXQAQAAAAgvLMxNKb+P5jwSIK6kkPHjWQH/NueTwcAAAAAAAAAAKqOJteTwad0SMWRI8hg+EKqq9ybNkMoXsmulA+kudEOyAvHVp+5Bhj0mtfn
+ABLaMjZMj0fVGWBNAAYfIAQAAADqsdQ60ilyN2qK707hr5NIfzorxtmkxAMAAAAAAAAAAAdmm8141IyLhH6c6nbSJ6VrVLyibtpcSvr9VSpQoK+0hBnaVqjwBhjZyz3h
+ABP8sJiJmTFclF8ZAAYnAAQAAABHPte37y/Ogowxj9XlhoNEpTVsnpO2BAQAAAAAAAAAAEQJyuW3svjxjqVfVYyb+nxfR3ihpTFypI/FfhctDtPSZMXrVsOkBhivm8HH
+ABUsJBbzwzhj/RTNAAYu4AQAAAD37yiBuKDLQVuoHoicebxfGwmBZ8lWRgMAAAAAAAAAAKSIaf6NZ3eCH6hVJROct30SxEDBYYLGN+lD3+p9k32qexb+VvSWBhhWKCct
+ABZeFeYwv+kd3mJ7AAY2wAQAAACJUWxLbjfVgA+fnjYJOiuNqEDXrOJFVgQAAAAAAAAAAJtNP14hQ/GkVCrywXZ4CgxX72aDphhfHF+Nih2UWbLkBVQPV0snBhhclofi
+ABeltF+z3kz9tZTwAAY+oAQAAADR7x73u97v/1ByQ7M+/tZHZYwwOKHmgQMAAAAAAAAAAETWTugwPNlatypt7HduiToghEoXJhzY1x2YAHP6aZITrskhV3YnBhhaaUYC
+ABjtTYrOHh0qfIZKAAZGgAEAACC8uMT/qxBBSnWtThC/67Ff5gIhu90AIQEAAAAAAAAAAO7KSzplx9PRqtr6XfVNa77PAZgw+qVEYJBCnVfp9e5DYsQyV/qoBRhCJKGr
+ABpRfLdgJt4nqRNjAAZOYAQAAADmLvKMuXk/T5zSpnpYwee1kxKbm+VWbwQAAAAAAAAAAGSfiOKI1oe8gZu13AlKjE939fRsL2osAVIllw97PFFXdsFEVzaEBRigCrKE
+ABu+78vXOVeKMGz1AAZWQAQAAAC7kyyQhvxEfu3SQkVNRZNvR/SRHikcvQEAAAAAAAAAAPrreBAfjCpsAEti4TRoZ1m3UmWvpBs/zI7c31XPADDj9oVXV6CbBRi2fCdV
+AB0mcOta9RlcQHkgAAZeIAEAACDNHXKw/agnsGcB2HlbfO3Wb/91M0h6wwEAAAAAAAAAAHO4pz6FxGfyz45cs3SgR4/MpfRnt7UwhSKVEaFATK6uQs5oV9Y/BRgO0kEv
+AB6mfdbrgpnwJCwPAAZmAAAAACBCLsOepCYOv0JCHb+GM1fEmFLawrQEGAUAAAAAAAAAAPnen2pzKIQ99/GjckUdhUzoQxvp3eaGMNlal3NweVcOMe56V/0mBRi+cadQ
+ACAtxfsiGV2z0xFqAAZt4AAAACDh2VuHjAFXFHz3IpMZ8BFDKffxiHj/SwMAAAAAAAAAAGA+JCR1kdW3pIFA/zuSI+PMFCTWoRZ0YDqTbhQyQcoHwmSNV2kmBRh4+yfw
+ACG1N1Lmnz65gcjUAAZ1wAAAADAhYiwmpOYsr6jkNMfgg/VAvMyDkjy0BgUAAAAAAAAAAEj6xboior1IrAoZHNGBEYjQ2Kje4gVpfSmkFC3OZu+gguugVyhyBRj9s3TO
+ACMnalaEJ1NTfQI5AAZ9oAAAACC5fXDa4zD0YCudAQ8FeDmjUAea4WhwkwMAAAAAAAAAADp+YYP4pmo57SYqnmIshNH5qkvcEszlYEEz5KjgAfqRAhGyV9wOBRgYcYix
+ACS1/dDcjk/vG+0YAAaFgAAAADBxOa6PS2sbIN7ep414bHCqZbmePOz24gIAAAAAAAAAAG6AhNzsYuvOL4V4labW7wL878syYnk9WxrOFWY2xQXkdULEVwj7BBiJ1sZx
+ACZKxHB79ab4pJEeAAaNYAAAACCxliE8dmLJ4CSzvJX4FUO7YjWxNmYHswAAAAAAAAAAANxevoKSYvotUK1wKjEkvrYhWtFRgroZhfZ6HQEdJRcMi03WV17eBBgvWejH
+ACfo3I9pX8Vg+F38AAaVQAAAACDVu7BS4xgWVM6zEOwFAjuj+wwdHZa4JQAAAAAAAAAAAP2sl0wjNKxVo9NGX5riTpBQZyeLPYvLOFh64GhzY1WMB5bnV9SOBBhlmsXv
+ACmjLx/5YpHTniFvAAadIAAAACAlCbO45PmCkMfJVR0YDrKkY/C5eIvVIQQAAAAAAAAAAKqNoGCd1mcCs+i1I7Wi1Lv1jroo7bHepqVSZRYRkszZKtD4V8RABBh++Xtk
+ACt9MvFVV3nfpKwMAAalAAAAACCjLo4nRVIWoC1HBLOjxHMc80EX1GjZfwIAAAAAAAAAAJSPpGVCwtMaN3M9ygOyzIL/rcBn/WA0efZNdz/PwTgB0qkLWNJVBBg9TuO0
+AC1OOf5J2N/elcOrAAas4AAAACClkM9dyJtNLsIhRAlyMdEJwKK4hDGiZAMAAAAAAAAAAKN+LTmq8x2L18AKB/qXhP7oirNhCC8DYBEZ2sSg2HyNAg0eWHRRBBibZltl
+AC8hHXGkPdcuVDR1AAa0wAAAACD/cu5pp48ULk+ldNcleEBgQEIEpdQuKgQAAAAAAAAAAHU7sAH14dJP9aV9uCd4sKl/gx396hdhNq3gFi01w1CsF7wuWNTmAxhrynAR
+ADEl0i+0xC2+0MbMAAa8oAAAACDTxa+JdxdIkPF+GouU2Rntb4DyE592XwIAAAAAAAAAAC5Atl/p/FL5QjniJgRHOm9GFoTgaEkkyfndzyMUoN6hguBAWInVAxho9k9N
+ADMzpbAMPo21HkkvAAbEgAAAACD/RceD0JcG41ncx2CD4V5Rg55O1TH/swAAAAAAAAAAAIQVlwvcyDUpOhEO4jh5dEs+FTj1GaP2+QmNotoCqdQzwfFRWIWLAxjG3f4O
+ADVsV7hkrnpwZcyeAAbMYAAAACDwZ24cV3C7qIhqq9iL/T7CZs5oI8vNHgIAAAAAAAAAABjU10kV7C0+g1eqjT5QD4ZeokqZ0NKsN41JYm5nuMmzJ/ljWP91Axh6IlTj
+ADey3SPIpnwtZ+nrAAbUQAIAACBsEgkEvq5p/Rx9P3I6P9zBJyuGO7MslwEAAAAAAAAAABusRqpnJ9rdKjeMBijz6TSo4tfR+TPF98Qw2ggdq0CN9GJ1WHlDAxggViTG
+ADocpOmmgGMKNFU2AAbcIAAAACA+evIAa711Ial9nNhBzAxngI0BsdImywAAAAAAAAAAAI24Czc2VsD4Mg6PTX+zNtohrAfjoruMFLnRJPSjLyRnxDeFWEfMAhh7mQNN
+ADztMjVjN2XegxWfAAbkAAAAACD0IUtha4NA5/e01gxpnJLNymYvArTedgIAAAAAAAAAAIlSU/fahyQ4LTjcyd0FqnYoFn2u8Ty+LZs6tWv+iXkUCWaWWLmaAhg8hAWG
+AD/zSsNCs+c6akJ0AAbr4AIAACAXD60LaxzL3EQB17HI7oaMaXfWzhJ5WAAAAAAAAAAAAOYp8InMviL4HtmJZ+qXbpQZa8lqYCLwZB7gwEnpTc4LEhaoWJN+Ahi5Hn+P
+AEMbgr5qXa66E8ZpAAbzwAIAACDI57WbtoNcjZuu68zYzr0eIsRqJJqYnwAAAAAAAAAAAPX/tG09B7hqaw09bNTpqlu6LSU3NCZW9Wc5u2QaeMaXTr65WN9iAhhUYqAB
+AEZoYHlBPSBbr3gxAAb7oAIAACAH1iE5ncNJo/fFTdZtBxMs6MSJi+2LAwAAAAAAAAAAAEguaQj5jPDyXdaqhlieIH6e4iBSliCangqNRT67w1A0/5/LWLFPAhhCxCu3
+AEnQoxdDwQphqRzIAAcDgAIAACDNtgpyTJf65DaaZkbLtrSlowAHWH30IgEAAAAAAAAAAPP4LeHjZPYWiIpTNZtu4pShjH6ZQAPVMaUuCUpSQJEGrDTdWFozAhgqr7Qk
+AE1kxf+UqjKJBDiUAAcLYAAAACCZ7QwAT9f0nw5QAqlk89D+vZBqpZ6tcgEAAAAAAAAAAFxkwm2ofXOccNo4M0KkS7ST+vKvrvhUEcxoEAL/sKsOpunuWHMcAhjUm2BO
+AFEftqLxzn0eR9qEAAcTQAIAACBx3BDH0Kh8Fnu1v8WZll4FxzOynULXAQIAAAAAAAAAACdBXTfPF0ByEQdNFp52bRgRyS8fEEbSJQgHrASPAxmcUVUBWT4bAhiVIS9H
+AFTc0w4mC90KhU9hAAcbIAAAACABgs9JpUR8CNbE/WGfkGy/79uKKptUwAAAAAAAAAAAANQNMFOfWTFb4YvHrCLuS3dwGavPGkXzJl6+H9boQj/TwIsSWaf2ARgA0Z/e
+AFjfmkHxo0TiewZzAAcjAAAAACD990Cw5Jz3W7PVFo+zWG92E9zFzYlnWwEAAAAAAAAAAC43sUTAus7Qfrfntk2pFs0xIfJCcAVVGusOxqZAKsfX8OQjWVTYARh/Xan1
+AF0kV5ADzGNCCJLEAAcq4AAAACCoGJH1orG0in8CAflT/1tGl12En7IxOgEAAAAAAAAAABngc7dr0++rCbkOMxmNUC6BwrSKgFVWaXqbC9Z1kGs2mxo0Wa+eARhX3jJH
+AGIA7PpiYqjrFEnBAAcywAAAACA0cRAbvaP+MHZksyg6nvDpfZo4p+rNiAAAAAAAAAAAABDIq6hHm7ql4ISBUv08IonKUOHD5YyaT6qvvfWAPFRI3bhFWX6LARjkOoHT
+AGcZ3nr5KS2Pc8sQAAc6oAIAACCZ1qcMVHu6oaggSQvQLMN407xuIEaUOAEAAAAAAAAAALZqCwJM/fB9Ddl+GK1u8aQRsEUhKdO/4+brrlXe/sTdlUJYWTCNARi8JgoI
+AGwtVR5QbbP7+NYNAAdCgAAAACDc8lFxBEpdPYP10NB3dPTebmsFfyse9AAAAAAAAAAAAIqaQsinfGejMjtzlgVoO1H9HkGbtAp0H9y7Ea8y+i0itoRoWdxdARi51QOB
+AHHwiS0wpgoU4a2uAAdKYAIAACC4eVrYZELObYKJcY195BPnOHWbcXMDDgEAAAAAAAAAAC9LtwzWjKpXXeYF6TpIN+wGjqi8hahEW63uWpIUruMomsh5WTVHARjEptgJ
+AHgZ3qmCxIkEdFyPAAdSQAIAACBmozoTm7ZwYR1xZUlhh3dbrQPXC9HiUwAAAAAAAAAAACB01a+exTUMb8xLXN3oEu5GAt1QA4rgb6aIs/4iQJCf4gGLWeAwARhJp86v
+AH62plJTHFrWpLjpAAdaIAIAACCAG4FikzS+jnr16/ud8JwY4fgztfDvywAAAAAAAAAAAEDRygd/7+f7eXcRuqDAY+ypuO2Uaa4BKJgrRK0MJThkkTKeWek8ARgi/1Qi
+AIUTNK0P3kp+jZI2AAdiAAAAACB4IgQMwEdDBLImi4thEzFMfB7WimOt0AAAAAAAAAAAADxwUP3ctm4wgFMTeDsSsSxsYsDrwyO5JXbZSA4DQLmHw/avWQsxARh2Zc5p
+AIuvP/EAUEY/eZ48AAdp4AAAACChi8JZfSP7eFbEyvTKqNeidphjQ6m9pwAAAAAAAAAAABMYNEx8WGnQzO0yKAG2lntPZvbc3DGn+5T2DU5f3XYFNGi/WRj/ABhT01Vf
+AJOWbjJFnoH8w2ISAAdxwAAAACBhjkMKwWl3WZliupk0hyPpY4N8MGps+wAAAAAAAAAAAI3r4znB2OjMHzJ4LgRcsFKQed5nBd7UAnTHketY2a4yAojRWXP6ABjYNa/f
+AJujLZFGK2U7jmYBAAd5oAAAACDZXG7YWfHa/yfFmfHx3LEPqrz/R4FAbwAAAAAAAAAAAHeJUflLt8RCKl7vCcWt2zkGOhJvC8pwh05/YSs+PSwzbt7iWTDrABgbBtzU
+AKQ10C7DKtkVjGQHAAeBgAAAACC06p4elhmvzrndOTx91MCSdz009zy+4wAAAAAAAAAAAMhj08Y+iZ7h9uMg5zsbKn9utdrVasel4WhCGpMt79Ub2hLyWb3BABgwGeUD
+AK6dnX5YX6bYxakBAAeJYAAAACBpopofHqz8DGjp1cH5IH5ll/He1gn7swAAAAAAAAAAAEcfGy5Yer3X5Jf6aFd7YUvadTrELBgixG5yiuiz8mMcL8IFWkvOABhGVPBx
+ALhjXJ75VIpo6JKGAAeRQAAAACCYKvxq+oBeISruI6Wz3y+04UVBBB/nvwAAAAAAAAAAAEGhEf0MnVYLWlZWQM2e/GZkkCsKTxocdj1ppfi/z9xjrHgYWvbQABgNbgyL
+AMIJZ3KMyNccgCcuAAeZIAAAACBl165IP0v4xn2hf9HL0ZYPnORu9b/jzgAAAAAAAAAAAIqwdYAuU8F/SVUQIJH3F0Q8KyGIaWt/4QwykQuEUZIdeRkoWu2wABjQAO0Q
+AM1urjbAzuVkCJbTAAehAAAAACDjfICnqLhQ4+ia3QkJC2uJuHRJZRPviQAAAAAAAAAAAChd3HmF58NOsgXSwxKXJ/e8EIc+EeBUtI0aknhqQtfSyMg3WkWWABibOqeS
+ANrZM7W6oNFt8uZnAAeo4AAAACDdX5Qm4nuyoj9Y4VriMauNMXxBZ6AFMQAAAAAAAAAAAGLVx5fnY6BKSpQjKjfcc8C9mTHoCoOlzz1Xb5CwEbUZWrFJWsGRABgSLQaq
+AOiuWCg9RKgiU0urAAewwAAAACAjkiq3e+Ve/QXO4SOSork3k/Jmn6MNcgAAAAAAAAAAADy5mlToNW73oLuFQh7YzHg3NFhngjaNfLCu1d4M/pVhYrFZWoxXfhdJt4bf
+APijmUI2IMbP+2pXAAe4oAAAACBM/YPL1ZJj9/n3BvEUFYY4ICzVy1eJagAAAAAAAAAAALp9U/IU2smDwyedYEAoN8kvXRZmTbNpL4oGbgFQkLGCtH1pWkYhbBflmY/7
+AQtIxK9jt5XeADXIAAfAgAAAACCBBqw8e44DUlaAnv6UjDiUF1QyVOVoawAAAAAAAAAAAM5recvHh4mNgVvBlCSK4/Jhi+vcsxryfJnhJD1eKEYyVzV6WvjpYRcRjX1F
+AR/fzayx9nuiacKMAAfIYAAAACDO+kcNtN8CqD3VGt9QEtvqAgOf6t7JAQAAAAAAAAAAAAJVqpnEuysv0y+KFVCd0QW055B31OyVHpJXOuquqbjba9qLWtyXXReVC7vR
+ATVqTsduFrCR3WRiAAfQQAAAACDRBJtmkoyHSm9OfuU/amIKUxGBd6iqEwAAAAAAAAAAAJqS+ximZ7/e6Oqu6Y2826uwkqPJ9R7yuHuQJ01UhIp/vsWcWqOJVRcEraJw
+AUz8BKngasmFxGtjAAfYIAAAACAwTKyssD5pyDS7/0vlMkowmJt4mKpnLwAAAAAAAAAAADezJ/Yacj838NQgdAlCR6Tp95q8LTWAQwdaZM9suE+3IlCuWklKURd9IESy
+AWXI367hnoV6V9zpAAfgAAAAACB5yZNwQc6+27xRkPbcbFuyJ+6YIwdfLgAAAAAAAAAAAHO/8/9O8Ui1rvLaH5hEzap0MPcwldOTvrvTlWSaj/9I1YTAWrcqUBcMmrXm
+AX7u8fTowemGBM0dAAfn4AAAACAYDV0zdLyxX+sWip70ujsF4q0gfETXKAAAAAAAAAAAAI1E1QMy+cLTC20QKlRrr7Af1S03Ni1yaPT9k4gGli3NZGfRWg1QSRdLHQYe
+AZpuw9LU3K9Yi6dQAAfvwAAAACAQZWFUV2wXJJWeqglMLb6HMwS5RpTYQgAAAAAAAAAAAMforTYxahXrERK4dhIyr2OWT/bCi0HXBX5YWXb/t2JMXQjjWlP7RReXH+lF
+Abc9mZiFlmDZF06CAAf3oAAAACDWa9SFVsinzt44IaA0SBcTLKubNk3sGAAAAAAAAAAAAKtczARVeFx0TAiZB0DG74AGATVTY4oYVswDDRTv6Uxox/f0WqnsQxdBDCJJ
+AdTr1i38PmyiFZ5sAAf/gAAAACB4ZuuNURVJDIWcDfYXO5ZrxMY3ImxKDQAAAAAAAAAAAJ5OdtT4l3HpapzTwfdfSuEc6sNOOITWBqJEjjdZZ9IUNbwGW0laQRdCG9nt
+AfPFgOhy1wDEwBC6AAgHYAAAACBqtiGOq5D48LeQU65Xa+B8IyHahrmtMQAAAAAAAAAAADlUYADGVX+lwB8xxK51Aof5PKccBvhJNPUFvzJh+wMl3tMWW0H4OBfe970O
+AhcowLPm4MSblXVuAAgPQAAAACATm0wBBag0mPkplc0zk1WJN80BEvQdAwAAAAAAAAAAAIlmBPoOz5WwdnN3xVsIAdIMAVXSmbuy/uYrbfC0dzkJ7cooW1ZvNxdWhKeI
+AjuG9ZjLnxX5qtizAAgXIAAAACDYzyjPVWQMfqZhUfRsLd3JS+GN/IvGIAAAAAAAAAAAAFHksafEa/I1XtqntoZ32R2wlMPh8K6/sbKQa8woDPSj/UU6Wyh6NBc545gl
+AmHxd50qYovic1m8AAgfAAAAACDwK5wok0gExoguH4yK872mRn0iLuXcCQAAAAAAAAAAAEBuodyPhcLelI0f+rpug3n/VDPohe/T0TQiidj9B+5DmWdNWxdaNhf6H6J4
+AocJntsfncQRNhF5AAgm4AAAACD+Fi95ceJM/+CsiRaFFUEUz03k9JLKLgAAAAAAAAAAAKprEDp2Vq3kFitaooGc74BKhddkkRfoJqbsaUZb1sjhk3hdW3tPLxdc6RrD
+ArGmue8BkhE2O2eFAAguwAAAACDF7sKQecJh3F4TffJV/1PwlURf6D2UAAAAAAAAAAAAAEHVzdgjWDQ1xUVucTIqz3mb/0iksYF40IiT1IEJ93sWK69uW6cNLBcKESRc
+At9qSfVMp/iybC+YAAg2oAAAACDPsRJxflyQ79R2wRdtX1uoqpM32UidHQAAAAAAAAAAAFGjv1vfVTUk9oQdbi43LK7dar/Kp74eg7UNEIwO+tA6VzeAWy3XKReXHySN
+Aw+ZY3Zvo76cg6xfAAg+gAAAACDOK/C5+6SApOvZ7bjo+Vy60Ua1FuZ3GAAAAAAAAAAAAGQ3cXV+MYgH/kPPpmqjJAo7rUgxz5hU9n08OQubdnZ6H+2RW6EZKBePcQzX
+A0HfsrWhrUX/AS70AAhGYAAAACCke7zeOAAMRUgCSw8mtIrWKS8/eCzrJQAAAAAAAAAAANtrcrSw1Vf2lYZTvXiofzXjV7uhkbydtdfvFYJfbR9W+w2kWx9aJxctEW7n
+A3Ua0mxdHmZ6i9CgAAhOQAAAACDihzv+Fzl2xvyjuUOjjOhGzJ13p7hhDAAAAAAAAAAAAAa0s5HbL10ZtHHgWwcQShZ3cNG/WD6FxZh1d3MukiaGAsa1W5HBJRd47Eoj
+A6p/xq47klb8dUKnAAhWIAAAACDGSqyFPFpIQQ3a7mcBZCu5oKbb/qnbAwAAAAAAAAAAABrjq2aDGqfl7vaTs/7YYWxgGRjhdjRyh791ZinAmqQHG+/IW70vJxeCTESF
+A93yCPQZPI+uNBqlAAheAAAAACB72/e2Vw4+TvIo3pk/iVWSFrZ+7VvHGgAAAAAAAAAAAH3IV1wi9LLm56mnIQsX+BbEzUTE2/VXs8aaXzOM5jIJ+GfbW5ItJxcEKAsy
+BBFmqAAfbeNmLFCnAAhl4AAAACBmF+NNB4n+fX0oF/2E3qKoyM3F6ZZXDgAAAAAAAAAAANfsscIddXjoVx+x2mAvgTWqjkMmq0LNUHDuzFOMrwTs/FfvWy9OKhdhIu7X
+BEENCGeaYj2soniZAAhtwAAAACDirLPnHk5EOvSOgdOB3qfTXi6NXmn+FQAAAAAAAAAAAH8q2iJNxK+6bKNwELCZwCMiy13yT87bD/W4f7PKZO6uoBoFXHzZMRdx8oYe
+BGl9nUzOC8OwGd2XAAh1oAAAQCDTstfWGtLZX/vVVtngDweHdCNgCo2gFQAAAAAAAAAAANGSdDosGQp0Ifkv7+klBVede47aVoys7hOyV1GscExmnYMZXPQeNxchuuPn
+BI4RD4GFzbbLp2U9AAh9gAAAACASCzJkVi1J31nEAKDydkSNsqmqS/b0CAAAAAAAAAAAAFy0tSFQ/n3sIXt020JORC74skEFwkTrrrWfY425xI7zyU8qXKUYMhe0EqUw
diff --git a/core/src/main/resources/org.bitcoin.test.checkpoints.txt b/core/src/main/resources/org.bitcoin.test.checkpoints.txt
index 189d0267664..6911a663ad9 100644
--- a/core/src/main/resources/org.bitcoin.test.checkpoints.txt
+++ b/core/src/main/resources/org.bitcoin.test.checkpoints.txt
@@ -1,6 +1,6 @@
 TXT CHECKPOINTS 1
 0
-339
+719
 AAAAAAAAB+EH4QfhAAAH4AEAAAApmwX6UCEnJcYIKTa7HO3pFkqqNhAzJVBMdEuGAAAAAPSAvVCBUypCbBW/OqU0oIF7ISF84h2spOqHrFCWN9Zw6r6/T///AB0E5oOO
 AAAAAAAAD8QPxA/EAAAPwAEAAADHtJ8Nq3z30grJ9lTH6bLhKSHX+MxmkZn8z5wuAAAAAK0gXcQFtYSj/IB2KZ38+itS1Da0Dn/3XosOFJntz7A8OsC/T8D/Pxwf0no+
 AAAAAAAALUAtQC1AAAAXoAEAAABwvpBfmfp76xvcOzhdR+OPnJ2aLD5znGpD8LkJAAAAALkv0fxOJYZ1dMLCyDV+3AB0y+BW8lP5/8xBMMqLbX7u+gPDT/D/DxwDvhrh
@@ -340,3 +340,383 @@ AAAAB1wi1IJbcVTyAApWAAQAAADVzGhz/9Nwj/zv8dwCGhj56YZzznn7A4tZQggAAAAAACHjR5BwNBJE
 AAAAB12lV93ezNbMAApd4AAAADDsTduHG5L4jqlQE5+cLYgyJLjHP3PN3l5H0wMAAAAAAEQNJ86WFpNt8y5M9hzqQC6dUn0xouqMiqimIKczPmOTrCurVv//ABsmVZ36
 AAAAB2ToX8Dmr96vAAplwAAAADDOS55fvrmCgBsjDyGkx10KC8zbOHrVqDDjAAAAAAAAAAEnBI6dANrGVKXFZksSWbhNDOjljFcIbi3yLk9Dbbw8XoGsVsD/PxrCkjsr
 AAAAB2+IEldtUhlfAAptoAQAAAAZbkID2Dmw3MSyDGDSeDogBP2i+wzVf/iPIQAAAAAAAFhFb8GKwJ2HoXHEL+DPcaUQQvobBaTKnLpQebSaAU3Y1dmyVj0AFhp1QCUX
+AAAAB4DwoqLZPNOZAAp1gAQAAAAdcjcKQAPCjb/mKuzCfep5rEgDJkYx7ePmlnwAAAAAAN67euhYO8duiy8wiSfHc2xcOHjWsKe3g5sdj9HINN3hDT6+VkGeAB3UXO5K
+AAAAB4Dwr1CCVdw1AAp9YAQAAAClBZaa44EGWK1Kc9PPtFUXL6OLwnAEJvcLobpaAAAAAPMlFK5Wrsm7TvgNyf1SUPH5YcyRZOJpEi+MfPZX9con3Fi+VkCQJxwlb0ga
+AAAAB4Dw4lit9iKuAAqFQAQAAACwfeCzuTokah4QMArq8GheBVb6yvz/5ibCd14AAAAAADX4Bw+xTByZ8yBklQQ5HSqdrNckKY5FJmQiCXxyj8jY9m2+VhDkCRwODr1T
+AAAAB4DxrnlcdzyUAAqNIAQAAADhmjo42bv7MotszDOQsJS811LowYlb+Cf+iekAAAAAAPEcW2KL1Cj+Y0k4hc3AInnSKhkElg975OvYifTJIMA+2YK+VgR5AhyXoxkg
+AAAAB4D03vwWe7PsAAqVAAQAAACsN30y/tDkgV78X0RiaRU075NiFIOFQ2LpoZEAAAAAAMSAcU5mdQfT9ykUT/i+mD2TRZQ5ORdFj/RLOBBzSjyY1pa+VkGeABzWh+Pu
+AAAAB4EBoQb+jaEMAAqc4AQAAAAitZMLW/2Wazm8+LTt35vpEH2B4hcykKZ4eUcAAAAAAM8v7Azlc33KKWU5cu8WPK3RnRD1XxbmpCW+2LKCz8YUU7G+VkCQJxv723rF
+AAAAB4Ey3g+8FvTtAAqkwAQAAAA87cyPH6EcDxZJKK7xfJOKtehIPMCpE1+e/QsAAAAAADa82YLfPH7WW6zWE/Oma/vWWmsrIURC8w2Ca+UwIUevnuW+VhDkCRubM13G
+AAAAB4HpDxj23ppqAAqsoAQAAAA5Bm/LV82PRVXOtwOMifI+NbSHmDe2MTzdWAEAAAAAAJ50jEFiFc93BI7oK04FrzpEcu+aeconSu4vbZmrOlnfso2/VgR5AhsAnH1W
+AAAAB4R3z3RnK/h0AAq0gAQAAACKozatNCpSRciftamCa1cFYDY4nWu1ngDXKQAAAAAAAHrZahDvch9TFthh5XYWy1E+ZtEY5kR1zeu8BspYO3mQs8HAVkGeABsJdNxm
+AAAAB4p4mPv58PHNAAq8YAQAAACX6b5cxtMVp4VY0vzM6bhLIFJjE9eKK6gH4uYAAAAAAP8Pqi4pH15B/zZ//hSYMyNuavXKshXhted6KRK9PyB69onEVsD/Pxy198is
+AAAAB4p4uGoZXxE7AArEQAQAAACMRIN+X8LF1jRQ8j0xGuW1TazMNMUP9SlE3PoAAAAAAE/Btbsz2j71y0kUBVZ0yTLcqfNmRtpveLZcAjSEoWPyLajEVvD/DxydVqDf
+AAAAB4p5NpqXj49rAArMIAQAAAC9/Bm+RL8TJkza/44RYV5ol5Srxrbaz++NxRkAAAAAAGzhYcyqXyISzGMwlNEbhr6MIsXAi/+2jSgfjGzkey8Esr7EVvz/AxwCXFXU
+AAAAB4p7L1yQUYgrAArUAAQAAAA5TEfr0g9tR2HyBahsmMDdQl0ExZNghE1EzwYAAAAAAKmMWcwojkByjPiQ9lo6ySjlheZGNLvb8W0bHlcmym06I9fEVv//ABznVUNf
+AAAAB4qDEmRzWWsrAArb4AQAAABoBUf+dIlZiRQ7C0HYmwLMiOPHGlseaj1qhdAAAAAAAOnqa0WTGFETmSC7Z+u1I5XQ1/cHgC1gO+DVzVc7BAQmje/EVsD/Pxtp0lip
+AAAAB4qiDqdvnGdPAArjwAQAAADa0UwajTHV6yT9ECTiEWI4pSwIeCtT7WOumj0AAAAAAPbCIp3+LjzULjOJKF0gHtVlCZpI0E5irYTFM6eIP7HWER3FVvD/DxvnIOI/
+AAAAB4sf3ytAIDdVAArroAQAAAB3EWkl4rdHWRSMgUYygZP+49WmIWD4eTgARQMAAAAAAHOs6iyAJknWUDjsuilRul/+z9ebtFzgQ0AC3erwwn3yFPnFVvz/Axss0eOm
+AAAAB40YoSQCGPdWAArzgAQAAADsUoyHHkqcn1oA7m5zroErr+ed5OPNMDc5dQEAAAAAAOHYDjOWwnggcFLFo+1xHSB3NmgJ5/4z/0cWuDdTrxdrysrIVv//ABsZ2iEv
+AAAAB5T7qQcJ+/85AAr7YAQAAAAqaAhOVk26OJobY6rWMoYll6jCrnnIIcaohwAAAAAAAF0iMfxyV1OoMLdTDv1kswZIk31UeBzi7ywS3WBhP1tB3xvKVsD/Pxol2joz
+AAAAB7OtnATiD6E8AAsDQAQAAAArEdPlbur2VAq5m5+sUXszr5y9NVmXskGmLgAAAAAAAEQ/QAKoTbEjOIE6YmQ7d+ZbvwJyxJiqD5ZmplGOhPSqIqPRVt8LGhpJ9/fe
+AAAAB/x1QcsVFgAVAAsLIAQAAADh/wqxUEgjOVH3K2J1mJSvXNK2uoxqm09UDAAAAAAAAAEr3HwB/h3h8V4jEAcKbIQxpLQdRiAgdletLxbWXA81K9HcVqXFDxr8iPFc
+AAAACGvw3FlNjtyTAAsTAAQAAACZiSbV3Q5XHYrVgKljOEmcOPMpKiM3TvxmDwAAAAAAANwEtv6sKp13rsvN79dhBom8PHZJwdLNzk0ozx2ADu8rUePqVp8EDBpYRE9u
+AAAACKuYXf3Zgp4kAAsa4AQAAAAlX7OBapUHtRwVZLmd4IY1mBT8sayKuyv+ExIAAAAAABMSCj8JLavoSWgc0XQIHQDFr80V5gcEzRvRYBV3Hrs+DSr0VvSAAB1VDku7
+AAAACKuYbZ4fRayTAAsiwAQAAAAFDtAQQchnQwGOhPgKrTPBxDuRwd0CBhbCgroAAAAAAAYTubfQ81qfcbKpckUq7sEWiwqk3+yRFOAT/cWsEXc7qj30VgA9IBwRWFey
+AAAACKuYrD69GM3PAAsqoAQAAABwCOwgtu/Yx1LA8KCzoccVqXUSUvkcSzaLqbcAAAAAANIa5ObvXkWA4xdHLbJ4mhMfZVnPTZAQHe9dLhp+aC1Ai0v0VkAPCBw1+Zs4
+AAAACKuZpsE0ZWJ9AAsygAQAAAAiR3j8RDKqWKGiI7btKoFUPuSutApUI9ti3EcAAAAAALkWeqgJgPYCT3B02+CiEWp0uiZDwFCTMHuAu+/eFwtxulr0VtADAhxa3yA+
+AAAACKudkMsRl7U3AAs6YAQAAADKZ1fQO775nmNeW0JabholgliFw1MOoS0AkVIAAAAAABe7zq6Jbq0swc5xbwJ1u19PnpN0xqS+qCPfAkqnUKqjhWr0VvSAABzND2A8
+AAAACKutOPKGYQ/fAAtCQAQAAAD1cbwMFToQxcm0gjUMbwoFeNxLWICz2cDL+18AAAAAAJaHNnOo6MBVF39b8C4SSmonM4M62jbG7Ca7llI281TCvX/0VgA9IBsxHks8
+AAAACKvmZKiDp4wQAAtKIAQAAADzX5tI9xzWMo3btsN+cild+qgni6awBsxpegoAAAAAABpqKLTpNLBQw7TX0qxYgLBL4stUitcN/ejmAhwylYdLecP0VkAPCBtT4Ofs
+AAAACKzUACDsx+whAAtSAAQAAAAB0wp8Xx80vlVgeocr2phgqu+M2ViXxLguIQcAAAAAAE7aE51S+BuFi2dO2vCZcB9GzyjazOXRbvp3eb2a2p+IX1b1VtADAhvLMkuV
+AAAACK9OyPuRh2JZAAtZ4AQAAAAc3uEgoFzGDGR13i7VsSUpTxZtP/TzjJ0J0WgAAAAAAKqPCYmDfGsA4+WiqcjqEYygnF9EWOXLuSCJNeEy+lXNo5j3VsD/PxwD+gRh
+AAAACK9O6ISxEIHiAAthwAQAAACEqKYoGAmxQ6eFa1PsoOvChIHQS0GkaETv3dUIAAAAAOJBuhtOxhOO2ystwiiS2bBHSUzzrJL2Yyp0y0vmxa/sqq73VvD/DxxTVqCl
+AAAACK9PZrUvQQASAAtpoAQAAACNANkXtOGN8BI8y1UpVZgL582wg5dYO7kN5MoKAAAAAG5eRh/0EaS//DFmYEL4u87/EdbSbtW9A6og3MPHFfXXnML3Vvz/AxwsiEhj
+AAAACK9RX3coAvjSAAtxgAQAAADlkN4QNFN7eMMLDBh5Vz3aGYczbwNUOqoepWYAAAAAAFnsYnDMVAK6rJgOcupue0vKuMlWIxJvIIS5gSBbYfJk5df3Vv//AByv+7Ke
+AAAACK9ZPYQGD9bXAAt5YAQAAACJmtDsIDi6C/F6G7DvUg5kaawKlZfopncWUosAAAAAAOngvGu2lBCVov5N+tj3fNjx6400HtApvGQW1M4wpgN64hH5VsD/PxszGwGM
+AAAACK93qepydkMfAAuBQAQAAACH2gQg/bowILKZv+5PCT5AV88PqxwxmePwIxgAAAAAAOrco+kve80uB22jkyoCIHLhiFs5/QRis8JkCcm1GQkEucH7VvD/Dxu+Otxk
+AAAACK/qGxjjpLPbAAuJIAQAAADc7zhT2l8UAVa+k7Ww9d05ZKkM0Lz1q8Ih+AsAAAAAAJeGEA6dSCjpt9x4IwABsCmlUafBL8SdEGfm8Uv7coENuEr8Vvz/AxtK2Kf2
+AAAACLGEHi3mubVXAAuRAAQAAACVEClKPbm6UPuobs5tzE4Bd5EoQQGvshn99AMAAAAAAKm8cak7jQ/KZ4nfmafEaxswv3S79OYU4Xi0ICsUJq6G9Xb9Vv//ABvcSPPg
+AAAACLckJhDunL06AAuY4AQAAACYhNoOB/z+352Xoc7zyd3KlKVc5QIqiS2EEQAAAAAAAMjfIT2Fap+yj8xcKjjsOrXIj2APFO0Lgfa/5VWYce5uIjj/VsD/PxqoGbTF
+AAAACMaYOYsCFtC0AAugwAQAAAA08Q5xLoOz+ZqnrpOK4ZWIew4c9SCdJaCKIAAAAAAAAF9T8MwaIZT1E9HMXLFkYsxAo1rmixxRepOZrT3g8jp8FvwCV/D/DxreFhIl
+AAAACPEGNo1/Qb1QAAuooAQAAAB/KBPt0n4YaGRcdLbzNs9v+/fh3nKehI8hBwAAAAAAANLP3ZP9FS7vVobJIopxaGtP8DPjqi1vGqiSXhyBtEhEwm4JV9SWBRrroiWf
+AAAACWYJS4k3IaxaAAuwgAEAACCzYQaUr8LEcQZVx8Bz1uzGVEW3wkHmylb2eQ8AAAAAAPGFt5+tv7IJkLJFLNfSbLYUZ+HiBnWNFD0YVCjm0nRrE7MRV0unchyAQEpc
+AAAACWYJXSVEspESAAu4YAEAACCKznfJdiFSxDTHv8etLmOkyVQxHP0FjBdNmxkAAAAAACEFjGzom7jg7ARQnUpODZNXigWxrKuOjSauoPhvLzOOm74RV9KpHBwSGLlL
+AAAACWYJo5V8z6NfAAvAQAAAACDGs6z5IrLwlGGoVZRYhJhNLt7mslxjgdSCBl0IAAAAALDH/xOnFRMLOWs9jIxQfv7bymHHdKPbkFrz8wRNvhbmzMsRV3QqBxxbIAUF
+AAAACWYKvVZw4snyAAvIIAAAACDv2j20gm/S2B1ZVJh7v0ssWL8JsBRqeKalclkBAAAAAPL6s4/L+hEywOenVMRTkKbE8l5uoYOBAIY0RUzJ/X6tHc0RV53KARyxlDbs
+AAAACWYPJFpBL3veAAvQAAAAACDkj0YZKGbmtCz5wJSq98rv0Ltt6cu/vbdyv2QAAAAAAEzRbMN6g8p+xgiL2IEpWrDbYnEInbGQa4vSiDX68YeIQ9ARV0CnchvdI6kD
+AAAACWYgwGmCYlsrAAvX4AAAACDpnqj3lUtGrP5LP8ndLjhixGYi1kq7Ynlr8z0AAAAAAG136eohQv+Lge68NT44D9BQU2iLBvUUofAOQsQZvcGRwd8RV9CpHBvYLX5e
+AAAACWZnMKaHLdhfAAvfwAAAACBjYpK9J0jSZYy3CJfi7lq437Udtk5CnzptUQYAAAAAACDoIHb3yAMNdXMGD8wlUq+PBKymOPeXFikCi7UGNf3zH/4RV3QqBxs3bQVi
+AAAACWeAzeH6+JxBAAvnoAAAACD3KqlH7Hne7Pv2UFYViW412zgmcZSy4Z9wwQEAAAAAAKomOfH4vcp/slYt7WJWNqIUW0mbcu7W9j2RyMxyp8W0hFwSV53KARsNIYcl
+AAAACWvn0bJHsHdlAAvvgAAAACAzoCFXF4K81xl1M8urldGMwhY8WUs0UTLC3wAAAAAAAMoYUfklDxD+TAiQe6e5Spboq+ik3UW/wBRoDxzASGy4FGYSV0CnchobfxHc
+AAAACX2D4PN6j+vVAAv3YAAAACDAaEKufE2D8z6+rUycPfr8N9GBhQu/0i2uCgAAAAAAAEU8UzfRjnKWjKTF083b6hvVZcdEFDFX2IveEvaHa8DW9n4SV9CpHBptMaht
+AAAACcP0HfhGDcV3AAv/QAAAACAPBvCD08dCs8O6cY5m/iqbaIeupdnzr1sqCQAAAAAAAOjKI/rLkZZ8lU11SBjFm27ilJYQ9ix7XcKgnspIFR/py6ASV3QqBxoaybnr
+AAAAClTyf7EiS3p1AAwHIAAAACCjF6rahGnCOcCiLtMB2oyL2JhmEi59/+4GqQ8AAAAAALwKgFaIVAZOCu6vq6o7B+MmEP4dn4KBUhavRwDsvuTs8dchV4rTAB3gD+0T
+AAAAClTyiTsDUh+IAAwPAAAAACB7xPWsoy7gsqJDCaVkBxMUuUWy/bzCveUVQy0AAAAAAPrNV7jNZJ/W1g1tIEvX6KfJYtEZuRnt3tALfhhxZxUyye4hV4DiNBz/dQCW
+AAAAClTyr2hp37YGAAwW4AAAACCg8bwGI0AldwIgY++/lZJxZC2Svkzgg7vJK/wAAAAAAOSuKhwhakNG9hc3rgBgsnY3uNUtvcViibZOGAo9jN+VYvohV6A4DRwkHXKq
+AAAAClTzSB4EFh+/AAwewAAAACDN6l9XG23YeYT6vVNhjiDb1kYnYZdLM3wOaUIBAAAAAKI9cjQVScSAi9OaQCJx+ZhEuI18/I0L1R39LjRMun44LQYiVyhOAxwAvbqM
+AAAAClT1qvRs795BAAwmoAAAACAN+1NOs7lzykXHrSsVkskW/twY7bvN6CB4mmIAAAAAAIYM86jV2KF8gu/DJSeFBw43faVZHNqQgb7lgkAMPhnTHRIiV4rTABwnwauY
+AAAAClT/Nk4QVuAqAAwugAAAACB3GHAMSU9qWj1XrIHcsj/s9ECOJAP+89vpwiMAAAAAAOI66i9yhvdWEwOtTuk/PmcEAtASUW8WXWoth1Lcm+vqCh8iV4DiNBt3qu30
+AAAAClUlY7Sd8veNAAw2YAAAACDbagFYiOn3qONtcYDfPi3jNvqVvsTRtkOKZRMAAAAAAAC5UrlB0xMPyyXpjTa7GgNvzskV8p9vSZ/ujrwFWp7w6zciV6A4DRuQbOl5
+AAAAClWuN+3MH2fKAAw+QAAAACDe1jWdK4j4ezhkfjCiw1dLptipbUuMXSlHyAcAAAAAAFZFBYlkys7FZJY2GB6vuAvwDGua3xZ0nLH21D01DOnDg3QiVyhOAxu7/mxd
+AAAAClfQUJJCSgbPAAxGIAAAACBrUhWSnecvj8p9HAgfQY+hLr2ArzIzggv5KwMAAAAAACz7iGfsgWnovO+Sl7AE1YAH5yDQdPFqZbNb0O5MeGUzMBUjV4rTABtj8a98
+AAAACl+0G5gNuk6rAAxOAAAAACDINoYXT9lri93GoJdoABHoUmlM8qZdZcAbAAAAAAAAABmSIfxzGMOpj1JZ70FHgDh2eXPUM+bJxgyCUlZCIeh2p3EkV4DiNBoIjRSp
+AAAACnNUyIxpCuAIAAxV4AAAACCg4+ZfFsis6/HCy3/biFTihvYMGZNTsQkdHgAAAAAAADtkVW7joxXh03DvCAjyzFO6vzVdOZAESTThqx+Wy9iWdsonV6A4DRrF4jMg
+AAAACqiUQLJN63tlAAxdwAAAACA2q6dFKIMdf/hbcP3OV3AG9N5XQdu6ZuCaxwwAAAAAADraVYXyVnQMl8/LgZFitYJL/rwOZnuVCogZjkDXzN33sHotV1MoTxzrGJpJ
+AAAACqiUWh/C2Fa9AAxloAAAACAZVxk6MxUZ0tHybd4ugHVItfbvtJRLJJiDQBQAAAAAABcKg2kHWMqqFFMVYDUXwVruuTD2nrwUb/nZQHKUv5zFf5AtVxTKExwwJj1g
+AAAACqiUwCYHV8zQAAxtgAAAACBXcsgySOMX4ZtWuU1pm2T6YlHAEHF1vKE1QREAAAAAAGSlph9XS/aU7XibOH64lPCrn02HMoKwQL4HTX8hkUWWbpstV4XyBByrdQqs
+AAAACqiWWD8Zf4sMAAx1YAAAACAfIcbaB7vAFOI+a9zN5GEHuolJkK/hziv7FZsAAAAAABGpAhLjc8bz2gKfgdjNYhNlvouMqXsXzycDNaHW4Hc9T6MtV6E8ARz7XP0R
+AAAACqicuKSra3eLAAx9QAAAACAsBQs/5zsqIDbEvgp7RRq0vVXzrVQs3m1QvhIAAAAAAMredFd9Rdt8wWDftNVWEor7Xcw2AZ25Cb1/+RxGMonvoKQtV0AoTxvEQBPt
+AAAACqi2OjrzGzFmAAyFIAAAACAIPa1HQtSmPj91nVzgBUhJDWVwVcZf6wx2YwkAAAAAAAsVNuhO7KZe2S34YbK5PGKww/sJ81KHZ66G16yaoDnMGr0tVxDKExuMNxFa
+AAAACqkcQJQR2hjTAAyNAAAAACAlCKe2uviHefp415fmmIMIX/62aD9nd0nF/gsAAAAAALEyONuUQmEC5aGyfTzhzfraLHhaQF3YxulJ4573HMq7YeYtV4TyBBshQ9uk
+AAAACqq0WfiM1b5pAAyU4AAAACAafs8WDFpKdD+pOxMmDa8xACwDFzxBuyj05wAAAAAAABJOMBPHz2tTDkZqd6tKFD9UPQoKauhHBruME5q1qqQdozkuV6E8ARvWuUmS
+AAAACrEUv4p4xGxeAAycwAAAACBM6y89ybcMlgL2VZnYtlCziv/qxiODN4C8NgAAAAAAAER2b2MNzwO0lf/JqBo7lUWym5gHN/CIYv4iMqZGhdwBAS8vV0AoTxrGHGVs
+AAAACsp8dnlp3ZsDAAykoAAAACAKwrgX4MJHd7cVHdmAmuRrNn+xPYK6rtxeDQ8AAAAAAMZs93uFRAyMOEWJznQhVkAY8wfWLSWTFQra7J+BxyaoDNQ0Vz5KThwKHPEh
+AAAACsp8kENUKqH1AAysgAAAACApiEkBVlBVUXQ4vsPhEaKtUnRaq4KAeVf9+B8AAAAAAGBimX2njLYGnWEvfSDM15kryfiGaWbef9GrLBQd0ctX/+U0V4+SExwRRYcg
+AAAACsp8917rqb9+AAy0YAIAACAzKRdYgFySze7wQhGMFU/WCoHlhcXqNbVg+SAAAAAAAKnAgog4fNoLrYSaPyy+J95FiN3d8QDavakEczHG//31rgI1V6PkBByTx0YD
+AAAACsp+k/3avoNhAAy8QAAAACCFfY7+VAAh/h6w7nJZxOVgoQcVIo02CZTYewYAAAAAABY4PvNoMhCcjK5Z00Xgfq1tA4uIXNTkKa/eMlw+K1VmSxA1Vyg5ARxW45DU
+AAAACsqFBn2I/u3dAAzEIAAAACAJO+lcds3UZ49FkLqD4LrGplyD1DIy6tXyITUAAAAAACRZQ7F2/UPxsMOE8ruPrnGrf8y5AwZ6WsBYxrfUH6g01yA1VwBKThspuomb
+AAAACsqe0HxCAJ+uAAzMAAAAACAdDM7lMkIHgKR3P9knznj7cbX374TEoPM/qwUAAAAAAPQ6Xz9PhbVfKO77q9Txn90luKwnV2WM+SwdVd3SJCpB2jU1V4CSExvAb5lD
+AAAACssF62O8rg4bAAzT4AAAACB8M9paVrpbd3x+HwdSgEkEbJSGuxzMp+zJSBAAAAAAAK78eXK2LczK9u840YOrWQyN5s0TZJUy+YjlJqzBouAiuEk1V6DkBBsj+jIM
+AAAACsyii09MyWomAAzbwAAAACBhrMn+7gVWqPtCghQSiEd9TZJvYb5B3qzKVAEAAAAAADxS/avVrpFTzjq315y8Simh1bPyCAUiyEp7v2YBdmr0ZFI1Vyg5ARsQny8w
+AAAACtMVCv2NNvHwAAzjoAAAACAQbWj+9G6K6FHtLcwhUI0aowYCjDNvvXVPwwAAAAAAAAJGlqbm4lE4UJ2CQilA8Vt4IDbxVcADfoNW5mTe7s8XpF01VwBKThparCuB
+AAAACulSADKEnlLxAAzrgAAAACAfGmvgiXm1EJKwqwj5nmOIuhTKpkls2IEFHgAAAAAAAAcPiZeYVoVIsiBsPy/R1mvdXupA2KWxn1Hd5yftqxqE4KQ2V4CSExpZYJdg
+AAAACwiJvSPzDmoRAAzzYAAAACDzOqdKLeaQU6WSL3dP7BYOQD7eC7Uw+Avc5tAAAAAAAFIUOhwpiR7VcGjaI0Q08Y61+mO6sBZAWx8g+tBGG6PsNKQ9V6BUYRxF2Ofu
+AAAACwiJ0doyLIRTAAz7QAAAACAmq7lxKvcWVdBN4IpDdPYvYCr3msYs86IBJZwGAAAAAEWqykCERMc/hXcKmBy5yj+aEu0E57lgXE1TImKH3npiYbc9VyhVGBwm2xxG
+AAAACwiKJNPJQBxRAA0DIAAAACA9gN9n+gxkPtvrXhPrwljwPzaNmwxVVImzJskAAAAAAEFr3B61lUkPSNo8yrhVFyA/p81nK99GWM4YW6oR4PgYRsE9V0oVBhx/f3y4
+AAAACwiLcLolxewRAA0LAAAAACCXgdxFqoOFdVP23xjp4VuvYjZcCeLpGJyt6REAAAAAAPj0f9Bu0VqhngnmtUE4a8QMN+DeSTq1cp8cY35zsvYB5Mw9V1KFARxZhbYA
+AAAACwiQoFVLfCWIAA0S4AAAACAhrYUteje8uhYcTLEWi+wvDQ1AB9/c9E9iEfMAAAAAAL28qwO/GsbqNPnNh5jDjLYl6Iatm+dbVMZCTSEH3uMJcto9V4BUYRskrTAM
+AAAACwilXsHiVRsiAA0awAAAACDFf5es1goMe5OAW/4usRfn341elajC/atcRS4AAAAAAEOj7r6rfZawmEmGObiDVV5srIdpYo1as0SA85mpU7mIb+w9VyBVGBuY4DRR
+AAAACwj0m2hcUgM+AA0ioAAAACAo0lKKB3ibys/Dv5DnCHmsmfVAszkjoomI7Q8AAAAAAFl+dLXSJAHqsZ6yJWiM5IPzK8gOc0J69j7pCwsNUFILGgY+V0gVBhu/JeAn
+AAAACwomiZpepJyDAA0qgAAAACBlsz10UHGMxpXNItRUS7FdDrBZ+LNWKUmkLAEAAAAAAMlbuzcrB27NUBsPwi6ai7An0HpHOoyI29FLuKZ5ykrZlGk+V1KFARvdFqfQ
+AAAACw7vkTGcJJ1MAA0yYAAAACCBJLdPsYqFkAIcpQ2OTUp2NqC0nsW69+hYTAAAAAAAABuZtQf8cBhKGCMYFzZ+kBkNrD4L94dX7uoof9ZEod14o4Y/V4BUYRp+VfZC
+AAAACyHUjbhtHeH4AA06QAQAAADvnEzXU2v9aPnold6L/nbBALi09T9WmbxgLwAAAAAAAInKh/Kit9lSL3SK2HRJ/r2cCpdnewVCuWuw4zqV1BRNibJDVyBVGBpSMm47
+AAAACzNgivvKJFXbAA1CIAAAACC1fZvk4wj6HcSk+Aed82Eli224tbA/CtH/CwAAAAAAAFF4VOZr3f3Be0of0zejnBiNm6v3lvOUAiiPFShN2eHFKf9WV2JxGRpQqjjg
+AAAAC0d9N59AwaTRAA1KAAAAACAsA52Girsag3GL4Ns6hkbBRTFO/dicvpaiBgAAAAAAAKGxSjF2+e3aON9cYhx0e/oHNxbxbIRtXEonDYBVXW5TeNFhV9jqDhok1tLt
+AAAAC2d+0CAKRv37AA1R4AAAACD5ke6bUV656OLmS2C9d+Ii/zkQiYJuSX9VDAAAAAAAAMqtHOMVi5WOF1wadcxZqTpr4txxcQXQViyFg7WoZFDGqZJuV/5OChqMrEIr
+AAAAC6fobOt3YlKqAA1ZwAAAACBV30euQTM5kg0p/6e7NS9/HxwF80scEdIwmzkAAAAAAFRUhjO2BzX/TD4MUlWJsdZHhhKtqQrPauYIVfSnIEFZz7B1V7+4YhyzAz7J
+AAAAC6fogV1w+/YdAA1hoAAAACAmLnNpH2dMW4TzFqp/A2LtSlB0xNPo5Dk0c4gfAAAAANvhlQYd9i2G32ypw2+ypBHbAh+bVADr5CSAsAPXv3rz4PN1Vy+uGBx1P5CG
+AAAAC6fo0yu5QTWLAA1pgAAAACBLDWxPmJBk5G7Lzg4bSltWW7/x4qd2q9KTL6oYAAAAAGarKFL0xpqeabWoiR6pj//U8yjz/rIRCUz9XzWn3NlVb/d1V4srBhy41Q4H
+AAAAC6fqGmUCWTbaAA1xYAAAACCt1qYUX39xOtd2H22yWiBXBWqJvudc9vx0JuIFAAAAAHQFCnOXvMvtaWZfSag4rTecLh/WTMz9Ni9B9MrFOshsefl1V+KKARy229eW
+AAAAC6fvN0yh38yJAA15QAAAACAAAS+r4dhhnTUIWVPJFcePDyFzeQlMMmuGPSIAAAAAAD3wSVovvE8CnxfpSnZgB2SlGfmN1MOKEwMEiecBiHs3wf11V4C4YhtFk1xR
+AAAAC6gDqusf+jMGAA2BIAAAACAKyVIqn1fcD05VhUTsUxl4er1JOLQqRdYfMisAAAAAADCXBftPyG7TDWGPy5SC+526LyZN40C2+iGiNA/8YRtPcQd2VyCuGBtHdZAB
+AAAAC6hVeWUYY+SZAA2JAAAAACAquT5NFiWNPL9VhBG9JSMjQQNLdbVRjHQyMRcAAAAAAF9LChYZd+1GDaAm0iGqYsLTMTp9CdqPG8utrNytNz982xN2V4grBhu8rusA
+AAAAC6mcs0z6CrqkAA2Q4AAAACC6n20QXE8+GeKh628OkHoavjtFuful3owVQwEAAAAAANp4z6iDsqBLj5ZfNGAHxgSSEDj8of4x7NmJS/VXOJJrejl2V+KKARux+xUE
+AAAAC665muyAphqxAA2YwAAAACBWTKjG8JhkoDZN++qkIZk9WwIwVq9WFHV3RgEAAAAAAFwrx5Px427sgiRsqedZd4r5Pa8k1IlAwTdWIERGeiMdd0d2V4C4Yhoh0hZW
+AAAAC8MtOWqbE6qmAA2goAQAAACSrvjG4XiPddKS2qT7BbjQH8vT7DAtz3Y5JAAAAAAAAFKRhxOtEuQLTG86Fxh+puIAezWHyEMUH1m/73bh/N1twJZ3VyCuGBpevjoT
+AAAADBObB49KZpemAA2ogAAAACBp8lxnn9BultC+5ENLAJIl6bG8R/KzGtsjEwAAAAAAAIYKZNtpjJ+CqbXx4Cxn1smxLMLXdgfopuQpRNqaYsme6Gp6V4grBhqOGFwp
+AAAADKG+eFoC/G5gAA2wYAAAAGCNeTilJobqdvLKRNYF8Mz1EPfKtsQiDEF6AQAAAAAAAIE6Yx7EeGGgM829XxFJ9eAIt3qX6MgNlhWTYi/ro2hT531+V+KKARqSfAtI
+AAAADrk8D0lbn77YAA24QAAAACDRApmVyVfAnUH76eDhAuPF++Lc36DjdBMrCxcAAAAAAIBd2pRJ/jQVmFPCRVx8vLgfsqaWQg4ImrJd/u99S5LcRIGZV///AB0dKszD
+AAAADrk8Fyxjgsa7AA3AIAAAADAJq9Rt70GCwIzFOKGtOi3aDGiHBGMp2dT6tBUAAAAAACpuBExz4ENprDpUdYuAsiSgzH1ZJQ4KilDgwZlTCbCgT7uZV8D/PxyhBEJk
+AAAADrk8NriDDuZHAA3IAAAAADCZH856VE1BGiD12cdt4NmjE9RDCGLxabi6vgoAAAAAAPie4AXBNxLSCyYCCt7ErCHHsQkzlYXi8FSQ+zf6/LB1n7yZV/D/DxzPVkWm
+AAAADrk8tOkBP2R3AA3P4AAAADBllXxbXovWrc28z6uOnfRyI70usegvXPDaCwsAAAAAAKzAOx7IjWpUiBEpyBDDI71RFAQr5NDEXzYN7YY0KDEbusaZV/z/AxyKY55a
+AAAADrk+rar6AV03AA3XwAAAADCUck5TvvRlQEsLvs1fq53zlF2JyOIb7kKvoQwAAAAAAHlKt/5WfhW3WzVE9o9NnqFeVlelsCBGhKEP6zKQN3U7Wu2ZV///ABxRqiTQ
+AAAADrlGkLLdCUA3AA3foAAAADCpnk5uDQgtq6xioQH4MlKwffjPhr9SBIzM0GkAAAAAADVlHBcb1hKkjIKZ9HUZSldpWevAv2cl2oHnYj87TGwiqu6ZV8D/PxsjfddK
+AAAADrlmHNJpKMw3AA3ngAAAADBTOzBBlxMQtLKn/nBPP8t46bX7OtxbX2j3xxkAAAAAAOMjSxmLHM6CK5czL/ViX6maYLZmLMoSvHPSVaNEpGDX8AOaV/D/DxtcSU4U
+AAAADrnkTVCZpvw3AA3vYAAAADCV1SlW+D9yPT/B18Emi67ZOojR9HjbIc50OA0AAAAAAHvQOMjeADF8AjKFuJe0zfOhYIQjppdn87ERjWfzO6I5LTeaV/z/AxtIT0LA
+AAAADrvdD0lbn7w4AA33QAAAADCLn3AV5sh3vbyELB8ikNrYMIa1cv91UsKHPwMAAAAAAPnDFPWhae6UBSmU34MVQYYbIZl2ougp4uBVfKSBPXAc7+2aV///ABudVN1h
+AAAADsPAFyxjgsQbAA3/IAAAADDRrs54sIAOMyYkS6KzIX3eN2frg2Suqq1y3AAAAAAAADoJf/ShL8NF6mzUBKdIt/SllfTgjfeiyO08fH3kZgRdyBCdV8D/PxqJ25ED
+AAAADuNMNriDDuOnAA4HAAAAACApqFfwSeTlbhtcBC/ycVJWZMQqsI0iNxP7AgAAAAAAAG7KEirKHr1/SPn4ZLT+nb3UTrm98+oWY1ywVDLJ03bdi7+fV/D/DxpBqWaI
+AAAAD2BQrXlgpguWAA4O4AAAACBO6cgvrBNqFQL2Fb2dgfCaiYgwDWT/diOQAQAAAAAAADCj6yID0P2rPA4JO4UVYlbh7il5VJrZ/Px3N0H1XnExI/ynV6sdBxo8UBxL
+AAAAEEJvSeNfseUBAA4WwAAAACCUty2OZD135FtFfuM5+s6KO0ooyKFhl+R+AAAAAAAAAEDupwwP+ihkzyOZcl9j4QH/KCaet4NiNx7FWxasDxBKW7S5V1DUBhp2t+yS
+AAAAEWZON940iQTDAA4eoAAAACCTqwQ/ZTyaMklDST2ZR79yvI0BV3+nldS0BQAAAAAAAKBkz9sK+MEQ3oYlxPKoio78AMMVj2r5BEiYRhjomIC5eFi/V+8TAhpBVQyD
+AAAAFExt2wOanLhVAA4mgAAAADDOgW8QhETnVAMmuwp4WP3M9eIoiNbmOsudAAAAAAAAAEmC3eDrRbEPwI/cBAFMlbIc4XSc+5xfdaXNM+wqW611DzjRV/ACAhrie5OZ
+AAAAFtE60M28lfB3AA4uYAAAACCaMvcGJ5duBEGiuSuFbxyV21K+OS20HwIYsc6jAAAAAHXoGMtj9AEm10IMjWbGHJcthL9C5749MXSNVnlDPWjN0GnnV///AB0ibsDK
+AAAAFtE62LDEePhaAA42QAAAACCD2XeXqwYyOFut0/Bw4J230XxOe8dU+iccjk5XAAAAABLcCaK5nEDzeR+0VVqR5QmwWJecqHcCuJWlvLlCfstjnm7nV8D/PxwUcmvk
+AAAAFtE6+DzkBRfmAA4+IAAAACD+p9SxJT1v/58zLCK66MMEfj7VITR0wUD2YtU5AAAAACLyMqj435DNbBe5x4yYNsEr7eOy2SLmfTmAfk1kL5Hg6njnV/D/DxwO0YHR
+AAAAFtE7dm1iNZYWAA5GAAAAACAmXrHDvr9BclgR+3cPgCZcjeFxeGlc1VkVywEAAAAAABOVjKBC3EcVYA+8Zkh466kzt8Ro8LhhiPHUwqIT/Kc9j4vnV/z/Axwh7DoQ
+AAAAFtE9by9a947WAA5N4AAAACBbXt5nncW8mu/CDOtfZe8mqHxsdRkDCZMa4AYAAAAAAM1mc/zfDzOVsR0tQ3NXfSI0MwRRiH7KsV8qg/aH+VxQl6fnV///ABwoxarL
+AAAAFtFFUjc9/3HWAA5VwAAAACAZRKfTiu/adJ1EvNiq9noHimMyMAFMWq8aqAAAAAAAAPjzuuE7t/EiD4vOLHgs0kppqK83s16zaMul3CzSQFA4O8bnV8D/PxvJTn1J
+AAAAFtFk3lbKHv3WAA5doAAAACBK4iv8mu+RYlZ0j+TlLY4pYSEvWMFjSVfQhwAAAAAAAFs66rCfYvUumiTXyqqlc2I0bX/lP7PcmYgDSEuL1vEEq+XnV/D/DxvKhjzi
+AAAAFtHjDtT6nS3WAA5lgAAAACCNZUYcP+lBC2xmxqiC/o62X5Rj1nw0HOdRMgMAAAAAANKp6yqkAA42E9C0y2nq1COWx+VPQkmVCCG7F3DsQyX9JgXoV/z/AxsJZn2u
+AAAAFtPb0M28le3XAA5tYAAAACAIeaBQ51vhvWNZGrLyld8/ubURRw5vfoWS9QAAAAAAAMZf7GAbrkzJOqd6goDTCvELuoveaD2tbuVtYo0tlKs5ZTnoV///ABtkjcWM
+AAAAFtu+2LDEePW6AA51QAAAACDthu7A1465am24IoOs3TQpAaVCuRhuQshTQwAAAAAAAIGGSZjgvyvLeypwcHuQhRkL2EEO2bllTY/MBWdbUFR2yPXoV8D/PxqfQu01
+AAAAFvZm9JHgWhGbAA59IAAAACBCrF8KJWrOhnH5xSSV6TDFMA19LvSZtkV4Ak8AAAAAAE/F+F7/yAKr+bGyL/KByzwlIQG23GlHEE9iz8vPGu/SnGrtV8D/PxwPC+FQ
+AAAAFvZnD/37xi0HAA6FAAAAACBk38W9b6I07UNqdOYxc4Y0KAiFB/kNBtx+QMYvAAAAAHj7r3rJqK8yQmHzLo1Anru+u2LgidBd3MQlwKFJ5R+zPnTtV/D/DxyU2LPj
+AAAAFvZnjNV4naneAA6M4AAAACCts/sPg/7gvjr045kHsVMWTr1lNuqRfAAzhwQAAAAAAIekU6P/7aPz+z9neNBna5u6EIihC/4xSfTI6DfRjjMM+4TtV/z/AxyVbXQd
+AAAAFvZphZdxX6KeAA6UwAAAACB///tI8UDgtFCtwc16eSADS4zHoOv8WhybWgIAAAAAAOmNdM2v7Z140jUnjL0TAfFt7WZcORVfh88q0JbcZZIdCpPtV///AByR477o
+AAAAFvZxaJ9UZ4WeAA6coAAAACA35kkLMA8srR3Ly7phHOQNV8XB7Ydz0ibQpnwAAAAAAIHRkgLNQqTLL2rPrQganu7cXd8EZHOk+sMRRDjbDWk85KDtV8D/PxvIErHP
+AAAAFvaOuUulE9YtAA6kgAAAACC7mkp5UCwhDmm0tP2IQbL6pILaCdV6p4P2WAIAAAAAAI070Qh7ITtTUH4mIvzHd7CM1mt10pBOwf/TFSkMoC/VBLHtV/D/DxspgEGE
+AAAAFvcCWmhGMHbWAA6sYAAAACBAJHjxyGNNy1Uz5BMe4xROSDDJE6y257wRUQEAAAAAAAp5ACLSkVL6bfOLFZ3AzMnnUUKYSKrngn3hU6tnzCB/esztV/z/Axvld4Mp
+AAAAFvjC3QnI0fe4AA60QAAAACC8glNQvr9l2H94E346yBCP8pWddMfK3k8HygEAAAAAAHgygNfgRBo/5rOQ3MdPcD1Th48lpOl3tTEWqqJJLs2gofXtV///ABvDepcW
+AAAAFv+g5OzQtP+bAA68IAAAACAstVirUpNdahbB8xXA333A/QW0StRdUKYRHAAAAAAAAFk9boB2W8MhaBFMGlGwRrKBgFxeFZV2h1d6++Zduw3MIY/uV8D/Pxp2zSpc
+AAAAFxYY/anpchhYAA7EAAAAACCsVo/dfrgBLlSrtl9VxGhsjaDvtMrh+PeDDAAAAAAAAPp4Ty1aaYXxrO4Bwug+gHTDUa6yWmHwHrPA1Q68QzrKYEjwV/D/Dxoa09c2
+AAAAF0opNlwiJFEKAA7L4AAAACDdlwmqgXh97cMuUST/SpkqPVeIU6HrDB1WCQAAAAAAABMtBumhPQQyqiLmeWH+PimZ1chF9K/t8UZQIkqgY//UfrP0V/z/Axp+wlqY
+AAAAF8PpthapYv43AA7TwAAAACCe7tZ+py5b17SGVln9UhIKp3bA+7FNubvPx30AAAAAAKYRNzQJxAaX5+/PTNgqXtXU6IgGaN00LA4S7GbqX2id2Lz9V24lfhwW02WK
+AAAAF8PpxgV5Pm7CAA7boAAAACCs9HWUfNPttzeHA5GhvZ6yrnMvhZCMirb+UQIAAAAAAMPA/zFACA5MO18V7ppOTJrUoASmIJSwoiwfXVvJ97/6uOH9V1uJHxztGdFh
+AAAAF8PqBgrXJ3DXAA7jgAAAAGAGkbS6J3x4hjksG5GIEpUU5VR2BKleBJeaPwEAAAAAAOBqhLFcrTGyPd3ngDLuTx5YbzrWuF7ClO7wdwnQulpjJef9V1biBxwZcbO3
+AAAAF8PrBiBnPGVrAA7rYAAAADA66PNSRnC3EnCeNHIxoOu3TJ/GviIfxjV3w+gGAAAAAOqkKmorYOEV+txAyBHUKfYqQLoHKeYr4pXqXMw8ygAjtO39V5X4ARw5mS/l
+AAAAF8PvBneq5dl+AA7zQAAAAGC5hJxX5UuQj2aiZkninwe6Uw7l2ENwZdWtQfMBAAAAAMXBRS7u22PKI29+WDFcg8nWB0UMGhF0nxNWPffCSZyqvfP9V0AlfhtfelJk
+AAAAF8P/B9S5i6nLAA77IAAAACBWO9GezKda9BKZijDxwoPRS0I5edd31FwnpikAAAAAAL2miQQQxBlvJnA/wNvGJE3SI8h9XRuEB74ahGuj5IbQM/X9V1CJHxv2yCMG
+AAAAF8Q3CIScgcYRAA8DAAAAACACsa5w6mo1Mqg0uqXJON/u0lvfrh9eniM2AwoAAAAAAMPDIu9T6pV42XROMrJ9yJEe/Io6jq8uBUvsqh/D9RC1//b9V1TiBxv6KC3q
+AAAAF8UU4F7L3YA0AA8K4AAAACCaYKPHLjjZon6Oi+EmOmpfBSS2TqaTULKiwQMAAAAAANZu5dm8cf1duw1nlbaUkAtpQj4/FS6vZ+S8mhC1DhDONBb+V5X4ARvDPj1j
+AAAAF8jEjQ58YN7MAA8SwAAAACApg+5CF+1Y5UemFhe9k4du+q0izkCHfr+JvQEAAAAAAC+EDBqL5htuN2/AWmqMgcIw+PZcy98L+WrFUaz3TluKRWj+V0AlfhqekWsN
+AAAAF9JUBdIhwHQCAA8aoAAAACC9gPaJOxyR4sB3wh9YH2Ia4QBAybIbH0IgEwAAAAAAALQ+kaXBe64LG+7UgI1yXLDmSyzkpNWXsx16FumpHwyvtfIAWFCJHxocqACl
+AAAAF+lhi3Gksa/UAA8igAAAACB86iJZcNX2IAbFy2yMZpnlrMRDLa71SamQzlQAAAAAALRl8xi1PiSa9WETIipKRa8+e4txik6arEL9thVB7WHTo9wGWM3MUhwG+C/P
+AAAAF+lho4q/+yv3AA8qYAAAACDIco19HaOHr7zNGpdXGkKTxZwWc2t+haT+Fg0gAAAAAJogmWxqJA8zuYYV4fLaUydrKMqAlYck3cmS+amF4iwDJd4GWDOzFBzv+LiQ
+AAAAF+lh+hxYrih7AA8yQAAAACBC6fvFDly3JV0wvnjYHineSRy5E/eIHBgCVucAAAAAAMa1lmT1LxSNqozTDJA/vPohJZ6BR8iQGFqE5/XtPQNikQQHWMwsBRwA4SU7
+AAAAF+ljgEGu9rWiAA86IAAAACDpxl2OioVVC+wy4iphmeQP3FED8mU2PJwW+IEAAAAAAOgfKGICFqGxzPrfN4k/JJn3a4RlrKbiSmJjVoTNzOpb+B4HWDNLARwvsUiR
+AAAAF+lpmBIoIuaMAA9CAAAAACB5zCaM4cCKtVpws707EbhDUxJdQ/uTdS4jrdcAAAAAAOkLl8ZFyJBRakfvGUI9mfI5CsUL1O4siQfuhw74uZrbvUsHWMDMUhsB+ANy
+AAAAF+mB+meMq8DhAA9J4AAAACCBGpsuJKZdyRJFdHAO/PLALcqTMeOH2BX2bQcAAAAAABg4VF0GRbSmkHNkdlQWBkKievJ8wSkN8SqGY4yUpFKyZXEHWDCzFBudWkbK
+AAAAF+njg70ezzn1AA9RwAAAACBYn3dlFRyQsal+immbQoZmRXQ+hCkZPQliSggAAAAAANr+/lIrGBNucTK1kIatfBwvyH4YmaQULm1odwY0gc0DB4oHWMwsBRsbD0Fa
+AAAAF+tpqRNnXS4DAA9ZoAAAACBLXmur35fmqFGvX4r3v2Q6yvPKn97pAdrRUQIAAAAAANvyrTNEtsDcU+N8qZDyCHI38kzlaWmOae6c+neSarvMAasHWDNLARvQ+xUX
+AAAAF/GCPmyJlP48AA9hgAAAACDs0MIYI5o2DQ043OoopmBgtuAfH2uZmIeaYAAAAAAAAJFv4eW7pIEuLhpZ6b7+8X0AZ9G1CBf5u1L+TBQJMzOiFx0IWMDMUhpZFAuP
+AAAAGAnkk9ESdEcCAA9pYAAAACB026HT6hrHIkBHtnXeboqIbegioESw6gp3FAAAAAAAAMgGwys8SvhXtPP9CfD+ml976MBcqHUpcU1qd0dn+31e80MJWDCzFBpbPkZe
+AAAAGGthi2TFtzsyAA9xQAAAACC43QNyh32I6SXPjgM8oRqRS13eCsnrBB0QBAAAAAAAAArYC/EIVg1qGGitevzJVw8HBCInCYbG1Xd9QKaeTzRoi8IMWMwsBRoZplIi
+AAAAGZkGN3lTQJ/lAA95IAAAACATtsQd2aTtsKLXSkjk5Hk6/MusGv+3HrYQBHB8AAAAAAmvcIZ7Q9FkGrD7PKh/zs0VzBPak6EXMoe1oBucTpbUpNQcWOreAB0XQD6e
+AAAAGZkGQIf+mdUvAA+BAAAAACAkgJi3I/FvgEIFaZi+aSsKPP1C4D5BMaA49F8FAAAAAPzpD/LpbGdNo5mPhoZcNK83D6OjIreudArh9cMN/j1rwNkcWIC6NxwuYvrf
+AAAAGZkGZMKr/roWAA+I4AAAACD+abxT5sqlUd7qM6FdyeTeL2ZQJW1lOyyfX8ouAAAAAIyGUUO9Dbd9W2GaIYeSIQjXqhW/j89Wad5c1vCtOD5n1vAcWKDuDRyOEX/T
+AAAAGZkG9a1hklWUAA+QwAAAACA/7/8wlF+gxKK+7RFjRvro3l8JQ7nF8Mx2m2cMAAAAAChT0omCty82fYKc4K1fGvtCxoojkLgCE5ReJ3ZJyc1pHwIdWKh7AxzXf+OY
+AAAAGZkJOVg34NsrAA+YoAAAACBwuTrewrflGxRKewrcD3eKAPpY3tnVMk5Jb3wAAAAAAPvbSIldgbB6ev2yiWTRSEY8obrnMdopntprNQ1dyOMFPxMdWOreABxcogTM
+AAAAGZkSSAORGwFHAA+ggAAAACCq1MaMa4HznUaIgg354gEE55MSnNKKbKLV3NUAAAAAALEPsa6l7rUYga/8qt9KP3MVGN52bH5gpdg6GtZui2/2PCcdWIC6NxsDb3Dr
+AAAAGZk2grD2A6l1AA+oYAAAACA6fUrFYsoXvsqZhFWxr3IGcSC2v6xs85RNdQ0AAAAAABKW/xfbjD8iVoooAhvZFnQM2pTxgOxd/s3OR/2V2H6H0kYdWKDuDRtswT5e
+AAAAGZnHbWaJpkowAA+wQAAAACB/VoYrep9hhXpaxwMonpIffw8TS3G6j7drCQQAAAAAABpfFemaOXaii6UsgRCcy1sd71Nuds5ARo+dW4vfq8LiTHYdWKh7AxuP49Z1
+AAAAGZwLGDzYMOS6AA+4IAAAACCM9l7CkyNeaoIqqCN3G59f822JNUzUOGxoDgIAAAAAAJHVX5wYoU/IPJfYm5/I46Y1eqbCfVqb6u8QLrtowWODB2seWOreABsp/dna
+AAAAGaUZw5YSW1bEAA/AAAAAACDaM5JbH3pV6fqObJVaIOoJQUi2DFyI9ppPUAAAAAAAADZzt7bOgVfTz8r0FbZ0CRjfdhCodp1wM0qpq9nJQbJediEhWIC6NxqFv5ZG
+AAAAGcZ4RBWmZoIhAA/H4AAAACD7dSLpdOhvBPclOGqTozRk5hfsIEMu5UaHDgAAAAAAAEnUJI7uxqAaJUUUVFpVa73CPIGZEF9YG/HttxhVjsrmQ5gsWAWPIhp1jB4B
+AAAAGfihfGG8+LnwAA/PwAQAAADiHEuHWW1ZklGivlmZYj9znwwnJqCpGNhIDwAAAAAAAJGmS2QaFRA3YvIsnxSmTfWV0M65rUAfZjllMm2qjGoRHOw4WEgUFxps1ZL0
+AAAAGkXX1sPIJ3OPAA/XoAAAACCek5gdfB/WFZhCZOq3nyDEsM+hKBgkW7BMIanqAAAAALOTZeH2dUvQl0uFTfxVlThOWIl5oDcNNKi9j4oytxmmbflDWEqZAB0fgqwl
+AAAAGkXX4++biFOZAA/fgAAAACBiUROpJ3OT6A5Smhk6fzCSo8vV7eTMAmBakX8fAAAAABHvJGkRac3nayOOezSoK+oPIJrfbLcSfvhwaZa7Scpgkv9DWIBSJhziOhXX
+AAAAGkXYGJ7pC9PBAA/nYAAAACCXcyqGu8QbOLMCKX6SYjQCjt/NvYfWBsbgTmcJAAAAAGRTv5BKOkCYA6o2JHJGlCFzZAzbjl8EgUxGvR/R1r2WKhdEWKCUCRwsyUnq
+AAAAGkXY61wfGdRiAA/vQAAAACB3vHjem5CCgl3wVyup7LvYBC/rEUs6CIxS8/MBAAAAAPnIq0Kn2+JbzUDP3JPDEVtTyhhrFbhivSVoEE1rB5z2/ydEWChlAhw85rx4
+AAAAGkXcNlD3Ud7GAA/3IAAAACCIf8w4A2520c/Ar5ek7MpCu013kfuuWcR6kTEBAAAAAKhNF2miqDEMcHcAIRP+P3EGXcgcQ4ziDmwngs3+hBGgRTZEWEqZABzmBYOd
+AAAAGkXpYiRYMhA2AA//AAAAACBcHHeDBijYwSpqMLsGpTQAtUw1iRIeCEREYycAAAAAADF+30o5iPYdA59MiKDAdTFmzJ/6UpywZz7fPv87M0oFi0xEWIBSJhvq1zOt
+AAAAGkYeEXHbst3WABAG4AAAACDaineze2hPHvz26SGxuFvUKTNX7vt4/6xSqBcAAAAAAM5mDPWpxNCD980RIn6cUjsvDly2sH1AeZaLPzL28knM3HNEWKCUCRt0kLku
+AAAAGkbwzqfpthw3ABAOwAAAACACWljzZESvBbDsoMRUsoD2Jyj7gqnsABqeeAYAAAAAAOhxrWsyJ2sTRneS9+7dPoiX6Iv6Bn6TrruT8dT9YeAUw+NEWChlAhtUqsUl
+AAAAGko7w4AhwyV6ABAWoAAAACD64JqjLPJUGSp/3WxirmjOMmudQemxVJ8uXQEAAAAAAP2T5t3me5bEPS4e9Ex0g3JXfGfetEEPNfdATZJiGHx/PYpFWEqZABsGzgKp
+AAAAGldR4QMQ7gzuABAegAAAACCXh/9oenRKyDzyAxEgtjS075/tZZEWvJN4LwAAAAAAAFA/u7P5DAkZxWL5C4dVaPEYh0QbQ4/q4nKQGSTxM8tubcdIWIBSJhoazXsk
+AAAAGovYC29/k4SWABAmYAAAACACWUawi42K+bgsFrbwblASqkjdGGo1zxxHCAAAAAAAAG+BEDANOWuwW1OPmwysgU6mVTxZ3wC8p7GOxppdl72iSpZNWIv5CRrQy062
+AAAAG0P0b5VrzjRpABAuQAAAACAKwk7jlqnxejDFcRR48xbevBFBPLWdC/CWBQAAAAAAAIuQqPVVcNLJ3NgVijFSv+o6dKf5mRFVvTKRPZfNiWvVhS9aWN/OBhrRqMwd
+AAAAHFnawu0xI3KAABA2IAAAACBRqbwADBQD5hXoUmWQpmPAM1hfT/YGJF17AAAAAAAAAPLqZbrZAW0hWccr4q1g4F3/7Wak0ixT1EKw1xEe6SLPqJJjWGZ2Axqk1BuZ
+AAAAHc5rHSnTyie6ABA+AAAAACAek3iuiZNhVjEfUrvCd9cvCc4QX7KhQFeTXcqTAAAAAFyp+8UoL+J0bou7QwwQwl8jpj+a+CAFJIy6I1G2BMujVJ94WP//AB0NnXJx
+AAAAHc5rJQzbrS+dABBF4AAAACBrKKX6DTkO+luuyus6eIoPCkByHzQnlVVIOi8pAAAAAMQRPLl36/0xICZhe2YY9yzRH4P9jMyG2xnzYZyxtvh+LqR4WMD/Pxwvr9zj
+AAAAHc5rRJj7OU8pABBNwAAAACAOY8dNVj7EEstbuMHIQ29oTw/OH40Q8N3XLoUeAAAAAIyBrRurXlv7W04t2g/qqgl4/on56mjlOF0KuXoju+uMAq54WPD/Dxyho9XR
+AAAAHc5rwsl5ac1ZABBVoAAAACCHn+hnN4WB4z3vfuzAiBP3s8bm86Hz57GP6ksMAAAAAJiG8/ij08IlLGG8jSDECQQDRfbW27+z9kJoHYgPjdEm/MR4WPz/Axz+f0l8
+AAAAHc5tu4tyK8YZABBdgAAAACB4xfKGUihIPzceCQa34Kw4+g4wxFUbcSEa854CAAAAACYd430PGThY4atX4YHb++NgjRobesFzrSG2knSgkrvOXN54WP//AByamRFe
+AAAAHc51npNVM6kZABBlYAAAACDnzORywa2t8ymDsrF7Zih+kdOT8Qiwa3hgkJcAAAAAAC+ktVs8ZvUxKKORFhciz4QXTenOchzvIwz6dJfhPXIRR+l4WMD/PxtU7bs0
+AAAAHc6VKrLhUzUZABBtQAAAACDTHvolquu7E1hE71XgTrBFe1EnFjsBmOsMAxkAAAAAAJ1LG3XCfZtHFzU+xbYmaK5xcYMRtfltTFGiYGYgTv5ecPB4WPD/Dxu+bXS/
+AAAAHc8TWzER0WUZABB1IAAAACCoCYvhDpRgX+3m8UNxdtgsyKPJT3m7RyIg3woAAAAAANxonmhJUvxi37cUelXwYyCTp1b3/z08Dk8AtPSQAkHO2/F4WPz/Axs8zcOl
+AAAAHdEMHSnTyiUaABB9AAAAACDzal9DKSej0nIQYFgNG4g9Oxjmix1I4mGQsQAAAAAAAGPII6IBXdPyM8UlYzw/FTZg6/Y8W/jzbNKnKl+Mctxifmt5WP//ABsEOFzt
+AAAAHdjvJQzbrSz9ABCE4AAAACD8Gf5FSQZtRieF0awUNB7lU9rU6Cmb9TRtegAAAAAAAJz7hY1McEpRsNPsD5Kh4OUtWN/70PGZuiLS8IBsmGxMfVZ6WMD/PxqXFVKC
+AAAAHffpsqbJ7WVpABCMwAAAACCZ0YrKD/kpvaCAOLj+Kd5i+rWePiw6IcpmLgAAAAAAADpmcHP0ry6tHXS9I+g1ERf0hFvNJ0mUDt8crZh9QkqBIXV/WBa9ERreS5MY
+AAAAHmTB5It+3bGRABCUoAAAACDNthdKnuL/dBvbA2MptX3zKAmNcgChCqFMCwAAAAAAAEZEKNlVRoApTxmjU+yrmKp4po72oj25wLsdQtGT7yeEewCKWGwhChppfo+n
+AAAAHti41lG+Zi1rABCcgAAAACBybByxX89GCyyTxo0f9nU3dFV5VhlrnzBDAQAAAAAAAEAeJTpXr85JyqupGsUF1DCIaCuC3YDWOBdUm5n7YBNAz4ChWOzlDBrYFSNo
+AAAAH0DCOAJqJTzGABCkYAAAACDVq9KpdY9aY5Q1MIvVo7nAGMxgrLMJVE2wAAAAAAAAAGsPBLwFeIb0DAuM7pZGYZq1qr0z30rxAcOCVZZnIPbZ5Yi2WBOxDhppY+az
+AAAAH8UGWcJNE6aAABCsQAAAACBxo+l2U4TYTD+CzsJIgmB4ogMnVSr2mSYKBAAAAAAAACGcdEEpnl88Q9EY/02H2vLpcyURxXKTYSfSGkeSViJ8BeG+WN2iBhoXHhrb
+AAAAIKtMIeYpK0sdABC0IAAAACAlmUQ961o/SOEdm66LlU+ZY0k96LcNhcvPBQAAAAAAAO8sFj2o5/Al4HzxSNf+Y0aptZpbghNoqZukygbWhUBFEjLPWM/dBRrOI+Uw
+AAAAIb9GJJ7Eh8OfABC8AAAAACD4PTHZ47A6GIyYVtgPyadxNhWBFAznIAL4kAEAAAAAAIR/JRPqFJjHwyoiezZX5hhqe4K6TPGODkyU/ft/v1JBV6XaWM+eAB09ZvnU
+AAAAIb9GMVVnFAKlABDD4AAAACDPLPfONf4BCJ8xtZSgwlRl9nZn0EGGFwY6VnSTAAAAALE5+w7G8lL548+kMKvHqVX1OGhxsxlCAKF2OegO6+heQLPaWMCzJxwFQaXd
+AAAAIb9GZC/xRQadABDLwAAAACC1fOy+QGcbEP+SKZ2k1ATR7lDe54lKjl5uTj4AAAAAAECT5eYsQV/y68n5g2tQ80CR0PBboX+qNDn+8mDNhuvvRMPaWPDsCRyRxp/n
+AAAAIb9HL5oaCR5eABDToAAAACCNSLWKT2aBym4x2phPiSclub0cRKpK0XfTjGEAAAAAACv/LfaFKIuzcPDF+IFJ5jnZfPbb2+z7PxkZ3TvqpCrdvdPaWDx7AhwKz9dM
+AAAAIb9KXUK9GY0hABDbgAAAACB7tyk0/iYDQOn7D8Ho/BKG9RLn/oV4ibJ6lw0AAAAAAFpYzaB9r8ra2xfoD8KhXZWT1hB+U8RD/tfOuzGKzuW9yeTaWM+eABxbT2AU
+AAAAIb9XE+VJW1AMABDjYAAAACALEewDqb24gcmpo0zKZfpEx1uMkw/dh7R1NQwAAAAAAJnzKZIC4cj1Ow7xLdlSNNj+bMk5NklJXs6crz1bkP7GMfbaWMCzJxtWJv2G
+AAAAIb+J7m96Ylu5ABDrQAAAACAWXDe75vVY5VVUDzzxWj7lv3gm1theWYnGeiQAAAAAACOY80B9IzcTuW3+MpXebBGfwGTabO+epQOTpqFgZcHDBw/bWPDsCRu0RaLk
+AAAAIcBVWJg+fpJOABDzIAAAACCLpDRR+IKAjplttiT4SFozH1F2EWKqdlMXPQkAAAAAAGlgiZE2aUAyqkJQ+PdnxNsV/affmXQgJ/aQktiQNR2sczDbWDx7Ahtqji8C
+AAAAIcODATtO73xjABD7AAAAACD44Vi+G+EjwnytJSxf05dilDfH8iLpj0TAwAAAAAAAAAmv9DHV2sI5LsyWSP1ykwYtvAcLj10szRkDvFkXuP6p3K/bWM+eABsFky/D
+AAAAIdAkrxU3MLYDABEC4AAAACC18u2eZ8+XkDLz4x0777KJsItl2w3B5+SrFgAAAAAAANIubrNAIphXooj4B86Z8wP/KBZuRxsbNUYLSw56LXO68XzfWMCzJxqrjOCi
+AAAAIgEvLEZXMYaOABEKwAAAACD0y9QLo99p/HQgSVeS68LYPbhSjLalzlcnJAAAAAAAANKO3hwsA1VpU2nHPpLsQm1Me7BxUAsXTS9Gy87n4YjSWaDoWE2KExp9RJAC
+AAAAIl4yRQnMPS/jABESoAAAACAWs+1qrq5EXdPfVbFdgwExvp9QanLXPT+BBgAAAAAAANJvDKKJbnRSH0T8W57g5uO/9wz2OFao0lLn55LXrFRjBSD1WAE4DRprh+KX
+AAAAIteysNc7nEzeABEagAAAACB68civgdnSZEHo3oWaKH7/Gu6MHP+c88Q8BQAAAAAAAPjQHcd2czgltmo0osB/PueJS6J0fv8NuFLXES4nYRSkxeUFWXUADBrQa/dG
+AAAAI0UZ9ZK4KYikABEiYAAAACD6m6dcXg1Uf1BgpEcs9ayJ9n7T8VyAJJd4AAAAAAAAAEYvkKF77XgEuuauv/oi7Ag1VWWraiTScMj2LDuSIGBvsLMXWQ+XCxrTP3EO
+AAAAI+r4GI9tbC9qABEqQAAAACBOXhuDCJ5BuUZiTeWlcAJUZX+IUom7GBbXAwAAAAAAAAWcd82WhOyn8yAseY/HM0f5mlSEX8W0I/KOVIeslu18K1YfWaHKBBpVYQLY
+AAAAJOI87cDGNMqOABEyIAAAACDcBjCks0vM4Qr9HSk7bl8BfNb6rT6jE6VRAgAAAAAAAK5tVFqb5EEvt4R59IbJr2ZO5ezGuSi7VJ2Sai+aGU1hr5o2WS0KBhqWZD1p
+AAAAJfiPkz00UafSABE6AAAAACDVl+Kq3oZJ1ML2mnpxB4MpaO99Hgfm1vjjCYCWAAAAAKvHSZfL2encbK8ygyREFo7htEj9LMyeGR8Lue2SO6wnaAlGWQvWAB3IAjXS
+AAAAJfiPnKv4yyKWABFB4AAAACAwzcyYlI6v6ils+88OV/qNmhs++ruD3zS3rLxiAAAAAPEiwVglcd6yzhQxQzKQxVA35Kp0eMe8w6ZRKNngkWuHNS1GWcCCNRxQ418L
+AAAAJfiPwmcKsRWGABFJwAAAACAU9G7Cszf2caZJtfMP80FTw5LlXsLTG5PAGEYdAAAAAGXDFTnTgaVbK6OoB7VhHVlbDQHyMJHjO6P5VyJWGzPsPHlGWbBgDRyexdBp
+AAAAJfiQWVNSSOklABFRoAAAACCGWj9JAC1BHHEun18pyqcGrVK28QSglt8psxgEAAAAADkaWQECNJ/RJlwLGsDEfeYTRs8mfxr+bLdxzDkbB7dFTI1GWSxYAxwNdOFg
+AAAAJfiStLjlC09RABFZgAAAACA2CIjnbXcDQagjeppsEJ6WSzwCfSMnkI64vwIDAAAAAP5MUgbB04l0q4EohUxDRbDfWbEqVkDXB6PAzS9NkOKjwpdGWQvWABwmxdKA
+AAAAJficI31eiKDtABFhYAAAACCl/NdE1m77Aq9TVbu8a7L4On6LPNlPE9n3uWkAAAAAAFDzedInrn0IXofQRX6qyd3z7WNKqtnhKYkHwRCOfywHh5xGWcCCNRsidXuW
+AAAAJfjB3o9Eff77ABFpQAAAACD6dEfoCSLjOOjjVOjegIvRenfike5AQkTsEQQAAAAAAOX0y5+W1C11WSBsQzBfnPTEVpaq47g3rSOdiYHLKLP0O6ZGWbBgDRvJcJYP
+AAAAJflYkXEl6D9eABFxIAAAACBSUCZPRJayt/E5gRp+fCIFM0bl3qTrIvNzfAAAAAAAAF+qwK6aEbba1HCJeKM5ksBZAZ0p5cPO66meAfRSUNbkLNhGWSxYAxtJ/6D6
+AAAAJfu0Qo+FPj+7ABF5AAAAACCeorbURAPAWKfeTe5nXZOHnbvtKiTA+fCtKQEAAAAAALq691c4t4yjFJFAy/rQIMKJmpDpfMkbl+vfTsmYH/WrNypHWQvWABuApynS
+AAAAJgUjBwkClkkRABGA4AAAACBQqNvTldL28auu4mat9plkSxtuixVx5pQ1NAAAAAAAANK4E9YdqK9PK5+2b2qz0LCX0kwWY5t+3QUJqlXpJw6vvxlJWcCCNRocSwSv
+AAAAJiUktlkpz6ExABGIwAAAACAb2u7EyLFpNtW8NDAnAg56uYi1IroiXA0PMgAAAAAAAMjNDVO86E8YzofVZ9Xpm5kASNy8VE6bIE4L0VWrJBRAz/1TWReSHxoYzg1n
+AAAAJmUACmqBJoJgABGQoAAAACAy4+Hcp7OXeuEIrblE5tu9vWBcGkeYLduMHgAAAAAAAEXsYB8budqg7vLn70pOh8hXNXYKG7AI2Cq+k7JlxXX2PipYWYXkBxqe1vuF
+AAAAJzuE2uHgBEpiABGYgAAAACARZaUcm39ahb1U9xJo46JRb+gn0M1MmckmAAAAAAAAAC9f5JwkWDxQ9EsDVP6/IDZiAmt5sF+z0b2lHoijQSsGQp5oWccHBxp8iAue
+AAAAKCNh63Gt+dTeABGgYAAAACBJSOgDgMi5ccn8aNS1xJMEjVuzCCwKgmp0AgAAAAAAAGdGivFyrmbHKM+jvTew4K43kzrBF0gPHc9X60yTF6S3cJV5WTl1BhrmKDrs
+AAAAKQq6H988JY1iABGoQAAAACBcg+xuB+sT+qBi2cCq5ZPA6Tz3XWSSToSflAIAAAAAABPUlyG58Dp40s+srO6T204fGYgiUqFzB99aBbIxafCBnHCNWf//AB1xXdeL
+AAAAKQq6J8JECJVFABGwIAAAACDo8E3IaE685EYCQnwiQYq5kzmG4opGZ9r7VgEAAAAAAARdDy/FITqcWuk3WiRBogLxQCJ9ksYI51e17gTmnM2lyYuNWcD/PxxHWHGH
+AAAAKQq6R05jlLTRABG4AAAAACBN9xbUgqvBlxz0Rin3+8+g4hDdyCJxgGw8tAMAAAAAALzoCgaI1tr6VtC35HRFXE7Ss8bOb1e6hi8HDc1m0DF9n6qNWfD/DxyqI+kY
+AAAAKQq6xX7hxTMBABG/4AAAACAM2vTrSTC1jZopRug9S0JdfgBJtrE4JFxj4AQAAAAAAIVIo498ZiPi6I29wB87PvS/Mb2LgALV0KR6racwFiC22MiNWfz/AxzEWqxl
+AAAAKQq8vkDahyvBABHHwAAAACDZNlIPofCU5/JyFUn8d7o1K9G3Kso8nrfkWAIAAAAAAHu0zkNbOIuwf/lVrGYPuxe09c6tVI0KTWAB+A8dHWCd0eaNWf//ABxAW52O
+AAAAKQrEoEm8kA3CABHPoAAAACC93qw1oijYSDyX6iP7uGcEm0leEM7+2XVogfUAAAAAAEp0sCVD5C4j352D5RT80udxPAotEg9dMzrIiIdPAaVZAQSOWcD/PxtwdqLr
+AAAAKQrkLGlIr5nCABHXgAAAACD9tm3xnNXWnojAYSMHrmRJS8ek9wqB7Lo7NQEAAAAAAJHiBXPe8XkL8T0x2OMp+51rpsU79r2n5wNy5WTOxv/DnweOWfD/Dxs2MEmv
+AAAAKQtiTOhpLrnDABHfYAAAACBB8QqBrZ3sNQ0nnwb63+PXvqYMZ3OUOIxNNQsAAAAAAKQn7PDBJXOPfkMe80rKIcRhylftkubG8bazibZF8RRKDBGOWfz/Axu56leF
+AAAAKQ1bDuErJ3nEABHnQAAAACA2yjXoEwpAO+/RahQytaJbCAj6MIfN5zkf+gIAAAAAAF3rvg+D+er26Ah8g7Tj0OycU+3AD7XEx7KHbcGnr5c+6z2OWf//ABsCIBFL
+AAAAKRU+FsQzCoGnABHvIAAAACDX0FjdPG5cbCDskkpHfvK/g5cqZVnuPpTH0gAAAAAAAI5iTjOj25WevLsOGpopFfCriUnc8ZSNiJM7NriSY6G0IaOOWcD/PxqD3fxk
+AAAAKTTKNlBSlqEzABH3AAAAACCf7A6c/Htass+5YkLu+0kLSZdKqNm0gUEDNgAAAAAAAKLB4LyZizGXfUh0IuglaV70JsWTb2aLqqxBr61yt5gcKPePWfD/DxqvHYjk
+AAAAKbDgZxMawdexABH+4AAAACAKfLMVOcg7Rn1+atkyJ5D8UvGS5syBk7XeBwAAAAAAAAm4pj/iZ4Y8LpUunrgf0dHD7d/FZ7sCfYCOrAxJ4KdXhdWXWRbKBhoZUVzs
+AAAAKjYGgQfdfDB5ABIGwAAAACAyZtFWnJIxA1FOqlwG5mZHrgzeKvfAYjSDMn3qAAAAAFfHZunHo5xgovA+d3C87DQTT9a5ubLUPGDJ6avFPdV90DizWf//AB1j1VSQ
+AAAAKjYGiOrlXzhcABIOoAAAACBp4jkCudMCYmZX/HU+hMd7mhL5yNRw093g/GgAAAAAAHuJWZec9EwCDvv2PoH5SLODHkh0T2ZNNwXH4THJ7rF77j6zWcD/PxwFF87R
+AAAAKjYGqHcE61foABIWgAAAACBpoDx4iuUQdAHuqO3YtsoxU529+JOUnCwhorQmAAAAAI7yFn4GIMzzROCOzGsEItGSZTyQFeVWo69M8yi1ASooAE6zWfD/DxzwA9ax
+AAAAKjYHJqeDG9YYABIeYAAAACD1OxTec0KEEAb8eKaweLuxHX/RHMODftyiXlMJAAAAAJy6d3QDs6YmtcFBJtapUq+Yy8zaYBhHhm7s2Pi3MHhVhGSzWfz/AxyyVHgj
+AAAAKjYJH2l73c7YABImQAAAACC66L4ir3gV4qNEVzPOqmXpLri41ZHKutXLB4YAAAAAANXwlim+KbvjKRt0vygcm1dM/c1INHI8h5Ifc2pWA1aX45CzWf//ABw1v+G4
+AAAAKjYRAnFe5bHYABIuIAAAACDZgfNOFMOPArs1QU1s55xW+XbhxJheD67t3DAAAAAAAPNwWu5F17rexNksn07lVRbCaobOt9dSYFm5jA4ufqEQURy0WcD/PxsIk7wS
+AAAAKjYwapnHDhnhABI2AAAAACC+rYxJTMczKqdHMlG/Vak0qSsiMVeoPw4/fCkAAAAAADKbBggkpSu3CRKJ/eA8bUk5pVvcgDWLR2T640Hihm/V71q2WfD/Dxtquem3
+AAAAKjat+yFXlanrABI94AAAACCUXnnyoYzcDi7xnZyRWIt1bkjbyyCBHkoNCgIAAAAAAC4EdKmqQrJuZ5yxcT338oj0ksG14jNf59G7h7kVl+F8CAu5Wfz/Axu4sXu1
+AAAAKjhQcdVbMWo6ABJFwAAAACCA2lQoBaWKbrzmcoYVYEpTtr+CMQLJr3OHBwAAAAAAAIORLErgHJnVFPXtP6KWBVuvvsnD4tt4AAM3rkOE7c6hFEDDWUg2AhugJ28G
+AAAAKjvhLateuYglABJNoAAAACC3vp+x5b2G7Tmk+Lu5BXg1N+HZBwiAZ93sAgEAAAAAAFkae1nqzp8j7B1sz8DoOhxMhBvgytSdsUrUrH9mYeRhUbjDWZKNABtaVx2o
+AAAAKkmq9YHCvStKABJVgAAAACBVOhzBX1LBAvkNPiPLOlNltHrGN+d+PC49XAAAAAAAANQzBJki0xt97YDLOAVHWix7KZ5pSLmP+6szuqawEpEeoz/GWYBkIxrWLB0r
+AAAAKnEIW1VugctrABJdYAAAACCwR6uwtRWY3E1qupETRqTKh//Ou81QFnd3GgAAAAAAAMv47ZELz6VGx3UdxNphgp9gn/w1g81vmNPEkcyPJLC/QVvVWWf4HBr5isa1
+AAAAKra5gwlRQukGABJlQAAAACDDHeBKsEYm0iMHHZAyW6tSTqiij9K7kMMeBwAAAAAAAI27SRurNd6vKBq8nOrr0glxgWVIJiFef4+ueZCBoe7osX7VWRk+BxoOs6V3
+AAAAK81+Prvcy51HABJtIAAAACA6Q0aY80BEV/rdNcmc1TbnbvLGEPeUMezDBQAAAAAAABqkuj+SlYp9/G6arSBWsPyceMdZZv4lZg2U4HHZWS54cgLWWYbPARpZX8BE
+AAAAMCiRxy4VT21yABJ1AAAAACDimf/XAcqiAoS2njtWrR7WaZKTkUWS9j3MAQAAAAAAAAQJEZtRQeK720o2oOguzwNz8pzhAZEx6Ix8z5NDojuvamTYWYDhcxlrAq+X
+AAAAMbQCm3aOvLN6ABJ84AAAACD0UigcZTC6kv2G+1BXa+S/rFaoEzqvzlQ1i3eMAAAAAC3op89VEGywCWm1YReuPaLhojAcl79u3vof972zNBAr0Vr7Wf//AB2CV54K
+AAAAMbQCo1mWn7tdABKEwAAAACDFZTuFDiTswyDswQYnCzMzPNo9B3bq+HUfo3wQAAAAAGaTeXP9xCz8HJG9LpI861n9vBZ7kKagee5V6k8iK8WivV77WcD/Pxz1LFF8
+AAAAMbQCwuW2K9rpABKMoAAAACBG2qIG1zDzlvpMe96RSEbXKj4Rzmkof46wmboGAAAAAI+g3C1yGdkn7zemaTWY/dtaxP8VPs6RwkwkkvxdhxHv+GP7WfD/DxwONuBK
+AAAAMbQDQRY0XFkZABKUgAAAACBlmCYeGEtpFftVv5oB5ZvaCrnf9hgoG9VrAzEPAAAAAG4+KMs5rd8ppMkAfC3eQI8gK9nWiZQRb0NhGoxN5nTXIW/7Wfz/Axxz6LjB
+AAAAMbQFOdgtHlHZABKcYAAAACCWBwc3Ka5loQ4tTcAKwNUI9rl5o7d+xBsQzE8AAAAAAHEmtXTQwHyscffq87mKiAzufJzxKsS9zAuLBb7rDJ+CiYj7Wf//ABz2T1Pa
+AAAAMbQNHOAQJjTZABKkQAAAACBtRhh6/1jOIihI+EdAk+Fpft/w3o6D2j7K1UQAAAAAABxOQbk0j1733bZGhZ/H9SUb6KqLPLpFutSlsWGGG6GrfMX7WcD/PxsX4nhw
+AAAAMbQsqP+cRcDZABKsIAAAACBQRr+bwait8bY9zdj9itlwM93EANTmexX7vSkAAAAAADwkQcbHRGEZPzdtvUya5lz+XimV3Qixo/pEIMhgydwoCnf8WfD/Dxu6U0Gq
+AAAAMbSq2X3Mw/DZABK0AAAAACComiAHNptFd6q4hwwEwhp4r3NPqlwD2Jpp6QUAAAAAAC8vpamz3Mn/BbJZOp8B26IkgLTQsjxUuXYZwfn1ujiB9AABWvz/AxumKSZX
+AAAAMbaVW6FO53ETABK74AAAACBCmGeBm23/p1MGJJLh4L3JZ6HqvoV9PwO6wAEAAAAAABLpB2/05OLsfrjIbjsjff2bJbO0WGBZOdSAAcixEnNjihIFWv//ABtV34Oy
+AAAAMb5mY4RWynj2ABLDwAAAACBJqspr8KTxFfdNv9smcox7nLQA6CkfEXYBDgAAAAAAALbIpjxV2mDPSNhJHHSt/1iJC//9ZkZes2YUp1273Wdd4g0GWsD/Pxp+IAoE
+AAAAMdEOeWJsqI7UABLLoAAAACDS3dWlc1fU5Oy0cD0riiJVQzj1U5AuGULPsjusAAAAAN//DaCp4LUdULP4YCJvchTJi59qdG3G6EpVu0SyVGzDDmcZWv//AB2AEZtA
+AAAAMdEOgUV0i5a3ABLTgAAAACAaHy9YbZwVjf7Gji/Zy5uOmbctSwSxQgi29ykPAAAAAMPXh9kioIIYpXV2flkl6rOdiECFbn07zT59d1jiCbcS5XIZWsD/PxzBvhnV
+AAAAMdEOoNGUF7ZDABLbYAAAACDvfsl9yPt48zcLzbKLUECZAN4lGpZgl1+8hi81AAAAALFlLWBwkUFH1t76ulgXnREK2R1n5DEtWnYdMYUqNwBASIUZWvD/Dxz+UwkZ
+AAAAMdEPHwISSDRzABLjQAAAACDNOViN+NsXgQihizZUOUz2V5j1V+15hgCGMJsOAAAAAFzTg/caSaQHK+Ex/exUF0Nq8ov8p/1zD+c95/XoP9w3RZwZWvz/AxymZdTl
+AAAAMdERF8QLCi0zABLrIAAAACCv0KjkkkpJPKCOuSyGO2ZsHb1iG+bQ/thLMhUAAAAAAGG49ycXfND27cOH/9TtU6cUU3bm+Mb968QeInDpsJgeTsQZWv//ABwMs7ue
+AAAAMdEY+svuEhAzABLzAAAAACAPS0RxBOuthTrB/P3BwC+nYBg0Swh6GxhaRyAAAAAAAJeAHTVrhTkfc7ZbzAqvXLWYl3JsGGncerSPkQcT+QzoOCkaWsD/PxuIJtFi
+AAAAMdE4hut6MZwzABL64AAAACDY4XNkZlBiDu51JziAOHNO8nR7cHWpCMUFGQMAAAAAAKUAgujGH3hmB4n7wE8IbHtKvxLBEYp0TfZJC//13IQqG7saWvD/DxvEHUWf
+AAAAMdG2t2mqr8wzABMCwAIAACC9qXXFo6mb94KIoUAVZpxaUO9uOqMuXbE4ygAAAAAAANlF+uo0EtBHUFIHY4DOsMSuyI4BsElbV8HYkY1Fxwhat98aWvz/AxutY3s3
+AAAAMdOo+XXsvAxOABMKoAAAACCSsyLy1zfWHukZC3VeiAZmOzB5op+op3mZcwIAAAAAAEis13LP6krkG+dXnDGPbVp2v5tFTvBsBf36jsxd898OluobWv//ABvgd51C
+AAAAMds6AVj0nxQxABMSgAAAACBndbypGbV2a77lrjmKRtVZJ8nCrG8m/DXpkQAAAAAAACWCjWpXAnWWhi90iCUfANqMdsCkCmKT6JU43wiz6aq3P6AeWsD/PxrCYuSN
+AAAAMfrGIOUUKzO9ABMaYAAAACBYbuOZZmT8NZXCP3APQDx8tgOCIFSCkznjBgAAAAAAADHxpipwtdnRsTogbVQJDig8Zs/8qHsU8fkG4DZ7oDwVtCUhWvD/DxpBFFLV
+AAAAMnQi90KiA0RaABMiQAAAACB8maYs6bIlGBtH61y2JKobfzr5dw0V0fH2CAAAAAAAAKnJ2n+15GuIp0jiBnmlxxqvFeVDFcT3H5f7/huFxc9f288nWkbFBRpJ4cNM
+AAAAMyLwY6TGuYRzABMqIAAAACCzniwkHD//LHvyC8XFR33HztshVMzt4ZRIAAAAAAAAALdn0csJ2541WDW36Uo4Wk+CrM6oXKxeawZwlrvV3PBV+6dBWqMTCBqR/+/O
+AAAAM9FjZ5Zsgh3jABMyAAAAACCODFvHsxENpKphV4mFkzJ8D5DXixpe+5dOBQAAAAAAAOxQtzMxz0Gtg1L/GK7ydxsxzOj4QZb650pRO7o5X6BcrZZUWiVICBonfRtv
+AAAANIEUU4MM7yKvABM54AAAACDcAgFLU6txE+4uwS0009FD3u4nlajFvPQABgAAAAAAACAsivvdRcW8yvJuGCSsSOAiFeyiSJC6v13XnUhxv795TlJmWvf0BxoBOoSC
+AAAANUVC8hZAoX/WABNBwAAAACBIacl9XiGLwbrIxFHqoUxOJkyzEEa7w/g+XK3RAAAAAFlgbCTIxsYzi7SZFVq4M/fpZ3q1vP00hXGB4Tsz42lwdTt2Wq3cAB1VCKhw
+AAAANUVC+zxwkLqsABNJoAAAACAjl6t/OL/SPN2etQL9jzS3wp26uCSXH+F6oPZiAAAAABoRfErQpl0/p4a6Zn0Mrcuzpm6J6IFoTyJQY2CfI83Nj0l2WkArNxwMd5Yx
+AAAANUVDH9UwTbXFABNRgAAAACA5bnVE9fHOFNIZ/ScJazPzEzIgIP8Jm3zJ5BQAAAAAABOBleESxvmr2C8WB21wXuIGpYLdJbuecE+8uKyB9VdoUWR2WtDKDRxrAo6k
+AAAANUVDsjgvQbnGABNZYAAAACCUshRmUlXVDFjI5cJ1Llolc/rTrifhgBhoBNAAAAAAAFzJKs/tbe66phvaNheDFjoUzm0YaOEXtPymn2l+3b9LVoR2WrRyAxxAufV6
+AAAANUVF+8QrEcnNABNhQAAAACALbO6LLuO7gRZcm/zAwa9kaS1mQI2iu4kxCQgAAAAAALoSrF6nCSltwfpcmoxoP9NAU1TR1qa8wtIUUPFv7DQ136d2Wq3cABwUqnuv
+AAAANUVPIfQaUiGJABNpIAAAACC/ayYcyPtAsGME1hkhjBxytk3vBCJbFvgM8S0AAAAAALRZ+R3b77LhMSnYmhfd8YNnjcLVX6bqmjnIxFYX4kGfGbl2WkArNxsP8qgO
+AAAANUVzurPXU5gYABNxAAAAACD7rBRqhe1H/xaBBFTaLS7THYy5AJjN54nHKAwAAAAAAADBlxvCAaPMq6UnU+w51MUDRnmT0+mdp7U6yTxxi+XJatN2WtDKDRvjR+PX
+AAAANUYCtYHV1DHgABN44AAAACDd4exkNOzu88lb8gmJ4fDZcYyymYKbXXXn6AMAAAAAAL5Sa7CVJCWJmZjBG3049Fn0bDf9xvocu7xjkAUi/pF7cyF4WrRyAxuz0WaS
+AAAANUhIxpoHocYNABOAwAAAACAi+H1GSs8D8F2cLZL2dsrKBni5LL46EKCVSwAAAAAAACMUqdCRLjVHp2OZONA6nYFtp4R57+5EXLZZpZ6IEQOs5xt5Wq3cABuEdXiF
+AAAANVEgFECYpMwuABOIoAAAACDABpXoHAQt3Al+914mgcJEBIYVp79yq9ISXwAAAAAAACQc7OrakgozDnEdRGRFhxD3U7NIeTsZAHbahgEQGFPN5Qp8WkArNxqTxgOy
+AAAANXRUKEq/FC/QABOQgAAAACCzEgj2kLmCAs0B+3e4jRg0M+mu2mfzs+3uFgAAAAAAAKjSsEZMIQWTXave1NmbblUKnC8b6HfYHRjyRRooZT0iFe6BWryXERrYgyBa
+AAAANeA/9Ixvdv9aABOYYAIAACAAMMuw3D9JfaMqrIdtZar4mon2tgaDvfPaAQAAAAAAAAyxoSJ+qbAp+Ty1aOUgUvDe3+uRf57w8Zr9GdidiQEJx0qNWmTUChq9w5bI
+AAAANpao7fTakzawABOgQAAAACAcRwCqSYDOKjbXymFpBYMHUpvtC62SaLiQAwAAAAAAAJSLMCr8uUaLUYnPUj2o5YdA9t0K34zkUU3odKXWos3Cv6qSWpYmAxrZHlQ9
+AAAAN9fKvUq9vuB1ABOoIAAAACDMIxqV45PRXQvVUZEjenWc2jo+fd60AV0QAgAAAAAAAAKPZ2gsSWD8rtkvrkRQug/Ebix2UtlyxyjHdA8lelcfksmpWmbxAxql3T5H
+AAAAOMhnNyNNwgf+ABOwAAAAACD0jwlUXW+kFSmJkYr98v+xpAGCMN8CqC82AgAAAAAAADcg5ZQ8BdWOVV+spnyNA7Le/wxJK9ZXQVHVPasZfHMjbWTDWkZ4BRry5bg4
+AAAAOgbYImm4kfEtABO34AAAACDLmI2eiyfFn9b6Vs2mkebX2Llky67Gpor7BAAAAAAAAO5BKXXuMbX0d3ngBnzn2IYyBB0WalSH63fLNHGhBk8g05DNWpsDAxoNSLJc
+AAAAPAHMe4/+VvD1ABO/wAAAACD3csS4EH4NPDoWBekyE+cert0IJSt12TvOAAAAAAAAAIg3FAXqSjIykeIi1BcGCl3RFnQWd5kT9NknfbynOdi1tfbfWhwBAxrZiTys
+AAAAPnYOdyWF940YABPHoAAAACBH9mo4Q1jZE21riGFMMwWk1EVa8YIJUtjQAgAAAAAAAJam/QAr5ZvugHponyI8/VTVWSBZrQ4c00jUnEJvzr3DOVbsWjECAhpIaXZU
+AAAAQMt/25p1Iv8oABPPgAAAACBwX9pYjWVpXAhu6HMxvVuPyd+eQF191ipQJf3KAAAAAArpRZ56wi+GauZJDTKNced7//+V9S+5iIc8P8UhcURrapkDW///AB1qtLbm
+AAAAQMt/4319BgcLABPXYAAAACAF2g7lzRf8tIvtQGoBKaAvCeoxd6ApejF1Bh6wAAAAAP8bbWYB+E4p9pGLDxDRxbIy2K+Y4iRjeZPwZIQTgZGByasDW8D/Pxx4hFvv
+AAAAQMuAAwmckiaXABPfQAAAACCcmVRcuhYkrvtZdWJ0qaAaQK3IzIMo7ZZTgHYmAAAAACXIbGnjjjxgimPyCraXRKGl/F8GzGgy35LbEp2Dfoe0F9gDW/D/DxywVZ/U
+AAAAQMuAgToawqTHABPnIAAAACB4GKTjnuK+BNSR2zIfycWNIiRYQj2PFVm3CgMAAAAAAMvDZ3YxPxDVL2g0wF2D3UE/Cxn4Eew4XoyZEDdCSrPZAgEEW/z/AxzZ54bC
+AAAAQMuCefwThJ2HABPvAAAAACAXMH0ZrlEz/Q6c8nE1+6EcIPuQdI7ADgTIoQ0AAAAAAB+7vF3YjZs9arqfFQqPQ1jaqOaSUc5t2FHUOtk27Q+Y1FQEW///AByKeWxN
+AAAAQMuKXQP2jICHABP24AAAACAwk2qOi7DhZFExOfqKuEqdARx9/G/BkKjL4wQAAAAAAKxMOGAHeRx9ogHMLi053ZPAFKW7UFmUv/jU2STWb+p5S6kEW8D/PxtlYFeE
+AAAAQMup6SOCrAyHABP+wAAAACBg0JtmrN5nCUoBmdECqk3lKUXke5dDC2P73AsAAAAAANdI2qGCTAXqPDBb7Uyl8LWPExdiSSW0w5f5/hVKBUS3/CQFW/D/DxuWrxT2
+AAAAQMwoGaGzKjyHABQGoAAAACCQN59Xr9qQYM1wQX5ptZC9nw3f1iHG+ThAJQcAAAAAAM9CYRM49e5K8NfhFvAmboUXdc2DXHgD/ch6xy3z+2GksJQFW/z/AxsApTZb
+AAAAQM4g25p1IvyIABQOgAAAACC0gQlUSGuaO96/8GewKJpGvzI2lOwc6ic+JgIAAAAAAOrOvggGSNKRAib5rOzGlwaT17rxZVQdNH5Sk8a4soxYS3IGW///ABukd8K4
+AAAAQNVEC8vOsmbsABQWYAAAACCg34XXPyaXRNzUNPAykDrSIvIXPWh+0aiU8QAAAAAAAIgXrj6Gf+8sJK763xq3/CDJ4ZDhY7jn4JdLq/Np6Hsjw0oMW58TURo8xbHD
+AAAAQO37sEK/KAF2ABQeQADgACC6azH1Z+HNnD8PGlByPCoTW83jRHCwt1njNgAAAAAAAI8cPbVkcMTIDTaoCRFQV9hQZ00bulyQiseo5ivdXzZWzXMOW+dEFBp0e5le
+AAAAQVGXuOLPTCXtABQmIAAAACBIb68RhxX7xmDp5uh2WvzV9/sf/eCQiukQCwAAAAAAAMaYphjrhuVOgdoEivDxMCupfPQSPrUpzHm2EitYh+86yk0QWzkRBRq9fcTK
+AAAAQt35AJkPyTfOABQuAAAAACCXw9VLRsauQv6zPo/D5rSbOHiujTsw5OEEAQAAAAAAAO3Eri3WCwyRYaJeggaY3SbFvmSpwfZHz4Abf2K9G2L5vnoVW7BrARoa9d0J
+AAAASGCXHcfIC/MhABQ14AAAACDHkXbCIM8k1iTeUUZ4S+ta0lofkjWmaOO9AAAAAAAAAGtmE7eUskixn4cyaFRO2EjbISUuA1pFHKa2hUv0I5iFLHEZWwDsWhmM/G3u
+AAAAUoo1YPUNpKUVABQ9wAAAACDAB1gJXV2IdGclllxzsWcKD9xWfk4T/zyjJqaBAAAAADw4nzgCnnztcCgclnD/o4QuUJGgGh/BV1bAQBriRGLOXzQ0W///AB3yTJ3i
+AAAAUoo1aNgVh6z4ABRFoAAAACAgaUS2PPQopb4GWVElkOcBYUF/duswkfPNV9NVAAAAAN4h8kd07tzUgjMExUvTHSb2LTnHLQ7eyxmAHyNHpB4zBDo0W8D/PxwrNUy0
+AAAAUoo1iGQ1E8yEABRNgAAAACCmoFFJuO6ttA814H/M3+hRJLCA/Vahwfkwi1USAAAAAOxhzLTlGf04IuW4T67VAJZUc2Gdaopdteb2E+ILz7uRsEI0W/D/DxyUFCor
+AAAAUoo2BpSzREq0ABRVYAAAACCV35shfJoF2sFBuH/ASd3E/zQDynz8JImGpAEAAAAAAP5uLmX/nnAn3e1ecRGPDChmsbqSUjKepRQ4oHANRr0QTFM0W/z/Axw6BPtu
+AAAAUoo3/1asBkN0ABRdQAAAACDAUp0EgtPmAygKYT0YJH78jLBxjKi70msIEAAAAAAAAOthEbLzUndybgQgY1O5mRT+fw07venbiGNk0ekRn0TBa2s0W///ABy4d0xo
+AAAAUoo/4l6PDiZ0ABRlIAAAACBk44XD1Jq4XOZZP354k94ocgkLgl3gL5mDjAEAAAAAAGdcI1LV+MlAXHfwDz5GePOw6NyGJn1fbOUN9N7uKCA5TYU0W8D/PxsgPlJv
+AAAAUopfbn4bLbJ0ABRtAAAAACAZf9QEOXhkjiqN530eXp7QAmhM/3BHMoCrIwAAAAAAAEC50fga+6Ez+J+Y6qIjp/no6QN5AP178ZFe9PchOtXvbqA0W/D/DxvgFfez
+AAAAUordnvxLq+J0ABR04AAAACATcZVoLbbxEFuNsdjElP6Lydg1eFXqlKJ/KAAAAAAAAGn2Vf+lyTvKJR8q71MhVg4kGlIN5zrJqWYNatn+hFBhn7s0W/z/AxvB40Mh
+AAAAUozWYPUNpKJ1ABR8wAAAACCzHD86H+QLimSO4obI2B8VHrogOPHfoPVC2AEAAAAAADCpOpkUebs/ZJOMlyOhdeCLVg/WlOW0kG0chlBGGoCnI9c0W///ABtpoRVS
+AAAAUpS5aNgVh6pYABSEoAAAACA9fMBgEB6z2/Dz7nSwJYu38AkUxS47l1RokAAAAAAAAB8WyizNlUeoaEFAyOrbdyXxavZeYS3MCqB5FpF6Gw9t7Qc1W8D/PxoknERK
+AAAAUrRFiGQ1E8nkABSMgAAAACCFOm5jcVGBPos5MtjM8HTv/3t1pJcr4pTmCQAAAAAAACUmcDy/XVZ8Xwtj8IMPxSRXk+NzTfjnSiJ20w7aFYBjfs81W/D/DxqpF+K3
+AAAAUzIGBiuy20erABSUYAAAACBlPBqnaT8HoNTB0XW1LhSxcXbUC2F4VrmUBQAAAAAAAB9wLoA+VFS373D+6uHhdg08zrUmyWpFn7s7S8Twg9iffgE5W/z/AxrZrspQ
+AAAAVSOH98qkejlIABScQAAAACDC+De1Tb5AG+D0NOP2hO+uUPMymYwFXG2sAgAAAAAAALNwh/0qcsWC0YNESW6wtCtzUO+0lu5z8rZ9OPwEKheeqn49W///ABrdXKHx
+AAAAXOQ1na3R43dpABSkIAAAACC9zJdVnhIWQtUtFGgwnaX9O6uOxXeCHanJAAAAAAAAADuREFWKmxbWORZdE5s5uTs9PObb13XNSe2Z3ttHWGwHj3pEW56sYBnN7C9A
+AAAAb1PlQUUXg7a5ABSsAAAAACB/5Cdwa4wEoP/DpZsgKmptNPt4kEz28r9RAAAAAAAAAKdi30YT+4ft542bxCTOD1eWQzIzQ3a44zqluafhByyZC5JSW1WYSRkG7Edj
+AAAAhX1SIdIdoYW8ABSz4AAAACDNx0IluupPiZNkc/AZnnyRpILt6VwQajY83wAAAAAAAB7/e0E1kHqlALIbPa9XOENZQu3Mb/ll+YPYCJcMlCOWRGtkW473AB3x+cKy
+AAAAhX1SKfn+ad2ZABS7wAAAACASi+hwG1Z/ribIeSIXoWRivy1bZ5GflQaAfAAAAAAAAJ6W1XkOhn1CLFbXT2bVpYeSASr3LNYo9ZlGUxZF+B83SXFkW4DjPRwI8m7f
+AAAAhX1SSpmBi0zLABTDoAAAACCGyuAEw4PYuDfZCTWuKjlMyDGHnmbnDXKzWgEAAAAAAHZlPzXsNlkD69UscVEQkVvd5jDQ7oLKZu6C43HwEnMH8HdkW+B4DxwqgCSz
+AAAAhX1SzReOEQmVABTLgAAAACA5YGodViTj91SMSRFe8DBd+yCQONpD7lZxbQEAAAAAADWYDwY9k5be2MjJ+tyxV+mULCMu80+be/CAlMI5fdsK6n5kWzjeAxz4ml2g
+AAAAhX1U1w/AKAx8ABTTYAAAACAqcrcj+HblvFIc1+FT0s6AkIM5/mM9+JKVnAAAAAAAAIWGJ89mxyRovK4M4TvJiMMVKEH71jiYnuSgUplQqvAayoVkW473ABxPbZj0
+AAAAhX1c/vCIhB/6ABTbQAAAACCZOgt0XKjjZlivSmSR7tK57fsxuFHfjUNr7j0AAAAAAPUHReZ+cRfZmz09sZx1g8jTdkTlxpeMCBbjDIJTgUxneoxkW4DjPRtBCIlg
+AAAAhX19nnOp9IWPABTjIAAAACDkueuYRpduUcTxiWNvmu4EFV1g3jqKTVn1VQEAAAAAAHoChCo5z1pfO+Rb6wXmn9dTAzebQwebDLy6kZPCl+hwaJNkW+B4Dxsc0YzE
+AAAAhX4AHIAvthvmABTrAAAAACAWNFnx+QvHvRs9JkNKqsLjkK2iSr8Gw98a4gEAAAAAAPvNKXh3QnwAvYeS7wdEIGwSSCZwa8biAmL8rDPiWOr/dJpkWzjeAxtuk3Vp
+AAAAhYAKFLJGvIzgABTy4AAAACCClpL++IbL/b18jjTRxX63ElwKhdmnS+gYggAAAAAAAKlEr8OTHjL8sndgOW/hiB0gRAgqjoAf4sakEDi4aUc2n6FkW473ABvTPawm
+AAAAhYgx9Xqi1liqABT6wAAAACA0nku8ZTVNXsdHq23K7cMEgXPx/zArtEH7VAAAAAAAAHkQmBApj6+KUIdOx92uuHUC9hcEhOLl6WAEBNE5mIz12KtkW4DjPRpcqz7n
+AAAAhajReJwTPZ9vABUCoAAAACBIgs7uwpp23p6UJ0YR2BvMnZU1uhXDJbhjJwAAAAAAAH81xCJvWlFJ4hocTNxpbjICFeAOTfzcK002R9kx/wGeJs9kW+B4DxoJAeUY
+AAAAhitPhSHU2rqGABUKgAAAACC7rDWcjZpzkV5Jf1JqHJniKIrTrgvaRHBDBwAAAAAAAIJxv4re068WAKI8Kcba5p0t5fNVJafugdixbPufKAMenFBlWzjeAxp485/T
+AAAAiDVHtzjbTz5/ABUSYAAAACCvr3oIFa46qX1TqJy9leC4OWu+oLCOrXQtAwAAAAAAAGhCpkMY8FUBCPGxNeg6rF9iw0PUTgdLf+ObspWzpsbe1lNnW473ABoKjEMM
+AAAAkFGNUw04m+MwABUaQAAAACCzg8xi7ambUsYXODEmzDDXpsxUWx8YJUBtAAAAAAAAADc5BNQme+pVFLRmyym/4QtrQE9QCjtZ5wIfzDGZabhnGfptWzsnWRl8R0Nm
+AAAApAxzYhaVGKBuABUiIAAAACAJ3l6BeIrIlo9WfGtQgTP9hmhrNU23oP4f2DocAAAAAMFCFuiZVFdSBX/YiyAuTiUndGtVZHvFtXvw4UXBuvQuY5R9W2fYAB0jC590
+AAAApAxza2sFuD7qABUqAAAAACBJzleRRY5iLPK6gbOCkPvpxNgSRyXxSiKdc0ABAAAAAJyZ8+tskjbX6JfmRNXmiZTqWRR9qYYRx5505RFEminRa5h9W8AZNhygBDmD
+AAAApAxzkLzINsC5ABUx4AAAACA4HTTZp7GKuqw9WdOWUkNFduHRyAMaX4McSQYDAAAAABzgF9fVoi3YGpLviZmjPmCGUhIrdw+B98YMMgRJ75iQc5x9W3CGDRwJVOvQ
+AAAApAx0JgPSMMf4ABU5wAAAACDRmnCVAgfdDdbGGrlHppsmz8/kuI4ii2GDswIAAAAAAEx0G1WpfOymqAUjFhove5ELAfnE31r5ZVJm/81oQjFL+aF9W5xhAxyYp8+a
+AAAApAx2ex/6GPyUABVBoAAAACBqbIWWiyOt9xeYZNHIT0cyUEC0B2SnJMcPyQAAAAAAAOJ1mlS2TMo5HeQmzgBtB7Ogz0Z0quwyNIPuoRklWdlH96l9W2fYABwRB/qD
+AAAApAx/z5CZueahABVJgAAAACApMtutygw8BChsPFpBL07YLRUT8qUjs2JaLQAAAAAAAKrNgr1PaU5xhV/zzdB2hURsFo6Gz9JDm5YP60uile1qFrJ9W8AZNhse1jyn
+AAAApAylIVMYPY7WABVRYAAAACB6ZCl6Zs1QBkgKADgFdmw1grYjpXtFIWoIjAAAAAAAANWAkhNajZemKT5sxWNB/xg8RJcwkYs0dGchx4lflkdsJbp9W3CGDRtpRHSz
+AAAApA06aF0STDeMABVZQAAAACCHmF8PWqzuxgHM4zGfoipwzNiDqmZi04bFBwAAAAAAANLgvrexzbUEnfXQOpcPTufGjz6s/pr390Bb7QsPORuCT8J9W5xhAxtJZzgd
+AAAApA+PhIT6hvICABVhIAAAACB/OuT65k264wfnZsL1sUCNv1hH8gNW43XxOwEAAAAAAEsvEMFdNtzf2w0+9HzpdhSC/27LmrJqFxk/IRSW4CgMnsp9W2fYABu7VDaX
+AAAApBjj9SSbceO8ABVpAAAAACDx/pwueLkjNybnV76aVCUl+zozpINpSByElgAAAAAAAH8akDkPLACRd/6iK2ZvmOpVxondOYZ3ir7KwLh2cUKTAdV9W8AZNhpgx4hp
+AAAApD41t6MfHcJCABVw4AAAACBByUZBiHE4BVzGP6MQ0KI9g9QdCvThxNffEgAAAAAAAANsycE9DYKCWX7A+qlHevHSP52D7sLD5STwuPr4gE13dfd9W3CGDRrbKIoF
+AAAApNN8wZ0tzUQ6ABV4wAAAACAz6zCll3TMYW9/oyMW+PzOMForVsbIa+tHCwAAAAAAAG8x5q1kCWc6M4bYE1FgMNPvJJQxyUx50xAwuGFTad0Af3B+W5xhAxrfU7co
+AAAApyiY6YVoi1P5ABWAoAAAACCz6/apm65pGp74UdcpwIHlAPmWt65YRcohAAAAAAAAALVjI3XSG9vKQlufM9WZ1YsXyTz5LdRGmQpFQcGywF/k7WuAW2fYABpLTnuK
+AAAAsHEVQxW9gmNwABWIgAAAACCyoh/YEuQ6MvEJvDHu/wQDIFYZu64pkL+lAAAAAAAAAOJNIPsgC7IJifqgQB28zEnII28OwUJbeIaPRvPxdvDfCs2GWwXBShnhgdef
+AAAAwaGUIiP2ByqNABWQYAAAACDEiRkpv/VQGZ66wPPIaR8Z2EYz3lPaivNGAAAAAAAAAAwQnP5bJPqh4BdLeIx+Po8vs0C87gelRJFLFnrUwnuCuamZW/BfTBkIaYpL
+AAAAxuhkPfrZdNa4ABWYQAAAACBRndnx/6N/sRP2xd8KfdaFz9yhSawHpC5XWotlAAAAAK5A+39U5EIw3c/nYlAQJnb85o48qG4pxjNqj0cRZHG/nDu6W///AB0gZeZD
+AAAAxuhkRd3hV96bABWgIAAAACBSafnRztDkdMAsmB8jCs2Z7v5hAAtSjHWu6WtdAAAAAPCyv5E51KkPLlpBwyYf96TPsV4UE3Mjbp2F36EyZneDQkK6W8D/PxzsLi5h
+AAAAxuhkZWoA4/4nABWoAAAAACDNSv2f8qfWxRpVjibyqgSMOUypKdMHd3RxRqoBAAAAAJFGEQbDKnNind26y9zmMED9dMW+fwXG/dwaUPQc/mlAski6W/D/Dxwe5jPG
+AAAAxuhk45p/FHxXABWv4AAAACAqGVxeRJ4VITYkez76q59GM6mnrD9GY3m5QbQEAAAAAK5Q1INBvF2Mp2xDWf1W3rYAOv0350B+SRV4Srsu490Phk66W/z/Axw3m9+3
+AAAAxuhm3Fx31nUXABW3wAAAACDGdjzvHzJzu8BeaoCQSpg7f6cPM3XIOxFCiM4CAAAAAAjh/7eKqS1irOyBoTzAousOqTfcAWYpN3RZ1qItIUN4mFa6W///AByidNyO
+AAAAxuhuv2Ra3lgXABW/oAAAACB3k4w2Ac7Pvc2swW0/W7SfDoibZ28cmr9hlwEAAAAAAB3e+HFQT6xzv0lIX8v16rAUbIjB24/o0vUtlhcUJSAdfGW6W8D/Pxt+HpjR
+AAAAxuiOS4Pm/eQXABXHgAAAACDhg+B0btZWCtxVJXswTVjZ43tVI3ka/Z4GigAAAAAAALZfcAhsxOHbn6eX0Bwz5W5IaEucXW+EsjwdJqw+pEcBn4i6W/D/DxuUmHKI
+AAAAxukMfAIXfBQXABXPYAAAACCJUuTXm4ycnvY+Y/F0pYwxRX3vWQYDUuxMwQEAAAAAAFKtmxIcRCJAf6vfaQ+EACVy0/6sJq/7+IsWEQlhFuczeqS6W/z/AxtGNtOl
+AAAAxusFPfrZdNQYABXXQADg/3+3KljK2mUk7i/YeJ9ER50M9J8db/Ynisv8nAAAAAAAADoAIB7WHhcZZh6OrykZbRb4t4VXJph5z82U1oA50VSletC6W///ABsybEgq
+AAAAxvLoRd3hV9v7ABXfIAAAACAtkgxQGKR+1R0rIL6YC1AN92X5j7t/rs8wfwAAAAAAAJ8IhdxIW+Ph/XlgOlRyqldJ/VSFeUZi+haXQ7npPXD/TT+7W8D/Pxq5pLp4
+AAAAxxJ0ZWoA4/uHABXnAAAAwCCKR6UgtjsOrnX1HvJH/FoNnpfkLzW0ui29LAAAAAAAAJpd9uSq/3j/12pUZxwB7THSnqninGDb3vZ+86uUvliSOV+9W/D/DxohQ4bk
+AAAAx43Eddvf0QeNABXu4AAAACDSFr3nppzBhYuEWZcAns8ebsuzFXpcKod6AQAAAAAAALSDdy83dtx8ZP0KmUh/VELym7QtBJi0bGSMWpKglK6+VwTCW7gGBBrueE4v
+AAAAyXyz7RsncUHcABX2wAAAACCeYiQAjdOgVmyMP/1hEGqWTIVJKwMWkuetAQAAAAAAAMroGwX8byHCCoYXeVYCibBBgKS8/Iy17slpxWkyHCLl/MfIW2B5ARr5DwGu
+AAAAzZo/VC+xAlpGABX+oAAAACB2zWT80WB/FL1JNnu5LWR11vj56d3k37iQAAAAAAAAALes4/dEB4rtAanw3oheqL3mKhPISR54Hs5jwvlwoUvpjlTaW6hmARqduvWQ
+AAAA0gWa1z4P92XmABYGgAAAACDsQETGfwYx4dxq9yLlsV3EG62Hw28NX+0JAQAAAAAAAO6QS6IRlqpQNbCPo3jYvh4IMhEaOxyYnuwzaeuAXBNRGzXsWz1bARrbZ+Zn
+AAAA1rgew2B1HfndABYOYAAAACCnZK1c/5qHBpn1CFb/Ms1mtEx7jgsPZQUxAAAAAAAAAL4EpUhK6O04jBkLxnbhVi6PAuJZaQVscg9HZglb7o4ohR/9Wzg+ARqrbbre
+AAAA203OQQZsu26SABYWQADg/z/YhSCLJeX+Ly06iYHqwCjpTzqqqBkkJtQTAQAAAAAAAJ99n1NG8ZKu30eEVfFx9Hl0w9LzH4N0ab9jtk8/u6O60cQQXGlSARoyZV/d
+AAAA4CKvRBrPcX/HABYeIAAAACAo/4JlJkhVf3rvL9pWeFpL0Wg1HGsZilvxAAAAAAAAAASo0MRrIXRJZx838aOoZKUuOdMPpPZbflAFpMQdWZs9bGIiXMlCARqkvxOx
diff --git a/core/src/test/java/org/bitcoinj/core/AbstractFullPrunedBlockChainTest.java b/core/src/test/java/org/bitcoinj/core/AbstractFullPrunedBlockChainTest.java
index aa93a1884b1..51f1f4f9db4 100644
--- a/core/src/test/java/org/bitcoinj/core/AbstractFullPrunedBlockChainTest.java
+++ b/core/src/test/java/org/bitcoinj/core/AbstractFullPrunedBlockChainTest.java
@@ -57,6 +57,8 @@ public abstract class AbstractFullPrunedBlockChainTest {
             return 10000;
         }
     };
+    private static final NetworkParameters MAINNET = MainNetParams.get();
+
     protected FullPrunedBlockChain chain;
     protected FullPrunedBlockStore store;
 
@@ -174,7 +176,7 @@ public void testFinalizedBlocks() throws Exception {
         // Build some blocks on genesis block to create a spendable output
         Block rollingBlock = PARAMS.getGenesisBlock().createNextBlockWithCoinbase(Block.BLOCK_VERSION_GENESIS, outKey.getPubKey(), height++);
         chain.add(rollingBlock);
-        TransactionOutPoint spendableOutput = new TransactionOutPoint(PARAMS, 0, rollingBlock.getTransactions().get(0).getHash());
+        TransactionOutPoint spendableOutput = new TransactionOutPoint(PARAMS, 0, rollingBlock.getTransactions().get(0).getTxId());
         byte[] spendableOutputScriptPubKey = rollingBlock.getTransactions().get(0).getOutputs().get(0).getScriptBytes();
         for (int i = 1; i < PARAMS.getSpendableCoinbaseDepth(); i++) {
             rollingBlock = rollingBlock.createNextBlockWithCoinbase(Block.BLOCK_VERSION_GENESIS, outKey.getPubKey(), height++);
@@ -193,12 +195,12 @@ public void testFinalizedBlocks() throws Exception {
         rollingBlock.solve();
         
         chain.add(rollingBlock);
-        WeakReference<StoredUndoableBlock> undoBlock = new WeakReference<StoredUndoableBlock>(store.getUndoBlock(rollingBlock.getHash()));
+        WeakReference<StoredUndoableBlock> undoBlock = new WeakReference<>(store.getUndoBlock(rollingBlock.getHash()));
 
         StoredUndoableBlock storedUndoableBlock = undoBlock.get();
         assertNotNull(storedUndoableBlock);
         assertNull(storedUndoableBlock.getTransactions());
-        WeakReference<TransactionOutputChanges> changes = new WeakReference<TransactionOutputChanges>(storedUndoableBlock.getTxOutChanges());
+        WeakReference<TransactionOutputChanges> changes = new WeakReference<>(storedUndoableBlock.getTxOutChanges());
         assertNotNull(changes.get());
         storedUndoableBlock = null;   // Blank the reference so it can be GCd.
         
@@ -219,12 +221,11 @@ public void testFinalizedBlocks() throws Exception {
     
     @Test
     public void testFirst100KBlocks() throws Exception {
-        NetworkParameters params = MainNetParams.get();
-        Context context = new Context(params);
+        Context context = new Context(MAINNET);
         File blockFile = new File(getClass().getResource("first-100k-blocks.dat").getFile());
-        BlockFileLoader loader = new BlockFileLoader(params, Arrays.asList(blockFile));
+        BlockFileLoader loader = new BlockFileLoader(MAINNET, Arrays.asList(blockFile));
         
-        store = createStore(params, 10);
+        store = createStore(MAINNET, 10);
         resetStore(store);
         chain = new FullPrunedBlockChain(context, store);
         for (Block block : loader)
@@ -249,7 +250,7 @@ public void testGetOpenTransactionOutputs() throws Exception {
         Block rollingBlock = PARAMS.getGenesisBlock().createNextBlockWithCoinbase(Block.BLOCK_VERSION_GENESIS, outKey.getPubKey(), height++);
         chain.add(rollingBlock);
         Transaction transaction = rollingBlock.getTransactions().get(0);
-        TransactionOutPoint spendableOutput = new TransactionOutPoint(PARAMS, 0, transaction.getHash());
+        TransactionOutPoint spendableOutput = new TransactionOutPoint(PARAMS, 0, transaction.getTxId());
         byte[] spendableOutputScriptPubKey = transaction.getOutputs().get(0).getScriptBytes();
         for (int i = 1; i < PARAMS.getSpendableCoinbaseDepth(); i++) {
             rollingBlock = rollingBlock.createNextBlockWithCoinbase(Block.BLOCK_VERSION_GENESIS, outKey.getPubKey(), height++);
@@ -260,7 +261,7 @@ public void testGetOpenTransactionOutputs() throws Exception {
         // Create bitcoin spend of 1 BTC.
         ECKey toKey = new ECKey();
         Coin amount = Coin.valueOf(100000000);
-        Address address = new Address(PARAMS, toKey.getPubKeyHash());
+        Address address = LegacyAddress.fromKey(PARAMS, toKey);
         Coin totalAmount = Coin.ZERO;
 
         Transaction t = new Transaction(PARAMS);
@@ -271,7 +272,7 @@ public void testGetOpenTransactionOutputs() throws Exception {
         chain.add(rollingBlock);
         totalAmount = totalAmount.add(amount);
 
-        List<UTXO> outputs = store.getOpenTransactionOutputs(Lists.newArrayList(address));
+        List<UTXO> outputs = store.getOpenTransactionOutputs(Lists.newArrayList(toKey));
         assertNotNull(outputs);
         assertEquals("Wrong Number of Outputs", 1, outputs.size());
         UTXO output = outputs.get(0);
@@ -300,7 +301,7 @@ public void testUTXOProviderWithWallet() throws Exception {
         Block rollingBlock = PARAMS.getGenesisBlock().createNextBlockWithCoinbase(Block.BLOCK_VERSION_GENESIS, outKey.getPubKey(), height++);
         chain.add(rollingBlock);
         Transaction transaction = rollingBlock.getTransactions().get(0);
-        TransactionOutPoint spendableOutput = new TransactionOutPoint(PARAMS, 0, transaction.getHash());
+        TransactionOutPoint spendableOutput = new TransactionOutPoint(PARAMS, 0, transaction.getTxId());
         byte[] spendableOutputScriptPubKey = transaction.getOutputs().get(0).getScriptBytes();
         for (int i = 1; i < PARAMS.getSpendableCoinbaseDepth(); i++) {
             rollingBlock = rollingBlock.createNextBlockWithCoinbase(Block.BLOCK_VERSION_GENESIS, outKey.getPubKey(), height++);
@@ -327,7 +328,7 @@ public void testUTXOProviderWithWallet() throws Exception {
         // Create another spend of 1/2 the value of BTC we have available using the wallet (store coin selector).
         ECKey toKey2 = new ECKey();
         Coin amount2 = amount.divide(2);
-        Address address2 = new Address(PARAMS, toKey2.getPubKeyHash());
+        Address address2 = LegacyAddress.fromKey(PARAMS, toKey2);
         SendRequest req = SendRequest.to(address2, amount2);
         wallet.completeTx(req);
         wallet.commitTx(req.tx);
@@ -340,7 +341,7 @@ public void testUTXOProviderWithWallet() throws Exception {
             totalPendingTxAmount = totalPendingTxAmount.add(tx.getValueSentToMe(wallet));
         }
 
-        // The availbale balance should be the 0 (as we spent the 1 BTC that's pending) and estimated should be 1/2 - fee BTC
+        // The available balance should be the 0 (as we spent the 1 BTC that's pending) and estimated should be 1/2 - fee BTC
         assertEquals("Available balance is incorrect", Coin.ZERO, wallet.getBalance(Wallet.BalanceType.AVAILABLE));
         assertEquals("Estimated balance is incorrect", amount2.subtract(fee), wallet.getBalance(Wallet.BalanceType.ESTIMATED));
         assertEquals("Pending tx amount is incorrect", amount2.subtract(fee), totalPendingTxAmount);
diff --git a/core/src/test/java/org/bitcoinj/core/AddressTest.java b/core/src/test/java/org/bitcoinj/core/AddressTest.java
deleted file mode 100644
index d758e9b9c54..00000000000
--- a/core/src/test/java/org/bitcoinj/core/AddressTest.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- * Copyright 2014 Andreas Schildbach
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.bitcoinj.core;
-
-import org.bitcoinj.params.MainNetParams;
-import org.bitcoinj.params.Networks;
-import org.bitcoinj.params.TestNet3Params;
-import org.bitcoinj.script.Script;
-import org.bitcoinj.script.ScriptBuilder;
-import org.junit.Test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.bitcoinj.core.Utils.HEX;
-import static org.junit.Assert.*;
-
-public class AddressTest {
-    static final NetworkParameters testParams = TestNet3Params.get();
-    static final NetworkParameters mainParams = MainNetParams.get();
-
-    @Test
-    public void testJavaSerialization() throws Exception {
-        Address testAddress = Address.fromBase58(testParams, "n4eA2nbYqErp7H6jebchxAN59DmNpksexv");
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        new ObjectOutputStream(os).writeObject(testAddress);
-        VersionedChecksummedBytes testAddressCopy = (VersionedChecksummedBytes) new ObjectInputStream(
-                new ByteArrayInputStream(os.toByteArray())).readObject();
-        assertEquals(testAddress, testAddressCopy);
-
-        Address mainAddress = Address.fromBase58(mainParams, "17kzeh4N8g49GFvdDzSf8PjaPfyoD1MndL");
-        os = new ByteArrayOutputStream();
-        new ObjectOutputStream(os).writeObject(mainAddress);
-        VersionedChecksummedBytes mainAddressCopy = (VersionedChecksummedBytes) new ObjectInputStream(
-                new ByteArrayInputStream(os.toByteArray())).readObject();
-        assertEquals(mainAddress, mainAddressCopy);
-    }
-
-    @Test
-    public void stringification() throws Exception {
-        // Test a testnet address.
-        Address a = new Address(testParams, HEX.decode("fda79a24e50ff70ff42f7d89585da5bd19d9e5cc"));
-        assertEquals("n4eA2nbYqErp7H6jebchxAN59DmNpksexv", a.toString());
-        assertFalse(a.isP2SHAddress());
-
-        Address b = new Address(mainParams, HEX.decode("4a22c3c4cbb31e4d03b15550636762bda0baf85a"));
-        assertEquals("17kzeh4N8g49GFvdDzSf8PjaPfyoD1MndL", b.toString());
-        assertFalse(b.isP2SHAddress());
-    }
-    
-    @Test
-    public void decoding() throws Exception {
-        Address a = Address.fromBase58(testParams, "n4eA2nbYqErp7H6jebchxAN59DmNpksexv");
-        assertEquals("fda79a24e50ff70ff42f7d89585da5bd19d9e5cc", Utils.HEX.encode(a.getHash160()));
-
-        Address b = Address.fromBase58(mainParams, "17kzeh4N8g49GFvdDzSf8PjaPfyoD1MndL");
-        assertEquals("4a22c3c4cbb31e4d03b15550636762bda0baf85a", Utils.HEX.encode(b.getHash160()));
-    }
-    
-    @Test
-    public void errorPaths() {
-        // Check what happens if we try and decode garbage.
-        try {
-            Address.fromBase58(testParams, "this is not a valid address!");
-            fail();
-        } catch (WrongNetworkException e) {
-            fail();
-        } catch (AddressFormatException e) {
-            // Success.
-        }
-
-        // Check the empty case.
-        try {
-            Address.fromBase58(testParams, "");
-            fail();
-        } catch (WrongNetworkException e) {
-            fail();
-        } catch (AddressFormatException e) {
-            // Success.
-        }
-
-        // Check the case of a mismatched network.
-        try {
-            Address.fromBase58(testParams, "17kzeh4N8g49GFvdDzSf8PjaPfyoD1MndL");
-            fail();
-        } catch (WrongNetworkException e) {
-            // Success.
-            assertEquals(e.verCode, MainNetParams.get().getAddressHeader());
-            assertTrue(Arrays.equals(e.acceptableVersions, TestNet3Params.get().getAcceptableAddressCodes()));
-        } catch (AddressFormatException e) {
-            fail();
-        }
-    }
-
-    @Test
-    public void getNetwork() throws Exception {
-        NetworkParameters params = Address.getParametersFromAddress("17kzeh4N8g49GFvdDzSf8PjaPfyoD1MndL");
-        assertEquals(MainNetParams.get().getId(), params.getId());
-        params = Address.getParametersFromAddress("n4eA2nbYqErp7H6jebchxAN59DmNpksexv");
-        assertEquals(TestNet3Params.get().getId(), params.getId());
-    }
-
-    @Test
-    public void getAltNetwork() throws Exception {
-        // An alternative network
-        class AltNetwork extends MainNetParams {
-            AltNetwork() {
-                super();
-                id = "alt.network";
-                addressHeader = 48;
-                p2shHeader = 5;
-                acceptableAddressCodes = new int[] { addressHeader, p2shHeader };
-            }
-        }
-        AltNetwork altNetwork = new AltNetwork();
-        // Add new network params
-        Networks.register(altNetwork);
-        // Check if can parse address
-        NetworkParameters params = Address.getParametersFromAddress("LLxSnHLN2CYyzB5eWTR9K9rS9uWtbTQFb6");
-        assertEquals(altNetwork.getId(), params.getId());
-        // Check if main network works as before
-        params = Address.getParametersFromAddress("17kzeh4N8g49GFvdDzSf8PjaPfyoD1MndL");
-        assertEquals(MainNetParams.get().getId(), params.getId());
-        // Unregister network
-        Networks.unregister(altNetwork);
-        try {
-            Address.getParametersFromAddress("LLxSnHLN2CYyzB5eWTR9K9rS9uWtbTQFb6");
-            fail();
-        } catch (AddressFormatException e) { }
-    }
-    
-    @Test
-    public void p2shAddress() throws Exception {
-        // Test that we can construct P2SH addresses
-        Address mainNetP2SHAddress = Address.fromBase58(MainNetParams.get(), "35b9vsyH1KoFT5a5KtrKusaCcPLkiSo1tU");
-        assertEquals(mainNetP2SHAddress.version, MainNetParams.get().p2shHeader);
-        assertTrue(mainNetP2SHAddress.isP2SHAddress());
-        Address testNetP2SHAddress = Address.fromBase58(TestNet3Params.get(), "2MuVSxtfivPKJe93EC1Tb9UhJtGhsoWEHCe");
-        assertEquals(testNetP2SHAddress.version, TestNet3Params.get().p2shHeader);
-        assertTrue(testNetP2SHAddress.isP2SHAddress());
-
-        // Test that we can determine what network a P2SH address belongs to
-        NetworkParameters mainNetParams = Address.getParametersFromAddress("35b9vsyH1KoFT5a5KtrKusaCcPLkiSo1tU");
-        assertEquals(MainNetParams.get().getId(), mainNetParams.getId());
-        NetworkParameters testNetParams = Address.getParametersFromAddress("2MuVSxtfivPKJe93EC1Tb9UhJtGhsoWEHCe");
-        assertEquals(TestNet3Params.get().getId(), testNetParams.getId());
-
-        // Test that we can convert them from hashes
-        byte[] hex = HEX.decode("2ac4b0b501117cc8119c5797b519538d4942e90e");
-        Address a = Address.fromP2SHHash(mainParams, hex);
-        assertEquals("35b9vsyH1KoFT5a5KtrKusaCcPLkiSo1tU", a.toString());
-        Address b = Address.fromP2SHHash(testParams, HEX.decode("18a0e827269b5211eb51a4af1b2fa69333efa722"));
-        assertEquals("2MuVSxtfivPKJe93EC1Tb9UhJtGhsoWEHCe", b.toString());
-        Address c = Address.fromP2SHScript(mainParams, ScriptBuilder.createP2SHOutputScript(hex));
-        assertEquals("35b9vsyH1KoFT5a5KtrKusaCcPLkiSo1tU", c.toString());
-    }
-
-    @Test
-    public void p2shAddressCreationFromKeys() throws Exception {
-        // import some keys from this example: https://gist.github.com/gavinandresen/3966071
-        ECKey key1 = DumpedPrivateKey.fromBase58(mainParams, "5JaTXbAUmfPYZFRwrYaALK48fN6sFJp4rHqq2QSXs8ucfpE4yQU").getKey();
-        key1 = ECKey.fromPrivate(key1.getPrivKeyBytes());
-        ECKey key2 = DumpedPrivateKey.fromBase58(mainParams, "5Jb7fCeh1Wtm4yBBg3q3XbT6B525i17kVhy3vMC9AqfR6FH2qGk").getKey();
-        key2 = ECKey.fromPrivate(key2.getPrivKeyBytes());
-        ECKey key3 = DumpedPrivateKey.fromBase58(mainParams, "5JFjmGo5Fww9p8gvx48qBYDJNAzR9pmH5S389axMtDyPT8ddqmw").getKey();
-        key3 = ECKey.fromPrivate(key3.getPrivKeyBytes());
-
-        List<ECKey> keys = Arrays.asList(key1, key2, key3);
-        Script p2shScript = ScriptBuilder.createP2SHOutputScript(2, keys);
-        Address address = Address.fromP2SHScript(mainParams, p2shScript);
-        assertEquals("3N25saC4dT24RphDAwLtD8LUN4E2gZPJke", address.toString());
-    }
-
-    @Test
-    public void cloning() throws Exception {
-        Address a = new Address(testParams, HEX.decode("fda79a24e50ff70ff42f7d89585da5bd19d9e5cc"));
-        Address b = a.clone();
-
-        assertEquals(a, b);
-        assertNotSame(a, b);
-    }
-
-    @Test
-    public void roundtripBase58() throws Exception {
-        String base58 = "17kzeh4N8g49GFvdDzSf8PjaPfyoD1MndL";
-        assertEquals(base58, Address.fromBase58(null, base58).toBase58());
-    }
-
-    @Test
-    public void comparisonCloneEqualTo() throws Exception {
-        Address a = Address.fromBase58(mainParams, "1Dorian4RoXcnBv9hnQ4Y2C1an6NJ4UrjX");
-        Address b = a.clone();
-
-        int result = a.compareTo(b);
-        assertEquals(0, result);
-    }
-
-    @Test
-    public void comparisonEqualTo() throws Exception {
-        Address a = Address.fromBase58(mainParams, "1Dorian4RoXcnBv9hnQ4Y2C1an6NJ4UrjX");
-        Address b = a.clone();
-
-        int result = a.compareTo(b);
-        assertEquals(0, result);
-    }
-
-    @Test
-    public void comparisonLessThan() throws Exception {
-        Address a = Address.fromBase58(mainParams, "1Dorian4RoXcnBv9hnQ4Y2C1an6NJ4UrjX");
-        Address b = Address.fromBase58(mainParams, "1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P");
-
-        int result = a.compareTo(b);
-        assertTrue(result < 0);
-    }
-
-    @Test
-    public void comparisonGreaterThan() throws Exception {
-        Address a = Address.fromBase58(mainParams, "1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P");
-        Address b = Address.fromBase58(mainParams, "1Dorian4RoXcnBv9hnQ4Y2C1an6NJ4UrjX");
-
-        int result = a.compareTo(b);
-        assertTrue(result > 0);
-    }
-
-    @Test
-    public void comparisonBytesVsString() throws Exception {
-        // TODO: To properly test this we need a much larger data set
-        Address a = Address.fromBase58(mainParams, "1Dorian4RoXcnBv9hnQ4Y2C1an6NJ4UrjX");
-        Address b = Address.fromBase58(mainParams, "1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P");
-
-        int resultBytes = a.compareTo(b);
-        int resultsString = a.toString().compareTo(b.toString());
-        assertTrue( resultBytes < 0 );
-        assertTrue( resultsString < 0 );
-    }
-}
diff --git a/core/src/test/java/org/bitcoinj/core/Base58Test.java b/core/src/test/java/org/bitcoinj/core/Base58Test.java
index c6642bf1f83..68c8b81752e 100644
--- a/core/src/test/java/org/bitcoinj/core/Base58Test.java
+++ b/core/src/test/java/org/bitcoinj/core/Base58Test.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2011 Google Inc.
+ * Copyright 2018 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +17,15 @@
 
 package org.bitcoinj.core;
 
-import junit.framework.TestCase;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.math.BigInteger;
 import java.util.Arrays;
 
-public class Base58Test extends TestCase {
+import org.junit.Test;
+
+public class Base58Test {
     @Test
     public void testEncode() throws Exception {
         byte[] testbytes = "Hello World".getBytes();
@@ -41,6 +44,18 @@ public void testEncode() throws Exception {
         assertEquals("", Base58.encode(new byte[0]));
     }
 
+    @Test
+    public void testEncodeChecked_address() throws Exception {
+        String encoded = Base58.encodeChecked(111, new byte[LegacyAddress.LENGTH]);
+        assertEquals("mfWxJ45yp2SFn7UciZyNpvDKrzbhyfKrY8", encoded);
+    }
+
+    @Test
+    public void testEncodeChecked_privateKey() throws Exception {
+        String encoded = Base58.encodeChecked(128, new byte[32]);
+        assertEquals("5HpHagT65TZzG1PH3CSu63k8DbpvD8s5ip4nEB3kEsreAbuatmU", encoded);
+    }
+
     @Test
     public void testDecode() throws Exception {
         byte[] testbytes = "Hello World".getBytes();
@@ -49,40 +64,40 @@ public void testDecode() throws Exception {
         
         assertTrue("1", Arrays.equals(Base58.decode("1"), new byte[1]));
         assertTrue("1111", Arrays.equals(Base58.decode("1111"), new byte[4]));
-        
-        try {
-            Base58.decode("This isn't valid base58");
-            fail();
-        } catch (AddressFormatException e) {
-            // expected
-        }
-
-        Base58.decodeChecked("4stwEBjT6FYyVV");
-
-        // Checksum should fail.
-        try {
-            Base58.decodeChecked("4stwEBjT6FYyVW");
-            fail();
-        } catch (AddressFormatException e) {
-            // expected
-        }
-
-        // Input is too short.
-        try {
-            Base58.decodeChecked("4s");
-            fail();
-        } catch (AddressFormatException e) {
-            // expected
-        }
 
         // Test decode of empty String.
         assertEquals(0, Base58.decode("").length);
+    }
+
+    @Test(expected = AddressFormatException.class)
+    public void testDecode_invalidBase58() {
+        Base58.decode("This isn't valid base58");
+    }
+
+    @Test
+    public void testDecodeChecked() {
+        Base58.decodeChecked("4stwEBjT6FYyVV");
 
         // Now check we can correctly decode the case where the high bit of the first byte is not zero, so BigInteger
         // sign extends. Fix for a bug that stopped us parsing keys exported using sipas patch.
         Base58.decodeChecked("93VYUMzRG9DdbRP72uQXjaWibbQwygnvaCu9DumcqDjGybD864T");
     }
 
+    @Test(expected = AddressFormatException.InvalidCharacter.class)
+    public void decode_invalidCharacter_notInAlphabet() {
+        Base58.decodeChecked("J0F12TrwUP45BMd");
+    }
+
+    @Test(expected = AddressFormatException.InvalidChecksum.class)
+    public void testDecodeChecked_invalidChecksum() {
+        Base58.decodeChecked("4stwEBjT6FYyVW");
+    }
+
+    @Test(expected = AddressFormatException.InvalidDataLength.class)
+    public void testDecodeChecked_shortInput() {
+        Base58.decodeChecked("4s");
+    }
+
     @Test
     public void testDecodeToBigInteger() {
         byte[] input = Base58.decode("129");
diff --git a/core/src/test/java/org/bitcoinj/core/Bech32Test.java b/core/src/test/java/org/bitcoinj/core/Bech32Test.java
new file mode 100644
index 00000000000..a8ec6a9c4b2
--- /dev/null
+++ b/core/src/test/java/org/bitcoinj/core/Bech32Test.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2018 Coinomi Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bitcoinj.core;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.util.Locale;
+
+import org.junit.Test;
+
+public class Bech32Test {
+    @Test
+    public void valid() {
+        for (String valid : VALID) {
+            Bech32.Bech32Data bechData = Bech32.decode(valid);
+            String recode = Bech32.encode(bechData);
+            assertEquals(String.format("Failed to roundtrip '%s' -> '%s'", valid, recode),
+                    valid.toLowerCase(Locale.ROOT), recode.toLowerCase(Locale.ROOT));
+            // Test encoding with an uppercase HRP
+            recode = Bech32.encode(bechData.hrp.toUpperCase(Locale.ROOT), bechData.data);
+            assertEquals(String.format("Failed to roundtrip '%s' -> '%s'", valid, recode),
+                    valid.toLowerCase(Locale.ROOT), recode.toLowerCase(Locale.ROOT));
+        }
+    }
+
+    private static final String[] VALID = {
+            "A12UEL5L",
+            "a12uel5l",
+            "an83characterlonghumanreadablepartthatcontainsthenumber1andtheexcludedcharactersbio1tt5tgs",
+            "abcdef1qpzry9x8gf2tvdw0s3jn54khce6mua7lmqqqxw",
+            "11qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqc8247j",
+            "split1checkupstagehandshakeupstreamerranterredcaperred2y9e3w",
+            "?1ezyfcl",
+    };
+
+    @Test
+    public void invalid() {
+        for (String invalid : INVALID) {
+            try {
+                Bech32.decode(invalid);
+                fail(String.format("Parsed an invalid code: '%s'", invalid));
+            } catch (AddressFormatException x) {
+                /* expected */
+            }
+        }
+    }
+
+    private static final String[] INVALID = {
+            " 1nwldj5", // HRP character out of range
+            new String(new char[] { 0x7f }) + "1axkwrx", // HRP character out of range
+            new String(new char[] { 0x80 }) + "1eym55h", // HRP character out of range
+            "an84characterslonghumanreadablepartthatcontainsthenumber1andtheexcludedcharactersbio1569pvx", // overall max length exceeded
+            "pzry9x0s0muk", // No separator character
+            "1pzry9x0s0muk", // Empty HRP
+            "x1b4n0q5v", // Invalid data character
+            "li1dgmt3", // Too short checksum
+            "de1lg7wt" + new String(new char[] { 0xff }), // Invalid character in checksum
+            "A1G7SGD8", // checksum calculated with uppercase form of HRP
+            "10a06t8", // empty HRP
+            "1qzzfhee", // empty HRP
+    };
+
+    @Test(expected = AddressFormatException.InvalidCharacter.class)
+    public void decode_invalidCharacter_notInAlphabet() {
+        Bech32.decode("A12OUEL5X");
+    }
+
+    @Test(expected = AddressFormatException.InvalidCharacter.class)
+    public void decode_invalidCharacter_upperLowerMix() {
+        Bech32.decode("A12UeL5X");
+    }
+
+    @Test(expected = AddressFormatException.InvalidChecksum.class)
+    public void decode_invalidNetwork() {
+        Bech32.decode("A12UEL5X");
+    }
+
+    @Test(expected = AddressFormatException.InvalidPrefix.class)
+    public void decode_invalidHrp() {
+        Bech32.decode("1pzry9x0s0muk");
+    }
+}
diff --git a/core/src/test/java/org/bitcoinj/core/BitcoinSerializerTest.java b/core/src/test/java/org/bitcoinj/core/BitcoinSerializerTest.java
index c43cbac6633..36be97145c1 100644
--- a/core/src/test/java/org/bitcoinj/core/BitcoinSerializerTest.java
+++ b/core/src/test/java/org/bitcoinj/core/BitcoinSerializerTest.java
@@ -30,6 +30,7 @@
 import static org.junit.Assert.*;
 
 public class BitcoinSerializerTest {
+    private static final NetworkParameters MAINNET = MainNetParams.get();
     private static final byte[] ADDRESS_MESSAGE_BYTES = HEX.decode("f9beb4d96164647200000000000000001f000000" +
             "ed52399b01e215104d010000000000000000000000000000000000ffff0a000001208d");
 
@@ -55,8 +56,7 @@ public class BitcoinSerializerTest {
 
     @Test
     public void testAddr() throws Exception {
-        final NetworkParameters params = MainNetParams.get();
-        MessageSerializer serializer = params.getDefaultSerializer();
+        MessageSerializer serializer = MAINNET.getDefaultSerializer();
         // the actual data from https://en.bitcoin.it/wiki/Protocol_specification#addr
         AddressMessage addressMessage = (AddressMessage) serializer.deserialize(ByteBuffer.wrap(ADDRESS_MESSAGE_BYTES));
         assertEquals(1, addressMessage.getAddresses().size());
@@ -67,7 +67,7 @@ public void testAddr() throws Exception {
         serializer.serialize(addressMessage, bos);
 
         assertEquals(31, addressMessage.getMessageSize());
-        addressMessage.addAddress(new PeerAddress(params, InetAddress.getLocalHost()));
+        addressMessage.addAddress(new PeerAddress(MAINNET, InetAddress.getLocalHost()));
         assertEquals(61, addressMessage.getMessageSize());
         addressMessage.removeAddress(0);
         assertEquals(31, addressMessage.getMessageSize());
@@ -78,7 +78,7 @@ public void testAddr() throws Exception {
 
     @Test
     public void testCachedParsing() throws Exception {
-        MessageSerializer serializer = MainNetParams.get().getSerializer(true);
+        MessageSerializer serializer = MAINNET.getSerializer(true);
         
         // first try writing to a fields to ensure uncaching and children are not affected
         Transaction transaction = (Transaction) serializer.deserialize(ByteBuffer.wrap(TRANSACTION_MESSAGE_BYTES));
@@ -135,7 +135,7 @@ public void testCachedParsing() throws Exception {
      */
     @Test
     public void testHeaders1() throws Exception {
-        MessageSerializer serializer = MainNetParams.get().getDefaultSerializer();
+        MessageSerializer serializer = MAINNET.getDefaultSerializer();
 
         byte[] headersMessageBytes = HEX.decode("f9beb4d9686561" +
                 "646572730000000000520000005d4fab8101010000006fe28c0ab6f1b372c1a6a246ae6" +
@@ -161,7 +161,7 @@ public void testHeaders1() throws Exception {
      */
     @Test
     public void testHeaders2() throws Exception {
-        MessageSerializer serializer = MainNetParams.get().getDefaultSerializer();
+        MessageSerializer serializer = MAINNET.getDefaultSerializer();
 
         byte[] headersMessageBytes = HEX.decode("f9beb4d96865616465" +
                 "72730000000000e701000085acd4ea06010000006fe28c0ab6f1b372c1a6a246ae63f74f931e" +
@@ -217,7 +217,7 @@ public void testBitcoinPacketHeaderTooLong() {
     public void testSeekPastMagicBytes() {
         // Fail in another way, there is data in the stream but no magic bytes.
         byte[] brokenMessage = HEX.decode("000000");
-        MainNetParams.get().getDefaultSerializer().seekPastMagicBytes(ByteBuffer.wrap(brokenMessage));
+        MAINNET.getDefaultSerializer().seekPastMagicBytes(ByteBuffer.wrap(brokenMessage));
     }
 
     /**
@@ -225,7 +225,7 @@ public void testSeekPastMagicBytes() {
      */
     @Test(expected = Error.class)
     public void testSerializeUnknownMessage() throws Exception {
-        MessageSerializer serializer = MainNetParams.get().getDefaultSerializer();
+        MessageSerializer serializer = MAINNET.getDefaultSerializer();
 
         Message unknownMessage = new Message() {
             @Override
diff --git a/core/src/test/java/org/bitcoinj/core/BitcoindComparisonTool.java b/core/src/test/java/org/bitcoinj/core/BitcoindComparisonTool.java
index 4faa2966e12..ca48409d764 100644
--- a/core/src/test/java/org/bitcoinj/core/BitcoindComparisonTool.java
+++ b/core/src/test/java/org/bitcoinj/core/BitcoindComparisonTool.java
@@ -40,7 +40,7 @@
 public class BitcoindComparisonTool {
     private static final Logger log = LoggerFactory.getLogger(BitcoindComparisonTool.class);
 
-    private static NetworkParameters params;
+    private static final NetworkParameters PARAMS = RegTestParams.get();
     private static FullPrunedBlockChain chain;
     private static Sha256Hash bitcoindChainHead;
     private static volatile InventoryMessage mostRecentInv = null;
@@ -54,31 +54,30 @@ public static void main(String[] args) throws Exception {
         System.out.println("USAGE: bitcoinjBlockStoreLocation runExpensiveTests(1/0) [port=18444]");
         boolean runExpensiveTests = args.length > 1 && Integer.parseInt(args[1]) == 1;
 
-        params = RegTestParams.get();
-        Context ctx = new Context(params);
+        Context ctx = new Context(PARAMS);
 
         File blockFile = File.createTempFile("testBlocks", ".dat");
         blockFile.deleteOnExit();
 
-        FullBlockTestGenerator generator = new FullBlockTestGenerator(params);
+        FullBlockTestGenerator generator = new FullBlockTestGenerator(PARAMS);
         final RuleList blockList = generator.getBlocksToTest(false, runExpensiveTests, blockFile);
-        final Map<Sha256Hash, Block> preloadedBlocks = new HashMap<Sha256Hash, Block>();
-        final Iterator<Block> blocks = new BlockFileLoader(params, Arrays.asList(blockFile));
+        final Map<Sha256Hash, Block> preloadedBlocks = new HashMap<>();
+        final Iterator<Block> blocks = new BlockFileLoader(PARAMS, Arrays.asList(blockFile));
 
         try {
-            H2FullPrunedBlockStore store = new H2FullPrunedBlockStore(params, args.length > 0 ? args[0] : "BitcoindComparisonTool", blockList.maximumReorgBlockCount);
+            H2FullPrunedBlockStore store = new H2FullPrunedBlockStore(PARAMS, args.length > 0 ? args[0] : "BitcoindComparisonTool", blockList.maximumReorgBlockCount);
             store.resetStore();
             //store = new MemoryFullPrunedBlockStore(params, blockList.maximumReorgBlockCount);
-            chain = new FullPrunedBlockChain(params, store);
+            chain = new FullPrunedBlockChain(PARAMS, store);
         } catch (BlockStoreException e) {
             e.printStackTrace();
             System.exit(1);
         }
 
-        VersionMessage ver = new VersionMessage(params, 42);
+        VersionMessage ver = new VersionMessage(PARAMS, 42);
         ver.appendToSubVer("BlockAcceptanceComparisonTool", "1.1", null);
         ver.localServices = VersionMessage.NODE_NETWORK;
-        final Peer bitcoind = new Peer(params, ver, new BlockChain(params, new MemoryBlockStore(params)), new PeerAddress(params, InetAddress.getLocalHost()));
+        final Peer bitcoind = new Peer(PARAMS, ver, new BlockChain(PARAMS, new MemoryBlockStore(PARAMS)), new PeerAddress(PARAMS, InetAddress.getLocalHost()));
         Preconditions.checkState(bitcoind.getVersionMessage().hasBlockChain());
 
         final BlockWrapper currentBlock = new BlockWrapper();
@@ -133,7 +132,7 @@ public Message onPreMessageReceived(Peer peer, Message m) {
                     System.exit(1);
                 } else if (m instanceof GetDataMessage) {
                     for (InventoryItem item : ((GetDataMessage) m).items)
-                        if (item.type == InventoryItem.Type.Block) {
+                        if (item.type == InventoryItem.Type.BLOCK) {
                             log.info("Requested " + item.hash);
                             if (currentBlock.block.getHash().equals(item.hash))
                                 bitcoind.sendMessage(currentBlock.block);
@@ -155,15 +154,15 @@ public Message onPreMessageReceived(Peer peer, Message m) {
                             log.info("Got a request for a header before we had even begun processing blocks!");
                             return null;
                         }
-                        LinkedList<Block> headers = new LinkedList<Block>();
+                        LinkedList<Block> headers = new LinkedList<>();
                         Block it = blockList.hashHeaderMap.get(currentBlock.block.getHash());
                         while (it != null) {
                             headers.addFirst(it);
                             it = blockList.hashHeaderMap.get(it.getPrevBlockHash());
                         }
-                        LinkedList<Block> sendHeaders = new LinkedList<Block>();
+                        LinkedList<Block> sendHeaders = new LinkedList<>();
                         boolean found = false;
-                        for (Sha256Hash hash : ((GetHeadersMessage) m).getLocator()) {
+                        for (Sha256Hash hash : ((GetHeadersMessage) m).getLocator().getHashes()) {
                             for (Block b : headers) {
                                 if (found) {
                                     sendHeaders.addLast(b);
@@ -180,8 +179,8 @@ public Message onPreMessageReceived(Peer peer, Message m) {
                         }
                         if (!found)
                             sendHeaders = headers;
-                        bitcoind.sendMessage(new HeadersMessage(params, sendHeaders));
-                        InventoryMessage i = new InventoryMessage(params);
+                        bitcoind.sendMessage(new HeadersMessage(PARAMS, sendHeaders));
+                        InventoryMessage i = new InventoryMessage(PARAMS);
                         for (Block b : sendHeaders)
                             i.addBlock(b);
                         bitcoind.sendMessage(i);
@@ -200,15 +199,15 @@ public Message onPreMessageReceived(Peer peer, Message m) {
             }
         });
         
-        bitcoindChainHead = params.getGenesisBlock().getHash();
+        bitcoindChainHead = PARAMS.getGenesisBlock().getHash();
         
         // bitcoind MUST be on localhost or we will get banned as a DoSer
-        new NioClient(new InetSocketAddress(InetAddress.getByName("127.0.0.1"), args.length > 2 ? Integer.parseInt(args[2]) : params.getPort()), bitcoind, 1000);
+        new NioClient(new InetSocketAddress(InetAddress.getLoopbackAddress(), args.length > 2 ? Integer.parseInt(args[2]) : PARAMS.getPort()), bitcoind, 1000);
 
         connectedFuture.get();
 
-        ArrayList<Sha256Hash> locator = new ArrayList<Sha256Hash>(1);
-        locator.add(params.getGenesisBlock().getHash());
+        BlockLocator locator = new BlockLocator();
+        locator = locator.add(PARAMS.getGenesisBlock().getHash());
         Sha256Hash hashTo = Sha256Hash.wrap("0000000000000000000000000000000000000000000000000000000000000000");
                 
         int rulesSinceFirstFail = 0;
@@ -266,7 +265,7 @@ public Message onPreMessageReceived(Peer peer, Message m) {
                 boolean shouldntRequest = blocksRequested.contains(nextBlock.getHash());
                 if (shouldntRequest)
                     blocksRequested.remove(nextBlock.getHash());
-                InventoryMessage message = new InventoryMessage(params);
+                InventoryMessage message = new InventoryMessage(PARAMS);
                 message.addBlock(nextBlock);
                 bitcoind.sendMessage(message);
                 log.info("Sent inv with block " + nextBlock.getHashAsString());
@@ -296,9 +295,9 @@ public Message onPreMessageReceived(Peer peer, Message m) {
                 if (block.throwsException)
                     blocksRequested.remove(nextBlock.getHash());
                 //bitcoind.sendMessage(nextBlock);
-                locator.clear();
-                locator.add(bitcoindChainHead);
-                bitcoind.sendMessage(new GetHeadersMessage(params, locator, hashTo));
+                locator = new BlockLocator();
+                locator = locator.add(bitcoindChainHead);
+                bitcoind.sendMessage(new GetHeadersMessage(PARAMS, locator, hashTo));
                 bitcoind.ping().get();
                 if (!chain.getChainHead().getHeader().getHash().equals(bitcoindChainHead)) {
                     rulesSinceFirstFail++;
@@ -318,7 +317,7 @@ public Message onPreMessageReceived(Peer peer, Message m) {
                     log.error("ERROR: bitcoind had a non-empty mempool, but we expected an empty one on rule " + rule.ruleName);
                     rulesSinceFirstFail++;
                 } else if (mostRecentInv != null) {
-                    Set<InventoryItem> originalRuleSet = new HashSet<InventoryItem>(((MemoryPoolState)rule).mempool);
+                    Set<InventoryItem> originalRuleSet = new HashSet<>(((MemoryPoolState)rule).mempool);
                     boolean matches = mostRecentInv.items.size() == ((MemoryPoolState)rule).mempool.size();
                     for (InventoryItem item : mostRecentInv.items)
                         if (!((MemoryPoolState) rule).mempool.remove(item))
diff --git a/core/src/test/java/org/bitcoinj/core/BlockChainTest.java b/core/src/test/java/org/bitcoinj/core/BlockChainTest.java
index 129e34aa9ba..15074e648fd 100644
--- a/core/src/test/java/org/bitcoinj/core/BlockChainTest.java
+++ b/core/src/test/java/org/bitcoinj/core/BlockChainTest.java
@@ -18,7 +18,7 @@
 package org.bitcoinj.core;
 
 import org.bitcoinj.params.MainNetParams;
-import org.bitcoinj.params.TestNet2Params;
+import org.bitcoinj.params.TestNet3Params;
 import org.bitcoinj.params.UnitTestParams;
 import org.bitcoinj.store.BlockStore;
 import org.bitcoinj.store.MemoryBlockStore;
@@ -55,28 +55,31 @@ public class BlockChainTest {
     private BlockChain chain;
     private BlockStore blockStore;
     private Address coinbaseTo;
-    private static final NetworkParameters PARAMS = UnitTestParams.get();
+
     private final StoredBlock[] block = new StoredBlock[1];
     private Transaction coinbaseTransaction;
 
-    private static class TweakableTestNet2Params extends TestNet2Params {
+    private static class TweakableTestNet3Params extends TestNet3Params {
         public void setMaxTarget(BigInteger limit) {
             maxTarget = limit;
         }
     }
-    private static final TweakableTestNet2Params testNet = new TweakableTestNet2Params();
+    private static final TweakableTestNet3Params TESTNET = new TweakableTestNet3Params();
+    private static final NetworkParameters UNITTEST = UnitTestParams.get();
+    private static final NetworkParameters MAINNET = MainNetParams.get();
 
     private void resetBlockStore() {
-        blockStore = new MemoryBlockStore(PARAMS);
+        blockStore = new MemoryBlockStore(UNITTEST);
     }
 
     @Before
     public void setUp() throws Exception {
         BriefLogFormatter.initVerbose();
-        Context.propagate(new Context(testNet, 100, Coin.ZERO, false));
-        testNetChain = new BlockChain(testNet, new Wallet(testNet), new MemoryBlockStore(testNet));
-        Context.propagate(new Context(PARAMS, 100, Coin.ZERO, false));
-        wallet = new Wallet(PARAMS) {
+        Utils.setMockClock(); // Use mock clock
+        Context.propagate(new Context(TESTNET, 100, Coin.ZERO, false));
+        testNetChain = new BlockChain(TESTNET, new Wallet(TESTNET), new MemoryBlockStore(TESTNET));
+        Context.propagate(new Context(UNITTEST, 100, Coin.ZERO, false));
+        wallet = new Wallet(UNITTEST) {
             @Override
             public void receiveFromBlock(Transaction tx, StoredBlock block, BlockChain.NewBlockType blockType,
                                          int relativityOffset) throws VerificationException {
@@ -90,9 +93,9 @@ public void receiveFromBlock(Transaction tx, StoredBlock block, BlockChain.NewBl
         wallet.freshReceiveKey();
 
         resetBlockStore();
-        chain = new BlockChain(PARAMS, wallet, blockStore);
+        chain = new BlockChain(UNITTEST, wallet, blockStore);
 
-        coinbaseTo = wallet.currentReceiveKey().toAddress(PARAMS);
+        coinbaseTo = LegacyAddress.fromKey(UNITTEST, wallet.currentReceiveKey());
     }
 
     @Test
@@ -126,9 +129,9 @@ public void testBasicChaining() throws Exception {
     public void receiveCoins() throws Exception {
         int height = 1;
         // Quick check that we can actually receive coins.
-        Transaction tx1 = createFakeTx(PARAMS,
+        Transaction tx1 = createFakeTx(UNITTEST,
                                        COIN,
-                                       wallet.currentReceiveKey().toAddress(PARAMS));
+                                       LegacyAddress.fromKey(UNITTEST, wallet.currentReceiveKey()));
         Block b1 = createFakeBlock(blockStore, height, tx1).block;
         chain.add(b1);
         assertTrue(wallet.getBalance().signum() > 0);
@@ -136,7 +139,7 @@ public void receiveCoins() throws Exception {
 
     @Test
     public void unconnectedBlocks() throws Exception {
-        Block b1 = PARAMS.getGenesisBlock().createNextBlock(coinbaseTo);
+        Block b1 = UNITTEST.getGenesisBlock().createNextBlock(coinbaseTo);
         Block b2 = b1.createNextBlock(coinbaseTo);
         Block b3 = b2.createNextBlock(coinbaseTo);
         // Connected.
@@ -153,9 +156,9 @@ public void unconnectedBlocks() throws Exception {
     public void difficultyTransitions() throws Exception {
         // Add a bunch of blocks in a loop until we reach a difficulty transition point. The unit test params have an
         // artificially shortened period.
-        Block prev = PARAMS.getGenesisBlock();
-        Utils.setMockClock(System.currentTimeMillis()/1000);
-        for (int height = 0; height < PARAMS.getInterval() - 1; height++) {
+        Block prev = UNITTEST.getGenesisBlock();
+        Utils.setMockClock(Utils.currentTimeSeconds());
+        for (int height = 0; height < UNITTEST.getInterval() - 1; height++) {
             Block newBlock = prev.createNextBlock(coinbaseTo, 1, Utils.currentTimeSeconds(), height);
             assertTrue(chain.add(newBlock));
             prev = newBlock;
@@ -164,13 +167,13 @@ public void difficultyTransitions() throws Exception {
         }
         // Now add another block that has no difficulty adjustment, it should be rejected.
         try {
-            chain.add(prev.createNextBlock(coinbaseTo, 1, Utils.currentTimeSeconds(), PARAMS.getInterval()));
+            chain.add(prev.createNextBlock(coinbaseTo, 1, Utils.currentTimeSeconds(), UNITTEST.getInterval()));
             fail();
         } catch (VerificationException e) {
         }
         // Create a new block with the right difficulty target given our blistering speed relative to the huge amount
         // of time it's supposed to take (set in the unit test network parameters).
-        Block b = prev.createNextBlock(coinbaseTo, 1, Utils.currentTimeSeconds(), PARAMS.getInterval() + 1);
+        Block b = prev.createNextBlock(coinbaseTo, 1, Utils.currentTimeSeconds(), UNITTEST.getInterval() + 1);
         b.setDifficultyTarget(0x201fFFFFL);
         b.solve();
         assertTrue(chain.add(b));
@@ -182,7 +185,7 @@ public void badDifficulty() throws Exception {
         assertTrue(testNetChain.add(getBlock1()));
         Block b2 = getBlock2();
         assertTrue(testNetChain.add(b2));
-        Block bad = new Block(testNet, Block.BLOCK_VERSION_GENESIS);
+        Block bad = new Block(TESTNET, Block.BLOCK_VERSION_GENESIS);
         // Merkle root can be anything here, doesn't matter.
         bad.setMerkleRoot(Sha256Hash.wrap("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"));
         // Nonce was just some number that made the hash < difficulty limit set below, it can be anything.
@@ -203,8 +206,8 @@ public void badDifficulty() throws Exception {
         }
 
         // Accept any level of difficulty now.
-        BigInteger oldVal = testNet.getMaxTarget();
-        testNet.setMaxTarget(new BigInteger("00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16));
+        BigInteger oldVal = TESTNET.getMaxTarget();
+        TESTNET.setMaxTarget(new BigInteger("00ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", 16));
         try {
             testNetChain.add(bad);
             // We should not get here as the difficulty target should not be changing at this point.
@@ -212,7 +215,7 @@ public void badDifficulty() throws Exception {
         } catch (VerificationException e) {
             assertTrue(e.getMessage(), e.getCause().getMessage().contains("Unexpected change in difficulty"));
         }
-        testNet.setMaxTarget(oldVal);
+        TESTNET.setMaxTarget(oldVal);
 
         // TODO: Test difficulty change is not out of range when a transition period becomes valid.
     }
@@ -237,8 +240,8 @@ public void badBip65Version() throws Exception {
 
     private void testDeprecatedBlockVersion(final long deprecatedVersion, final long newVersion)
             throws Exception {
-        final BlockStore versionBlockStore = new MemoryBlockStore(PARAMS);
-        final BlockChain versionChain = new BlockChain(PARAMS, versionBlockStore);
+        final BlockStore versionBlockStore = new MemoryBlockStore(UNITTEST);
+        final BlockChain versionChain = new BlockChain(UNITTEST, versionBlockStore);
 
         // Build a historical chain of version 3 blocks
         long timeSeconds = 1231006505;
@@ -246,13 +249,13 @@ private void testDeprecatedBlockVersion(final long deprecatedVersion, final long
         FakeTxBuilder.BlockPair chainHead = null;
 
         // Put in just enough v2 blocks to be a minority
-        for (height = 0; height < (PARAMS.getMajorityWindow() - PARAMS.getMajorityRejectBlockOutdated()); height++) {
+        for (height = 0; height < (UNITTEST.getMajorityWindow() - UNITTEST.getMajorityRejectBlockOutdated()); height++) {
             chainHead = FakeTxBuilder.createFakeBlock(versionBlockStore, deprecatedVersion, timeSeconds, height);
             versionChain.add(chainHead.block);
             timeSeconds += 60;
         }
         // Fill the rest of the window with v3 blocks
-        for (; height < PARAMS.getMajorityWindow(); height++) {
+        for (; height < UNITTEST.getMajorityWindow(); height++) {
             chainHead = FakeTxBuilder.createFakeBlock(versionBlockStore, newVersion, timeSeconds, height);
             versionChain.add(chainHead.block);
             timeSeconds += 60;
@@ -271,7 +274,7 @@ private void testDeprecatedBlockVersion(final long deprecatedVersion, final long
     @Test
     public void duplicates() throws Exception {
         // Adding a block twice should not have any effect, in particular it should not send the block to the wallet.
-        Block b1 = PARAMS.getGenesisBlock().createNextBlock(coinbaseTo);
+        Block b1 = UNITTEST.getGenesisBlock().createNextBlock(coinbaseTo);
         Block b2 = b1.createNextBlock(coinbaseTo);
         Block b3 = b2.createNextBlock(coinbaseTo);
         assertTrue(chain.add(b1));
@@ -291,13 +294,13 @@ public void duplicates() throws Exception {
     public void intraBlockDependencies() throws Exception {
         // Covers issue 166 in which transactions that depend on each other inside a block were not always being
         // considered relevant.
-        Address somebodyElse = new ECKey().toAddress(PARAMS);
-        Block b1 = PARAMS.getGenesisBlock().createNextBlock(somebodyElse);
+        Address somebodyElse = LegacyAddress.fromKey(UNITTEST, new ECKey());
+        Block b1 = UNITTEST.getGenesisBlock().createNextBlock(somebodyElse);
         ECKey key = wallet.freshReceiveKey();
-        Address addr = key.toAddress(PARAMS);
+        Address addr = LegacyAddress.fromKey(UNITTEST, key);
         // Create a tx that gives us some coins, and another that spends it to someone else in the same block.
-        Transaction t1 = FakeTxBuilder.createFakeTx(PARAMS, COIN, addr);
-        Transaction t2 = new Transaction(PARAMS);
+        Transaction t1 = FakeTxBuilder.createFakeTx(UNITTEST, COIN, addr);
+        Transaction t2 = new Transaction(UNITTEST);
         t2.addInput(t1.getOutputs().get(0));
         t2.addOutput(valueOf(2, 0), somebodyElse);
         b1.addTransaction(t1);
@@ -312,15 +315,15 @@ public void coinbaseTransactionAvailability() throws Exception {
         // Check that a coinbase transaction is only available to spend after NetworkParameters.getSpendableCoinbaseDepth() blocks.
 
         // Create a second wallet to receive the coinbase spend.
-        Wallet wallet2 = new Wallet(PARAMS);
+        Wallet wallet2 = new Wallet(UNITTEST);
         ECKey receiveKey = wallet2.freshReceiveKey();
         int height = 1;
         chain.addWallet(wallet2);
 
-        Address addressToSendTo = receiveKey.toAddress(PARAMS);
+        Address addressToSendTo = LegacyAddress.fromKey(UNITTEST, receiveKey);
 
         // Create a block, sending the coinbase to the coinbaseTo address (which is in the wallet).
-        Block b1 = PARAMS.getGenesisBlock().createNextBlockWithCoinbase(Block.BLOCK_VERSION_GENESIS, wallet.currentReceiveKey().getPubKey(), height++);
+        Block b1 = UNITTEST.getGenesisBlock().createNextBlockWithCoinbase(Block.BLOCK_VERSION_GENESIS, wallet.currentReceiveKey().getPubKey(), height++);
         chain.add(b1);
 
         // Check a transaction has been received.
@@ -339,10 +342,9 @@ public void coinbaseTransactionAvailability() throws Exception {
         }
 
         // Check that the coinbase is unavailable to spend for the next spendableCoinbaseDepth - 2 blocks.
-        for (int i = 0; i < PARAMS.getSpendableCoinbaseDepth() - 2; i++) {
+        for (int i = 0; i < UNITTEST.getSpendableCoinbaseDepth() - 2; i++) {
             // Non relevant tx - just for fake block creation.
-            Transaction tx2 = createFakeTx(PARAMS, COIN,
-                new ECKey().toAddress(PARAMS));
+            Transaction tx2 = createFakeTx(UNITTEST, COIN, LegacyAddress.fromKey(UNITTEST, new ECKey()));
 
             Block b2 = createFakeBlock(blockStore, height++, tx2).block;
             chain.add(b2);
@@ -363,7 +365,7 @@ public void coinbaseTransactionAvailability() throws Exception {
         }
 
         // Give it one more block - should now be able to spend coinbase transaction. Non relevant tx.
-        Transaction tx3 = createFakeTx(PARAMS, COIN, new ECKey().toAddress(PARAMS));
+        Transaction tx3 = createFakeTx(UNITTEST, COIN, LegacyAddress.fromKey(UNITTEST, new ECKey()));
         Block b3 = createFakeBlock(blockStore, height++, tx3).block;
         chain.add(b3);
 
@@ -394,31 +396,32 @@ public void coinbaseTransactionAvailability() throws Exception {
 
     // Some blocks from the test net.
     private static Block getBlock2() throws Exception {
-        Block b2 = new Block(testNet, Block.BLOCK_VERSION_GENESIS);
-        b2.setMerkleRoot(Sha256Hash.wrap("addc858a17e21e68350f968ccd384d6439b64aafa6c193c8b9dd66320470838b"));
-        b2.setNonce(2642058077L);
-        b2.setTime(1296734343L);
-        b2.setPrevBlockHash(Sha256Hash.wrap("000000033cc282bc1fa9dcae7a533263fd7fe66490f550d80076433340831604"));
-        assertEquals("000000037b21cac5d30fc6fda2581cf7b2612908aed2abbcc429c45b0557a15f", b2.getHashAsString());
+        Block b2 = new Block(TESTNET, Block.BLOCK_VERSION_GENESIS);
+        b2.setMerkleRoot(Sha256Hash.wrap("20222eb90f5895556926c112bb5aa0df4ab5abc3107e21a6950aec3b2e3541e2"));
+        b2.setNonce(875942400L);
+        b2.setTime(1296688946L);
+        b2.setDifficultyTarget(0x1d00ffff);
+        b2.setPrevBlockHash(Sha256Hash.wrap("00000000b873e79784647a6c82962c70d228557d24a747ea4d1b8bbe878e1206"));
+        assertEquals("000000006c02c8ea6e4ff69651f7fcde348fb9d557a06e6957b65552002a7820", b2.getHashAsString());
         b2.verifyHeader();
         return b2;
     }
 
     private static Block getBlock1() throws Exception {
-        Block b1 = new Block(testNet, Block.BLOCK_VERSION_GENESIS);
-        b1.setMerkleRoot(Sha256Hash.wrap("0e8e58ecdacaa7b3c6304a35ae4ffff964816d2b80b62b58558866ce4e648c10"));
-        b1.setNonce(236038445);
-        b1.setTime(1296734340);
-        b1.setPrevBlockHash(Sha256Hash.wrap("00000007199508e34a9ff81e6ec0c477a4cccff2a4767a8eee39c11db367b008"));
-        assertEquals("000000033cc282bc1fa9dcae7a533263fd7fe66490f550d80076433340831604", b1.getHashAsString());
+        Block b1 = new Block(TESTNET, Block.BLOCK_VERSION_GENESIS);
+        b1.setMerkleRoot(Sha256Hash.wrap("f0315ffc38709d70ad5647e22048358dd3745f3ce3874223c80a7c92fab0c8ba"));
+        b1.setNonce(1924588547);
+        b1.setTime(1296688928);
+        b1.setDifficultyTarget(0x1d00ffff);
+        b1.setPrevBlockHash(Sha256Hash.wrap("000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943"));
+        assertEquals("00000000b873e79784647a6c82962c70d228557d24a747ea4d1b8bbe878e1206", b1.getHashAsString());
         b1.verifyHeader();
         return b1;
     }
 
     @Test
     public void estimatedBlockTime() throws Exception {
-        NetworkParameters params = MainNetParams.get();
-        BlockChain prod = new BlockChain(new Context(params), new MemoryBlockStore(params));
+        BlockChain prod = new BlockChain(new Context(MAINNET), new MemoryBlockStore(MAINNET));
         Date d = prod.estimateBlockTime(200000);
         // The actual date of block 200,000 was 2012-09-22 10:47:00
         assertEquals(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.US).parse("2012-10-23T08:35:05.000-0700"), d);
@@ -455,7 +458,7 @@ public void falsePositives() throws Exception {
     public void rollbackBlockStore() throws Exception {
         // This test simulates an issue on Android, that causes the VM to crash while receiving a block, so that the
         // block store is persisted but the wallet is not.
-        Block b1 = PARAMS.getGenesisBlock().createNextBlock(coinbaseTo);
+        Block b1 = UNITTEST.getGenesisBlock().createNextBlock(coinbaseTo);
         Block b2 = b1.createNextBlock(coinbaseTo);
         // Add block 1, no frills.
         assertTrue(chain.add(b1));
diff --git a/core/src/test/java/org/bitcoinj/core/BlockTest.java b/core/src/test/java/org/bitcoinj/core/BlockTest.java
index 597a0db70fd..77fa994abb4 100644
--- a/core/src/test/java/org/bitcoinj/core/BlockTest.java
+++ b/core/src/test/java/org/bitcoinj/core/BlockTest.java
@@ -21,7 +21,6 @@
 
 import org.bitcoinj.core.AbstractBlockChain.NewBlockType;
 import org.bitcoinj.params.MainNetParams;
-import org.bitcoinj.params.TestNet2Params;
 import org.bitcoinj.params.TestNet3Params;
 import org.bitcoinj.params.UnitTestParams;
 import org.bitcoinj.script.ScriptOpCodes;
@@ -30,58 +29,59 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;
 
-import static org.bitcoinj.core.Utils.HEX;
 import static org.junit.Assert.*;
+import static org.bitcoinj.core.Utils.HEX;
 
 public class BlockTest {
-    private static final NetworkParameters PARAMS = TestNet2Params.get();
+    private static final NetworkParameters TESTNET = TestNet3Params.get();
+    private static final NetworkParameters UNITTEST = UnitTestParams.get();
+    private static final NetworkParameters MAINNET = MainNetParams.get();
 
-    public static final byte[] blockBytes;
-
-    static {
-        // Block 00000000a6e5eb79dcec11897af55e90cd571a4335383a3ccfbc12ec81085935
-        // One with lots of transactions in, so a good test of the merkle tree hashing.
-        blockBytes = HEX.decode("0100000040f11b68435988807d64dff20261f7d9827825fbb37542601fb94d45000000000f28f7c69e2669981f92ff081c129e196200c60f4fad7911d93a682de0b49ea2ecd9d24c1844011d00d361050c01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff07041844011d0142ffffffff0100f2052a01000000434104a313febd5f91b6a13bd9c5317030518fee96d1319a0eb10076917294933d09c17dc1588a06953a264738f2acea0c66b99e796caa4f28158e0dd5f6fed69a185bac000000000100000001aa18a952c3f73e5d7440bc570b2aa78f72059887b25b6a1790514b7feedec090000000008b483045022100a970ee6e96fa8bea1cf76d3bda3fb70441a6ec50014d4ea3adcdeae9fbfb5129022025ce9e090366dd6175071a0a5b4a4727571b9bd7bdd5a74d3d3bad7f63eb5dd4014104ac44bdf511477465cb70fef1d06b9241e74d26047ccbdfa641ec9a0115ad35594cbb58a61a6fd56893a405bcffbf6555995ddedc7e6cd4e5ceb83a37e1cf8f98ffffffff02004d92d86a0000001976a914b8083945473bc8289efb681f94de7b07a5b851ad88ac00743ba40b0000001976a914ef01911c9efec6799d1ee5f7c6fb072d9669da8088ac000000000100000001438bd97cb2172e0dd6f341e455e00b7d089747bd4e7f54bd802afe6a6d006c7c000000008a47304402207db94026c96572519101a08e2c864bbe51c987eda6266079a35286df68f123ca02202d7d24c616776a70cce6cb2f97a424e47c30d466e96b750ca03564810249073c014104880286646dab4c894a5ff1bf62bd80047a50b86446b326f2155de94a54d01f9058d4cbc7452563a7c18b2bfb353262fc5adac6307a9446e8c4669daa58e97071ffffffff0200743ba40b0000001976a914fce443c743b456606d1e70ff0d98c4609addc10688ac00ba1dd2050000001976a91411e3e67c08e5d791c97b3d49a8d52025d3f78d3a88ac000000000100000001dc4a6300b6eca8d7ab8e119e9fc4b18890c0e26ec950e681b8d5e46c214aee24010000008b48304502202bcf8632a11192f6b4998343c13589771e6715a080236087dcb1771cbab01809022100edcc38488dd70cd38c058994f143ca5d259071b8fe54c66bf67e55d4468dcacb01410475106e33e14e9cf35bc359dd4120b580ecf5412bb8803f2a927aecd4218d1346e242c7056dca2e4c114fcf2f60799bc5e79107bd1a8b8d5135c92f02bdb59834ffffffff0200f2052a010000001976a9146c9715e09fb00ba84af1ff916ff409b4a5dc9ae288ac00c817a8040000001976a914f7be161206700eb7be1bca5768232c61e4694f4788ac000000000100000001b6cc12ff76247895cb7a604d888012136f06bba64654262044ecb93ff7762c2f000000008b48304502206d795045622c7cdfb4a211c5b41d477920437c21e69214ab4a14f10fe0306b78022100840e55114d6922f3c5e44c7cdcf85dc800d1caef64e7846998423e4ba86714e6014104f88ae9067bc05136cb53a8c18f8549f544ff55ab87ada8f3ba7e2aea773ec73585b61f18ade1c0ddd6c447788578be5fb785c245a64d29b7ff5d28b85cbec58cffffffff0200743ba40b0000001976a914c8081083a8b741da2da260bc0656b88c7bfa6fbf88ac00743ba40b0000001976a914fce443c743b456606d1e70ff0d98c4609addc10688ac0000000001000000019a8d70c7a27560b28dfe778db9ce7f2ff235faf98d5123c07991682be90a4c16000000008b483045022100a118c34f63854ee03d15cca2918d592c295035c42e03be7b0c7e86e66d40ea790220558336d2583a1da00ed5bcad2de5d3b9d485431f702bf2f002267b35ab0b41a0014104f88ae9067bc05136cb53a8c18f8549f544ff55ab87ada8f3ba7e2aea773ec73585b61f18ade1c0ddd6c447788578be5fb785c245a64d29b7ff5d28b85cbec58cffffffff0200743ba40b0000001976a914a440ef00c2e1d39be93607da66568caa26e0501888ac00743ba40b0000001976a914e1d3e65f78f962c4e9dfd04db2119aeefa4e111088ac000000000100000001883acd4bff920f19c4e570e6b3e2d7503d1072d3ca098a124e23534ecdc879d5000000008a473044022040677305de69fd8c18e2c54d5b3c67c5c05735cf6b73d420ccd306762c4bfda2022032cd32ac15ac1820265ffce82654a6008cda22a79fb619ebb65e0af806e14f9b0141044423ef78a2859eb57c4a59dc0878141cf5a4b1fdef71d649d3fb5cf8ea6b1114f4086e5d684a0999d4435db99217a994cc3cf7ad435c8f4e44613d9d160916c4ffffffff0100743ba40b0000001976a914fce443c743b456606d1e70ff0d98c4609addc10688ac000000000100000001ceb27fb142ce3bf9a1f263653dc3971332c71dd10e0e83d647037f608c459f12000000008b4830450220389218287e87d0d7b7113eb20cc1cbf1a00d7acdca32bba7f184cd066db74d6a022100b0998058e5a242699a48f931004cf5550f4e8802b866ce1baf1a0b2616861f27014104255a048d416984101c17514a89289a7d5d3dc8c562850c7a3599f0c7c39bcf9c3a43df75e1e614e51d70c5f85212c99298a21f087be93ecba7ef3900d02c0e8bffffffff0200743ba40b0000001976a914211fd13b614521ed566ddd42738381e42c3c2b2088ac00d956345f0000001976a914d3cc345ba8bdf51d7097955f0f259731f4c34f4388ac000000000100000001703701493f08e82bf6d8cb7c517070eee9f62d14904e14636a7b4af4f34180c7010000008a4730440220061a61eae90ffcf13c10c88a88c085b02954f488823c2f5c81e83a5a833e9f3b02204a61498a9668b2793e77fe3b68585f2daff4dd5daf6097a82615035325ada4730141040db6308d6170333e2c50dee4c9f18f0ab84a7a5c4c88a6836a91f39cb8f4712e08bd72979c542d4b3b60e8dc2021c1b3cc45ffaa83f36a9dec3c4473ea2aa2f3ffffffff0200f2052a010000001976a9143e7e087b9b09149e0266b7a416da2709b4ccf58788ac00d6117e030000001976a914777af71a3b2a48e48f2e467f65028d85c1b5eb5288ac0000000001000000014bdc82abc7db9c06613a712e488685c6feb4522d25017b856222171c17d144e0000000008b4830450221009eb7edcbf8d6be63529264b07bb9f40cf1a0ca779235999e40f5311d70706f1102207f65c5f66982519e6d82e13ca3e61f4f071c73da6c5830b3c4461252012b474e0141045af9665878e6696fd069669951acc54a87c5e3b256a9e20cd8858e0dc5a8c53624e0c979096c00af8a8c60136eef9ffa3d511309417b8315b7f9e3e41e805e8fffffffff0100743ba40b0000001976a914e1d3e65f78f962c4e9dfd04db2119aeefa4e111088ac000000000100000001a854b2b84a76e43de59db647121cdfe481bd8ae9623a345c2188369775b533f7010000008c493046022100c4db6ecf679264c9b525628ec5a983710ff45a1d2d4aa0b54ee218ca9a1ad4df022100dc2e0077cfdd3cbeb28f7463632902ad5306f6d5c77c8149e5b9249bfea8060e014104f9a476b612bb9788c64b9b1e4c9d2deaae1ef0baf6eb593a95d00e2ef8a2beb897ea1fb7c3832e842dd6307fd162816c19c8f458fd8dae331dbc9062fb02e5d8ffffffff0200651b90530000001976a914d5c7c9aec292a807005f013c4d2122f7126e257788ac00743ba40b0000001976a914211fd13b614521ed566ddd42738381e42c3c2b2088ac0000000001000000012908482e9f7d31e9dd392bb6e788a329458a3bc95230b468e4b8c578d27a63b3000000008a4730440220549a7b422fc2020671acabfb937349bd87d985b2e4b9698e4ccacc985f61aee102204dc272322079e9114746db2f8d035d82b64523a69cd7be674173e063090cc8ac014104011a6c220a5549ff112c92c6c38dec93f66ef1f0a21d1409b92f0ccf0fb159aa8173a5b2413a45140fc02b45d63775bae03691d9dc87fd7a10d709a04922900cffffffff0200743ba40b0000001976a914211fd13b614521ed566ddd42738381e42c3c2b2088ac00f1dfeb470000001976a9140adcb4e90cc87f53d7618294222a8a4e193ae9f088ac00000000");
-    }
+    private byte[] block700000Bytes;
+    private Block block700000;
 
     @Before
     public void setUp() throws Exception {
-        Context context = new Context(PARAMS);
+        new Context(TESTNET);
+        // One with some of transactions in, so a good test of the merkle tree hashing.
+        block700000Bytes = ByteStreams.toByteArray(BlockTest.class.getResourceAsStream("block_testnet700000.dat"));
+        block700000 = TESTNET.getDefaultSerializer().makeBlock(block700000Bytes);
+        assertEquals("000000000000406178b12a4dea3b27e13b3c4fe4510994fd667d7c1e6a3f4dc1", block700000.getHashAsString());
     }
 
     @Test
     public void testWork() throws Exception {
-        BigInteger work = PARAMS.getGenesisBlock().getWork();
+        BigInteger work = TESTNET.getGenesisBlock().getWork();
+        double log2Work = Math.log(work.longValue()) / Math.log(2);
         // This number is printed by Bitcoin Core at startup as the calculated value of chainWork on testnet:
-        //
-        // SetBestChain: new best=00000007199508e34a9f  height=0  work=536879104
-        assertEquals(BigInteger.valueOf(536879104L), work);
+        // UpdateTip: new best=000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943 height=0 version=0x00000001 log2_work=32.000022 tx=1 date='2011-02-02 23:16:42' ...
+        assertEquals(32.000022, log2Work, 0.0000001);
     }
 
     @Test
     public void testBlockVerification() throws Exception {
-        Block block = PARAMS.getDefaultSerializer().makeBlock(blockBytes);
-        block.verify(Block.BLOCK_HEIGHT_GENESIS, EnumSet.noneOf(Block.VerifyFlag.class));
-        assertEquals("00000000a6e5eb79dcec11897af55e90cd571a4335383a3ccfbc12ec81085935", block.getHashAsString());
+        block700000.verify(Block.BLOCK_HEIGHT_GENESIS, EnumSet.noneOf(Block.VerifyFlag.class));
     }
     
     @SuppressWarnings("deprecation")
     @Test
     public void testDate() throws Exception {
-        Block block = PARAMS.getDefaultSerializer().makeBlock(blockBytes);
-        assertEquals("4 Nov 2010 16:06:04 GMT", block.getTime().toGMTString());
+        assertEquals("2016-02-13T22:59:39Z", Utils.dateTimeFormat(block700000.getTime()));
     }
 
     @Test
     public void testProofOfWork() throws Exception {
         // This params accepts any difficulty target.
-        NetworkParameters params = UnitTestParams.get();
-        Block block = params.getDefaultSerializer().makeBlock(blockBytes);
+        Block block = UNITTEST.getDefaultSerializer().makeBlock(block700000Bytes);
         block.setNonce(12346);
         try {
             block.verify(Block.BLOCK_HEIGHT_GENESIS, EnumSet.noneOf(Block.VerifyFlag.class));
@@ -105,19 +105,17 @@ public void testProofOfWork() throws Exception {
         // Should find an acceptable nonce.
         block.solve();
         block.verify(Block.BLOCK_HEIGHT_GENESIS, EnumSet.noneOf(Block.VerifyFlag.class));
-        assertEquals(block.getNonce(), 2);
     }
 
     @Test
     public void testBadTransactions() throws Exception {
-        Block block = PARAMS.getDefaultSerializer().makeBlock(blockBytes);
         // Re-arrange so the coinbase transaction is not first.
-        Transaction tx1 = block.transactions.get(0);
-        Transaction tx2 = block.transactions.get(1);
-        block.transactions.set(0, tx2);
-        block.transactions.set(1, tx1);
+        Transaction tx1 = block700000.transactions.get(0);
+        Transaction tx2 = block700000.transactions.get(1);
+        block700000.transactions.set(0, tx2);
+        block700000.transactions.set(1, tx1);
         try {
-            block.verify(Block.BLOCK_HEIGHT_GENESIS, EnumSet.noneOf(Block.VerifyFlag.class));
+            block700000.verify(Block.BLOCK_HEIGHT_GENESIS, EnumSet.noneOf(Block.VerifyFlag.class));
             fail();
         } catch (VerificationException e) {
             // We should get here.
@@ -126,9 +124,8 @@ public void testBadTransactions() throws Exception {
 
     @Test
     public void testHeaderParse() throws Exception {
-        Block block = PARAMS.getDefaultSerializer().makeBlock(blockBytes);
-        Block header = block.cloneAsHeader();
-        Block reparsed = PARAMS.getDefaultSerializer().makeBlock(header.bitcoinSerialize());
+        Block header = block700000.cloneAsHeader();
+        Block reparsed = TESTNET.getDefaultSerializer().makeBlock(header.bitcoinSerialize());
         assertEquals(reparsed, header);
     }
 
@@ -138,24 +135,22 @@ public void testBitcoinSerialization() throws Exception {
         // proves that transaction serialization works, along with all its subobjects like scripts and in/outpoints.
         //
         // NB: This tests the bitcoin serialization protocol.
-        Block block = PARAMS.getDefaultSerializer().makeBlock(blockBytes);
-        assertTrue(Arrays.equals(blockBytes, block.bitcoinSerialize()));
+        assertTrue(Arrays.equals(block700000Bytes, block700000.bitcoinSerialize()));
     }
     
     @Test
     public void testUpdateLength() {
-        NetworkParameters params = UnitTestParams.get();
-        Block block = params.getGenesisBlock().createNextBlockWithCoinbase(Block.BLOCK_VERSION_GENESIS, new ECKey().getPubKey(), Block.BLOCK_HEIGHT_GENESIS);
+        Block block = UNITTEST.getGenesisBlock().createNextBlockWithCoinbase(Block.BLOCK_VERSION_GENESIS, new ECKey().getPubKey(), Block.BLOCK_HEIGHT_GENESIS);
         assertEquals(block.bitcoinSerialize().length, block.length);
         final int origBlockLen = block.length;
-        Transaction tx = new Transaction(params);
+        Transaction tx = new Transaction(UNITTEST);
         // this is broken until the transaction has > 1 input + output (which is required anyway...)
         //assertTrue(tx.length == tx.bitcoinSerialize().length && tx.length == 8);
         byte[] outputScript = new byte[10];
         Arrays.fill(outputScript, (byte) ScriptOpCodes.OP_FALSE);
-        tx.addOutput(new TransactionOutput(params, null, Coin.SATOSHI, outputScript));
-        tx.addInput(new TransactionInput(params, null, new byte[] {(byte) ScriptOpCodes.OP_FALSE},
-                new TransactionOutPoint(params, 0, Sha256Hash.of(new byte[] { 1 }))));
+        tx.addOutput(new TransactionOutput(UNITTEST, null, Coin.SATOSHI, outputScript));
+        tx.addInput(new TransactionInput(UNITTEST, null, new byte[] {(byte) ScriptOpCodes.OP_FALSE},
+                new TransactionOutPoint(UNITTEST, 0, Sha256Hash.of(new byte[] { 1 }))));
         int origTxLength = 8 + 2 + 8 + 1 + 10 + 40 + 1 + 1;
         assertEquals(tx.unsafeBitcoinSerialize().length, tx.length);
         assertEquals(origTxLength, tx.length);
@@ -169,8 +164,8 @@ public void testUpdateLength() {
         assertEquals(block.length, block.unsafeBitcoinSerialize().length);
         assertEquals(block.length, origBlockLen + tx.length);
         assertEquals(tx.length, origTxLength - 1);
-        block.getTransactions().get(1).addInput(new TransactionInput(params, null, new byte[] {(byte) ScriptOpCodes.OP_FALSE},
-                new TransactionOutPoint(params, 0, Sha256Hash.of(new byte[] { 1 }))));
+        block.getTransactions().get(1).addInput(new TransactionInput(UNITTEST, null, new byte[] {(byte) ScriptOpCodes.OP_FALSE},
+                new TransactionOutPoint(UNITTEST, 0, Sha256Hash.of(new byte[] { 1 }))));
         assertEquals(block.length, origBlockLen + tx.length);
         assertEquals(tx.length, origTxLength + 41); // - 1 + 40 + 1 + 1
     }
@@ -181,7 +176,7 @@ public void testCoinbaseHeightTestnet() throws Exception {
         // contains a coinbase transaction whose height is two bytes, which is
         // shorter than we see in most other cases.
 
-        Block block = TestNet3Params.get().getDefaultSerializer().makeBlock(
+        Block block = TESTNET.getDefaultSerializer().makeBlock(
             ByteStreams.toByteArray(getClass().getResourceAsStream("block_testnet21066.dat")));
 
         // Check block.
@@ -193,7 +188,7 @@ public void testCoinbaseHeightTestnet() throws Exception {
         // fit in two bytes. This test primarily ensures script encoding checks
         // are applied correctly.
 
-        block = TestNet3Params.get().getDefaultSerializer().makeBlock(
+        block = TESTNET.getDefaultSerializer().makeBlock(
             ByteStreams.toByteArray(getClass().getResourceAsStream("block_testnet32768.dat")));
 
         // Check block.
@@ -212,9 +207,7 @@ public void testReceiveCoinbaseTransaction() throws Exception {
 
         final long BLOCK_NONCE = 3973947400L;
         final Coin BALANCE_AFTER_BLOCK = Coin.valueOf(22223642);
-        final NetworkParameters PARAMS = MainNetParams.get();
-
-        Block block169482 = PARAMS.getDefaultSerializer().makeBlock(ByteStreams.toByteArray(getClass().getResourceAsStream("block169482.dat")));
+        Block block169482 = MAINNET.getDefaultSerializer().makeBlock(ByteStreams.toByteArray(getClass().getResourceAsStream("block169482.dat")));
 
         // Check block.
         assertNotNull(block169482);
@@ -224,9 +217,9 @@ public void testReceiveCoinbaseTransaction() throws Exception {
         StoredBlock storedBlock = new StoredBlock(block169482, BigInteger.ONE, 169482); // Nonsense work - not used in test.
 
         // Create a wallet contain the miner's key that receives a spend from a coinbase.
-        ECKey miningKey = DumpedPrivateKey.fromBase58(PARAMS, MINING_PRIVATE_KEY).getKey();
+        ECKey miningKey = DumpedPrivateKey.fromBase58(MAINNET, MINING_PRIVATE_KEY).getKey();
         assertNotNull(miningKey);
-        Context context = new Context(PARAMS);
+        Context context = new Context(MAINNET);
         Wallet wallet = new Wallet(context);
         wallet.importKey(miningKey);
 
@@ -243,47 +236,122 @@ public void testReceiveCoinbaseTransaction() throws Exception {
         assertEquals(Coin.ZERO, wallet.getBalance(BalanceType.AVAILABLE));
     }
 
+    @Test
+    public void testBlock481815_witnessCommitmentInCoinbase() throws Exception {
+        Block block481815 = MAINNET.getDefaultSerializer()
+                .makeBlock(ByteStreams.toByteArray(getClass().getResourceAsStream("block481815.dat")));
+        assertEquals(2097, block481815.getTransactions().size());
+        assertEquals("f115afa8134171a0a686bfbe9667b60ae6fb5f6a439e0265789babc315333262",
+                block481815.getMerkleRoot().toString());
+
+        // This block has no witnesses.
+        for (Transaction tx : block481815.getTransactions())
+            assertFalse(tx.hasWitnesses());
+
+        // Nevertheless, there is a witness commitment (but no witness reserved).
+        Transaction coinbase = block481815.getTransactions().get(0);
+        assertEquals("919a0df2253172a55bebcb9002dbe775b8511f84955b282ca6dae826fdd94f90", coinbase.getTxId().toString());
+        assertEquals("919a0df2253172a55bebcb9002dbe775b8511f84955b282ca6dae826fdd94f90",
+                coinbase.getWTxId().toString());
+        Sha256Hash witnessCommitment = coinbase.findWitnessCommitment();
+        assertEquals("3d03076733467c45b08ec503a0c5d406647b073e1914d35b5111960ed625f3b7", witnessCommitment.toString());
+    }
+
+    @Test
+    public void testBlock481829_witnessTransactions() throws Exception {
+        Block block481829 = MAINNET.getDefaultSerializer()
+                .makeBlock(ByteStreams.toByteArray(getClass().getResourceAsStream("block481829.dat")));
+        assertEquals(2020, block481829.getTransactions().size());
+        assertEquals("f06f697be2cac7af7ed8cd0b0b81eaa1a39e444c6ebd3697e35ab34461b6c58d",
+                block481829.getMerkleRoot().toString());
+        assertEquals("0a02ddb2f86a14051294f8d98dd6959dd12bf3d016ca816c3db9b32d3e24fc2d",
+                block481829.getWitnessRoot().toString());
+
+        Transaction coinbase = block481829.getTransactions().get(0);
+        assertEquals("9c1ab453283035800c43eb6461eb46682b81be110a0cb89ee923882a5fd9daa4", coinbase.getTxId().toString());
+        assertEquals("2bbda73aa4e561e7f849703994cc5e563e4bcf103fb0f6fef5ae44c95c7b83a6",
+                coinbase.getWTxId().toString());
+        Sha256Hash witnessCommitment = coinbase.findWitnessCommitment();
+        assertEquals("c3c1145d8070a57e433238e42e4c022c1e51ca2a958094af243ae1ee252ca106", witnessCommitment.toString());
+        byte[] witnessReserved = coinbase.getInput(0).getWitness().getPush(0);
+        assertEquals("0000000000000000000000000000000000000000000000000000000000000000", HEX.encode(witnessReserved));
+        block481829.checkWitnessRoot();
+    }
+
     @Test
     public void isBIPs() throws Exception {
-        final MainNetParams mainnet = MainNetParams.get();
-        final Block genesis = mainnet.getGenesisBlock();
+        final Block genesis = MAINNET.getGenesisBlock();
         assertFalse(genesis.isBIP34());
         assertFalse(genesis.isBIP66());
         assertFalse(genesis.isBIP65());
 
         // 227835/00000000000001aa077d7aa84c532a4d69bdbff519609d1da0835261b7a74eb6: last version 1 block
-        final Block block227835 = mainnet.getDefaultSerializer()
+        final Block block227835 = MAINNET.getDefaultSerializer()
                 .makeBlock(ByteStreams.toByteArray(getClass().getResourceAsStream("block227835.dat")));
         assertFalse(block227835.isBIP34());
         assertFalse(block227835.isBIP66());
         assertFalse(block227835.isBIP65());
 
         // 227836/00000000000000d0dfd4c9d588d325dce4f32c1b31b7c0064cba7025a9b9adcc: version 2 block
-        final Block block227836 = mainnet.getDefaultSerializer()
+        final Block block227836 = MAINNET.getDefaultSerializer()
                 .makeBlock(ByteStreams.toByteArray(getClass().getResourceAsStream("block227836.dat")));
         assertTrue(block227836.isBIP34());
         assertFalse(block227836.isBIP66());
         assertFalse(block227836.isBIP65());
 
         // 363703/0000000000000000011b2a4cb91b63886ffe0d2263fd17ac5a9b902a219e0a14: version 3 block
-        final Block block363703 = mainnet.getDefaultSerializer()
+        final Block block363703 = MAINNET.getDefaultSerializer()
                 .makeBlock(ByteStreams.toByteArray(getClass().getResourceAsStream("block363703.dat")));
         assertTrue(block363703.isBIP34());
         assertTrue(block363703.isBIP66());
         assertFalse(block363703.isBIP65());
 
         // 383616/00000000000000000aab6a2b34e979b09ca185584bd1aecf204f24d150ff55e9: version 4 block
-        final Block block383616 = mainnet.getDefaultSerializer()
+        final Block block383616 = MAINNET.getDefaultSerializer()
                 .makeBlock(ByteStreams.toByteArray(getClass().getResourceAsStream("block383616.dat")));
         assertTrue(block383616.isBIP34());
         assertTrue(block383616.isBIP66());
         assertTrue(block383616.isBIP65());
 
         // 370661/00000000000000001416a613602d73bbe5c79170fd8f39d509896b829cf9021e: voted for BIP101
-        final Block block370661 = mainnet.getDefaultSerializer()
+        final Block block370661 = MAINNET.getDefaultSerializer()
                 .makeBlock(ByteStreams.toByteArray(getClass().getResourceAsStream("block370661.dat")));
         assertTrue(block370661.isBIP34());
         assertTrue(block370661.isBIP66());
         assertTrue(block370661.isBIP65());
     }
+
+    @Test
+    public void parseBlockWithHugeDeclaredTransactionsSize() throws Exception{
+        Block block = new Block(UNITTEST, 1, Sha256Hash.ZERO_HASH, Sha256Hash.ZERO_HASH, 1, 1, 1, new ArrayList<Transaction>()) {
+            @Override
+            protected void bitcoinSerializeToStream(OutputStream stream) throws IOException {
+                Utils.uint32ToByteStreamLE(getVersion(), stream);
+                stream.write(getPrevBlockHash().getReversedBytes());
+                stream.write(getMerkleRoot().getReversedBytes());
+                Utils.uint32ToByteStreamLE(getTimeSeconds(), stream);
+                Utils.uint32ToByteStreamLE(getDifficultyTarget(), stream);
+                Utils.uint32ToByteStreamLE(getNonce(), stream);
+
+                stream.write(new VarInt(Integer.MAX_VALUE).encode());
+            }
+
+            @Override
+            public byte[] bitcoinSerialize() {
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                try {
+                    bitcoinSerializeToStream(baos);
+                } catch (IOException e) {
+                }
+                return baos.toByteArray();
+            }
+        };
+        byte[] serializedBlock = block.bitcoinSerialize();
+        try {
+            UNITTEST.getDefaultSerializer().makeBlock(serializedBlock, serializedBlock.length);
+            fail("We expect ProtocolException with the fixed code and OutOfMemoryError with the buggy code, so this is weird");
+        } catch (ProtocolException e) {
+            //Expected, do nothing
+        }
+    }
 }
diff --git a/core/src/test/java/org/bitcoinj/core/BloomFilterTest.java b/core/src/test/java/org/bitcoinj/core/BloomFilterTest.java
index 3248fa9e82c..48177052423 100644
--- a/core/src/test/java/org/bitcoinj/core/BloomFilterTest.java
+++ b/core/src/test/java/org/bitcoinj/core/BloomFilterTest.java
@@ -28,6 +28,8 @@
 import static org.junit.Assert.*;
 
 public class BloomFilterTest {
+    private static final NetworkParameters MAINNET = MainNetParams.get();
+
     @Test
     public void insertSerializeTest() {
         BloomFilter filter = new BloomFilter(3, 0.01, 0, BloomFilter.BloomUpdate.UPDATE_ALL);
@@ -68,21 +70,20 @@ public void insertSerializeTestWithTweak() {
 
     @Test
     public void walletTest() throws Exception {
-        NetworkParameters params = MainNetParams.get();
-        Context.propagate(new Context(params));
+        Context.propagate(new Context(MAINNET));
 
-        DumpedPrivateKey privKey = DumpedPrivateKey.fromBase58(params, "5Kg1gnAjaLfKiwhhPpGS3QfRg2m6awQvaj98JCZBZQ5SuS2F15C");
+        DumpedPrivateKey privKey = DumpedPrivateKey.fromBase58(MAINNET, "5Kg1gnAjaLfKiwhhPpGS3QfRg2m6awQvaj98JCZBZQ5SuS2F15C");
 
-        Address addr = privKey.getKey().toAddress(params);
+        Address addr = LegacyAddress.fromKey(MAINNET, privKey.getKey());
         assertTrue(addr.toString().equals("17Wx1GQfyPTNWpQMHrTwRSMTCAonSiZx9e"));
 
-        KeyChainGroup group = new KeyChainGroup(params);
+        KeyChainGroup group = KeyChainGroup.builder(MAINNET).build();
         // Add a random key which happens to have been used in a recent generation
         group.importKeys(ECKey.fromPublicOnly(privKey.getKey().getPubKeyPoint()), ECKey.fromPublicOnly(HEX.decode("03cb219f69f1b49468bd563239a86667e74a06fcba69ac50a08a5cbc42a5808e99")));
-        Wallet wallet = new Wallet(params, group);
-        wallet.commitTx(new Transaction(params, HEX.decode("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d038754030114062f503253482fffffffff01c05e559500000000232103cb219f69f1b49468bd563239a86667e74a06fcba69ac50a08a5cbc42a5808e99ac00000000")));
+        Wallet wallet = new Wallet(MAINNET, group);
+        wallet.commitTx(new Transaction(MAINNET, HEX.decode("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0d038754030114062f503253482fffffffff01c05e559500000000232103cb219f69f1b49468bd563239a86667e74a06fcba69ac50a08a5cbc42a5808e99ac00000000")));
         
-        // We should have 2 per pubkey, and one for the pay-2-pubkey output we have
+        // We should have 2 per pubkey, and one for the P2PK output we have
         assertEquals(5, wallet.getBloomFilterElementCount());
         
         BloomFilter filter = wallet.getBloomFilter(wallet.getBloomFilterElementCount(), 0.001, 0);
diff --git a/core/src/test/java/org/bitcoinj/core/ChainSplitTest.java b/core/src/test/java/org/bitcoinj/core/ChainSplitTest.java
index 9d406b18b17..8b5ab580f40 100644
--- a/core/src/test/java/org/bitcoinj/core/ChainSplitTest.java
+++ b/core/src/test/java/org/bitcoinj/core/ChainSplitTest.java
@@ -48,7 +48,7 @@
 
 public class ChainSplitTest {
     private static final Logger log = LoggerFactory.getLogger(ChainSplitTest.class);
-    private static final NetworkParameters PARAMS = UnitTestParams.get();
+    private static final NetworkParameters UNITTEST = UnitTestParams.get();
     private Wallet wallet;
     private BlockChain chain;
     private Address coinsTo;
@@ -59,15 +59,15 @@ public class ChainSplitTest {
     public void setUp() throws Exception {
         BriefLogFormatter.init();
         Utils.setMockClock(); // Use mock clock
-        Context.propagate(new Context(PARAMS, 100, Coin.ZERO, false));
-        MemoryBlockStore blockStore = new MemoryBlockStore(PARAMS);
-        wallet = new Wallet(PARAMS);
+        Context.propagate(new Context(UNITTEST, 100, Coin.ZERO, false));
+        MemoryBlockStore blockStore = new MemoryBlockStore(UNITTEST);
+        wallet = new Wallet(UNITTEST);
         ECKey key1 = wallet.freshReceiveKey();
         ECKey key2 = wallet.freshReceiveKey();
-        chain = new BlockChain(PARAMS, wallet, blockStore);
-        coinsTo = key1.toAddress(PARAMS);
-        coinsTo2 = key2.toAddress(PARAMS);
-        someOtherGuy = new ECKey().toAddress(PARAMS);
+        chain = new BlockChain(UNITTEST, wallet, blockStore);
+        coinsTo = LegacyAddress.fromKey(UNITTEST, key1);
+        coinsTo2 = LegacyAddress.fromKey(UNITTEST, key2);
+        someOtherGuy = LegacyAddress.fromKey(UNITTEST, new ECKey());
     }
 
     @Test
@@ -91,7 +91,7 @@ public void onWalletChanged(Wallet wallet) {
         });
 
         // Start by building a couple of blocks on top of the genesis block.
-        Block b1 = PARAMS.getGenesisBlock().createNextBlock(coinsTo);
+        Block b1 = UNITTEST.getGenesisBlock().createNextBlock(coinsTo);
         Block b2 = b1.createNextBlock(coinsTo);
         assertTrue(chain.add(b1));
         assertTrue(chain.add(b2));
@@ -125,7 +125,7 @@ public void onWalletChanged(Wallet wallet) {
         assertTrue(chain.add(b7));
         Block b8 = b1.createNextBlock(coinsTo);
         final Transaction t = b7.getTransactions().get(1);
-        final Sha256Hash tHash = t.getHash();
+        final Sha256Hash tHash = t.getTxId();
         b8.addTransaction(t);
         b8.solve();
         assertTrue(chain.add(roundtrip(b8)));
@@ -165,7 +165,7 @@ public void onWalletChanged(Wallet wallet) {
     public void testForking2() throws Exception {
         // Check that if the chain forks and new coins are received in the alternate chain our balance goes up
         // after the re-org takes place.
-        Block b1 = PARAMS.getGenesisBlock().createNextBlock(someOtherGuy);
+        Block b1 = UNITTEST.getGenesisBlock().createNextBlock(someOtherGuy);
         Block b2 = b1.createNextBlock(someOtherGuy);
         assertTrue(chain.add(b1));
         assertTrue(chain.add(b2));
@@ -183,16 +183,16 @@ public void testForking2() throws Exception {
     @Test
     public void testForking3() throws Exception {
         // Check that we can handle our own spends being rolled back by a fork.
-        Block b1 = PARAMS.getGenesisBlock().createNextBlock(coinsTo);
+        Block b1 = UNITTEST.getGenesisBlock().createNextBlock(coinsTo);
         chain.add(b1);
         assertEquals(FIFTY_COINS, wallet.getBalance());
-        Address dest = new ECKey().toAddress(PARAMS);
+        Address dest = LegacyAddress.fromKey(UNITTEST, new ECKey());
         Transaction spend = wallet.createSend(dest, valueOf(10, 0));
         wallet.commitTx(spend);
         // Waiting for confirmation ... make it eligible for selection.
         assertEquals(Coin.ZERO, wallet.getBalance());
-        spend.getConfidence().markBroadcastBy(new PeerAddress(PARAMS, InetAddress.getByAddress(new byte[]{1, 2, 3, 4})));
-        spend.getConfidence().markBroadcastBy(new PeerAddress(PARAMS, InetAddress.getByAddress(new byte[]{5,6,7,8})));
+        spend.getConfidence().markBroadcastBy(new PeerAddress(UNITTEST, InetAddress.getByAddress(new byte[]{1, 2, 3, 4})));
+        spend.getConfidence().markBroadcastBy(new PeerAddress(UNITTEST, InetAddress.getByAddress(new byte[]{5,6,7,8})));
         assertEquals(ConfidenceType.PENDING, spend.getConfidence().getConfidenceType());
         assertEquals(valueOf(40, 0), wallet.getBalance());
         Block b2 = b1.createNextBlock(someOtherGuy);
@@ -217,10 +217,10 @@ public void testForking4() throws Exception {
         // Check that we can handle external spends on an inactive chain becoming active. An external spend is where
         // we see a transaction that spends our own coins but we did not broadcast it ourselves. This happens when
         // keys are being shared between wallets.
-        Block b1 = PARAMS.getGenesisBlock().createNextBlock(coinsTo);
+        Block b1 = UNITTEST.getGenesisBlock().createNextBlock(coinsTo);
         chain.add(b1);
         assertEquals(FIFTY_COINS, wallet.getBalance());
-        Address dest = new ECKey().toAddress(PARAMS);
+        Address dest = LegacyAddress.fromKey(UNITTEST, new ECKey());
         Transaction spend = wallet.createSend(dest, FIFTY_COINS);
         // We do NOT confirm the spend here. That means it's not considered to be pending because createSend is
         // stateless. For our purposes it is as if some other program with our keys created the tx.
@@ -235,7 +235,7 @@ public void testForking4() throws Exception {
         chain.add(roundtrip(b3));
         // The external spend is now pending.
         assertEquals(ZERO, wallet.getBalance());
-        Transaction tx = wallet.getTransaction(spend.getHash());
+        Transaction tx = wallet.getTransaction(spend.getTxId());
         assertEquals(ConfidenceType.PENDING, tx.getConfidence().getConfidenceType());
         Block b4 = b3.createNextBlock(someOtherGuy);
         chain.add(b4);
@@ -247,13 +247,13 @@ public void testForking4() throws Exception {
     @Test
     public void testForking5() throws Exception {
         // Test the standard case in which a block containing identical transactions appears on a side chain.
-        Block b1 = PARAMS.getGenesisBlock().createNextBlock(coinsTo);
+        Block b1 = UNITTEST.getGenesisBlock().createNextBlock(coinsTo);
         chain.add(b1);
         final Transaction t = b1.transactions.get(1);
         assertEquals(FIFTY_COINS, wallet.getBalance());
         // genesis -> b1
         //         -> b2
-        Block b2 = PARAMS.getGenesisBlock().createNextBlock(coinsTo);
+        Block b2 = UNITTEST.getGenesisBlock().createNextBlock(coinsTo);
         Transaction b2coinbase = b2.transactions.get(0);
         b2.transactions.clear();
         b2.addTransaction(b2coinbase);
@@ -262,7 +262,7 @@ public void testForking5() throws Exception {
         chain.add(roundtrip(b2));
         assertEquals(FIFTY_COINS, wallet.getBalance());
         assertTrue(wallet.isConsistent());
-        assertEquals(2, wallet.getTransaction(t.getHash()).getAppearsInHashes().size());
+        assertEquals(2, wallet.getTransaction(t.getTxId()).getAppearsInHashes().size());
         //          -> b2 -> b3
         Block b3 = b2.createNextBlock(someOtherGuy);
         chain.add(b3);
@@ -271,17 +271,17 @@ public void testForking5() throws Exception {
     }
 
     private Block roundtrip(Block b2) throws ProtocolException {
-        return PARAMS.getDefaultSerializer().makeBlock(b2.bitcoinSerialize());
+        return UNITTEST.getDefaultSerializer().makeBlock(b2.bitcoinSerialize());
     }
 
     @Test
     public void testForking6() throws Exception {
-        // Test the case in which a side chain block contains a tx, and then it appears in the main chain too.
-        Block b1 = PARAMS.getGenesisBlock().createNextBlock(someOtherGuy);
+        // Test the case in which a side chain block contains a tx, and then it appears in the best chain too.
+        Block b1 = UNITTEST.getGenesisBlock().createNextBlock(someOtherGuy);
         chain.add(b1);
         // genesis -> b1
         //         -> b2
-        Block b2 = PARAMS.getGenesisBlock().createNextBlock(coinsTo);
+        Block b2 = UNITTEST.getGenesisBlock().createNextBlock(coinsTo);
         chain.add(b2);
         assertEquals(Coin.ZERO, wallet.getBalance());
         // genesis -> b1 -> b3
@@ -307,25 +307,25 @@ public void onTransactionConfidenceChanged(Wallet wallet, Transaction tx) {
             }
         });
 
-        Block b1 = PARAMS.getGenesisBlock().createNextBlock(coinsTo);
+        Block b1 = UNITTEST.getGenesisBlock().createNextBlock(coinsTo);
         chain.add(b1);
 
         Transaction t1 = wallet.createSend(someOtherGuy, valueOf(10, 0));
-        Address yetAnotherGuy = new ECKey().toAddress(PARAMS);
+        Address yetAnotherGuy = LegacyAddress.fromKey(UNITTEST, new ECKey());
         Transaction t2 = wallet.createSend(yetAnotherGuy, valueOf(20, 0));
         wallet.commitTx(t1);
         // Receive t1 as confirmed by the network.
-        Block b2 = b1.createNextBlock(new ECKey().toAddress(PARAMS));
+        Block b2 = b1.createNextBlock(LegacyAddress.fromKey(UNITTEST, new ECKey()));
         b2.addTransaction(t1);
         b2.solve();
         chain.add(roundtrip(b2));
 
         // Now we make a double spend become active after a re-org.
-        Block b3 = b1.createNextBlock(new ECKey().toAddress(PARAMS));
+        Block b3 = b1.createNextBlock(LegacyAddress.fromKey(UNITTEST, new ECKey()));
         b3.addTransaction(t2);
         b3.solve();
         chain.add(roundtrip(b3));  // Side chain.
-        Block b4 = b3.createNextBlock(new ECKey().toAddress(PARAMS));
+        Block b4 = b3.createNextBlock(LegacyAddress.fromKey(UNITTEST, new ECKey()));
         chain.add(b4);  // New best chain.
         Threading.waitForUserCode();
         // Should have seen a double spend.
@@ -350,15 +350,15 @@ public void onTransactionConfidenceChanged(Wallet wallet, Transaction tx) {
         });
 
         // Start with 50 coins.
-        Block b1 = PARAMS.getGenesisBlock().createNextBlock(coinsTo);
+        Block b1 = UNITTEST.getGenesisBlock().createNextBlock(coinsTo);
         chain.add(b1);
 
         Transaction t1 = checkNotNull(wallet.createSend(someOtherGuy, valueOf(10, 0)));
-        Address yetAnotherGuy = new ECKey().toAddress(PARAMS);
+        Address yetAnotherGuy = LegacyAddress.fromKey(UNITTEST, new ECKey());
         Transaction t2 = checkNotNull(wallet.createSend(yetAnotherGuy, valueOf(20, 0)));
         wallet.commitTx(t1);
         // t1 is still pending ...
-        Block b2 = b1.createNextBlock(new ECKey().toAddress(PARAMS));
+        Block b2 = b1.createNextBlock(LegacyAddress.fromKey(UNITTEST, new ECKey()));
         chain.add(b2);
         assertEquals(ZERO, wallet.getBalance());
         assertEquals(valueOf(40, 0), wallet.getBalance(Wallet.BalanceType.ESTIMATED));
@@ -366,11 +366,11 @@ public void onTransactionConfidenceChanged(Wallet wallet, Transaction tx) {
         // Now we make a double spend become active after a re-org.
         // genesis -> b1 -> b2 [t1 pending]
         //              \-> b3 (t2) -> b4
-        Block b3 = b1.createNextBlock(new ECKey().toAddress(PARAMS));
+        Block b3 = b1.createNextBlock(LegacyAddress.fromKey(UNITTEST, new ECKey()));
         b3.addTransaction(t2);
         b3.solve();
         chain.add(roundtrip(b3));  // Side chain.
-        Block b4 = b3.createNextBlock(new ECKey().toAddress(PARAMS));
+        Block b4 = b3.createNextBlock(LegacyAddress.fromKey(UNITTEST, new ECKey()));
         chain.add(b4);  // New best chain.
         Threading.waitForUserCode();
         // Should have seen a double spend against the pending pool.
@@ -381,17 +381,17 @@ public void onTransactionConfidenceChanged(Wallet wallet, Transaction tx) {
         assertEquals(valueOf(30, 0), wallet.getBalance());
 
         // ... and back to our own parallel universe.
-        Block b5 = b2.createNextBlock(new ECKey().toAddress(PARAMS));
+        Block b5 = b2.createNextBlock(LegacyAddress.fromKey(UNITTEST, new ECKey()));
         chain.add(b5);
-        Block b6 = b5.createNextBlock(new ECKey().toAddress(PARAMS));
+        Block b6 = b5.createNextBlock(LegacyAddress.fromKey(UNITTEST, new ECKey()));
         chain.add(b6);
         // genesis -> b1 -> b2 -> b5 -> b6 [t1 still dead]
         //              \-> b3 [t2 resurrected and now pending] -> b4
         assertEquals(ZERO, wallet.getBalance());
         // t2 is pending - resurrected double spends take precedence over our dead transactions (which are in nobodies
         // mempool by this point).
-        t1 = checkNotNull(wallet.getTransaction(t1.getHash()));
-        t2 = checkNotNull(wallet.getTransaction(t2.getHash()));
+        t1 = checkNotNull(wallet.getTransaction(t1.getTxId()));
+        t2 = checkNotNull(wallet.getTransaction(t2.getTxId()));
         assertEquals(ConfidenceType.DEAD, t1.getConfidence().getConfidenceType());
         assertEquals(ConfidenceType.PENDING, t2.getConfidence().getConfidenceType());
     }
@@ -400,7 +400,7 @@ public void onTransactionConfidenceChanged(Wallet wallet, Transaction tx) {
     public void txConfidenceLevels() throws Exception {
         // Check that as the chain forks and re-orgs, the confidence data associated with each transaction is
         // maintained correctly.
-        final ArrayList<Transaction> txns = new ArrayList<Transaction>(3);
+        final ArrayList<Transaction> txns = new ArrayList<>(3);
         wallet.addCoinsReceivedEventListener(new WalletCoinsReceivedEventListener() {
             @Override
             public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coin newBalance) {
@@ -409,7 +409,7 @@ public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coi
         });
 
         // Start by building three blocks on top of the genesis block. All send to us.
-        Block b1 = PARAMS.getGenesisBlock().createNextBlock(coinsTo);
+        Block b1 = UNITTEST.getGenesisBlock().createNextBlock(coinsTo);
         BigInteger work1 = b1.getWork();
         Block b2 = b1.createNextBlock(coinsTo2);
         BigInteger work2 = b2.getWork();
@@ -524,15 +524,15 @@ public void orderingInsideBlock() throws Exception {
         // This covers issue 468.
 
         // Receive some money to the wallet.
-        Transaction t1 = FakeTxBuilder.createFakeTx(PARAMS, COIN, coinsTo);
-        final Block b1 = FakeTxBuilder.makeSolvedTestBlock(PARAMS.genesisBlock, t1);
+        Transaction t1 = FakeTxBuilder.createFakeTx(UNITTEST, COIN, coinsTo);
+        final Block b1 = FakeTxBuilder.makeSolvedTestBlock(UNITTEST.genesisBlock, t1);
         chain.add(b1);
 
         // Send a couple of payments one after the other (so the second depends on the change output of the first).
         wallet.allowSpendingUnconfirmedTransactions();
-        Transaction t2 = checkNotNull(wallet.createSend(new ECKey().toAddress(PARAMS), CENT));
+        Transaction t2 = checkNotNull(wallet.createSend(LegacyAddress.fromKey(UNITTEST, new ECKey()), CENT));
         wallet.commitTx(t2);
-        Transaction t3 = checkNotNull(wallet.createSend(new ECKey().toAddress(PARAMS), CENT));
+        Transaction t3 = checkNotNull(wallet.createSend(LegacyAddress.fromKey(UNITTEST, new ECKey()), CENT));
         wallet.commitTx(t3);
         chain.add(FakeTxBuilder.makeSolvedTestBlock(b1, t2, t3));
 
@@ -558,7 +558,7 @@ public void coinbaseDeath() throws Exception {
         // Check that a coinbase tx is marked as dead after a reorg rather than pending as normal non-double-spent
         // transactions would be. Also check that a dead coinbase on a sidechain is resurrected if the sidechain
         // becomes the best chain once more. Finally, check that dependent transactions are killed recursively.
-        final ArrayList<Transaction> txns = new ArrayList<Transaction>(3);
+        final ArrayList<Transaction> txns = new ArrayList<>(3);
         wallet.addCoinsReceivedEventListener(Threading.SAME_THREAD, new WalletCoinsReceivedEventListener() {
             @Override
             public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coin newBalance) {
@@ -566,7 +566,7 @@ public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coi
             }
         });
 
-        Block b1 = PARAMS.getGenesisBlock().createNextBlock(someOtherGuy);
+        Block b1 = UNITTEST.getGenesisBlock().createNextBlock(someOtherGuy);
         final ECKey coinsTo2 = wallet.freshReceiveKey();
         Block b2 = b1.createNextBlockWithCoinbase(Block.BLOCK_VERSION_GENESIS, coinsTo2.getPubKey(), 2);
         Block b3 = b2.createNextBlock(someOtherGuy);
@@ -588,19 +588,19 @@ public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coi
         // Check the coinbase transaction is building and in the unspent pool only.
         final Transaction coinbase = txns.get(0);
         assertEquals(ConfidenceType.BUILDING, coinbase.getConfidence().getConfidenceType());
-        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.PENDING, coinbase.getHash()));
-        assertTrue(wallet.poolContainsTxHash(WalletTransaction.Pool.UNSPENT, coinbase.getHash()));
-        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.SPENT, coinbase.getHash()));
-        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.DEAD, coinbase.getHash()));
+        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.PENDING, coinbase.getTxId()));
+        assertTrue(wallet.poolContainsTxHash(WalletTransaction.Pool.UNSPENT, coinbase.getTxId()));
+        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.SPENT, coinbase.getTxId()));
+        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.DEAD, coinbase.getTxId()));
 
         // Add blocks to b3 until we can spend the coinbase.
         Block firstTip = b3;
-        for (int i = 0; i < PARAMS.getSpendableCoinbaseDepth() - 2; i++) {
+        for (int i = 0; i < UNITTEST.getSpendableCoinbaseDepth() - 2; i++) {
             firstTip = firstTip.createNextBlock(someOtherGuy);
             chain.add(firstTip);
         }
         // ... and spend.
-        Transaction fodder = wallet.createSend(new ECKey().toAddress(PARAMS), FIFTY_COINS);
+        Transaction fodder = wallet.createSend(LegacyAddress.fromKey(UNITTEST, new ECKey()), FIFTY_COINS);
         wallet.commitTx(fodder);
         final AtomicBoolean fodderIsDead = new AtomicBoolean(false);
         fodder.getConfidence().addEventListener(Threading.SAME_THREAD, new TransactionConfidence.Listener() {
@@ -628,7 +628,7 @@ public void onConfidenceChanged(TransactionConfidence confidence, ChangeReason r
         assertTrue(chain.add(b6));
 
         Block secondTip = b6;
-        for (int i = 0; i < PARAMS.getSpendableCoinbaseDepth() - 2; i++) {
+        for (int i = 0; i < UNITTEST.getSpendableCoinbaseDepth() - 2; i++) {
             secondTip = secondTip.createNextBlock(someOtherGuy);
             chain.add(secondTip);
         }
@@ -636,10 +636,10 @@ public void onConfidenceChanged(TransactionConfidence confidence, ChangeReason r
         // Transaction 1 (in block b2) is now on a side chain and should have confidence type of dead and be in
         // the dead pool only.
         assertEquals(TransactionConfidence.ConfidenceType.DEAD, coinbase.getConfidence().getConfidenceType());
-        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.PENDING, coinbase.getHash()));
-        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.UNSPENT, coinbase.getHash()));
-        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.SPENT, coinbase.getHash()));
-        assertTrue(wallet.poolContainsTxHash(WalletTransaction.Pool.DEAD, coinbase.getHash()));
+        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.PENDING, coinbase.getTxId()));
+        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.UNSPENT, coinbase.getTxId()));
+        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.SPENT, coinbase.getTxId()));
+        assertTrue(wallet.poolContainsTxHash(WalletTransaction.Pool.DEAD, coinbase.getTxId()));
         assertTrue(fodderIsDead.get());
 
         // ... and back to the first chain.
@@ -658,10 +658,10 @@ public void onConfidenceChanged(TransactionConfidence confidence, ChangeReason r
 
         // The coinbase transaction should now have confidence type of building once more and in the unspent pool only.
         assertEquals(TransactionConfidence.ConfidenceType.BUILDING, coinbase.getConfidence().getConfidenceType());
-        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.PENDING, coinbase.getHash()));
-        assertTrue(wallet.poolContainsTxHash(WalletTransaction.Pool.UNSPENT, coinbase.getHash()));
-        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.SPENT, coinbase.getHash()));
-        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.DEAD, coinbase.getHash()));
+        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.PENDING, coinbase.getTxId()));
+        assertTrue(wallet.poolContainsTxHash(WalletTransaction.Pool.UNSPENT, coinbase.getTxId()));
+        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.SPENT, coinbase.getTxId()));
+        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.DEAD, coinbase.getTxId()));
         // However, fodder is still dead. Bitcoin Core doesn't keep killed transactions around in case they become
         // valid again later. They are just deleted from the mempool for good.
 
@@ -681,9 +681,9 @@ public void onConfidenceChanged(TransactionConfidence confidence, ChangeReason r
 
         // The coinbase transaction should now have the confidence type of dead and be in the dead pool only.
         assertEquals(TransactionConfidence.ConfidenceType.DEAD, coinbase.getConfidence().getConfidenceType());
-        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.PENDING, coinbase.getHash()));
-        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.UNSPENT, coinbase.getHash()));
-        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.SPENT, coinbase.getHash()));
-        assertTrue(wallet.poolContainsTxHash(WalletTransaction.Pool.DEAD, coinbase.getHash()));
+        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.PENDING, coinbase.getTxId()));
+        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.UNSPENT, coinbase.getTxId()));
+        assertTrue(!wallet.poolContainsTxHash(WalletTransaction.Pool.SPENT, coinbase.getTxId()));
+        assertTrue(wallet.poolContainsTxHash(WalletTransaction.Pool.DEAD, coinbase.getTxId()));
     }
 }
diff --git a/core/src/test/java/org/bitcoinj/core/CheckpointManagerTest.java b/core/src/test/java/org/bitcoinj/core/CheckpointManagerTest.java
new file mode 100644
index 00000000000..2690bf29261
--- /dev/null
+++ b/core/src/test/java/org/bitcoinj/core/CheckpointManagerTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright by the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bitcoinj.core;
+
+import org.easymock.EasyMockRunner;
+import org.easymock.Mock;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+
+@RunWith(EasyMockRunner.class)
+public class CheckpointManagerTest {
+
+    @Mock
+    NetworkParameters params;
+
+    @Test(expected = NullPointerException.class)
+    public void shouldThrowNullPointerExceptionWhenCheckpointsNotFound() throws IOException {
+        expect(params.getId()).andReturn("org/bitcoinj/core/checkpointmanagertest/notFound");
+        replay(params);
+        new CheckpointManager(params, null);
+    }
+
+    @Test(expected = IOException.class)
+    public void shouldThrowNullPointerExceptionWhenCheckpointsInUnknownFormat() throws IOException {
+        expect(params.getId()).andReturn("org/bitcoinj/core/checkpointmanagertest/unsupportedFormat");
+        replay(params);
+        new CheckpointManager(params, null);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void shouldThrowIllegalStateExceptionWithNoCheckpoints() throws IOException {
+        expect(params.getId()).andReturn("org/bitcoinj/core/checkpointmanagertest/noCheckpoints");
+        replay(params);
+        new CheckpointManager(params, null);
+    }
+
+    @Test
+    public void canReadTextualStream() throws IOException {
+        expect(params.getId()).andReturn("org/bitcoinj/core/checkpointmanagertest/validTextualFormat");
+        expect(params.getSerializer(false)).andReturn(
+                new BitcoinSerializer(params, false));
+        expect(params.getProtocolVersionNum(NetworkParameters.ProtocolVersion.CURRENT))
+                .andReturn(NetworkParameters.ProtocolVersion.CURRENT.getBitcoinProtocolVersion());
+        replay(params);
+        new CheckpointManager(params, null);
+    }
+}
diff --git a/core/src/test/java/org/bitcoinj/core/CoinTest.java b/core/src/test/java/org/bitcoinj/core/CoinTest.java
index a741caf46ad..018fa08bd9f 100644
--- a/core/src/test/java/org/bitcoinj/core/CoinTest.java
+++ b/core/src/test/java/org/bitcoinj/core/CoinTest.java
@@ -42,6 +42,19 @@ public void testParseCoin() {
         } catch (Exception e) {
             org.junit.Assert.fail("should throw IllegalArgumentException");
         }
+        assertEquals(1, parseCoin("0.00000001").value);
+        assertEquals(1, parseCoin("0.000000010").value);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testParseCoinOverprecise() {
+        parseCoin("0.000000011");
+    }
+
+    @Test
+    public void testParseCoinInexact() {
+        assertEquals(1, parseCoinInexact("0.00000001").value);
+        assertEquals(1, parseCoinInexact("0.000000011").value);
     }
 
     @Test
diff --git a/core/src/test/java/org/bitcoinj/core/DumpedPrivateKeyTest.java b/core/src/test/java/org/bitcoinj/core/DumpedPrivateKeyTest.java
index 05edfc34d56..2c45d010ac0 100644
--- a/core/src/test/java/org/bitcoinj/core/DumpedPrivateKeyTest.java
+++ b/core/src/test/java/org/bitcoinj/core/DumpedPrivateKeyTest.java
@@ -17,28 +17,30 @@
 package org.bitcoinj.core;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.util.Arrays;
 
 import org.junit.Test;
 import org.bitcoinj.params.MainNetParams;
 import org.bitcoinj.params.TestNet3Params;
 
 public class DumpedPrivateKeyTest {
-
-    private static final MainNetParams MAINNET = MainNetParams.get();
-    private static final TestNet3Params TESTNET = TestNet3Params.get();
+    private static final NetworkParameters MAINNET = MainNetParams.get();
+    private static final NetworkParameters TESTNET = TestNet3Params.get();
 
     @Test
     public void checkNetwork() throws Exception {
         DumpedPrivateKey.fromBase58(MAINNET, "5HtUCLMFWNueqN9unpgX2DzjMg6SDNZyKRb8s3LJgpFg5ubuMrk");
     }
 
-    @Test(expected = WrongNetworkException.class)
+    @Test(expected = AddressFormatException.WrongNetwork.class)
     public void checkNetworkWrong() throws Exception {
         DumpedPrivateKey.fromBase58(TESTNET, "5HtUCLMFWNueqN9unpgX2DzjMg6SDNZyKRb8s3LJgpFg5ubuMrk");
     }
@@ -66,7 +68,55 @@ public void cloning() throws Exception {
 
     @Test
     public void roundtripBase58() throws Exception {
-        String base58 = "5HtUCLMFWNueqN9unpgX2DzjMg6SDNZyKRb8s3LJgpFg5ubuMrk";
-        assertEquals(base58, DumpedPrivateKey.fromBase58(null, base58).toBase58());
+        String base58 = "5HtUCLMFWNueqN9unpgX2DzjMg6SDNZyKRb8s3LJgpFg5ubuMrk"; // 32-bytes key
+        DumpedPrivateKey dumpedPrivateKey = DumpedPrivateKey.fromBase58(null, base58);
+        assertFalse(dumpedPrivateKey.isPubKeyCompressed());
+        assertEquals(base58, dumpedPrivateKey.toBase58());
+    }
+
+    @Test
+    public void roundtripBase58_compressed() throws Exception {
+        String base58 = "cSthBXr8YQAexpKeh22LB9PdextVE1UJeahmyns5LzcmMDSy59L4"; // 33-bytes, compressed == true
+        DumpedPrivateKey dumpedPrivateKey = DumpedPrivateKey.fromBase58(null, base58);
+        assertTrue(dumpedPrivateKey.isPubKeyCompressed());
+        assertEquals(base58, dumpedPrivateKey.toBase58());
+    }
+
+    @Test(expected = AddressFormatException.class)
+    public void roundtripBase58_invalidCompressed() {
+        String base58 = "5Kg5shEQWrf1TojaHTdc2kLuz5Mfh4uvp3cYu8uJHaHgfTGUbTD"; // 32-bytes key
+        byte[] bytes = Base58.decodeChecked(base58);
+        bytes = Arrays.copyOf(bytes, bytes.length + 1); // append a "compress" byte
+        bytes[bytes.length - 1] = 0; // set it to false
+        base58 = Base58.encode(bytes); // 33-bytes key, compressed == false
+        DumpedPrivateKey.fromBase58(null, base58); // fail
+    }
+
+    @Test(expected = AddressFormatException.InvalidDataLength.class)
+    public void fromBase58_tooShort() {
+        String base58 = Base58.encodeChecked(MAINNET.dumpedPrivateKeyHeader, new byte[31]);
+        DumpedPrivateKey.fromBase58(null, base58);
+    }
+
+    @Test(expected = AddressFormatException.InvalidDataLength.class)
+    public void fromBase58_tooLong() {
+        String base58 = Base58.encodeChecked(MAINNET.dumpedPrivateKeyHeader, new byte[34]);
+        DumpedPrivateKey.fromBase58(null, base58);
+    }
+
+    @Test
+    public void roundtripBase58_getKey() throws Exception {
+        ECKey k = new ECKey().decompress();
+        assertFalse(k.isCompressed());
+        assertEquals(k.getPrivKey(),
+                DumpedPrivateKey.fromBase58(null, k.getPrivateKeyAsWiF(MAINNET)).getKey().getPrivKey());
+    }
+
+    @Test
+    public void roundtripBase58_compressed_getKey() throws Exception {
+        ECKey k = new ECKey();
+        assertTrue(k.isCompressed());
+        assertEquals(k.getPrivKey(),
+                DumpedPrivateKey.fromBase58(null, k.getPrivateKeyAsWiF(MAINNET)).getKey().getPrivKey());
     }
 }
diff --git a/core/src/test/java/org/bitcoinj/core/ECKeyTest.java b/core/src/test/java/org/bitcoinj/core/ECKeyTest.java
index ed1fe56f14f..7e08081b505 100644
--- a/core/src/test/java/org/bitcoinj/core/ECKeyTest.java
+++ b/core/src/test/java/org/bitcoinj/core/ECKeyTest.java
@@ -38,11 +38,10 @@
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import java.io.InputStream;
 import java.math.BigInteger;
-import java.security.SecureRandom;
 import java.security.SignatureException;
 import java.util.Arrays;
 import java.util.List;
@@ -62,14 +61,13 @@ public class ECKeyTest {
 
     private static CharSequence PASSWORD1 = "my hovercraft has eels";
     private static CharSequence WRONG_PASSWORD = "it is a snowy day today";
+    private static final NetworkParameters TESTNET = TestNet3Params.get();
+    private static final NetworkParameters MAINNET = MainNetParams.get();
+    private static final NetworkParameters UNITTEST = UnitTestParams.get();
 
     @Before
     public void setUp() throws Exception {
-        SecureRandom secureRandom = new SecureRandom();
-
-        byte[] salt = new byte[KeyCrypterScrypt.SALT_LENGTH];
-        secureRandom.nextBytes(salt);
-        Protos.ScryptParameters.Builder scryptParametersBuilder = Protos.ScryptParameters.newBuilder().setSalt(ByteString.copyFrom(salt));
+        Protos.ScryptParameters.Builder scryptParametersBuilder = Protos.ScryptParameters.newBuilder().setSalt(ByteString.copyFrom(KeyCrypterScrypt.randomSalt()));
         ScryptParameters scryptParameters = scryptParametersBuilder.build();
         keyCrypter = new KeyCrypterScrypt(scryptParameters);
 
@@ -189,16 +187,16 @@ public void testKeyPairRoundtrip() throws Exception {
     public void base58Encoding() throws Exception {
         String addr = "mqAJmaxMcG5pPHHc3H3NtyXzY7kGbJLuMF";
         String privkey = "92shANodC6Y4evT5kFzjNFQAdjqTtHAnDTLzqBBq4BbKUPyx6CD";
-        ECKey key = DumpedPrivateKey.fromBase58(TestNet3Params.get(), privkey).getKey();
-        assertEquals(privkey, key.getPrivateKeyEncoded(TestNet3Params.get()).toString());
-        assertEquals(addr, key.toAddress(TestNet3Params.get()).toString());
+        ECKey key = DumpedPrivateKey.fromBase58(TESTNET, privkey).getKey();
+        assertEquals(privkey, key.getPrivateKeyEncoded(TESTNET).toString());
+        assertEquals(addr, LegacyAddress.fromKey(TESTNET, key).toString());
     }
 
     @Test
     public void base58Encoding_leadingZero() throws Exception {
         String privkey = "91axuYLa8xK796DnBXXsMbjuc8pDYxYgJyQMvFzrZ6UfXaGYuqL";
-        ECKey key = DumpedPrivateKey.fromBase58(TestNet3Params.get(), privkey).getKey();
-        assertEquals(privkey, key.getPrivateKeyEncoded(TestNet3Params.get()).toString());
+        ECKey key = DumpedPrivateKey.fromBase58(TESTNET, privkey).getKey();
+        assertEquals(privkey, key.getPrivateKeyEncoded(TESTNET).toString());
         assertEquals(0, key.getPrivKeyBytes()[0]);
     }
 
@@ -207,8 +205,8 @@ public void base58Encoding_stress() throws Exception {
         // Replace the loop bound with 1000 to get some keys with leading zero byte
         for (int i = 0 ; i < 20 ; i++) {
             ECKey key = new ECKey();
-            ECKey key1 = DumpedPrivateKey.fromBase58(TestNet3Params.get(),
-                    key.getPrivateKeyEncoded(TestNet3Params.get()).toString()).getKey();
+            ECKey key1 = DumpedPrivateKey.fromBase58(TESTNET,
+                    key.getPrivateKeyEncoded(TESTNET).toString()).getKey();
             assertEquals(Utils.HEX.encode(key.getPrivKeyBytes()),
                     Utils.HEX.encode(key1.getPrivKeyBytes()));
         }
@@ -219,7 +217,7 @@ public void signTextMessage() throws Exception {
         ECKey key = new ECKey();
         String message = "聡中本";
         String signatureBase64 = key.signMessage(message);
-        log.info("Message signed with " + key.toAddress(MainNetParams.get()) + ": " + signatureBase64);
+        log.info("Message signed with " + LegacyAddress.fromKey(MAINNET, key) + ": " + signatureBase64);
         // Should verify correctly.
         key.verifyMessage(message, signatureBase64);
         try {
@@ -235,12 +233,58 @@ public void verifyMessage() throws Exception {
         // Test vector generated by Bitcoin-Qt.
         String message = "hello";
         String sigBase64 = "HxNZdo6ggZ41hd3mM3gfJRqOQPZYcO8z8qdX2BwmpbF11CaOQV+QiZGGQxaYOncKoNW61oRuSMMF8udfK54XqI8=";
-        Address expectedAddress = Address.fromBase58(MainNetParams.get(), "14YPSNPi6NSXnUxtPAsyJSuw3pv7AU3Cag");
+        Address expectedAddress = LegacyAddress.fromBase58(MAINNET, "14YPSNPi6NSXnUxtPAsyJSuw3pv7AU3Cag");
         ECKey key = ECKey.signedMessageToKey(message, sigBase64);
-        Address gotAddress = key.toAddress(MainNetParams.get());
+        Address gotAddress = LegacyAddress.fromKey(MAINNET, key);
         assertEquals(expectedAddress, gotAddress);
     }
 
+    @Test
+    public void findRecoveryId() {
+        ECKey key = new ECKey();
+        String message = "Hello World!";
+        Sha256Hash hash = Sha256Hash.of(message.getBytes());
+        ECKey.ECDSASignature sig = key.sign(hash);
+        key = ECKey.fromPublicOnly(key.getPubKeyPoint());
+
+        List<Byte> possibleRecIds = Lists.newArrayList((byte) 0, (byte) 1, (byte) 2, (byte) 3);
+        byte recId = key.findRecoveryId(hash, sig);
+        assertTrue(possibleRecIds.contains(recId));
+    }
+
+    @Test
+    public void keyRecoveryTestVector() {
+        // a test that exercises key recovery with findRecoveryId() on a test vector
+        // test vector from https://crypto.stackexchange.com/a/41339
+        ECKey key = ECKey.fromPrivate(
+                new BigInteger("ebb2c082fd7727890a28ac82f6bdf97bad8de9f5d7c9028692de1a255cad3e0f", 16));
+        String message = "Maarten Bodewes generated this test vector on 2016-11-08";
+        Sha256Hash hash = Sha256Hash.of(message.getBytes());
+        ECKey.ECDSASignature sig = key.sign(hash);
+        key = ECKey.fromPublicOnly(key.getPubKeyPoint());
+
+        byte recId = key.findRecoveryId(hash, sig);
+        byte expectedRecId = 0;
+        assertEquals(recId, expectedRecId);
+
+        ECKey pubKey = ECKey.fromPublicOnly(key.getPubKeyPoint());
+        ECKey recoveredKey = ECKey.recoverFromSignature(recId, sig, hash, true);
+        assertEquals(recoveredKey, pubKey);
+    }
+
+    @Test
+    public void keyRecoveryWithFindRecoveryId() throws Exception {
+        ECKey key = new ECKey();
+        String message = "Hello World!";
+        Sha256Hash hash = Sha256Hash.of(message.getBytes());
+        ECKey.ECDSASignature sig = key.sign(hash);
+
+        byte recId = key.findRecoveryId(hash, sig);
+        ECKey pubKey = ECKey.fromPublicOnly(key.getPubKeyPoint());
+        ECKey recoveredKey = ECKey.recoverFromSignature(recId, sig, hash, true);
+        assertEquals(recoveredKey, pubKey);
+    }
+
     @Test
     public void keyRecovery() throws Exception {
         ECKey key = new ECKey();
@@ -320,9 +364,9 @@ public void testEncryptionIsReversible() throws Exception {
     @Test
     public void testToString() throws Exception {
         ECKey key = ECKey.fromPrivate(BigInteger.TEN).decompress(); // An example private key.
-        NetworkParameters params = MainNetParams.get();
+        NetworkParameters params = MAINNET;
         assertEquals("ECKey{pub HEX=04a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7893aba425419bc27a3b6c7e693a24c696f794c2ed877a1593cbee53b037368d7, isEncrypted=false, isPubKeyOnly=false}", key.toString());
-        assertEquals("ECKey{pub HEX=04a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7893aba425419bc27a3b6c7e693a24c696f794c2ed877a1593cbee53b037368d7, priv HEX=000000000000000000000000000000000000000000000000000000000000000a, priv WIF=5HpHagT65TZzG1PH3CSu63k8DbpvD8s5ip4nEB3kEsreBoNWTw6, isEncrypted=false, isPubKeyOnly=false}", key.toStringWithPrivate(params));
+        assertEquals("ECKey{pub HEX=04a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7893aba425419bc27a3b6c7e693a24c696f794c2ed877a1593cbee53b037368d7, priv HEX=000000000000000000000000000000000000000000000000000000000000000a, priv WIF=5HpHagT65TZzG1PH3CSu63k8DbpvD8s5ip4nEB3kEsreBoNWTw6, isEncrypted=false, isPubKeyOnly=false}", key.toStringWithPrivate(null, params));
     }
 
     @Test
@@ -363,9 +407,8 @@ public void keyRecoveryWithEncryptedKey() throws Exception {
     public void roundTripDumpedPrivKey() throws Exception {
         ECKey key = new ECKey();
         assertTrue(key.isCompressed());
-        NetworkParameters params = UnitTestParams.get();
-        String base58 = key.getPrivateKeyEncoded(params).toString();
-        ECKey key2 = DumpedPrivateKey.fromBase58(params, base58).getKey();
+        String base58 = key.getPrivateKeyEncoded(UNITTEST).toString();
+        ECKey key2 = DumpedPrivateKey.fromBase58(UNITTEST, base58).getKey();
         assertTrue(key2.isCompressed());
         assertTrue(Arrays.equals(key.getPrivKeyBytes(), key2.getPrivKeyBytes()));
         assertTrue(Arrays.equals(key.getPubKey(), key2.getPubKey()));
@@ -459,4 +502,21 @@ private static boolean checkSomeBytesAreNonZero(byte[] bytes) {
         for (byte b : bytes) if (b != 0) return true;
         return false;
     }
+
+    @Test
+    public void testPublicKeysAreEqual() {
+        ECKey key = new ECKey();
+        ECKey pubKey1 = ECKey.fromPublicOnly(key.getPubKeyPoint());
+        assertTrue(pubKey1.isCompressed());
+        ECKey pubKey2 = pubKey1.decompress();
+        assertEquals(pubKey1, pubKey2);
+        assertEquals(pubKey1.hashCode(), pubKey2.hashCode());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void fromPrivate_exceedsSize() {
+        final byte[] bytes = new byte[33];
+        bytes[0] = 42;
+        ECKey.fromPrivate(bytes);
+    }
 }
diff --git a/core/src/test/java/org/bitcoinj/core/FilteredBlockAndPartialMerkleTreeTests.java b/core/src/test/java/org/bitcoinj/core/FilteredBlockAndPartialMerkleTreeTests.java
index d78b8f175d2..b525bd94073 100644
--- a/core/src/test/java/org/bitcoinj/core/FilteredBlockAndPartialMerkleTreeTests.java
+++ b/core/src/test/java/org/bitcoinj/core/FilteredBlockAndPartialMerkleTreeTests.java
@@ -26,6 +26,8 @@
 import org.junit.runner.*;
 import org.junit.runners.*;
 
+import java.io.IOException;
+import java.io.OutputStream;
 import java.math.*;
 import java.util.*;
 
@@ -46,20 +48,20 @@ public FilteredBlockAndPartialMerkleTreeTests(ClientType clientType) {
 
     @Before
     public void setUp() throws Exception {
-        context = new Context(PARAMS);
-        MemoryBlockStore store = new MemoryBlockStore(PARAMS);
+        context = new Context(UNITTEST);
+        MemoryBlockStore store = new MemoryBlockStore(UNITTEST);
 
         // Cheat and place the previous block (block 100000) at the head of the block store without supporting blocks
-        store.put(new StoredBlock(new Block(PARAMS, HEX.decode("0100000050120119172a610421a6c3011dd330d9df07b63616c2cc1f1cd00200000000006657a9252aacd5c0b2940996ecff952228c3067cc38d4885efb5a4ac4247e9f337221b4d4c86041b0f2b5710")),
+        store.put(new StoredBlock(new Block(UNITTEST, HEX.decode("0100000050120119172a610421a6c3011dd330d9df07b63616c2cc1f1cd00200000000006657a9252aacd5c0b2940996ecff952228c3067cc38d4885efb5a4ac4247e9f337221b4d4c86041b0f2b5710")),
                 BigInteger.valueOf(1), 100000));
         store.setChainHead(store.get(Sha256Hash.wrap("000000000003ba27aa200b1cecaad478d2b00432346c3f1f3986da1afd33e506")));
 
-        KeyChainGroup group = new KeyChainGroup(PARAMS);
+        KeyChainGroup group = KeyChainGroup.builder(UNITTEST).build();
         group.importKeys(ECKey.fromPublicOnly(HEX.decode("04b27f7e9475ccf5d9a431cb86d665b8302c140144ec2397fce792f4a4e7765fecf8128534eaa71df04f93c74676ae8279195128a1506ebf7379d23dab8fca0f63")),
                 ECKey.fromPublicOnly(HEX.decode("04732012cb962afa90d31b25d8fb0e32c94e513ab7a17805c14ca4c3423e18b4fb5d0e676841733cb83abaf975845c9f6f2a8097b7d04f4908b18368d6fc2d68ec")),
                 ECKey.fromPublicOnly(HEX.decode("04cfb4113b3387637131ebec76871fd2760fc430dd16de0110f0eb07bb31ffac85e2607c189cb8582ea1ccaeb64ffd655409106589778f3000fdfe3263440b0350")),
                 ECKey.fromPublicOnly(HEX.decode("04b2f30018908a59e829c1534bfa5010d7ef7f79994159bba0f534d863ef9e4e973af6a8de20dc41dbea50bc622263ec8a770b2c9406599d39e4c9afe61f8b1613")));
-        wallet = new Wallet(PARAMS, group);
+        wallet = new Wallet(UNITTEST, group);
 
         super.setUp(store);
     }
@@ -73,7 +75,7 @@ public void tearDown() {
     public void deserializeFilteredBlock() throws Exception {
         // Random real block (000000000000dab0130bbcc991d3d7ae6b81aa6f50a798888dfe62337458dc45)
         // With one tx
-        FilteredBlock block = new FilteredBlock(PARAMS, HEX.decode("0100000079cda856b143d9db2c1caff01d1aecc8630d30625d10e8b4b8b0000000000000b50cc069d6a3e33e3ff84a5c41d9d3febe7c770fdcc96b2c3ff60abe184f196367291b4d4c86041b8fa45d630100000001b50cc069d6a3e33e3ff84a5c41d9d3febe7c770fdcc96b2c3ff60abe184f19630101"));
+        FilteredBlock block = new FilteredBlock(UNITTEST, HEX.decode("0100000079cda856b143d9db2c1caff01d1aecc8630d30625d10e8b4b8b0000000000000b50cc069d6a3e33e3ff84a5c41d9d3febe7c770fdcc96b2c3ff60abe184f196367291b4d4c86041b8fa45d630100000001b50cc069d6a3e33e3ff84a5c41d9d3febe7c770fdcc96b2c3ff60abe184f19630101"));
         
         // Check that the header was properly deserialized
         assertTrue(block.getBlockHeader().getHash().equals(Sha256Hash.wrap("000000000000dab0130bbcc991d3d7ae6b81aa6f50a798888dfe62337458dc45")));
@@ -84,16 +86,16 @@ public void deserializeFilteredBlock() throws Exception {
         assertTrue(txesMatched.contains(Sha256Hash.wrap("63194f18be0af63f2c6bc9dc0f777cbefed3d9415c4af83f3ee3a3d669c00cb5")));
 
         // Check round tripping.
-        assertEquals(block, new FilteredBlock(PARAMS, block.bitcoinSerialize()));
+        assertEquals(block, new FilteredBlock(UNITTEST, block.bitcoinSerialize()));
     }
 
     @Test
     public void createFilteredBlock() throws Exception {
         ECKey key1 = new ECKey();
         ECKey key2 = new ECKey();
-        Transaction tx1 = FakeTxBuilder.createFakeTx(PARAMS, Coin.COIN,  key1);
-        Transaction tx2 = FakeTxBuilder.createFakeTx(PARAMS, Coin.FIFTY_COINS, key2.toAddress(PARAMS));
-        Block block = FakeTxBuilder.makeSolvedTestBlock(PARAMS.getGenesisBlock(), Address.fromBase58(PARAMS, "msg2t2V2sWNd85LccoddtWysBTR8oPnkzW"), tx1, tx2);
+        Transaction tx1 = FakeTxBuilder.createFakeTx(UNITTEST, Coin.COIN,  key1);
+        Transaction tx2 = FakeTxBuilder.createFakeTx(UNITTEST, Coin.FIFTY_COINS, LegacyAddress.fromKey(UNITTEST, key2));
+        Block block = FakeTxBuilder.makeSolvedTestBlock(UNITTEST.getGenesisBlock(), LegacyAddress.fromBase58(UNITTEST, "msg2t2V2sWNd85LccoddtWysBTR8oPnkzW"), tx1, tx2);
         BloomFilter filter = new BloomFilter(4, 0.1, 1);
         filter.insert(key1);
         filter.insert(key2);
@@ -101,8 +103,8 @@ public void createFilteredBlock() throws Exception {
         assertEquals(4, filteredBlock.getTransactionCount());
         // This call triggers verification of the just created data.
         List<Sha256Hash> txns = filteredBlock.getTransactionHashes();
-        assertTrue(txns.contains(tx1.getHash()));
-        assertTrue(txns.contains(tx2.getHash()));
+        assertTrue(txns.contains(tx1.getTxId()));
+        assertTrue(txns.contains(tx2.getTxId()));
     }
 
     private Sha256Hash numAsHash(int num) {
@@ -120,17 +122,17 @@ public void merkleTreeMalleability() throws Exception {
         byte[] includeBits = new byte[2];
         Utils.setBitLE(includeBits, 9);
         Utils.setBitLE(includeBits, 10);
-        PartialMerkleTree pmt = PartialMerkleTree.buildFromLeaves(PARAMS, includeBits, hashes);
+        PartialMerkleTree pmt = PartialMerkleTree.buildFromLeaves(UNITTEST, includeBits, hashes);
         List<Sha256Hash> matchedHashes = Lists.newArrayList();
         pmt.getTxnHashAndMerkleRoot(matchedHashes);
     }
 
     @Test
     public void serializeDownloadBlockWithWallet() throws Exception {
-        // First we create all the neccessary objects, including lots of serialization and double-checks
+        // First we create all the necessary objects, including lots of serialization and double-checks
         // Note that all serialized forms here are generated by Bitcoin Core/pulled from block explorer
-        Block block = new Block(PARAMS, HEX.decode("0100000006e533fd1ada86391f3f6c343204b0d278d4aaec1c0b20aa27ba0300000000006abbb3eb3d733a9fe18967fd7d4c117e4ccbbac5bec4d910d900b3ae0793e77f54241b4d4c86041b4089cc9b0c01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff07044c86041b010dffffffff0100f2052a01000000434104b27f7e9475ccf5d9a431cb86d665b8302c140144ec2397fce792f4a4e7765fecf8128534eaa71df04f93c74676ae8279195128a1506ebf7379d23dab8fca0f63ac000000000100000001d992e5a888a86d4c7a6a69167a4728ee69497509740fc5f456a24528c340219a000000008b483045022100f0519bdc9282ff476da1323b8ef7ffe33f495c1a8d52cc522b437022d83f6a230220159b61d197fbae01b4a66622a23bc3f1def65d5fa24efd5c26fa872f3a246b8e014104839f9023296a1fabb133140128ca2709f6818c7d099491690bd8ac0fd55279def6a2ceb6ab7b5e4a71889b6e739f09509565eec789e86886f6f936fa42097adeffffffff02000fe208010000001976a914948c765a6914d43f2a7ac177da2c2f6b52de3d7c88ac00e32321000000001976a9140c34f4e29ab5a615d5ea28d4817f12b137d62ed588ac0000000001000000059daf0abe7a92618546a9dbcfd65869b6178c66ec21ccfda878c1175979cfd9ef000000004a493046022100c2f7f25be5de6ce88ac3c1a519514379e91f39b31ddff279a3db0b1a229b708b022100b29efbdbd9837cc6a6c7318aa4900ed7e4d65662c34d1622a2035a3a5534a99a01ffffffffd516330ebdf075948da56db13d22632a4fb941122df2884397dda45d451acefb0000000048473044022051243debe6d4f2b433bee0cee78c5c4073ead0e3bde54296dbed6176e128659c022044417bfe16f44eb7b6eb0cdf077b9ce972a332e15395c09ca5e4f602958d266101ffffffffe1f5aa33961227b3c344e57179417ce01b7ccd421117fe2336289b70489883f900000000484730440220593252bb992ce3c85baf28d6e3aa32065816271d2c822398fe7ee28a856bc943022066d429dd5025d3c86fd8fd8a58e183a844bd94aa312cefe00388f57c85b0ca3201ffffffffe207e83718129505e6a7484831442f668164ae659fddb82e9e5421a081fb90d50000000049483045022067cf27eb733e5bcae412a586b25a74417c237161a084167c2a0b439abfebdcb2022100efcc6baa6824b4c5205aa967e0b76d31abf89e738d4b6b014e788c9a8cccaf0c01ffffffffe23b8d9d80a9e9d977fab3c94dbe37befee63822443c3ec5ae5a713ede66c3940000000049483045022020f2eb35036666b1debe0d1d2e77a36d5d9c4e96c1dba23f5100f193dbf524790221008ce79bc1321fb4357c6daee818038d41544749127751726e46b2b320c8b565a201ffffffff0200ba1dd2050000001976a914366a27645806e817a6cd40bc869bdad92fe5509188ac40420f00000000001976a914ee8bd501094a7d5ca318da2506de35e1cb025ddc88ac0000000001000000010abad2dc0c9b4b1dbb023077da513f81e5a71788d8680fca98ef1c37356c459c000000004a493046022100a894e521c87b3dbe23007079db4ac2896e9e791f8b57317ba6c0d99a7becd27a022100bc40981393eafeb33e89079f857c728701a9af4523c3f857cd96a500f240780901ffffffff024026ee22010000001976a914d28f9cefb58c1f7a5f97aa6b79047585f58fbd4388acc0cb1707000000001976a9142229481696e417aa5f51ad751d8cd4c6a669e4fe88ac000000000100000001f66d89b3649e0b18d84db056930676cb81c0168042fc4324c3682e252ea9410d0000000048473044022038e0b55b37c9253bfeda59c76c0134530f91fb586d6eb21738a77a984f370a44022048d4d477aaf97ef9c8275bbc5cb19b9c8a0e9b1f9fdafdd39bc85bf6c2f04a4d01ffffffff024041a523010000001976a914955f70ac8792b48b7bd52b15413bd8500ecf32c888ac00f36f06000000001976a91486116d15f3dbb23a2b58346f36e6ec2d867eba2b88ac00000000010000000126c384984f63446a4f2be8dd6531ba9837bd5f2c3d37403c5f51fb9192ee754e010000008b48304502210083af8324456f052ff1b2597ff0e6a8cce8b006e379a410cf781be7874a2691c2022072259e2f7292960dea0ffc361bbad0b861f719beb8550476f22ce0f82c023449014104f3ed46a81cba02af0593e8572a9130adb0d348b538c829ccaaf8e6075b78439b2746a76891ce7ba71abbcbb7ca76e8a220782738a6789562827c1065b0ce911dffffffff02c0dd9107000000001976a91463d4dd1b29d95ed601512b487bfc1c49d84d057988ac00a0491a010000001976a91465746bef92511df7b34abf71c162efb7ae353de388ac0000000001000000011b56cf3aab3286d582c055a42af3a911ee08423f276da702bb67f1222ac1a5b6000000008c4930460221009e9fba682e162c9627b96b7df272006a727988680b956c61baff869f0907b8fb022100a9c19adc7c36144bafe526630783845e5cb9554d30d3edfb56f0740274d507f30141046e0efbfac7b1615ad553a6f097615bc63b7cdb3b8e1cb3263b619ba63740012f51c7c5b09390e3577e377b7537e61226e315f95f926444fc5e5f2978c112e448ffffffff02c0072b11010000001976a914b73e9e01933351ca076faf8e0d94dd58079d0b1f88ac80b63908000000001976a9141aca0bdf0d2cee63db19aa4a484f45a4e26a880c88ac000000000100000001251b187504ea873b2c3915fad401f7a7734cc13567e0417708e86294a29f4f68010000008b4830450221009bef423141ed1ae60d0a5bcaa57b1673fc96001f0d4e105535cca817ba5a7724022037c399bd30374f22481ffc81327cfca4951c7264b227f765fcd6a429f3d9d2080141044d0d1b4f194c31a73dbce41c42b4b3946849117c5bb320467e014bad3b1532f28a9a1568ba7108f188e7823b6e618e91d974306701379a27b9339e646e156e7bffffffff02c00fd103010000001976a914ef7f5d9e1bc6ed68cfe0b1db9d8f09cef0f3ba4a88ac004dd208000000001976a914c22420641cea028c9e06c4d9104c1646f8b1769088ac0000000001000000013486dd5f0a2f3efcc04f64cb03872c021f98ee39f514747ce5336b874bbe47a7010000008b48304502201cadddc2838598fee7dc35a12b340c6bde8b389f7bfd19a1252a17c4b5ed2d71022100c1a251bbecb14b058a8bd77f65de87e51c47e95904f4c0e9d52eddc21c1415ac014104fe7df86d58aafa9246ca6fd30c905714533c25f700e2329b8ecec8aa52083b844baa3a8acd5d6b9732dcb39079bb56ba2711a3580dec824955fce0596a460c11ffffffff02c011f6e1000000001976a91490fac83c9adde91d670dde8755f8b475ab9e427d88acc0f9df15000000001976a91437f691b3e8ee5dcb56c2e31af4c80caa2df3b09b88ac00000000010000000170016bd1274b795b262f32a53003a4714b22b62f9057adf5fbe6ed939003b5190100000089463043022061456499582170a94d6b54308f792e37dad28bf0ed7aa61021f0301d2774d378021f4224b33f707efd810a01dd34ea86d6069cd599cc435513a0eef8c83c137bf7014104a2c95d6b98e745448eb45ed0ba95cf24dd7c3b16386e1028e24a0358ee4afc33e2f0199139853edaf32845d8a42254c75f7dc8add3286c682c650fbd93f0a4a1ffffffff02001bd2b7000000001976a9141b11c6acaa5223013f3a3240fdb024ecd9f8135488ac8023ad18000000001976a914ada27ca87bbaa1ee6fb1cb61bb0a29baaf6da2c988ac000000000100000001c8ff91f031ec6a5aba4baee6549e61dd01f26f61b70e2f1574f24cd680f464ad000000008b48304502210082235e21a2300022738dabb8e1bbd9d19cfb1e7ab8c30a23b0afbb8d178abcf3022024bf68e256c534ddfaf966bf908deb944305596f7bdcc38d69acad7f9c868724014104174f9eef1157dc1ad5eac198250b70d1c3b04b2fca12ad1483f07358486f02909b088bbc83f4de55f767f6cdf9d424aa02b5eeaffa08394d39b717895fc08d0affffffff0200ea3b43000000001976a914fb32df708f0610901f6d1b6df8c9c368fe0d981c88ac800f1777000000001976a914462c501c70fb996d15ac0771e7fc8d3ca3f7201888ac000000000100000001c67323867de802402e780a70e0deba3c708c4d87497e17590afee9c321f1c680010000008a473044022042734b25f54845d662e6499b75ff8529ff47f42fd224498a9f752d212326dbfa0220523e4b7b570bbb1f3af02baa2c04ea8eb7b0fccb1522cced130b666ae9a9d014014104b5a23b922949877e9eaf7512897ed091958e2e8cf05b0d0eb9064e7976043fde6023b4e2c188b7e38ef94eec6845dc4933f5e8635f1f6a3702290956aa9e284bffffffff0280041838030000001976a91436e5884215f7d3044be5d37bdd8c987d9d942c8488ac404b4c00000000001976a91460085d6838f8a44a21a0de56ff963cfa6242a96188ac00000000"));
-        FilteredBlock filteredBlock = new FilteredBlock(PARAMS, HEX.decode("0100000006e533fd1ada86391f3f6c343204b0d278d4aaec1c0b20aa27ba0300000000006abbb3eb3d733a9fe18967fd7d4c117e4ccbbac5bec4d910d900b3ae0793e77f54241b4d4c86041b4089cc9b0c000000084c30b63cfcdc2d35e3329421b9805ef0c6565d35381ca857762ea0b3a5a128bbca5065ff9617cbcba45eb23726df6498a9b9cafed4f54cbab9d227b0035ddefbbb15ac1d57d0182aaee61c74743a9c4f785895e563909bafec45c9a2b0ff3181d77706be8b1dcc91112eada86d424e2d0a8907c3488b6e44fda5a74a25cbc7d6bb4fa04245f4ac8a1a571d5537eac24adca1454d65eda446055479af6c6d4dd3c9ab658448c10b6921b7a4ce3021eb22ed6bb6a7fde1e5bcc4b1db6615c6abc5ca042127bfaf9f44ebce29cb29c6df9d05b47f35b2edff4f0064b578ab741fa78276222651209fe1a2c4c0fa1c58510aec8b090dd1eb1f82f9d261b8273b525b02ff1a"));
+        Block block = new Block(UNITTEST, HEX.decode("0100000006e533fd1ada86391f3f6c343204b0d278d4aaec1c0b20aa27ba0300000000006abbb3eb3d733a9fe18967fd7d4c117e4ccbbac5bec4d910d900b3ae0793e77f54241b4d4c86041b4089cc9b0c01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff07044c86041b010dffffffff0100f2052a01000000434104b27f7e9475ccf5d9a431cb86d665b8302c140144ec2397fce792f4a4e7765fecf8128534eaa71df04f93c74676ae8279195128a1506ebf7379d23dab8fca0f63ac000000000100000001d992e5a888a86d4c7a6a69167a4728ee69497509740fc5f456a24528c340219a000000008b483045022100f0519bdc9282ff476da1323b8ef7ffe33f495c1a8d52cc522b437022d83f6a230220159b61d197fbae01b4a66622a23bc3f1def65d5fa24efd5c26fa872f3a246b8e014104839f9023296a1fabb133140128ca2709f6818c7d099491690bd8ac0fd55279def6a2ceb6ab7b5e4a71889b6e739f09509565eec789e86886f6f936fa42097adeffffffff02000fe208010000001976a914948c765a6914d43f2a7ac177da2c2f6b52de3d7c88ac00e32321000000001976a9140c34f4e29ab5a615d5ea28d4817f12b137d62ed588ac0000000001000000059daf0abe7a92618546a9dbcfd65869b6178c66ec21ccfda878c1175979cfd9ef000000004a493046022100c2f7f25be5de6ce88ac3c1a519514379e91f39b31ddff279a3db0b1a229b708b022100b29efbdbd9837cc6a6c7318aa4900ed7e4d65662c34d1622a2035a3a5534a99a01ffffffffd516330ebdf075948da56db13d22632a4fb941122df2884397dda45d451acefb0000000048473044022051243debe6d4f2b433bee0cee78c5c4073ead0e3bde54296dbed6176e128659c022044417bfe16f44eb7b6eb0cdf077b9ce972a332e15395c09ca5e4f602958d266101ffffffffe1f5aa33961227b3c344e57179417ce01b7ccd421117fe2336289b70489883f900000000484730440220593252bb992ce3c85baf28d6e3aa32065816271d2c822398fe7ee28a856bc943022066d429dd5025d3c86fd8fd8a58e183a844bd94aa312cefe00388f57c85b0ca3201ffffffffe207e83718129505e6a7484831442f668164ae659fddb82e9e5421a081fb90d50000000049483045022067cf27eb733e5bcae412a586b25a74417c237161a084167c2a0b439abfebdcb2022100efcc6baa6824b4c5205aa967e0b76d31abf89e738d4b6b014e788c9a8cccaf0c01ffffffffe23b8d9d80a9e9d977fab3c94dbe37befee63822443c3ec5ae5a713ede66c3940000000049483045022020f2eb35036666b1debe0d1d2e77a36d5d9c4e96c1dba23f5100f193dbf524790221008ce79bc1321fb4357c6daee818038d41544749127751726e46b2b320c8b565a201ffffffff0200ba1dd2050000001976a914366a27645806e817a6cd40bc869bdad92fe5509188ac40420f00000000001976a914ee8bd501094a7d5ca318da2506de35e1cb025ddc88ac0000000001000000010abad2dc0c9b4b1dbb023077da513f81e5a71788d8680fca98ef1c37356c459c000000004a493046022100a894e521c87b3dbe23007079db4ac2896e9e791f8b57317ba6c0d99a7becd27a022100bc40981393eafeb33e89079f857c728701a9af4523c3f857cd96a500f240780901ffffffff024026ee22010000001976a914d28f9cefb58c1f7a5f97aa6b79047585f58fbd4388acc0cb1707000000001976a9142229481696e417aa5f51ad751d8cd4c6a669e4fe88ac000000000100000001f66d89b3649e0b18d84db056930676cb81c0168042fc4324c3682e252ea9410d0000000048473044022038e0b55b37c9253bfeda59c76c0134530f91fb586d6eb21738a77a984f370a44022048d4d477aaf97ef9c8275bbc5cb19b9c8a0e9b1f9fdafdd39bc85bf6c2f04a4d01ffffffff024041a523010000001976a914955f70ac8792b48b7bd52b15413bd8500ecf32c888ac00f36f06000000001976a91486116d15f3dbb23a2b58346f36e6ec2d867eba2b88ac00000000010000000126c384984f63446a4f2be8dd6531ba9837bd5f2c3d37403c5f51fb9192ee754e010000008b48304502210083af8324456f052ff1b2597ff0e6a8cce8b006e379a410cf781be7874a2691c2022072259e2f7292960dea0ffc361bbad0b861f719beb8550476f22ce0f82c023449014104f3ed46a81cba02af0593e8572a9130adb0d348b538c829ccaaf8e6075b78439b2746a76891ce7ba71abbcbb7ca76e8a220782738a6789562827c1065b0ce911dffffffff02c0dd9107000000001976a91463d4dd1b29d95ed601512b487bfc1c49d84d057988ac00a0491a010000001976a91465746bef92511df7b34abf71c162efb7ae353de388ac0000000001000000011b56cf3aab3286d582c055a42af3a911ee08423f276da702bb67f1222ac1a5b6000000008c4930460221009e9fba682e162c9627b96b7df272006a727988680b956c61baff869f0907b8fb022100a9c19adc7c36144bafe526630783845e5cb9554d30d3edfb56f0740274d507f30141046e0efbfac7b1615ad553a6f097615bc63b7cdb3b8e1cb3263b619ba63740012f51c7c5b09390e3577e377b7537e61226e315f95f926444fc5e5f2978c112e448ffffffff02c0072b11010000001976a914b73e9e01933351ca076faf8e0d94dd58079d0b1f88ac80b63908000000001976a9141aca0bdf0d2cee63db19aa4a484f45a4e26a880c88ac000000000100000001251b187504ea873b2c3915fad401f7a7734cc13567e0417708e86294a29f4f68010000008b4830450221009bef423141ed1ae60d0a5bcaa57b1673fc96001f0d4e105535cca817ba5a7724022037c399bd30374f22481ffc81327cfca4951c7264b227f765fcd6a429f3d9d2080141044d0d1b4f194c31a73dbce41c42b4b3946849117c5bb320467e014bad3b1532f28a9a1568ba7108f188e7823b6e618e91d974306701379a27b9339e646e156e7bffffffff02c00fd103010000001976a914ef7f5d9e1bc6ed68cfe0b1db9d8f09cef0f3ba4a88ac004dd208000000001976a914c22420641cea028c9e06c4d9104c1646f8b1769088ac0000000001000000013486dd5f0a2f3efcc04f64cb03872c021f98ee39f514747ce5336b874bbe47a7010000008b48304502201cadddc2838598fee7dc35a12b340c6bde8b389f7bfd19a1252a17c4b5ed2d71022100c1a251bbecb14b058a8bd77f65de87e51c47e95904f4c0e9d52eddc21c1415ac014104fe7df86d58aafa9246ca6fd30c905714533c25f700e2329b8ecec8aa52083b844baa3a8acd5d6b9732dcb39079bb56ba2711a3580dec824955fce0596a460c11ffffffff02c011f6e1000000001976a91490fac83c9adde91d670dde8755f8b475ab9e427d88acc0f9df15000000001976a91437f691b3e8ee5dcb56c2e31af4c80caa2df3b09b88ac00000000010000000170016bd1274b795b262f32a53003a4714b22b62f9057adf5fbe6ed939003b5190100000089463043022061456499582170a94d6b54308f792e37dad28bf0ed7aa61021f0301d2774d378021f4224b33f707efd810a01dd34ea86d6069cd599cc435513a0eef8c83c137bf7014104a2c95d6b98e745448eb45ed0ba95cf24dd7c3b16386e1028e24a0358ee4afc33e2f0199139853edaf32845d8a42254c75f7dc8add3286c682c650fbd93f0a4a1ffffffff02001bd2b7000000001976a9141b11c6acaa5223013f3a3240fdb024ecd9f8135488ac8023ad18000000001976a914ada27ca87bbaa1ee6fb1cb61bb0a29baaf6da2c988ac000000000100000001c8ff91f031ec6a5aba4baee6549e61dd01f26f61b70e2f1574f24cd680f464ad000000008b48304502210082235e21a2300022738dabb8e1bbd9d19cfb1e7ab8c30a23b0afbb8d178abcf3022024bf68e256c534ddfaf966bf908deb944305596f7bdcc38d69acad7f9c868724014104174f9eef1157dc1ad5eac198250b70d1c3b04b2fca12ad1483f07358486f02909b088bbc83f4de55f767f6cdf9d424aa02b5eeaffa08394d39b717895fc08d0affffffff0200ea3b43000000001976a914fb32df708f0610901f6d1b6df8c9c368fe0d981c88ac800f1777000000001976a914462c501c70fb996d15ac0771e7fc8d3ca3f7201888ac000000000100000001c67323867de802402e780a70e0deba3c708c4d87497e17590afee9c321f1c680010000008a473044022042734b25f54845d662e6499b75ff8529ff47f42fd224498a9f752d212326dbfa0220523e4b7b570bbb1f3af02baa2c04ea8eb7b0fccb1522cced130b666ae9a9d014014104b5a23b922949877e9eaf7512897ed091958e2e8cf05b0d0eb9064e7976043fde6023b4e2c188b7e38ef94eec6845dc4933f5e8635f1f6a3702290956aa9e284bffffffff0280041838030000001976a91436e5884215f7d3044be5d37bdd8c987d9d942c8488ac404b4c00000000001976a91460085d6838f8a44a21a0de56ff963cfa6242a96188ac00000000"));
+        FilteredBlock filteredBlock = new FilteredBlock(UNITTEST, HEX.decode("0100000006e533fd1ada86391f3f6c343204b0d278d4aaec1c0b20aa27ba0300000000006abbb3eb3d733a9fe18967fd7d4c117e4ccbbac5bec4d910d900b3ae0793e77f54241b4d4c86041b4089cc9b0c000000084c30b63cfcdc2d35e3329421b9805ef0c6565d35381ca857762ea0b3a5a128bbca5065ff9617cbcba45eb23726df6498a9b9cafed4f54cbab9d227b0035ddefbbb15ac1d57d0182aaee61c74743a9c4f785895e563909bafec45c9a2b0ff3181d77706be8b1dcc91112eada86d424e2d0a8907c3488b6e44fda5a74a25cbc7d6bb4fa04245f4ac8a1a571d5537eac24adca1454d65eda446055479af6c6d4dd3c9ab658448c10b6921b7a4ce3021eb22ed6bb6a7fde1e5bcc4b1db6615c6abc5ca042127bfaf9f44ebce29cb29c6df9d05b47f35b2edff4f0064b578ab741fa78276222651209fe1a2c4c0fa1c58510aec8b090dd1eb1f82f9d261b8273b525b02ff1a"));
         
         // Block 100001
         assertTrue(block.getHash().equals(Sha256Hash.wrap("00000000000080b66c911bd5ba14a74260057311eaeb1982802f7010f1a9f090")));
@@ -139,22 +141,22 @@ public void serializeDownloadBlockWithWallet() throws Exception {
         List<Sha256Hash> txHashList = filteredBlock.getTransactionHashes();
         assertTrue(txHashList.size() == 4);
         // Four transactions (0, 1, 2, 6) from block 100001
-        Transaction tx0 = PARAMS.getDefaultSerializer().makeTransaction(HEX.decode("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff07044c86041b010dffffffff0100f2052a01000000434104b27f7e9475ccf5d9a431cb86d665b8302c140144ec2397fce792f4a4e7765fecf8128534eaa71df04f93c74676ae8279195128a1506ebf7379d23dab8fca0f63ac00000000"));
-        assertTrue(tx0.getHash().equals(Sha256Hash.wrap("bb28a1a5b3a02e7657a81c38355d56c6f05e80b9219432e3352ddcfc3cb6304c")));
-        assertEquals(tx0.getHash(), txHashList.get(0));
+        Transaction tx0 = UNITTEST.getDefaultSerializer().makeTransaction(HEX.decode("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff07044c86041b010dffffffff0100f2052a01000000434104b27f7e9475ccf5d9a431cb86d665b8302c140144ec2397fce792f4a4e7765fecf8128534eaa71df04f93c74676ae8279195128a1506ebf7379d23dab8fca0f63ac00000000"));
+        assertTrue(tx0.getTxId().equals(Sha256Hash.wrap("bb28a1a5b3a02e7657a81c38355d56c6f05e80b9219432e3352ddcfc3cb6304c")));
+        assertEquals(tx0.getTxId(), txHashList.get(0));
         
-        Transaction tx1 = PARAMS.getDefaultSerializer().makeTransaction(HEX.decode("0100000001d992e5a888a86d4c7a6a69167a4728ee69497509740fc5f456a24528c340219a000000008b483045022100f0519bdc9282ff476da1323b8ef7ffe33f495c1a8d52cc522b437022d83f6a230220159b61d197fbae01b4a66622a23bc3f1def65d5fa24efd5c26fa872f3a246b8e014104839f9023296a1fabb133140128ca2709f6818c7d099491690bd8ac0fd55279def6a2ceb6ab7b5e4a71889b6e739f09509565eec789e86886f6f936fa42097adeffffffff02000fe208010000001976a914948c765a6914d43f2a7ac177da2c2f6b52de3d7c88ac00e32321000000001976a9140c34f4e29ab5a615d5ea28d4817f12b137d62ed588ac00000000"));
-        assertTrue(tx1.getHash().equals(Sha256Hash.wrap("fbde5d03b027d2b9ba4cf5d4fecab9a99864df2637b25ea4cbcb1796ff6550ca")));
-        assertEquals(tx1.getHash(), txHashList.get(1));
+        Transaction tx1 = UNITTEST.getDefaultSerializer().makeTransaction(HEX.decode("0100000001d992e5a888a86d4c7a6a69167a4728ee69497509740fc5f456a24528c340219a000000008b483045022100f0519bdc9282ff476da1323b8ef7ffe33f495c1a8d52cc522b437022d83f6a230220159b61d197fbae01b4a66622a23bc3f1def65d5fa24efd5c26fa872f3a246b8e014104839f9023296a1fabb133140128ca2709f6818c7d099491690bd8ac0fd55279def6a2ceb6ab7b5e4a71889b6e739f09509565eec789e86886f6f936fa42097adeffffffff02000fe208010000001976a914948c765a6914d43f2a7ac177da2c2f6b52de3d7c88ac00e32321000000001976a9140c34f4e29ab5a615d5ea28d4817f12b137d62ed588ac00000000"));
+        assertTrue(tx1.getTxId().equals(Sha256Hash.wrap("fbde5d03b027d2b9ba4cf5d4fecab9a99864df2637b25ea4cbcb1796ff6550ca")));
+        assertEquals(tx1.getTxId(), txHashList.get(1));
 
-        Transaction tx2 = PARAMS.getDefaultSerializer().makeTransaction(HEX.decode("01000000059daf0abe7a92618546a9dbcfd65869b6178c66ec21ccfda878c1175979cfd9ef000000004a493046022100c2f7f25be5de6ce88ac3c1a519514379e91f39b31ddff279a3db0b1a229b708b022100b29efbdbd9837cc6a6c7318aa4900ed7e4d65662c34d1622a2035a3a5534a99a01ffffffffd516330ebdf075948da56db13d22632a4fb941122df2884397dda45d451acefb0000000048473044022051243debe6d4f2b433bee0cee78c5c4073ead0e3bde54296dbed6176e128659c022044417bfe16f44eb7b6eb0cdf077b9ce972a332e15395c09ca5e4f602958d266101ffffffffe1f5aa33961227b3c344e57179417ce01b7ccd421117fe2336289b70489883f900000000484730440220593252bb992ce3c85baf28d6e3aa32065816271d2c822398fe7ee28a856bc943022066d429dd5025d3c86fd8fd8a58e183a844bd94aa312cefe00388f57c85b0ca3201ffffffffe207e83718129505e6a7484831442f668164ae659fddb82e9e5421a081fb90d50000000049483045022067cf27eb733e5bcae412a586b25a74417c237161a084167c2a0b439abfebdcb2022100efcc6baa6824b4c5205aa967e0b76d31abf89e738d4b6b014e788c9a8cccaf0c01ffffffffe23b8d9d80a9e9d977fab3c94dbe37befee63822443c3ec5ae5a713ede66c3940000000049483045022020f2eb35036666b1debe0d1d2e77a36d5d9c4e96c1dba23f5100f193dbf524790221008ce79bc1321fb4357c6daee818038d41544749127751726e46b2b320c8b565a201ffffffff0200ba1dd2050000001976a914366a27645806e817a6cd40bc869bdad92fe5509188ac40420f00000000001976a914ee8bd501094a7d5ca318da2506de35e1cb025ddc88ac00000000"));
-        assertTrue(tx2.getHash().equals(Sha256Hash.wrap("8131ffb0a2c945ecaf9b9063e59558784f9c3a74741ce6ae2a18d0571dac15bb")));
-        assertEquals(tx2.getHash(), txHashList.get(2));
+        Transaction tx2 = UNITTEST.getDefaultSerializer().makeTransaction(HEX.decode("01000000059daf0abe7a92618546a9dbcfd65869b6178c66ec21ccfda878c1175979cfd9ef000000004a493046022100c2f7f25be5de6ce88ac3c1a519514379e91f39b31ddff279a3db0b1a229b708b022100b29efbdbd9837cc6a6c7318aa4900ed7e4d65662c34d1622a2035a3a5534a99a01ffffffffd516330ebdf075948da56db13d22632a4fb941122df2884397dda45d451acefb0000000048473044022051243debe6d4f2b433bee0cee78c5c4073ead0e3bde54296dbed6176e128659c022044417bfe16f44eb7b6eb0cdf077b9ce972a332e15395c09ca5e4f602958d266101ffffffffe1f5aa33961227b3c344e57179417ce01b7ccd421117fe2336289b70489883f900000000484730440220593252bb992ce3c85baf28d6e3aa32065816271d2c822398fe7ee28a856bc943022066d429dd5025d3c86fd8fd8a58e183a844bd94aa312cefe00388f57c85b0ca3201ffffffffe207e83718129505e6a7484831442f668164ae659fddb82e9e5421a081fb90d50000000049483045022067cf27eb733e5bcae412a586b25a74417c237161a084167c2a0b439abfebdcb2022100efcc6baa6824b4c5205aa967e0b76d31abf89e738d4b6b014e788c9a8cccaf0c01ffffffffe23b8d9d80a9e9d977fab3c94dbe37befee63822443c3ec5ae5a713ede66c3940000000049483045022020f2eb35036666b1debe0d1d2e77a36d5d9c4e96c1dba23f5100f193dbf524790221008ce79bc1321fb4357c6daee818038d41544749127751726e46b2b320c8b565a201ffffffff0200ba1dd2050000001976a914366a27645806e817a6cd40bc869bdad92fe5509188ac40420f00000000001976a914ee8bd501094a7d5ca318da2506de35e1cb025ddc88ac00000000"));
+        assertTrue(tx2.getTxId().equals(Sha256Hash.wrap("8131ffb0a2c945ecaf9b9063e59558784f9c3a74741ce6ae2a18d0571dac15bb")));
+        assertEquals(tx2.getTxId(), txHashList.get(2));
 
 
-        Transaction tx3 = PARAMS.getDefaultSerializer().makeTransaction(HEX.decode("01000000011b56cf3aab3286d582c055a42af3a911ee08423f276da702bb67f1222ac1a5b6000000008c4930460221009e9fba682e162c9627b96b7df272006a727988680b956c61baff869f0907b8fb022100a9c19adc7c36144bafe526630783845e5cb9554d30d3edfb56f0740274d507f30141046e0efbfac7b1615ad553a6f097615bc63b7cdb3b8e1cb3263b619ba63740012f51c7c5b09390e3577e377b7537e61226e315f95f926444fc5e5f2978c112e448ffffffff02c0072b11010000001976a914b73e9e01933351ca076faf8e0d94dd58079d0b1f88ac80b63908000000001976a9141aca0bdf0d2cee63db19aa4a484f45a4e26a880c88ac00000000"));
-        assertTrue(tx3.getHash().equals(Sha256Hash.wrap("c5abc61566dbb1c4bce5e1fda7b66bed22eb2130cea4b721690bc1488465abc9")));
-        assertEquals(tx3.getHash(),txHashList.get(3));
+        Transaction tx3 = UNITTEST.getDefaultSerializer().makeTransaction(HEX.decode("01000000011b56cf3aab3286d582c055a42af3a911ee08423f276da702bb67f1222ac1a5b6000000008c4930460221009e9fba682e162c9627b96b7df272006a727988680b956c61baff869f0907b8fb022100a9c19adc7c36144bafe526630783845e5cb9554d30d3edfb56f0740274d507f30141046e0efbfac7b1615ad553a6f097615bc63b7cdb3b8e1cb3263b619ba63740012f51c7c5b09390e3577e377b7537e61226e315f95f926444fc5e5f2978c112e448ffffffff02c0072b11010000001976a914b73e9e01933351ca076faf8e0d94dd58079d0b1f88ac80b63908000000001976a9141aca0bdf0d2cee63db19aa4a484f45a4e26a880c88ac00000000"));
+        assertTrue(tx3.getTxId().equals(Sha256Hash.wrap("c5abc61566dbb1c4bce5e1fda7b66bed22eb2130cea4b721690bc1488465abc9")));
+        assertEquals(tx3.getTxId(),txHashList.get(3));
 
         BloomFilter filter = wallet.getBloomFilter(wallet.getKeyChainGroupSize()*2, 0.001, 0xDEADBEEF);
         // Compare the serialized bloom filter to a known-good value
@@ -165,7 +167,7 @@ public void serializeDownloadBlockWithWallet() throws Exception {
         InboundMessageQueuer p1 = connectPeer(1);
         assertEquals(1, peerGroup.numConnectedPeers());
         // Send an inv for block 100001
-        InventoryMessage inv = new InventoryMessage(PARAMS);
+        InventoryMessage inv = new InventoryMessage(UNITTEST);
         inv.addBlock(block);
         inbound(p1, inv);
         
@@ -174,7 +176,7 @@ public void serializeDownloadBlockWithWallet() throws Exception {
         assertTrue(getData instanceof GetDataMessage);
         assertTrue(((GetDataMessage)getData).getItems().size() == 1);
         assertTrue(((GetDataMessage)getData).getItems().get(0).hash.equals(block.getHash()));
-        assertTrue(((GetDataMessage)getData).getItems().get(0).type == InventoryItem.Type.FilteredBlock);
+        assertTrue(((GetDataMessage)getData).getItems().get(0).type == InventoryItem.Type.FILTERED_BLOCK);
         
         // Check that we then immediately pinged.
         Object ping = outbound(p1);
@@ -202,4 +204,34 @@ public void serializeDownloadBlockWithWallet() throws Exception {
         // Peer 1 goes away.
         closePeer(peerOf(p1));
     }
+
+    @Test
+    public void parseHugeDeclaredSizePartialMerkleTree() throws Exception{
+        final byte[] bits = new byte[1];
+        bits[0] = 0x3f;
+        final List<Sha256Hash> hashes = new ArrayList<>();
+        hashes.add(Sha256Hash.wrap("0000000000000000000000000000000000000000000000000000000000000001"));
+        hashes.add(Sha256Hash.wrap("0000000000000000000000000000000000000000000000000000000000000002"));
+        hashes.add(Sha256Hash.wrap("0000000000000000000000000000000000000000000000000000000000000003"));
+        PartialMerkleTree pmt = new PartialMerkleTree(UNITTEST, bits, hashes, 3) {
+            public void bitcoinSerializeToStream(OutputStream stream) throws IOException {
+                uint32ToByteStreamLE(getTransactionCount(), stream);
+                // Add Integer.MAX_VALUE instead of hashes.size()
+                stream.write(new VarInt(Integer.MAX_VALUE).encode());
+                //stream.write(new VarInt(hashes.size()).encode());
+                for (Sha256Hash hash : hashes)
+                    stream.write(hash.getReversedBytes());
+
+                stream.write(new VarInt(bits.length).encode());
+                stream.write(bits);
+            }
+        };
+        byte[] serializedPmt = pmt.bitcoinSerialize();
+        try {
+            new PartialMerkleTree(UNITTEST, serializedPmt, 0);
+            fail("We expect ProtocolException with the fixed code and OutOfMemoryError with the buggy code, so this is weird");
+        } catch (ProtocolException e) {
+            //Expected, do nothing
+        }
+    }
 }
diff --git a/core/src/test/java/org/bitcoinj/core/FullBlockTestGenerator.java b/core/src/test/java/org/bitcoinj/core/FullBlockTestGenerator.java
index 08481e13b5c..8de18a7bfb7 100644
--- a/core/src/test/java/org/bitcoinj/core/FullBlockTestGenerator.java
+++ b/core/src/test/java/org/bitcoinj/core/FullBlockTestGenerator.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -20,6 +22,9 @@
 import org.bitcoinj.crypto.TransactionSignature;
 import org.bitcoinj.script.Script;
 import org.bitcoinj.script.ScriptBuilder;
+import org.bitcoinj.script.ScriptException;
+import org.bitcoinj.script.ScriptPattern;
+
 import com.google.common.base.Preconditions;
 
 import javax.annotation.Nullable;
@@ -43,7 +48,7 @@
  *    Bitcoin Core consensus rules a shared library and use that. Seriously, you wont get it right, and starting with
  *    this tester as a way to try to do so will simply end in pain and lost coins. SERIOUSLY, JUST STOP!
  *
- * b) Bitcoin Core is faling some test in here and you're wondering what test is causing failure. Just stop. There is no
+ * b) Bitcoin Core is failing some test in here and you're wondering what test is causing failure. Just stop. There is no
  *    hope trying to read this file and decipher it. Give up and ping BlueMatt. Seriously, this stuff is a huge mess.
  *
  * c) You are trying to add a new test. STOP! WHY THE HELL WOULD YOU EVEN DO THAT? GO REWRITE THIS TESTER!
@@ -86,7 +91,7 @@ public TransactionOutPointWithValue(TransactionOutPoint outpoint, Coin value, Sc
     }
 
     public TransactionOutPointWithValue(Transaction tx, int output) {
-        this(new TransactionOutPoint(tx.getParams(), output, tx.getHash()),
+        this(new TransactionOutPoint(tx.getParams(), output, tx.getTxId()),
                 tx.getOutput(output).getValue(), tx.getOutput(output).getScriptPubKey());
     }
 }
@@ -145,10 +150,10 @@ public class FullBlockTestGenerator {
     private byte[] coinbaseOutKeyPubKey;
 
     // Used to double-check that we are always using the right next-height
-    private Map<Sha256Hash, Integer> blockToHeightMap = new HashMap<Sha256Hash, Integer>();
+    private Map<Sha256Hash, Integer> blockToHeightMap = new HashMap<>();
 
-    private Map<Sha256Hash, Block> hashHeaderMap = new HashMap<Sha256Hash, Block>();
-    private Map<Sha256Hash, Sha256Hash> coinbaseBlockMap = new HashMap<Sha256Hash, Sha256Hash>();
+    private Map<Sha256Hash, Block> hashHeaderMap = new HashMap<>();
+    private Map<Sha256Hash, Sha256Hash> coinbaseBlockMap = new HashMap<>();
 
     public FullBlockTestGenerator(NetworkParameters params) {
         this.params = params;
@@ -169,10 +174,7 @@ public RuleList getBlocksToTest(boolean runBarelyExpensiveTests, boolean runExpe
             public boolean add(Rule element) {
                 if (outStream != null && element instanceof BlockAndValidity) {
                     try {
-                        outStream.write((int) (params.getPacketMagic() >>> 24));
-                        outStream.write((int) (params.getPacketMagic() >>> 16));
-                        outStream.write((int) (params.getPacketMagic() >>> 8));
-                        outStream.write((int) params.getPacketMagic());
+                        Utils.uint32ToByteStreamBE(params.getPacketMagic(), outStream);
                         byte[] block = ((BlockAndValidity)element).block.bitcoinSerialize();
                         byte[] length = new byte[4];
                         Utils.uint32ToByteArrayBE(block.length, length, 0);
@@ -188,20 +190,20 @@ public boolean add(Rule element) {
         };
         RuleList ret = new RuleList(blocks, hashHeaderMap, 10);
 
-        Queue<TransactionOutPointWithValue> spendableOutputs = new LinkedList<TransactionOutPointWithValue>();
+        Queue<TransactionOutPointWithValue> spendableOutputs = new LinkedList<>();
 
         int chainHeadHeight = 1;
         Block chainHead = params.getGenesisBlock().createNextBlockWithCoinbase(Block.BLOCK_VERSION_GENESIS, coinbaseOutKeyPubKey, chainHeadHeight);
         blocks.add(new BlockAndValidity(chainHead, true, false, chainHead.getHash(), 1, "Initial Block"));
         spendableOutputs.offer(new TransactionOutPointWithValue(
-                new TransactionOutPoint(params, 0, chainHead.getTransactions().get(0).getHash()),
+                new TransactionOutPoint(params, 0, chainHead.getTransactions().get(0).getTxId()),
                 FIFTY_COINS, chainHead.getTransactions().get(0).getOutputs().get(0).getScriptPubKey()));
         for (int i = 1; i < params.getSpendableCoinbaseDepth(); i++) {
             chainHead = chainHead.createNextBlockWithCoinbase(Block.BLOCK_VERSION_GENESIS, coinbaseOutKeyPubKey, chainHeadHeight);
             chainHeadHeight++;
             blocks.add(new BlockAndValidity(chainHead, true, false, chainHead.getHash(), i+1, "Initial Block chain output generation"));
             spendableOutputs.offer(new TransactionOutPointWithValue(
-                    new TransactionOutPoint(params, 0, chainHead.getTransactions().get(0).getHash()),
+                    new TransactionOutPoint(params, 0, chainHead.getTransactions().get(0).getTxId()),
                     FIFTY_COINS, chainHead.getTransactions().get(0).getOutputs().get(0).getScriptPubKey()));
         }
 
@@ -234,7 +236,7 @@ public boolean add(Rule element) {
         UTXORule utxo1;
         {
             Transaction coinbase = b2.block.getTransactions().get(0);
-            TransactionOutPoint outpoint = new TransactionOutPoint(params, 0, coinbase.getHash());
+            TransactionOutPoint outpoint = new TransactionOutPoint(params, 0, coinbase.getTxId());
             long[] heights = {chainHeadHeight + 2};
             UTXOsMessage result = new UTXOsMessage(params, ImmutableList.of(coinbase.getOutput(0)), heights, b2.getHash(), chainHeadHeight + 2);
             utxo1 = new UTXORule("utxo1", outpoint, result);
@@ -253,7 +255,7 @@ public boolean add(Rule element) {
         // Check that the old coinbase is no longer in the UTXO set and the new one is.
         {
             Transaction coinbase = b4.block.getTransactions().get(0);
-            TransactionOutPoint outpoint = new TransactionOutPoint(params, 0, coinbase.getHash());
+            TransactionOutPoint outpoint = new TransactionOutPoint(params, 0, coinbase.getTxId());
             List<TransactionOutPoint> queries = ImmutableList.of(utxo1.query.get(0), outpoint);
             List<TransactionOutput> results = Lists.asList(null, coinbase.getOutput(0), new TransactionOutput[]{});
             long[] heights = {chainHeadHeight + 3};
@@ -319,7 +321,7 @@ public boolean add(Rule element) {
 
         NewBlock b13 = createNextBlock(b12, chainHeadHeight + 5, out4, null);
         blocks.add(new BlockAndValidity(b13, false, false, b6.getHash(), chainHeadHeight + 4, "b13"));
-        // Make sure we dont die if an orphan gets added twice
+        // Make sure we don't die if an orphan gets added twice
         blocks.add(new BlockAndValidity(b13, false, false, b6.getHash(), chainHeadHeight + 4, "b13"));
         spendableOutputs.offer(b13.getCoinbaseOutput());
 
@@ -330,7 +332,7 @@ public boolean add(Rule element) {
         // and will be discarded when an attempt is made to reorg to it.
         // TODO: Use a WeakReference to check that it is freed properly after the reorg
         blocks.add(new BlockAndValidity(b14, false, false, b6.getHash(), chainHeadHeight + 4, "b14"));
-        // Make sure we dont die if an orphan gets added twice
+        // Make sure we don't die if an orphan gets added twice
         blocks.add(new BlockAndValidity(b14, false, false, b6.getHash(), chainHeadHeight + 4, "b14"));
 
         blocks.add(new BlockAndValidity(b12, false, true, b13.getHash(), chainHeadHeight + 5, "b12"));
@@ -715,7 +717,7 @@ public boolean add(Rule element) {
                 tx.addOutput(new TransactionOutput(params, tx, SATOSHI, scriptPubKey.toByteArray()));
                 tx.addOutput(new TransactionOutput(params, tx, lastOutputValue, new byte[]{OP_1}));
                 addOnlyInputToTransaction(tx, out11);
-                lastOutPoint = new TransactionOutPoint(params, 1, tx.getHash());
+                lastOutPoint = new TransactionOutPoint(params, 1, tx.getTxId());
                 b39.addTransaction(tx);
             }
             b39numP2SHOutputs++;
@@ -728,7 +730,7 @@ public boolean add(Rule element) {
                 tx.addOutput(new TransactionOutput(params, tx, SATOSHI, scriptPubKey.toByteArray()));
                 tx.addOutput(new TransactionOutput(params, tx, lastOutputValue, new byte[]{OP_1}));
                 tx.addInput(new TransactionInput(params, tx, new byte[]{OP_1}, lastOutPoint));
-                lastOutPoint = new TransactionOutPoint(params, 1, tx.getHash());
+                lastOutPoint = new TransactionOutPoint(params, 1, tx.getTxId());
 
                 if (b39.block.getMessageSize() + tx.getMessageSize() < Block.MAX_BLOCK_SIZE) {
                     b39.addTransaction(tx);
@@ -753,7 +755,7 @@ public boolean add(Rule element) {
             int numTxes = (Block.MAX_BLOCK_SIGOPS - sigOps) / b39sigOpsPerOutput;
             checkState(numTxes <= b39numP2SHOutputs);
 
-            TransactionOutPoint lastOutPoint = new TransactionOutPoint(params, 1, b40.block.getTransactions().get(1).getHash());
+            TransactionOutPoint lastOutPoint = new TransactionOutPoint(params, 1, b40.block.getTransactions().get(1).getTxId());
 
             byte[] scriptSig = null;
             for (int i = 1; i <= numTxes; i++) {
@@ -762,7 +764,7 @@ public boolean add(Rule element) {
                 tx.addInput(new TransactionInput(params, tx, new byte[]{OP_1}, lastOutPoint));
 
                 TransactionInput input = new TransactionInput(params, tx, new byte[]{},
-                        new TransactionOutPoint(params, 0, b39.block.getTransactions().get(i).getHash()));
+                        new TransactionOutPoint(params, 0, b39.block.getTransactions().get(i).getTxId()));
                 tx.addInput(input);
 
                 if (scriptSig == null) {
@@ -789,7 +791,7 @@ public boolean add(Rule element) {
 
                 input.setScriptBytes(scriptSig);
 
-                lastOutPoint = new TransactionOutPoint(params, 0, tx.getHash());
+                lastOutPoint = new TransactionOutPoint(params, 0, tx.getTxId());
 
                 b40.addTransaction(tx);
             }
@@ -819,7 +821,7 @@ public boolean add(Rule element) {
                 checkState(numTxes <= b39numP2SHOutputs);
 
                 TransactionOutPoint lastOutPoint = new TransactionOutPoint(
-                        params, 1, b41.block.getTransactions().get(1).getHash());
+                        params, 1, b41.block.getTransactions().get(1).getTxId());
 
                 byte[] scriptSig = null;
                 for (int i = 1; i <= numTxes; i++) {
@@ -831,7 +833,7 @@ public boolean add(Rule element) {
 
                     TransactionInput input = new TransactionInput(params, tx,
                             new byte[] {}, new TransactionOutPoint(params, 0,
-                            b39.block.getTransactions().get(i).getHash()));
+                            b39.block.getTransactions().get(i).getTxId()));
                     tx.addInput(input);
 
                     if (scriptSig == null) {
@@ -865,7 +867,7 @@ public boolean add(Rule element) {
                     input.setScriptBytes(scriptSig);
 
                     lastOutPoint = new TransactionOutPoint(params, 0,
-                            tx.getHash());
+                            tx.getTxId());
 
                     b41.addTransaction(tx);
                 }
@@ -905,7 +907,7 @@ public boolean add(Rule element) {
 
         // A valid block created exactly like b44 to make sure the creation itself works
         Block b44 = new Block(params, Block.BLOCK_VERSION_GENESIS);
-        byte[] outScriptBytes = ScriptBuilder.createOutputScript(ECKey.fromPublicOnly(coinbaseOutKeyPubKey)).getProgram();
+        byte[] outScriptBytes = ScriptBuilder.createP2PKOutputScript(ECKey.fromPublicOnly(coinbaseOutKeyPubKey)).getProgram();
         {
             b44.setDifficultyTarget(b43.block.getDifficultyTarget());
             b44.addCoinbaseTransaction(coinbaseOutKeyPubKey, ZERO, chainHeadHeight + 15);
@@ -956,7 +958,7 @@ public boolean add(Rule element) {
         // A block with no txn
         Block b46 = new Block(params, Block.BLOCK_VERSION_GENESIS);
         {
-            b46.transactions = new ArrayList<Transaction>();
+            b46.transactions = new ArrayList<>();
             b46.setDifficultyTarget(b44.getDifficultyTarget());
             b46.setMerkleRoot(Sha256Hash.ZERO_HASH);
 
@@ -1091,21 +1093,21 @@ public boolean add(Rule element) {
             Transaction tx2 = new Transaction(params);
             tx2.addOutput(new TransactionOutput(params, tx2, SATOSHI, new byte[] {OP_TRUE}));
             addOnlyInputToTransaction(tx2, new TransactionOutPointWithValue(
-                    new TransactionOutPoint(params, 0, tx1.getHash()),
+                    new TransactionOutPoint(params, 0, tx1.getTxId()),
                     SATOSHI, tx1.getOutputs().get(0).getScriptPubKey()));
             b57p2.addTransaction(tx2);
 
             b56p2txToDuplicate1 = new Transaction(params);
             b56p2txToDuplicate1.addOutput(new TransactionOutput(params, b56p2txToDuplicate1, SATOSHI, new byte[]{OP_TRUE}));
             addOnlyInputToTransaction(b56p2txToDuplicate1, new TransactionOutPointWithValue(
-                    new TransactionOutPoint(params, 0, tx2.getHash()),
+                    new TransactionOutPoint(params, 0, tx2.getTxId()),
                     SATOSHI, tx2.getOutputs().get(0).getScriptPubKey()));
             b57p2.addTransaction(b56p2txToDuplicate1);
 
             b56p2txToDuplicate2 = new Transaction(params);
             b56p2txToDuplicate2.addOutput(new TransactionOutput(params, b56p2txToDuplicate2, SATOSHI, new byte[]{}));
             addOnlyInputToTransaction(b56p2txToDuplicate2, new TransactionOutPointWithValue(
-                    new TransactionOutPoint(params, 0, b56p2txToDuplicate1.getHash()),
+                    new TransactionOutPoint(params, 0, b56p2txToDuplicate1.getTxId()),
                     SATOSHI, b56p2txToDuplicate1.getOutputs().get(0).getScriptPubKey()));
             b57p2.addTransaction(b56p2txToDuplicate2);
         }
@@ -1257,7 +1259,7 @@ public boolean add(Rule element) {
             b65.addTransaction(tx1);
             Transaction tx2 = new Transaction(params);
             tx2.addOutput(ZERO, OP_TRUE_SCRIPT);
-            tx2.addInput(tx1.getHash(), 0, OP_TRUE_SCRIPT);
+            tx2.addInput(tx1.getTxId(), 0, OP_TRUE_SCRIPT);
             b65.addTransaction(tx2);
         }
         b65.solve();
@@ -1277,7 +1279,7 @@ public boolean add(Rule element) {
             addOnlyInputToTransaction(tx1, out20, 0);
             Transaction tx2 = new Transaction(params);
             tx2.addOutput(ZERO, OP_TRUE_SCRIPT);
-            tx2.addInput(tx1.getHash(), 0, OP_NOP_SCRIPT);
+            tx2.addInput(tx1.getTxId(), 0, OP_NOP_SCRIPT);
             b66.addTransaction(tx2);
             b66.addTransaction(tx1);
         }
@@ -1296,11 +1298,11 @@ public boolean add(Rule element) {
             b67.addTransaction(tx1);
             Transaction tx2 = new Transaction(params);
             tx2.addOutput(ZERO, OP_TRUE_SCRIPT);
-            tx2.addInput(tx1.getHash(), 0, OP_NOP_SCRIPT);
+            tx2.addInput(tx1.getTxId(), 0, OP_NOP_SCRIPT);
             b67.addTransaction(tx2);
             Transaction tx3 = new Transaction(params);
             tx3.addOutput(out20.value, OP_TRUE_SCRIPT);
-            tx3.addInput(tx1.getHash(), 0, OP_NOP_SCRIPT);
+            tx3.addInput(tx1.getTxId(), 0, OP_NOP_SCRIPT);
             b67.addTransaction(tx3);
         }
         b67.solve();
@@ -1488,7 +1490,7 @@ public boolean add(Rule element) {
 
         {
             b79tx.addOutput(ZERO, OP_TRUE_SCRIPT);
-            b79tx.addInput(b78tx.getHash(), 0, OP_NOP_SCRIPT);
+            b79tx.addInput(b78tx.getTxId(), 0, OP_NOP_SCRIPT);
             b79.addTransaction(b79tx);
         }
         b79.solve();
@@ -1508,14 +1510,14 @@ public boolean add(Rule element) {
         blocks.add(new BlockAndValidity(b82, true, false, b82.getHash(), chainHeadHeight + 28, "b82"));
         spendableOutputs.offer(b82.getCoinbaseOutput());
 
-        HashSet<InventoryItem> post82Mempool = new HashSet<InventoryItem>();
-        post82Mempool.add(new InventoryItem(InventoryItem.Type.Transaction, b78tx.getHash()));
-        post82Mempool.add(new InventoryItem(InventoryItem.Type.Transaction, b79tx.getHash()));
+        HashSet<InventoryItem> post82Mempool = new HashSet<>();
+        post82Mempool.add(new InventoryItem(InventoryItem.Type.TRANSACTION, b78tx.getTxId()));
+        post82Mempool.add(new InventoryItem(InventoryItem.Type.TRANSACTION, b79tx.getTxId()));
         blocks.add(new MemoryPoolState(post82Mempool, "post-b82 tx resurrection"));
 
         // Check the UTXO query takes mempool into account.
         {
-            TransactionOutPoint outpoint = new TransactionOutPoint(params, 0, b79tx.getHash());
+            TransactionOutPoint outpoint = new TransactionOutPoint(params, 0, b79tx.getTxId());
             long[] heights = { UTXOsMessage.MEMPOOL_HEIGHT };
             UTXOsMessage result = new UTXOsMessage(params, ImmutableList.of(b79tx.getOutput(0)), heights, b82.getHash(), chainHeadHeight + 28);
             UTXORule utxo3 = new UTXORule("utxo3", outpoint, result);
@@ -1539,7 +1541,7 @@ public boolean add(Rule element) {
             Transaction tx2 = new Transaction(params);
             tx2.addOutput(new TransactionOutput(params, tx2, ZERO, new byte[]{OP_TRUE}));
             tx2.addInput(new TransactionInput(params, tx2, new byte[]{OP_FALSE},
-                    new TransactionOutPoint(params, 0, tx1.getHash())));
+                    new TransactionOutPoint(params, 0, tx1.getTxId())));
             b83.addTransaction(tx2);
         }
         b83.solve();
@@ -1687,11 +1689,11 @@ public boolean add(Rule element) {
             Preconditions.checkArgument(blockStorageFile != null);
 
             NewBlock lastBlock = b1001;
-            TransactionOutPoint lastOutput = new TransactionOutPoint(params, 1, b1001.block.getTransactions().get(1).getHash());
+            TransactionOutPoint lastOutput = new TransactionOutPoint(params, 1, b1001.block.getTransactions().get(1).getTxId());
             int blockCountAfter1001;
             int nextHeight = heightAfter1001;
 
-            List<Sha256Hash> hashesToSpend = new LinkedList<Sha256Hash>(); // all index 0
+            List<Sha256Hash> hashesToSpend = new LinkedList<>(); // all index 0
             final int TRANSACTION_CREATION_BLOCKS = 100;
             for (blockCountAfter1001 = 0; blockCountAfter1001 < TRANSACTION_CREATION_BLOCKS; blockCountAfter1001++) {
                 NewBlock block = createNextBlock(lastBlock, nextHeight++, null, null);
@@ -1700,8 +1702,8 @@ public boolean add(Rule element) {
                     tx.addInput(lastOutput.getHash(), lastOutput.getIndex(), OP_NOP_SCRIPT);
                     tx.addOutput(ZERO, OP_TRUE_SCRIPT);
                     tx.addOutput(ZERO, OP_TRUE_SCRIPT);
-                    lastOutput = new TransactionOutPoint(params, 1, tx.getHash());
-                    hashesToSpend.add(tx.getHash());
+                    lastOutput = new TransactionOutPoint(params, 1, tx.getTxId());
+                    hashesToSpend.add(tx.getTxId());
                     block.addTransaction(tx);
                 }
                 block.solve();
@@ -1817,7 +1819,7 @@ private void addOnlyInputToTransaction(Transaction t, TransactionOutPointWithVal
             input.setScriptSig(new ScriptBuilder().op(OP_1).build());
         } else {
             // Sign input
-            checkState(prevOut.scriptPubKey.isSentToRawPubKey());
+            checkState(ScriptPattern.isP2PK(prevOut.scriptPubKey));
             Sha256Hash hash = t.hashForSignature(0, prevOut.scriptPubKey, SigHash.ALL, false);
             input.setScriptSig(ScriptBuilder.createInputScript(
                             new TransactionSignature(coinbaseOutKey.sign(hash), SigHash.ALL, false))
diff --git a/core/src/test/java/org/bitcoinj/core/H2FullPrunedBlockChainTest.java b/core/src/test/java/org/bitcoinj/core/H2FullPrunedBlockChainTest.java
index 1c2301d03c5..f3e0b968fc5 100644
--- a/core/src/test/java/org/bitcoinj/core/H2FullPrunedBlockChainTest.java
+++ b/core/src/test/java/org/bitcoinj/core/H2FullPrunedBlockChainTest.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/test/java/org/bitcoinj/core/LegacyAddressTest.java b/core/src/test/java/org/bitcoinj/core/LegacyAddressTest.java
new file mode 100644
index 00000000000..8b7888c9be8
--- /dev/null
+++ b/core/src/test/java/org/bitcoinj/core/LegacyAddressTest.java
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2011 Google Inc.
+ * Copyright 2014 Andreas Schildbach
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bitcoinj.core;
+
+import org.bitcoinj.params.MainNetParams;
+import org.bitcoinj.params.Networks;
+import org.bitcoinj.params.TestNet3Params;
+import org.bitcoinj.script.Script;
+import org.bitcoinj.script.ScriptBuilder;
+import org.bitcoinj.script.ScriptPattern;
+import org.bitcoinj.script.Script.ScriptType;
+import org.junit.Test;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStreamReader;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.bitcoinj.core.Utils.HEX;
+import static org.junit.Assert.*;
+
+public class LegacyAddressTest {
+    private static final NetworkParameters TESTNET = TestNet3Params.get();
+    private static final NetworkParameters MAINNET = MainNetParams.get();
+
+    @Test
+    public void testJavaSerialization() throws Exception {
+        LegacyAddress testAddress = LegacyAddress.fromBase58(TESTNET, "n4eA2nbYqErp7H6jebchxAN59DmNpksexv");
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        new ObjectOutputStream(os).writeObject(testAddress);
+        LegacyAddress testAddressCopy = (LegacyAddress) new ObjectInputStream(new ByteArrayInputStream(os.toByteArray()))
+                .readObject();
+        assertEquals(testAddress, testAddressCopy);
+
+        LegacyAddress mainAddress = LegacyAddress.fromBase58(MAINNET, "17kzeh4N8g49GFvdDzSf8PjaPfyoD1MndL");
+        os = new ByteArrayOutputStream();
+        new ObjectOutputStream(os).writeObject(mainAddress);
+        LegacyAddress mainAddressCopy = (LegacyAddress) new ObjectInputStream(new ByteArrayInputStream(os.toByteArray()))
+                .readObject();
+        assertEquals(mainAddress, mainAddressCopy);
+    }
+
+    @Test
+    public void stringification() throws Exception {
+        // Test a testnet address.
+        LegacyAddress a = LegacyAddress.fromPubKeyHash(TESTNET, HEX.decode("fda79a24e50ff70ff42f7d89585da5bd19d9e5cc"));
+        assertEquals("n4eA2nbYqErp7H6jebchxAN59DmNpksexv", a.toString());
+        assertEquals(ScriptType.P2PKH, a.getOutputScriptType());
+
+        LegacyAddress b = LegacyAddress.fromPubKeyHash(MAINNET, HEX.decode("4a22c3c4cbb31e4d03b15550636762bda0baf85a"));
+        assertEquals("17kzeh4N8g49GFvdDzSf8PjaPfyoD1MndL", b.toString());
+        assertEquals(ScriptType.P2PKH, b.getOutputScriptType());
+    }
+
+    @Test
+    public void decoding() throws Exception {
+        LegacyAddress a = LegacyAddress.fromBase58(TESTNET, "n4eA2nbYqErp7H6jebchxAN59DmNpksexv");
+        assertEquals("fda79a24e50ff70ff42f7d89585da5bd19d9e5cc", Utils.HEX.encode(a.getHash()));
+
+        LegacyAddress b = LegacyAddress.fromBase58(MAINNET, "17kzeh4N8g49GFvdDzSf8PjaPfyoD1MndL");
+        assertEquals("4a22c3c4cbb31e4d03b15550636762bda0baf85a", Utils.HEX.encode(b.getHash()));
+    }
+
+    @Test
+    public void errorPaths() {
+        // Check what happens if we try and decode garbage.
+        try {
+            LegacyAddress.fromBase58(TESTNET, "this is not a valid address!");
+            fail();
+        } catch (AddressFormatException.WrongNetwork e) {
+            fail();
+        } catch (AddressFormatException e) {
+            // Success.
+        }
+
+        // Check the empty case.
+        try {
+            LegacyAddress.fromBase58(TESTNET, "");
+            fail();
+        } catch (AddressFormatException.WrongNetwork e) {
+            fail();
+        } catch (AddressFormatException e) {
+            // Success.
+        }
+
+        // Check the case of a mismatched network.
+        try {
+            LegacyAddress.fromBase58(TESTNET, "17kzeh4N8g49GFvdDzSf8PjaPfyoD1MndL");
+            fail();
+        } catch (AddressFormatException.WrongNetwork e) {
+            // Success.
+        } catch (AddressFormatException e) {
+            fail();
+        }
+    }
+
+    @Test
+    public void getNetwork() throws Exception {
+        NetworkParameters params = LegacyAddress.getParametersFromAddress("17kzeh4N8g49GFvdDzSf8PjaPfyoD1MndL");
+        assertEquals(MAINNET.getId(), params.getId());
+        params = LegacyAddress.getParametersFromAddress("n4eA2nbYqErp7H6jebchxAN59DmNpksexv");
+        assertEquals(TESTNET.getId(), params.getId());
+    }
+
+    @Test
+    public void getAltNetwork() throws Exception {
+        // An alternative network
+        class AltNetwork extends MainNetParams {
+            AltNetwork() {
+                super();
+                id = "alt.network";
+                addressHeader = 48;
+                p2shHeader = 5;
+            }
+        }
+        AltNetwork altNetwork = new AltNetwork();
+        // Add new network params
+        Networks.register(altNetwork);
+        // Check if can parse address
+        NetworkParameters params = LegacyAddress.getParametersFromAddress("LLxSnHLN2CYyzB5eWTR9K9rS9uWtbTQFb6");
+        assertEquals(altNetwork.getId(), params.getId());
+        // Check if main network works as before
+        params = LegacyAddress.getParametersFromAddress("17kzeh4N8g49GFvdDzSf8PjaPfyoD1MndL");
+        assertEquals(MAINNET.getId(), params.getId());
+        // Unregister network
+        Networks.unregister(altNetwork);
+        try {
+            LegacyAddress.getParametersFromAddress("LLxSnHLN2CYyzB5eWTR9K9rS9uWtbTQFb6");
+            fail();
+        } catch (AddressFormatException e) { }
+    }
+
+    @Test
+    public void p2shAddress() throws Exception {
+        // Test that we can construct P2SH addresses
+        LegacyAddress mainNetP2SHAddress = LegacyAddress.fromBase58(MainNetParams.get(), "35b9vsyH1KoFT5a5KtrKusaCcPLkiSo1tU");
+        assertEquals(mainNetP2SHAddress.getVersion(), MAINNET.p2shHeader);
+        assertEquals(ScriptType.P2SH, mainNetP2SHAddress.getOutputScriptType());
+        LegacyAddress testNetP2SHAddress = LegacyAddress.fromBase58(TestNet3Params.get(), "2MuVSxtfivPKJe93EC1Tb9UhJtGhsoWEHCe");
+        assertEquals(testNetP2SHAddress.getVersion(), TESTNET.p2shHeader);
+        assertEquals(ScriptType.P2SH, testNetP2SHAddress.getOutputScriptType());
+
+        // Test that we can determine what network a P2SH address belongs to
+        NetworkParameters mainNetParams = LegacyAddress.getParametersFromAddress("35b9vsyH1KoFT5a5KtrKusaCcPLkiSo1tU");
+        assertEquals(MAINNET.getId(), mainNetParams.getId());
+        NetworkParameters testNetParams = LegacyAddress.getParametersFromAddress("2MuVSxtfivPKJe93EC1Tb9UhJtGhsoWEHCe");
+        assertEquals(TESTNET.getId(), testNetParams.getId());
+
+        // Test that we can convert them from hashes
+        byte[] hex = HEX.decode("2ac4b0b501117cc8119c5797b519538d4942e90e");
+        LegacyAddress a = LegacyAddress.fromScriptHash(MAINNET, hex);
+        assertEquals("35b9vsyH1KoFT5a5KtrKusaCcPLkiSo1tU", a.toString());
+        LegacyAddress b = LegacyAddress.fromScriptHash(TESTNET, HEX.decode("18a0e827269b5211eb51a4af1b2fa69333efa722"));
+        assertEquals("2MuVSxtfivPKJe93EC1Tb9UhJtGhsoWEHCe", b.toString());
+        LegacyAddress c = LegacyAddress.fromScriptHash(MAINNET,
+                ScriptPattern.extractHashFromP2SH(ScriptBuilder.createP2SHOutputScript(hex)));
+        assertEquals("35b9vsyH1KoFT5a5KtrKusaCcPLkiSo1tU", c.toString());
+    }
+
+    @Test
+    public void p2shAddressCreationFromKeys() throws Exception {
+        // import some keys from this example: https://gist.github.com/gavinandresen/3966071
+        ECKey key1 = DumpedPrivateKey.fromBase58(MAINNET, "5JaTXbAUmfPYZFRwrYaALK48fN6sFJp4rHqq2QSXs8ucfpE4yQU").getKey();
+        key1 = ECKey.fromPrivate(key1.getPrivKeyBytes());
+        ECKey key2 = DumpedPrivateKey.fromBase58(MAINNET, "5Jb7fCeh1Wtm4yBBg3q3XbT6B525i17kVhy3vMC9AqfR6FH2qGk").getKey();
+        key2 = ECKey.fromPrivate(key2.getPrivKeyBytes());
+        ECKey key3 = DumpedPrivateKey.fromBase58(MAINNET, "5JFjmGo5Fww9p8gvx48qBYDJNAzR9pmH5S389axMtDyPT8ddqmw").getKey();
+        key3 = ECKey.fromPrivate(key3.getPrivKeyBytes());
+
+        List<ECKey> keys = Arrays.asList(key1, key2, key3);
+        Script p2shScript = ScriptBuilder.createP2SHOutputScript(2, keys);
+        LegacyAddress address = LegacyAddress.fromScriptHash(MAINNET,
+                ScriptPattern.extractHashFromP2SH(p2shScript));
+        assertEquals("3N25saC4dT24RphDAwLtD8LUN4E2gZPJke", address.toString());
+    }
+
+    @Test
+    public void cloning() throws Exception {
+        LegacyAddress a = LegacyAddress.fromPubKeyHash(TESTNET, HEX.decode("fda79a24e50ff70ff42f7d89585da5bd19d9e5cc"));
+        LegacyAddress b = a.clone();
+
+        assertEquals(a, b);
+        assertNotSame(a, b);
+    }
+
+    @Test
+    public void roundtripBase58() throws Exception {
+        String base58 = "17kzeh4N8g49GFvdDzSf8PjaPfyoD1MndL";
+        assertEquals(base58, LegacyAddress.fromBase58(null, base58).toBase58());
+    }
+
+    @Test
+    public void comparisonCloneEqualTo() throws Exception {
+        LegacyAddress a = LegacyAddress.fromBase58(MAINNET, "1Dorian4RoXcnBv9hnQ4Y2C1an6NJ4UrjX");
+        LegacyAddress b = a.clone();
+
+        int result = a.compareTo(b);
+        assertEquals(0, result);
+    }
+
+    @Test
+    public void comparisonLessThan() throws Exception {
+        LegacyAddress a = LegacyAddress.fromBase58(MAINNET, "1Dorian4RoXcnBv9hnQ4Y2C1an6NJ4UrjX");
+        LegacyAddress b = LegacyAddress.fromBase58(MAINNET, "1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P");
+
+        int result = a.compareTo(b);
+        assertTrue(result < 0);
+    }
+
+    @Test
+    public void comparisonGreaterThan() throws Exception {
+        LegacyAddress a = LegacyAddress.fromBase58(MAINNET, "1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P");
+        LegacyAddress b = LegacyAddress.fromBase58(MAINNET, "1Dorian4RoXcnBv9hnQ4Y2C1an6NJ4UrjX");
+
+        int result = a.compareTo(b);
+        assertTrue(result > 0);
+    }
+
+    @Test
+    public void comparisonBytesVsString() throws Exception {
+        BufferedReader dataSetReader = new BufferedReader(
+                new InputStreamReader(getClass().getResourceAsStream("LegacyAddressTestDataset.txt")));
+        String line;
+        while ((line = dataSetReader.readLine()) != null) {
+            String addr[] = line.split(",");
+            LegacyAddress first = LegacyAddress.fromBase58(MAINNET, addr[0]);
+            LegacyAddress second = LegacyAddress.fromBase58(MAINNET, addr[1]);
+            assertTrue(first.compareTo(second) < 0);
+            assertTrue(first.toString().compareTo(second.toString()) < 0);
+        }
+    }
+}
diff --git a/core/src/test/java/org/bitcoinj/core/MemoryFullPrunedBlockChainTest.java b/core/src/test/java/org/bitcoinj/core/MemoryFullPrunedBlockChainTest.java
index 68f3d55c313..8c49cc72cb7 100644
--- a/core/src/test/java/org/bitcoinj/core/MemoryFullPrunedBlockChainTest.java
+++ b/core/src/test/java/org/bitcoinj/core/MemoryFullPrunedBlockChainTest.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/test/java/org/bitcoinj/core/MessageTest.java b/core/src/test/java/org/bitcoinj/core/MessageTest.java
index cb23b440dc6..fa676824940 100644
--- a/core/src/test/java/org/bitcoinj/core/MessageTest.java
+++ b/core/src/test/java/org/bitcoinj/core/MessageTest.java
@@ -21,14 +21,14 @@
 import org.junit.Test;
 
 public class MessageTest {
+    private static final NetworkParameters UNITTEST = UnitTestParams.get();
 
     // If readStr() is vulnerable this causes OutOfMemory
     @Test(expected = ProtocolException.class)
     public void readStrOfExtremeLength() throws Exception {
-        NetworkParameters params = UnitTestParams.get();
         VarInt length = new VarInt(Integer.MAX_VALUE);
         byte[] payload = length.encode();
-        new VarStrMessage(params, payload);
+        new VarStrMessage(UNITTEST, payload);
     }
 
     static class VarStrMessage extends Message {
@@ -45,10 +45,9 @@ protected void parse() throws ProtocolException {
     // If readBytes() is vulnerable this causes OutOfMemory
     @Test(expected = ProtocolException.class)
     public void readByteArrayOfExtremeLength() throws Exception {
-        NetworkParameters params = UnitTestParams.get();
         VarInt length = new VarInt(Integer.MAX_VALUE);
         byte[] payload = length.encode();
-        new VarBytesMessage(params, payload);
+        new VarBytesMessage(UNITTEST, payload);
     }
 
     static class VarBytesMessage extends Message {
diff --git a/core/src/test/java/org/bitcoinj/core/ParseByteCacheTest.java b/core/src/test/java/org/bitcoinj/core/ParseByteCacheTest.java
index 1f44d095cfe..ccf8614e724 100644
--- a/core/src/test/java/org/bitcoinj/core/ParseByteCacheTest.java
+++ b/core/src/test/java/org/bitcoinj/core/ParseByteCacheTest.java
@@ -65,7 +65,6 @@ public class ParseByteCacheTest {
             "c7 36 7a 7a 25 3b c1 13  52 23 ad b9 a4 68 bb 3a");
 
     private BlockStore blockStore;
-    private static final NetworkParameters PARAMS = UnitTestParams.get();
     
     private byte[] b1Bytes;
     private byte[] b1BytesWithHeader;
@@ -76,35 +75,39 @@ public class ParseByteCacheTest {
     private byte[] tx2Bytes;
     private byte[] tx2BytesWithHeader;
 
+    private static final NetworkParameters UNITTEST = UnitTestParams.get();
+    private static final NetworkParameters MAINNET = MainNetParams.get();
+
     private void resetBlockStore() {
-        blockStore = new MemoryBlockStore(PARAMS);
+        blockStore = new MemoryBlockStore(UNITTEST);
     }
     
     @Before
     public void setUp() throws Exception {
-        Context context = new Context(PARAMS);
+        Utils.setMockClock(); // Use mock clock
+        Context context = new Context(UNITTEST);
         Wallet wallet = new Wallet(context);
         wallet.freshReceiveKey();
 
         resetBlockStore();
         
-        Transaction tx1 = createFakeTx(PARAMS,
+        Transaction tx1 = createFakeTx(UNITTEST,
                 valueOf(2, 0),
-                wallet.currentReceiveKey().toAddress(PARAMS));
+                LegacyAddress.fromKey(UNITTEST, wallet.currentReceiveKey()));
         
         // add a second input so can test granularity of byte cache.
-        Transaction prevTx = new Transaction(PARAMS);
-        TransactionOutput prevOut = new TransactionOutput(PARAMS, prevTx, COIN, wallet.currentReceiveKey().toAddress(PARAMS));
+        Transaction prevTx = new Transaction(UNITTEST);
+        TransactionOutput prevOut = new TransactionOutput(UNITTEST, prevTx, COIN, LegacyAddress.fromKey(UNITTEST, wallet.currentReceiveKey()));
         prevTx.addOutput(prevOut);
         // Connect it.
         tx1.addInput(prevOut);
         
-        Transaction tx2 = createFakeTx(PARAMS, COIN,
-                new ECKey().toAddress(PARAMS));
+        Transaction tx2 = createFakeTx(UNITTEST, COIN,
+                LegacyAddress.fromKey(UNITTEST, new ECKey()));
 
         Block b1 = createFakeBlock(blockStore, BLOCK_HEIGHT_GENESIS, tx1, tx2).block;
 
-        MessageSerializer bs = PARAMS.getDefaultSerializer();
+        MessageSerializer bs = UNITTEST.getDefaultSerializer();
         
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         bs.serialize(tx1, bos);
@@ -138,16 +141,16 @@ public void validateSetup() {
     
     @Test
     public void testTransactionsRetain() throws Exception {
-        testTransaction(MainNetParams.get(), txMessage, false, true);
-        testTransaction(PARAMS, tx1BytesWithHeader, false, true);
-        testTransaction(PARAMS, tx2BytesWithHeader, false, true);
+        testTransaction(MAINNET, txMessage, false, true);
+        testTransaction(UNITTEST, tx1BytesWithHeader, false, true);
+        testTransaction(UNITTEST, tx2BytesWithHeader, false, true);
     }
     
     @Test
     public void testTransactionsNoRetain() throws Exception {
-        testTransaction(MainNetParams.get(), txMessage, false, false);
-        testTransaction(PARAMS, tx1BytesWithHeader, false, false);
-        testTransaction(PARAMS, tx2BytesWithHeader, false, false);
+        testTransaction(MAINNET, txMessage, false, false);
+        testTransaction(UNITTEST, tx1BytesWithHeader, false, false);
+        testTransaction(UNITTEST, tx2BytesWithHeader, false, false);
     }
 
     @Test
@@ -159,10 +162,10 @@ public void testBlockAll() throws Exception {
     public void testBlock(byte[] blockBytes, boolean isChild, boolean retain) throws Exception {
         // reference serializer to produce comparison serialization output after changes to
         // message structure.
-        MessageSerializer bsRef = PARAMS.getSerializer(false);
+        MessageSerializer bsRef = UNITTEST.getSerializer(false);
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         
-        BitcoinSerializer bs = PARAMS.getSerializer(retain);
+        BitcoinSerializer bs = UNITTEST.getSerializer(retain);
         Block b1;
         Block bRef;
         b1 = (Block) bs.deserialize(ByteBuffer.wrap(blockBytes));
diff --git a/core/src/test/java/org/bitcoinj/core/PeerAddressTest.java b/core/src/test/java/org/bitcoinj/core/PeerAddressTest.java
index 88376d46e4c..2ebc71e1925 100644
--- a/core/src/test/java/org/bitcoinj/core/PeerAddressTest.java
+++ b/core/src/test/java/org/bitcoinj/core/PeerAddressTest.java
@@ -17,30 +17,115 @@
 
 package org.bitcoinj.core;
 
+import static org.bitcoinj.core.Utils.HEX;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.math.BigInteger;
+import java.net.InetAddress;
+
 import org.bitcoinj.params.MainNetParams;
 import org.junit.Test;
+import java.net.InetSocketAddress;
 
-import java.net.InetAddress;
 
-import static org.bitcoinj.core.Utils.HEX;
-import static org.junit.Assert.assertEquals;
+public class PeerAddressTest {
+    private static final NetworkParameters MAINNET = MainNetParams.get();
+    
+    @Test
+    public void parse_ancientProtocolVersion() throws Exception {
+        // copied from https://en.bitcoin.it/wiki/Protocol_documentation#Network_address
+        String hex = "010000000000000000000000000000000000ffff0a000001208d";
+        PeerAddress pa = new PeerAddress(MAINNET, HEX.decode(hex), 0, 0);
+        assertEquals(26, pa.length);
+        assertEquals(VersionMessage.NODE_NETWORK, pa.getServices().longValue());
+        assertEquals("10.0.0.1", pa.getAddr().getHostAddress());
+        assertEquals(8333, pa.getPort());
+    }
+
+    @Test
+    public void bitcoinSerialize_ancientProtocolVersion() throws Exception {
+        PeerAddress pa = new PeerAddress(MAINNET, InetAddress.getByName(null), 8333, 0, BigInteger.ZERO);
+        assertEquals(26, pa.length);        
+        assertEquals("000000000000000000000000000000000000ffff7f000001208d", Utils.HEX.encode(pa.bitcoinSerialize()));
+    }
 
-public class PeerAddressTest
-{
     @Test
-    public void testPeerAddressRoundtrip() throws Exception {
-        // copied verbatim from https://en.bitcoin.it/wiki/Protocol_specification#Network_address
-        String fromSpec = "010000000000000000000000000000000000ffff0a000001208d";
-        PeerAddress pa = new PeerAddress(MainNetParams.get(),
-                HEX.decode(fromSpec), 0, 0);
-        String reserialized = Utils.HEX.encode(pa.unsafeBitcoinSerialize());
-        assertEquals(reserialized,fromSpec );
+    public void roundtrip_ipv4_currentProtocolVersion() throws Exception {
+        long time = Utils.currentTimeSeconds();
+        PeerAddress pa = new PeerAddress(MAINNET, InetAddress.getByName("1.2.3.4"), 1234,
+                NetworkParameters.ProtocolVersion.CURRENT.getBitcoinProtocolVersion(), BigInteger.ZERO);
+        byte[] serialized = pa.bitcoinSerialize();
+        PeerAddress pa2 = new PeerAddress(MAINNET, serialized, 0,
+                NetworkParameters.ProtocolVersion.CURRENT.getBitcoinProtocolVersion());
+        assertEquals("1.2.3.4", pa2.getAddr().getHostAddress());
+        assertEquals(1234, pa2.getPort());
+        assertEquals(BigInteger.ZERO, pa2.getServices());
+        assertTrue(pa2.getTime() >= time && pa2.getTime() < time + 5); // potentially racy
     }
 
     @Test
-    public void testBitcoinSerialize() throws Exception {
-        PeerAddress pa = new PeerAddress(InetAddress.getByName(null), 8333, 0);
-        assertEquals("000000000000000000000000000000000000ffff7f000001208d",
-                Utils.HEX.encode(pa.bitcoinSerialize()));
+    public void roundtrip_ipv4_ancientProtocolVersion() throws Exception {
+        PeerAddress pa = new PeerAddress(MAINNET, InetAddress.getByName("1.2.3.4"), 1234, 0, BigInteger.ZERO);
+        byte[] serialized = pa.bitcoinSerialize();
+        PeerAddress pa2 = new PeerAddress(MAINNET, serialized, 0, 0);
+        assertEquals("1.2.3.4", pa2.getAddr().getHostAddress());
+        assertEquals(1234, pa2.getPort());
+        assertEquals(BigInteger.ZERO, pa2.getServices());
+        assertEquals(-1, pa2.getTime());
     }
+
+    @Test
+    public void roundtrip_ipv6_currentProtocolVersion() throws Exception {
+        long time = Utils.currentTimeSeconds();
+        PeerAddress pa = new PeerAddress(MAINNET, InetAddress.getByName("2001:db8:85a3:0:0:8a2e:370:7334"), 1234,
+                NetworkParameters.ProtocolVersion.CURRENT.getBitcoinProtocolVersion(), BigInteger.ZERO);
+        byte[] serialized = pa.bitcoinSerialize();
+        PeerAddress pa2 = new PeerAddress(MAINNET, serialized, 0,
+                NetworkParameters.ProtocolVersion.CURRENT.getBitcoinProtocolVersion());
+        assertEquals("2001:db8:85a3:0:0:8a2e:370:7334", pa2.getAddr().getHostAddress());
+        assertEquals(1234, pa2.getPort());
+        assertEquals(BigInteger.ZERO, pa2.getServices());
+        assertTrue(pa2.getTime() >= time && pa2.getTime() < time + 5); // potentially racy
+    }
+
+    @Test
+    public void roundtrip_ipv6_ancientProtocolVersion() throws Exception {
+        PeerAddress pa = new PeerAddress(MAINNET, InetAddress.getByName("2001:db8:85a3:0:0:8a2e:370:7334"), 1234, 0,
+                BigInteger.ZERO);
+        byte[] serialized = pa.bitcoinSerialize();
+        PeerAddress pa2 = new PeerAddress(MAINNET, serialized, 0, 0);
+        assertEquals("2001:db8:85a3:0:0:8a2e:370:7334", pa2.getAddr().getHostAddress());
+        assertEquals(1234, pa2.getPort());
+        assertEquals(BigInteger.ZERO, pa2.getServices());
+        assertEquals(-1, pa2.getTime());
+    }
+
+    @Test
+    public void testOnionHostname() throws Exception {
+        PeerAddress pa = new PeerAddress(InetSocketAddress.createUnresolved("explorernuoc63nb.onion", 8333));
+        assertEquals("explorernuoc63nb.onion", pa.toSocketAddress().getHostString());
+        assertEquals("explorernuoc63nb.onion", pa.getHostname());
+        assertEquals(null, pa.getAddr());
+        assertEquals(8333, pa.toSocketAddress().getPort());
+        assertEquals(8333, pa.getPort());
+        PeerAddress pa2 = new PeerAddress(MainNetParams.get(), InetSocketAddress.createUnresolved("explorernuoc63nb.onion", 8333));
+        assertPeerAddressEqualsRegardlessOfTime(pa, pa2);
+        PeerAddress pa3 = new PeerAddress("explorernuoc63nb.onion", 8333);
+        assertPeerAddressEqualsRegardlessOfTime(pa, pa3);
+        PeerAddress pa4 = new PeerAddress(MainNetParams.get(), "explorernuoc63nb.onion", 8333);
+        assertPeerAddressEqualsRegardlessOfTime(pa, pa4);
+        byte[] serialized = pa.unsafeBitcoinSerialize();
+        PeerAddress paFromSerialized = new PeerAddress(MainNetParams.get(), serialized, 0, NetworkParameters.ProtocolVersion.CURRENT.getBitcoinProtocolVersion());
+        assertPeerAddressEqualsRegardlessOfTime(pa, paFromSerialized);
+    }
+
+    private void assertPeerAddressEqualsRegardlessOfTime(PeerAddress pa, PeerAddress pa2) {
+        assertEquals(pa.getPort(), pa2.getPort());
+        assertEquals(pa.getAddr(), pa2.getAddr());
+        assertEquals(pa.getHostname(), pa2.getHostname());
+        assertEquals(pa.getServices(), pa2.getServices());
+    }
+
+
 }
diff --git a/core/src/test/java/org/bitcoinj/core/PeerGroupTest.java b/core/src/test/java/org/bitcoinj/core/PeerGroupTest.java
index 625b89a1463..02e5b9ae74e 100644
--- a/core/src/test/java/org/bitcoinj/core/PeerGroupTest.java
+++ b/core/src/test/java/org/bitcoinj/core/PeerGroupTest.java
@@ -19,10 +19,10 @@
 
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.*;
-import com.google.common.net.*;
 import com.google.common.util.concurrent.*;
 import org.bitcoinj.core.listeners.*;
 import org.bitcoinj.net.discovery.*;
+import org.bitcoinj.script.Script;
 import org.bitcoinj.testing.*;
 import org.bitcoinj.utils.*;
 import org.bitcoinj.wallet.Wallet;
@@ -77,9 +77,9 @@ public PeerGroupTest(ClientType clientType) {
     @Before
     public void setUp() throws Exception {
         super.setUp();
-        peerToMessageCount = new HashMap<Peer, AtomicInteger>();
-        connectedPeers = new LinkedBlockingQueue<Peer>();
-        disconnectedPeers = new LinkedBlockingQueue<Peer>();
+        peerToMessageCount = new HashMap<>();
+        connectedPeers = new LinkedBlockingQueue<>();
+        disconnectedPeers = new LinkedBlockingQueue<>();
         preMessageReceivedListener = new PreMessageReceivedEventListener() {
             @Override
             public Message onPreMessageReceived(Peer peer, Message m) {
@@ -207,15 +207,15 @@ public void receiveTxBroadcast() throws Exception {
         
         // Check the peer accessors.
         assertEquals(2, peerGroup.numConnectedPeers());
-        Set<Peer> tmp = new HashSet<Peer>(peerGroup.getConnectedPeers());
-        Set<Peer> expectedPeers = new HashSet<Peer>();
+        Set<Peer> tmp = new HashSet<>(peerGroup.getConnectedPeers());
+        Set<Peer> expectedPeers = new HashSet<>();
         expectedPeers.add(peerOf(p1));
         expectedPeers.add(peerOf(p2));
         assertEquals(tmp, expectedPeers);
 
         Coin value = COIN;
-        Transaction t1 = FakeTxBuilder.createFakeTx(PARAMS, value, address);
-        InventoryMessage inv = new InventoryMessage(PARAMS);
+        Transaction t1 = FakeTxBuilder.createFakeTx(UNITTEST, value, address);
+        InventoryMessage inv = new InventoryMessage(UNITTEST);
         inv.addTransaction(t1);
 
         // Note: we start with p2 here to verify that transactions are downloaded from whichever peer announces first
@@ -229,7 +229,7 @@ public void receiveTxBroadcast() throws Exception {
         // Asks for dependency.
         GetDataMessage getdata = (GetDataMessage) outbound(p2);
         assertNotNull(getdata);
-        inbound(p2, new NotFoundMessage(PARAMS, getdata.getItems()));
+        inbound(p2, new NotFoundMessage(UNITTEST, getdata.getItems()));
         pingAndWait(p2);
         assertEquals(value, wallet.getBalance(Wallet.BalanceType.ESTIMATED));
     }
@@ -243,9 +243,9 @@ public void receiveTxBroadcastOnAddedWallet() throws Exception {
         // Create a peer.
         InboundMessageQueuer p1 = connectPeer(1);
         
-        Wallet wallet2 = new Wallet(PARAMS);
+        Wallet wallet2 = new Wallet(UNITTEST);
         ECKey key2 = wallet2.freshReceiveKey();
-        Address address2 = key2.toAddress(PARAMS);
+        Address address2 = LegacyAddress.fromKey(UNITTEST, key2);
         
         peerGroup.addWallet(wallet2);
         blockChain.addWallet(wallet2);
@@ -254,8 +254,8 @@ public void receiveTxBroadcastOnAddedWallet() throws Exception {
         assertEquals(MemoryPoolMessage.class, waitForOutbound(p1).getClass());
 
         Coin value = COIN;
-        Transaction t1 = FakeTxBuilder.createFakeTx(PARAMS, value, address2);
-        InventoryMessage inv = new InventoryMessage(PARAMS);
+        Transaction t1 = FakeTxBuilder.createFakeTx(UNITTEST, value, address2);
+        InventoryMessage inv = new InventoryMessage(UNITTEST);
         inv.addTransaction(t1);
 
         inbound(p1, inv);
@@ -264,7 +264,7 @@ public void receiveTxBroadcastOnAddedWallet() throws Exception {
         // Asks for dependency.
         GetDataMessage getdata = (GetDataMessage) outbound(p1);
         assertNotNull(getdata);
-        inbound(p1, new NotFoundMessage(PARAMS, getdata.getItems()));
+        inbound(p1, new NotFoundMessage(UNITTEST, getdata.getItems()));
         pingAndWait(p1);
         assertEquals(value, wallet2.getBalance(Wallet.BalanceType.ESTIMATED));
     }
@@ -287,7 +287,7 @@ public void singleDownloadPeer1() throws Exception {
         Block b3 = FakeTxBuilder.makeSolvedTestBlock(b2);
 
         // Peer 1 and 2 receives an inv advertising a newly solved block.
-        InventoryMessage inv = new InventoryMessage(PARAMS);
+        InventoryMessage inv = new InventoryMessage(UNITTEST);
         inv.addBlock(b3);
         // Only peer 1 tries to download it.
         inbound(p1, inv);
@@ -326,12 +326,12 @@ public void singleDownloadPeer2() throws Exception {
         Block b3 = FakeTxBuilder.makeSolvedTestBlock(b2);
 
         // Expect a zero hash getblocks on p1. This is how the process starts.
-        peerGroup.startBlockChainDownload(new AbstractPeerDataEventListener() {
-        });
+        peerGroup.startBlockChainDownload(new AbstractPeerDataEventListener() {});
+        peerGroup.startBlockChainDownloadFromPeer(peerGroup.getConnectedPeers().iterator().next());
         GetBlocksMessage getblocks = (GetBlocksMessage) outbound(p1);
         assertEquals(Sha256Hash.ZERO_HASH, getblocks.getStopHash());
         // We give back an inv with some blocks in it.
-        InventoryMessage inv = new InventoryMessage(PARAMS);
+        InventoryMessage inv = new InventoryMessage(UNITTEST);
         inv.addBlock(b1);
         inv.addBlock(b2);
         inv.addBlock(b3);
@@ -365,8 +365,8 @@ public void onTransaction(Peer peer, Transaction t) {
         InboundMessageQueuer p2 = connectPeer(2);
         InboundMessageQueuer p3 = connectPeer(3);
 
-        Transaction tx = FakeTxBuilder.createFakeTx(PARAMS, valueOf(20, 0), address);
-        InventoryMessage inv = new InventoryMessage(PARAMS);
+        Transaction tx = FakeTxBuilder.createFakeTx(UNITTEST, valueOf(20, 0), address);
+        InventoryMessage inv = new InventoryMessage(UNITTEST);
         inv.addTransaction(tx);
 
         assertEquals(0, tx.getConfidence().numBroadcastPeers());
@@ -406,7 +406,7 @@ public void onConfidenceChanged(TransactionConfidence confidence, TransactionCon
         inbound(p3, inv);
         pingAndWait(p3);
         Threading.waitForUserCode();
-        assertEquals(tx.getHash(), confEvent[0].getTransactionHash());
+        assertEquals(tx.getTxId(), confEvent[0].getTransactionHash());
         assertEquals(3, tx.getConfidence().numBroadcastPeers());
         assertTrue(tx.getConfidence().wasBroadcastBy(peerOf(p3).getAddress()));
     }
@@ -419,7 +419,7 @@ public void testWalletCatchupTime() throws Exception {
         final long now = Utils.currentTimeSeconds();
         peerGroup.start();
         assertTrue(peerGroup.getFastCatchupTimeSecs() > now - WEEK - 10000);
-        Wallet w2 = new Wallet(PARAMS);
+        Wallet w2 = new Wallet(UNITTEST);
         ECKey key1 = new ECKey();
         key1.setCreationTimeSeconds(now - 86400);  // One day ago.
         w2.importKey(key1);
@@ -439,7 +439,7 @@ public void testWalletCatchupTime() throws Exception {
     public void noPings() throws Exception {
         peerGroup.start();
         peerGroup.setPingIntervalMsec(0);
-        VersionMessage versionMessage = new VersionMessage(PARAMS, 2);
+        VersionMessage versionMessage = new VersionMessage(UNITTEST, 2);
         versionMessage.clientVersion = NetworkParameters.ProtocolVersion.BLOOM_FILTER.getBitcoinProtocolVersion();
         versionMessage.localServices = VersionMessage.NODE_NETWORK;
         connectPeer(1, versionMessage);
@@ -451,7 +451,7 @@ public void noPings() throws Exception {
     public void pings() throws Exception {
         peerGroup.start();
         peerGroup.setPingIntervalMsec(100);
-        VersionMessage versionMessage = new VersionMessage(PARAMS, 2);
+        VersionMessage versionMessage = new VersionMessage(UNITTEST, 2);
         versionMessage.clientVersion = NetworkParameters.ProtocolVersion.BLOOM_FILTER.getBitcoinProtocolVersion();
         versionMessage.localServices = VersionMessage.NODE_NETWORK;
         InboundMessageQueuer p1 = connectPeer(1, versionMessage);
@@ -468,30 +468,40 @@ public void pings() throws Exception {
     @Test
     public void downloadPeerSelection() throws Exception {
         peerGroup.start();
-        VersionMessage versionMessage2 = new VersionMessage(PARAMS, 2);
-        versionMessage2.clientVersion = NetworkParameters.ProtocolVersion.BLOOM_FILTER.getBitcoinProtocolVersion();
-        versionMessage2.localServices = VersionMessage.NODE_NETWORK;
-        VersionMessage versionMessage3 = new VersionMessage(PARAMS, 3);
-        versionMessage3.clientVersion = NetworkParameters.ProtocolVersion.BLOOM_FILTER.getBitcoinProtocolVersion();
-        versionMessage3.localServices = VersionMessage.NODE_NETWORK;
+        VersionMessage v1 = new VersionMessage(UNITTEST, 2);
+        v1.clientVersion = NetworkParameters.ProtocolVersion.WITNESS_VERSION.getBitcoinProtocolVersion();
+        v1.localServices = VersionMessage.NODE_NETWORK | VersionMessage.NODE_BLOOM | VersionMessage.NODE_WITNESS;
+        VersionMessage v2 = new VersionMessage(UNITTEST, 4);
+        v2.clientVersion = NetworkParameters.ProtocolVersion.WITNESS_VERSION.getBitcoinProtocolVersion();
+        v2.localServices = VersionMessage.NODE_NETWORK | VersionMessage.NODE_BLOOM | VersionMessage.NODE_WITNESS;
         assertNull(peerGroup.getDownloadPeer());
-        Peer a = connectPeer(1, versionMessage2).peer;
-        assertEquals(2, peerGroup.getMostCommonChainHeight());
-        assertEquals(a, peerGroup.getDownloadPeer());
-        connectPeer(2, versionMessage2);
-        assertEquals(2, peerGroup.getMostCommonChainHeight());
-        assertEquals(a, peerGroup.getDownloadPeer());  // No change.
-        Peer c = connectPeer(3, versionMessage3).peer;
+
+        Peer p1 = connectPeer(0, v1).peer;
         assertEquals(2, peerGroup.getMostCommonChainHeight());
-        assertEquals(a, peerGroup.getDownloadPeer());  // No change yet.
-        connectPeer(4, versionMessage3);
-        assertEquals(3, peerGroup.getMostCommonChainHeight());
-        assertEquals(a, peerGroup.getDownloadPeer());  // Still no change.
+        assertEquals(2, peerGroup.selectDownloadPeer(peerGroup.getConnectedPeers()).getBestHeight());
+        assertEquals(p1, peerGroup.getDownloadPeer());
+
+        connectPeer(1, v1);
+        assertEquals(2, peerGroup.getMostCommonChainHeight()); // No change.
+        assertEquals(2, peerGroup.selectDownloadPeer(peerGroup.getConnectedPeers()).getBestHeight());
+
+        Peer p2 = connectPeer(2, v2).peer;
+        assertEquals(2, peerGroup.getMostCommonChainHeight()); // No change yet.
+        assertEquals(2, peerGroup.selectDownloadPeer(peerGroup.getConnectedPeers()).getBestHeight());
+
+        connectPeer(3, v2);
+        assertEquals(0, peerGroup.getMostCommonChainHeight()); // Most common height tied between two...
+        assertNull(peerGroup.selectDownloadPeer(peerGroup.getConnectedPeers())); // ...so no peer would be selected.
+
+        connectPeer(4, v2);
+        assertEquals(4, peerGroup.getMostCommonChainHeight()); // Now we have a new winner...
+        assertEquals(4, peerGroup.selectDownloadPeer(peerGroup.getConnectedPeers()).getBestHeight());
+        assertEquals(p1, peerGroup.getDownloadPeer()); // ...but the download peer doesn't change unless it misbehaves.
 
         // New peer with a higher protocol version but same chain height.
         // TODO: When PeerGroup.selectDownloadPeer.PREFERRED_VERSION is not equal to vMinRequiredProtocolVersion,
         // reenable this test
-        /*VersionMessage versionMessage4 = new VersionMessage(PARAMS, 3);
+        /*VersionMessage versionMessage4 = new VersionMessage(UNITTEST, 3);
         versionMessage4.clientVersion = 100000;
         versionMessage4.localServices = VersionMessage.NODE_NETWORK;
         InboundMessageQueuer d = connectPeer(5, versionMessage4);
@@ -607,8 +617,8 @@ public void shutdown() {
     }
 
     @Test
-    public void testBloomOnP2Pubkey() throws Exception {
-        // Cover bug 513. When a relevant transaction with a p2pubkey output is found, the Bloom filter should be
+    public void testBloomOnP2PK() throws Exception {
+        // Cover bug 513. When a relevant transaction with a P2PK output is found, the Bloom filter should be
         // recalculated to include that transaction hash but not re-broadcast as the remote nodes should have followed
         // the same procedure. However a new node that's connected should get the fresh filter.
         peerGroup.start();
@@ -616,25 +626,27 @@ public void testBloomOnP2Pubkey() throws Exception {
         // Create a couple of peers.
         InboundMessageQueuer p1 = connectPeer(1);
         InboundMessageQueuer p2 = connectPeer(2);
-        // Create a pay to pubkey tx.
-        Transaction tx = FakeTxBuilder.createFakeTx(PARAMS, COIN, key);
-        Transaction tx2 = new Transaction(PARAMS);
+        // Create a P2PK tx.
+        Transaction tx = FakeTxBuilder.createFakeTx(UNITTEST, COIN, key);
+        Transaction tx2 = new Transaction(UNITTEST);
         tx2.addInput(tx.getOutput(0));
         TransactionOutPoint outpoint = tx2.getInput(0).getOutpoint();
         assertTrue(p1.lastReceivedFilter.contains(key.getPubKey()));
-        assertFalse(p1.lastReceivedFilter.contains(tx.getHash().getBytes()));
+        assertTrue(p1.lastReceivedFilter.contains(key.getPubKeyHash()));
+        assertFalse(p1.lastReceivedFilter.contains(tx.getTxId().getBytes()));
         inbound(p1, tx);
         // p1 requests dep resolution, p2 is quiet.
         assertTrue(outbound(p1) instanceof GetDataMessage);
         final Sha256Hash dephash = tx.getInput(0).getOutpoint().getHash();
-        final InventoryItem inv = new InventoryItem(InventoryItem.Type.Transaction, dephash);
-        inbound(p1, new NotFoundMessage(PARAMS, ImmutableList.of(inv)));
+        final InventoryItem inv = new InventoryItem(InventoryItem.Type.TRANSACTION, dephash);
+        inbound(p1, new NotFoundMessage(UNITTEST, ImmutableList.of(inv)));
         assertNull(outbound(p1));
         assertNull(outbound(p2));
         peerGroup.waitForJobQueue();
         // Now we connect p3 and there is a new bloom filter sent, that DOES match the relevant outpoint.
         InboundMessageQueuer p3 = connectPeer(3);
         assertTrue(p3.lastReceivedFilter.contains(key.getPubKey()));
+        assertTrue(p3.lastReceivedFilter.contains(key.getPubKeyHash()));
         assertTrue(p3.lastReceivedFilter.contains(outpoint.unsafeBitcoinSerialize()));
     }
 
@@ -642,8 +654,6 @@ public void testBloomOnP2Pubkey() throws Exception {
     public void testBloomResendOnNewKey() throws Exception {
         // Check that when we add a new key to the wallet, the Bloom filter is re-calculated and re-sent but only once
         // we exceed the lookahead threshold.
-        wallet.setKeyChainGroupLookaheadSize(5);
-        wallet.setKeyChainGroupLookaheadThreshold(4);
         peerGroup.start();
         // Create a couple of peers.
         InboundMessageQueuer p1 = connectPeer(1);
@@ -689,24 +699,24 @@ public void waitForNumPeers1() throws Exception {
 
     @Test
     public void waitForPeersOfVersion() throws Exception {
-        final int baseVer = peerGroup.getMinRequiredProtocolVersion() + 3000;
-        final int newVer = baseVer + 1000;
+        final int bip37ver = UNITTEST.getProtocolVersionNum(NetworkParameters.ProtocolVersion.BLOOM_FILTER);
+        final int bip111ver = UNITTEST.getProtocolVersionNum(NetworkParameters.ProtocolVersion.BLOOM_FILTER_BIP111);
 
-        ListenableFuture<List<Peer>> future = peerGroup.waitForPeersOfVersion(2, newVer);
+        ListenableFuture<List<Peer>> future = peerGroup.waitForPeersOfVersion(2, bip111ver);
 
-        VersionMessage ver1 = new VersionMessage(PARAMS, 10);
-        ver1.clientVersion = baseVer;
+        VersionMessage ver1 = new VersionMessage(UNITTEST, 10);
+        ver1.clientVersion = bip37ver;
         ver1.localServices = VersionMessage.NODE_NETWORK;
-        VersionMessage ver2 = new VersionMessage(PARAMS, 10);
-        ver2.clientVersion = newVer;
-        ver2.localServices = VersionMessage.NODE_NETWORK;
+        VersionMessage ver2 = new VersionMessage(UNITTEST, 10);
+        ver2.clientVersion = bip111ver;
+        ver2.localServices = VersionMessage.NODE_NETWORK | VersionMessage.NODE_BLOOM;
         peerGroup.start();
         assertFalse(future.isDone());
         connectPeer(1, ver1);
         assertFalse(future.isDone());
         connectPeer(2, ver2);
         assertFalse(future.isDone());
-        assertTrue(peerGroup.waitForPeersOfVersion(1, newVer).isDone());   // Immediate completion.
+        assertTrue(peerGroup.waitForPeersOfVersion(1, bip111ver).isDone());   // Immediate completion.
         connectPeer(3, ver2);
         future.get();
         assertTrue(future.isDone());
@@ -716,10 +726,10 @@ public void waitForPeersOfVersion() throws Exception {
     public void waitForPeersWithServiceFlags() throws Exception {
         ListenableFuture<List<Peer>> future = peerGroup.waitForPeersWithServiceMask(2, 3);
 
-        VersionMessage ver1 = new VersionMessage(PARAMS, 10);
+        VersionMessage ver1 = new VersionMessage(UNITTEST, 10);
         ver1.clientVersion = 70000;
         ver1.localServices = VersionMessage.NODE_NETWORK;
-        VersionMessage ver2 = new VersionMessage(PARAMS, 10);
+        VersionMessage ver2 = new VersionMessage(UNITTEST, 10);
         ver2.clientVersion = 70000;
         ver2.localServices = VersionMessage.NODE_NETWORK | 2;
         peerGroup.start();
@@ -744,12 +754,12 @@ public void preferLocalPeer() throws IOException {
         // 1. Test are executed on the same machine that is running a full node
         // 2. Test are executed without any full node running locally
         // We have to avoid to connecting to real and external services in unit tests
-        // So we skip this test in case we have already something running on port PARAMS.getPort()
+        // So we skip this test in case we have already something running on port UNITTEST.getPort()
 
         // Check that if we have a localhost port 8333 or 18333 then it's used instead of the p2p network.
         ServerSocket local = null;
         try {
-            local = new ServerSocket(PARAMS.getPort(), 100, InetAddresses.forString("127.0.0.1"));
+            local = new ServerSocket(UNITTEST.getPort(), 100, InetAddress.getLoopbackAddress());
         }
         catch(BindException e) { // Port already in use, skipping this test.
             return;
@@ -762,7 +772,7 @@ public void preferLocalPeer() throws IOException {
             local.accept();   // Real connect
             // If we get here it used the local peer. Check no others are in use.
             assertEquals(1, peerGroup.getMaxConnections());
-            assertEquals(PeerAddress.localhost(PARAMS), peerGroup.getPendingPeers().get(0).getAddress());
+            assertEquals(PeerAddress.localhost(UNITTEST), peerGroup.getPendingPeers().get(0).getAddress());
         } finally {
             local.close();
         }
@@ -782,14 +792,11 @@ public void autoRescanOnKeyExhaustion() throws Exception {
         final int NUM_KEYS = 9;
 
         // First, grab a load of keys from the wallet, and then recreate it so it forgets that those keys were issued.
-        Wallet shadow = Wallet.fromSeed(wallet.getParams(), wallet.getKeyChainSeed());
-        List<ECKey> keys = new ArrayList<ECKey>(NUM_KEYS);
+        Wallet shadow = Wallet.fromSeed(wallet.getParams(), wallet.getKeyChainSeed(), Script.ScriptType.P2PKH);
+        List<ECKey> keys = new ArrayList<>(NUM_KEYS);
         for (int i = 0; i < NUM_KEYS; i++) {
             keys.add(shadow.freshReceiveKey());
         }
-        // Reduce the number of keys we need to work with to speed up this test.
-        wallet.setKeyChainGroupLookaheadSize(4);
-        wallet.setKeyChainGroupLookaheadThreshold(2);
 
         peerGroup.start();
         InboundMessageQueuer p1 = connectPeer(1);
@@ -797,6 +804,7 @@ public void autoRescanOnKeyExhaustion() throws Exception {
         assertTrue(p1.lastReceivedFilter.contains(keys.get(5).getPubKeyHash()));
         assertFalse(p1.lastReceivedFilter.contains(keys.get(keys.size() - 1).getPubKey()));
         peerGroup.startBlockChainDownload(null);
+        peerGroup.startBlockChainDownloadFromPeer(peerGroup.getConnectedPeers().iterator().next());
         assertNextMessageIs(p1, GetBlocksMessage.class);
 
         // Make some transactions and blocks that send money to the wallet thus using up all the keys.
@@ -804,8 +812,8 @@ public void autoRescanOnKeyExhaustion() throws Exception {
         Coin expectedBalance = Coin.ZERO;
         Block prev = blockStore.getChainHead().getHeader();
         for (ECKey key1 : keys) {
-            Address addr = key1.toAddress(PARAMS);
-            Block next = FakeTxBuilder.makeSolvedTestBlock(prev, FakeTxBuilder.createFakeTx(PARAMS, Coin.FIFTY_COINS, addr));
+            Address addr = LegacyAddress.fromKey(UNITTEST, key1);
+            Block next = FakeTxBuilder.makeSolvedTestBlock(prev, FakeTxBuilder.createFakeTx(UNITTEST, Coin.FIFTY_COINS, addr));
             expectedBalance = expectedBalance.add(next.getTransactions().get(2).getOutput(0).getValue());
             blocks.add(next);
             prev = next;
@@ -814,7 +822,7 @@ public void autoRescanOnKeyExhaustion() throws Exception {
         // Send the chain that doesn't have all the transactions in it. The blocks after the exhaustion point should all
         // be ignored.
         int epoch = wallet.getKeyChainGroupCombinedKeyLookaheadEpochs();
-        BloomFilter filter = new BloomFilter(PARAMS, p1.lastReceivedFilter.bitcoinSerialize());
+        BloomFilter filter = new BloomFilter(UNITTEST, p1.lastReceivedFilter.bitcoinSerialize());
         filterAndSend(p1, blocks, filter);
         Block exhaustionPoint = blocks.get(3);
         pingAndWait(p1);
@@ -835,7 +843,7 @@ public void autoRescanOnKeyExhaustion() throws Exception {
         // Await restart of the chain download.
         GetDataMessage getdata = assertNextMessageIs(p1, GetDataMessage.class);
         assertEquals(exhaustionPoint.getHash(), getdata.getHashOf(0));
-        assertEquals(InventoryItem.Type.FilteredBlock, getdata.getItems().get(0).type);
+        assertEquals(InventoryItem.Type.FILTERED_BLOCK, getdata.getItems().get(0).type);
         List<Block> newBlocks = blocks.subList(3, blocks.size());
         filterAndSend(p1, newBlocks, newFilter);
         assertNextMessageIs(p1, Ping.class);
@@ -864,4 +872,15 @@ private void filterAndSend(InboundMessageQueuer p1, List<Block> blocks, BloomFil
                 inbound(p1, tx);
         }
     }
+
+    @Test
+    public void testMaxOfMostFreq() throws Exception {
+        assertEquals(0, PeerGroup.maxOfMostFreq(Collections.<Integer>emptyList()));
+        assertEquals(0, PeerGroup.maxOfMostFreq(Arrays.asList(0, 0, 1)));
+        assertEquals(3, PeerGroup.maxOfMostFreq(Arrays.asList(1, 3, 1, 2, 2, 3, 3)));
+        assertEquals(0, PeerGroup.maxOfMostFreq(Arrays.asList(1, 1, 2, 2)));
+        assertEquals(0, PeerGroup.maxOfMostFreq(Arrays.asList(-1, 1, 1, 2, 2)));
+        assertEquals(1, PeerGroup.maxOfMostFreq(Arrays.asList(1, 1, 2, 2, 1)));
+        assertEquals(-1, PeerGroup.maxOfMostFreq(Arrays.asList(-1, -1, 2, 2, -1)));
+    }
 }
diff --git a/core/src/test/java/org/bitcoinj/core/PeerTest.java b/core/src/test/java/org/bitcoinj/core/PeerTest.java
index dce7e991f1b..d01beb253dd 100644
--- a/core/src/test/java/org/bitcoinj/core/PeerTest.java
+++ b/core/src/test/java/org/bitcoinj/core/PeerTest.java
@@ -31,6 +31,7 @@
 import com.google.common.util.concurrent.Uninterruptibles;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -39,10 +40,11 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketException;
 import java.nio.channels.CancelledKeyException;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -62,7 +64,7 @@ public class PeerTest extends TestWithNetworkConnections {
     private InboundMessageQueuer writeTarget;
     private static final int OTHER_PEER_CHAIN_HEIGHT = 110;
     private final AtomicBoolean fail = new AtomicBoolean(false);
-
+    private static final NetworkParameters TESTNET = TestNet3Params.get();
 
     @Parameterized.Parameters
     public static Collection<ClientType[]> parameters() {
@@ -80,9 +82,9 @@ public PeerTest(ClientType clientType) {
     @Before
     public void setUp() throws Exception {
         super.setUp();
-        VersionMessage ver = new VersionMessage(PARAMS, 100);
-        InetSocketAddress address = new InetSocketAddress("127.0.0.1", 4000);
-        peer = new Peer(PARAMS, ver, new PeerAddress(PARAMS, address), blockChain);
+        VersionMessage ver = new VersionMessage(UNITTEST, 100);
+        InetSocketAddress address = new InetSocketAddress(InetAddress.getLoopbackAddress(), 4000);
+        peer = new Peer(UNITTEST, ver, new PeerAddress(UNITTEST, address), blockChain);
         peer.addWallet(wallet);
     }
 
@@ -98,35 +100,12 @@ private void connect() throws Exception {
     }
 
     private void connectWithVersion(int version, int flags) throws Exception {
-        VersionMessage peerVersion = new VersionMessage(PARAMS, OTHER_PEER_CHAIN_HEIGHT);
+        VersionMessage peerVersion = new VersionMessage(UNITTEST, OTHER_PEER_CHAIN_HEIGHT);
         peerVersion.clientVersion = version;
         peerVersion.localServices = flags;
         writeTarget = connect(peer, peerVersion);
     }
 
-    @Test
-    public void testAddConnectedEventListener() throws Exception {
-        connect();
-        PeerConnectedEventListener listener = new AbstractPeerConnectionEventListener() {
-        };
-        assertFalse(peer.removeConnectedEventListener(listener));
-        peer.addConnectedEventListener(listener);
-        assertTrue(peer.removeConnectedEventListener(listener));
-        assertFalse(peer.removeConnectedEventListener(listener));
-    }
-
-    @Test
-    public void testAddDisconnectedEventListener() throws Exception {
-        connect();
-        PeerDisconnectedEventListener listener = new AbstractPeerConnectionEventListener() {
-        };
-
-        assertFalse(peer.removeDisconnectedEventListener(listener));
-        peer.addDisconnectedEventListener(listener);
-        assertTrue(peer.removeDisconnectedEventListener(listener));
-        assertFalse(peer.removeDisconnectedEventListener(listener));
-    }
-
     // Check that it runs through the event loop and shut down correctly
     @Test
     public void shutdown() throws Exception {
@@ -150,7 +129,7 @@ public void chainDownloadEnd2End() throws Exception {
         assertEquals(blockStore.getChainHead().getHeader().getHash(), getblocks.getLocator().get(0));
         assertEquals(Sha256Hash.ZERO_HASH, getblocks.getStopHash());
         // Remote peer sends us an inv with some blocks.
-        InventoryMessage inv = new InventoryMessage(PARAMS);
+        InventoryMessage inv = new InventoryMessage(UNITTEST);
         inv.addBlock(b2);
         inv.addBlock(b3);
         // We do a getdata on them.
@@ -164,7 +143,7 @@ public void chainDownloadEnd2End() throws Exception {
         inbound(writeTarget, b2);
         inbound(writeTarget, b3);
 
-        inv = new InventoryMessage(PARAMS);
+        inv = new InventoryMessage(UNITTEST);
         inv.addBlock(b5);
         // We request the head block.
         inbound(writeTarget, inv);
@@ -176,14 +155,14 @@ public void chainDownloadEnd2End() throws Exception {
         inbound(writeTarget, b5);
         getblocks = (GetBlocksMessage)outbound(writeTarget);
         assertEquals(b5.getHash(), getblocks.getStopHash());
-        assertEquals(b3.getHash(), getblocks.getLocator().get(0));
+        assertEquals(b3.getHash(), getblocks.getLocator().getHashes().get(0));
         // At this point another block is solved and broadcast. The inv triggers a getdata but we do NOT send another
         // getblocks afterwards, because that would result in us receiving the same set of blocks twice which is a
         // timewaste. The getblocks message that would have been generated is set to be the same as the previous
         // because we walk backwards down the orphan chain and then discover we already asked for those blocks, so
         // nothing is done.
         Block b6 = makeSolvedTestBlock(b5);
-        inv = new InventoryMessage(PARAMS);
+        inv = new InventoryMessage(UNITTEST);
         inv.addBlock(b6);
         inbound(writeTarget, inv);
         getdata = (GetDataMessage)outbound(writeTarget);
@@ -192,7 +171,7 @@ public void chainDownloadEnd2End() throws Exception {
         inbound(writeTarget, b6);
         assertNull(outbound(writeTarget));  // Nothing is sent at this point.
         // We're still waiting for the response to the getblocks (b3,b5) sent above.
-        inv = new InventoryMessage(PARAMS);
+        inv = new InventoryMessage(UNITTEST);
         inv.addBlock(b4);
         inv.addBlock(b5);
         inbound(writeTarget, inv);
@@ -218,15 +197,15 @@ public void invTickle() throws Exception {
         Block b2 = makeSolvedTestBlock(b1);
         Block b3 = makeSolvedTestBlock(b2);
         inbound(writeTarget, b3);
-        InventoryMessage inv = new InventoryMessage(PARAMS);
-        InventoryItem item = new InventoryItem(InventoryItem.Type.Block, b3.getHash());
+        InventoryMessage inv = new InventoryMessage(UNITTEST);
+        InventoryItem item = new InventoryItem(InventoryItem.Type.BLOCK, b3.getHash());
         inv.addItem(item);
         inbound(writeTarget, inv);
 
         GetBlocksMessage getblocks = (GetBlocksMessage)outbound(writeTarget);
-        List<Sha256Hash> expectedLocator = new ArrayList<Sha256Hash>();
-        expectedLocator.add(b1.getHash());
-        expectedLocator.add(PARAMS.getGenesisBlock().getHash());
+        BlockLocator expectedLocator = new BlockLocator();
+        expectedLocator = expectedLocator.add(b1.getHash());
+        expectedLocator = expectedLocator.add(UNITTEST.getGenesisBlock().getHash());
         
         assertEquals(getblocks.getLocator(), expectedLocator);
         assertEquals(getblocks.getStopHash(), b3.getHash());
@@ -247,8 +226,8 @@ public void invNoDownload() throws Exception {
         Block b2 = makeSolvedTestBlock(b1);
 
         // Receive an inv.
-        InventoryMessage inv = new InventoryMessage(PARAMS);
-        InventoryItem item = new InventoryItem(InventoryItem.Type.Block, b2.getHash());
+        InventoryMessage inv = new InventoryMessage(UNITTEST);
+        InventoryItem item = new InventoryItem(InventoryItem.Type.BLOCK, b2.getHash());
         inv.addItem(item);
         inbound(writeTarget, inv);
 
@@ -263,19 +242,19 @@ public void invDownloadTx() throws Exception {
         peer.setDownloadData(true);
         // Make a transaction and tell the peer we have it.
         Coin value = COIN;
-        Transaction tx = createFakeTx(PARAMS, value, address);
-        InventoryMessage inv = new InventoryMessage(PARAMS);
-        InventoryItem item = new InventoryItem(InventoryItem.Type.Transaction, tx.getHash());
+        Transaction tx = createFakeTx(UNITTEST, value, address);
+        InventoryMessage inv = new InventoryMessage(UNITTEST);
+        InventoryItem item = new InventoryItem(InventoryItem.Type.TRANSACTION, tx.getTxId());
         inv.addItem(item);
         inbound(writeTarget, inv);
         // Peer hasn't seen it before, so will ask for it.
         GetDataMessage getdata = (GetDataMessage) outbound(writeTarget);
         assertEquals(1, getdata.getItems().size());
-        assertEquals(tx.getHash(), getdata.getItems().get(0).hash);
+        assertEquals(tx.getTxId(), getdata.getItems().get(0).hash);
         inbound(writeTarget, tx);
         // Ask for the dependency, it's not in the mempool (in chain).
         getdata = (GetDataMessage) outbound(writeTarget);
-        inbound(writeTarget, new NotFoundMessage(PARAMS, getdata.getItems()));
+        inbound(writeTarget, new NotFoundMessage(UNITTEST, getdata.getItems()));
         pingAndWait(writeTarget);
         assertEquals(value, wallet.getBalance(Wallet.BalanceType.ESTIMATED));
     }
@@ -283,11 +262,11 @@ public void invDownloadTx() throws Exception {
     @Test
     public void invDownloadTxMultiPeer() throws Exception {
         // Check co-ordination of which peer to download via the memory pool.
-        VersionMessage ver = new VersionMessage(PARAMS, 100);
-        InetSocketAddress address = new InetSocketAddress("127.0.0.1", 4242);
-        Peer peer2 = new Peer(PARAMS, ver, new PeerAddress(PARAMS, address), blockChain);
+        VersionMessage ver = new VersionMessage(UNITTEST, 100);
+        InetSocketAddress address = new InetSocketAddress(InetAddress.getLoopbackAddress(), 4242);
+        Peer peer2 = new Peer(UNITTEST, ver, new PeerAddress(UNITTEST, address), blockChain);
         peer2.addWallet(wallet);
-        VersionMessage peerVersion = new VersionMessage(PARAMS, OTHER_PEER_CHAIN_HEIGHT);
+        VersionMessage peerVersion = new VersionMessage(UNITTEST, OTHER_PEER_CHAIN_HEIGHT);
         peerVersion.clientVersion = 70001;
         peerVersion.localServices = VersionMessage.NODE_NETWORK;
 
@@ -296,9 +275,9 @@ public void invDownloadTxMultiPeer() throws Exception {
 
         // Make a tx and advertise it to one of the peers.
         Coin value = COIN;
-        Transaction tx = createFakeTx(PARAMS, value, this.address);
-        InventoryMessage inv = new InventoryMessage(PARAMS);
-        InventoryItem item = new InventoryItem(InventoryItem.Type.Transaction, tx.getHash());
+        Transaction tx = createFakeTx(UNITTEST, value, this.address);
+        InventoryMessage inv = new InventoryMessage(UNITTEST);
+        InventoryItem item = new InventoryItem(InventoryItem.Type.TRANSACTION, tx.getTxId());
         inv.addItem(item);
 
         inbound(writeTarget, inv);
@@ -306,7 +285,7 @@ public void invDownloadTxMultiPeer() throws Exception {
         // We got a getdata message.
         GetDataMessage message = (GetDataMessage)outbound(writeTarget);
         assertEquals(1, message.getItems().size());
-        assertEquals(tx.getHash(), message.getItems().get(0).hash);
+        assertEquals(tx.getTxId(), message.getItems().get(0).hash);
         assertNotEquals(0, tx.getConfidence().numBroadcastPeers());
 
         // Advertising to peer2 results in no getdata message.
@@ -322,8 +301,8 @@ public void newBlock() throws Exception {
         blockChain.add(b1);
         final Block b2 = makeSolvedTestBlock(b1);
         // Receive notification of a new block.
-        final InventoryMessage inv = new InventoryMessage(PARAMS);
-        InventoryItem item = new InventoryItem(InventoryItem.Type.Block, b2.getHash());
+        final InventoryMessage inv = new InventoryMessage(UNITTEST);
+        InventoryItem item = new InventoryItem(InventoryItem.Type.BLOCK, b2.getHash());
         inv.addItem(item);
 
         final AtomicInteger newBlockMessagesReceived = new AtomicInteger(0);
@@ -373,7 +352,7 @@ public synchronized void onBlocksDownloaded(Peer p, Block block, @Nullable Filte
         List<InventoryItem> items = getdata.getItems();
         assertEquals(1, items.size());
         assertEquals(b2.getHash(), items.get(0).hash);
-        assertEquals(InventoryItem.Type.Block, items.get(0).type);
+        assertEquals(InventoryItem.Type.BLOCK, items.get(0).type);
     }
 
     // Check that it starts downloading the block chain correctly on request.
@@ -395,10 +374,10 @@ public void onChainDownloadStarted(Peer p, int blocksLeft) {
         });
         peer.startBlockChainDownload();
 
-        List<Sha256Hash> expectedLocator = new ArrayList<Sha256Hash>();
-        expectedLocator.add(b2.getHash());
-        expectedLocator.add(b1.getHash());
-        expectedLocator.add(PARAMS.getGenesisBlock().getHash());
+        BlockLocator expectedLocator = new BlockLocator();
+        expectedLocator = expectedLocator.add(b2.getHash());
+        expectedLocator = expectedLocator.add(b1.getHash());
+        expectedLocator = expectedLocator.add(UNITTEST.getGenesisBlock().getHash());
 
         GetBlocksMessage message = (GetBlocksMessage) outbound(writeTarget);
         assertEquals(message.getLocator(), expectedLocator);
@@ -434,9 +413,9 @@ public void getLargeBlock() throws Exception {
         Block b1 = createFakeBlock(blockStore, Block.BLOCK_HEIGHT_GENESIS).block;
         blockChain.add(b1);
         Block b2 = makeSolvedTestBlock(b1);
-        Transaction t = new Transaction(PARAMS);
+        Transaction t = new Transaction(UNITTEST);
         t.addInput(b1.getTransactions().get(0).getOutput(0));
-        t.addOutput(new TransactionOutput(PARAMS, t, Coin.ZERO, new byte[Block.MAX_BLOCK_SIZE - 1000]));
+        t.addOutput(new TransactionOutput(UNITTEST, t, Coin.ZERO, new byte[Block.MAX_BLOCK_SIZE - 1000]));
         b2.addTransaction(t);
 
         // Request the block.
@@ -477,26 +456,26 @@ public void fastCatchup() throws Exception {
         peer.setDownloadParameters(Utils.currentTimeSeconds() - (600*2) + 1, false);
         peer.startBlockChainDownload();
         GetHeadersMessage getheaders = (GetHeadersMessage) outbound(writeTarget);
-        List<Sha256Hash> expectedLocator = new ArrayList<Sha256Hash>();
-        expectedLocator.add(b1.getHash());
-        expectedLocator.add(PARAMS.getGenesisBlock().getHash());
+        BlockLocator expectedLocator = new BlockLocator();
+        expectedLocator = expectedLocator.add(b1.getHash());
+        expectedLocator = expectedLocator.add(UNITTEST.getGenesisBlock().getHash());
         assertEquals(getheaders.getLocator(), expectedLocator);
         assertEquals(getheaders.getStopHash(), Sha256Hash.ZERO_HASH);
         // Now send all the headers.
-        HeadersMessage headers = new HeadersMessage(PARAMS, b2.cloneAsHeader(),
+        HeadersMessage headers = new HeadersMessage(UNITTEST, b2.cloneAsHeader(),
                 b3.cloneAsHeader(), b4.cloneAsHeader());
         // We expect to be asked for b3 and b4 again, but this time, with a body.
-        expectedLocator.clear();
-        expectedLocator.add(b2.getHash());
-        expectedLocator.add(b1.getHash());
-        expectedLocator.add(PARAMS.getGenesisBlock().getHash());
+        expectedLocator = new BlockLocator();
+        expectedLocator = expectedLocator.add(b2.getHash());
+        expectedLocator = expectedLocator.add(b1.getHash());
+        expectedLocator = expectedLocator.add(UNITTEST.getGenesisBlock().getHash());
         inbound(writeTarget, headers);
         GetBlocksMessage getblocks = (GetBlocksMessage) outbound(writeTarget);
         assertEquals(expectedLocator, getblocks.getLocator());
         assertEquals(Sha256Hash.ZERO_HASH, getblocks.getStopHash());
         // We're supposed to get an inv here.
-        InventoryMessage inv = new InventoryMessage(PARAMS);
-        inv.addItem(new InventoryItem(InventoryItem.Type.Block, b3.getHash()));
+        InventoryMessage inv = new InventoryMessage(UNITTEST);
+        inv.addItem(new InventoryItem(InventoryItem.Type.BLOCK, b3.getHash()));
         inbound(writeTarget, inv);
         GetDataMessage getdata = (GetDataMessage) outbound(writeTarget);
         assertEquals(b3.getHash(), getdata.getItems().get(0).hash);
@@ -542,7 +521,7 @@ public void recursiveDependencyDownloadDisabled() throws Exception {
         peer.setDownloadTxDependencies(false);
         connect();
         // Check that if we request dependency download to be disabled and receive a relevant tx, things work correctly.
-        Transaction tx = FakeTxBuilder.createFakeTx(PARAMS, COIN, address);
+        Transaction tx = FakeTxBuilder.createFakeTx(UNITTEST, COIN, address);
         final Transaction[] result = new Transaction[1];
         wallet.addCoinsReceivedEventListener(new WalletCoinsReceivedEventListener() {
             @Override
@@ -575,34 +554,34 @@ public void onTransaction(Peer peer1, Transaction t) {
         //      -> [t7]
         //      -> [t8]
         // The ones in brackets are assumed to be in the chain and are represented only by hashes.
-        Transaction t2 = FakeTxBuilder.createFakeTx(PARAMS, COIN, to);
+        Transaction t2 = FakeTxBuilder.createFakeTx(UNITTEST, COIN, to);
         Sha256Hash t5hash = t2.getInput(0).getOutpoint().getHash();
-        Transaction t4 = FakeTxBuilder.createFakeTx(PARAMS, COIN, new ECKey());
+        Transaction t4 = FakeTxBuilder.createFakeTx(UNITTEST, COIN, new ECKey());
         Sha256Hash t6hash = t4.getInput(0).getOutpoint().getHash();
         t4.addOutput(COIN, new ECKey());
-        Transaction t3 = new Transaction(PARAMS);
+        Transaction t3 = new Transaction(UNITTEST);
         t3.addInput(t4.getOutput(0));
         t3.addOutput(COIN, new ECKey());
-        Transaction t1 = new Transaction(PARAMS);
+        Transaction t1 = new Transaction(UNITTEST);
         t1.addInput(t2.getOutput(0));
         t1.addInput(t3.getOutput(0));
         Sha256Hash t7hash = Sha256Hash.wrap("2b801dd82f01d17bbde881687bf72bc62e2faa8ab8133d36fcb8c3abe7459da6");
-        t1.addInput(new TransactionInput(PARAMS, t1, new byte[]{}, new TransactionOutPoint(PARAMS, 0, t7hash)));
+        t1.addInput(new TransactionInput(UNITTEST, t1, new byte[]{}, new TransactionOutPoint(UNITTEST, 0, t7hash)));
         Sha256Hash t8hash = Sha256Hash.wrap("3b801dd82f01d17bbde881687bf72bc62e2faa8ab8133d36fcb8c3abe7459da6");
-        t1.addInput(new TransactionInput(PARAMS, t1, new byte[]{}, new TransactionOutPoint(PARAMS, 1, t8hash)));
+        t1.addInput(new TransactionInput(UNITTEST, t1, new byte[]{}, new TransactionOutPoint(UNITTEST, 1, t8hash)));
         t1.addOutput(COIN, to);
-        t1 = FakeTxBuilder.roundTripTransaction(PARAMS, t1);
-        t2 = FakeTxBuilder.roundTripTransaction(PARAMS, t2);
-        t3 = FakeTxBuilder.roundTripTransaction(PARAMS, t3);
-        t4 = FakeTxBuilder.roundTripTransaction(PARAMS, t4);
+        t1 = FakeTxBuilder.roundTripTransaction(UNITTEST, t1);
+        t2 = FakeTxBuilder.roundTripTransaction(UNITTEST, t2);
+        t3 = FakeTxBuilder.roundTripTransaction(UNITTEST, t3);
+        t4 = FakeTxBuilder.roundTripTransaction(UNITTEST, t4);
 
         // Announce the first one. Wait for it to be downloaded.
-        InventoryMessage inv = new InventoryMessage(PARAMS);
+        InventoryMessage inv = new InventoryMessage(UNITTEST);
         inv.addTransaction(t1);
         inbound(writeTarget, inv);
         GetDataMessage getdata = (GetDataMessage) outbound(writeTarget);
         Threading.waitForUserCode();
-        assertEquals(t1.getHash(), getdata.getItems().get(0).hash);
+        assertEquals(t1.getTxId(), getdata.getItems().get(0).hash);
         inbound(writeTarget, t1);
         pingAndWait(writeTarget);
         assertEquals(t1, onTx[0]);
@@ -612,35 +591,35 @@ public void onTransaction(Peer peer1, Transaction t) {
         // It will recursively ask for the dependencies of t1: t2, t3, t7, t8.
         getdata = (GetDataMessage) outbound(writeTarget);
         assertEquals(4, getdata.getItems().size());
-        assertEquals(t2.getHash(), getdata.getItems().get(0).hash);
-        assertEquals(t3.getHash(), getdata.getItems().get(1).hash);
+        assertEquals(t2.getTxId(), getdata.getItems().get(0).hash);
+        assertEquals(t3.getTxId(), getdata.getItems().get(1).hash);
         assertEquals(t7hash, getdata.getItems().get(2).hash);
         assertEquals(t8hash, getdata.getItems().get(3).hash);
         // Deliver the requested transactions.
         inbound(writeTarget, t2);
         inbound(writeTarget, t3);
-        NotFoundMessage notFound = new NotFoundMessage(PARAMS);
-        notFound.addItem(new InventoryItem(InventoryItem.Type.Transaction, t7hash));
-        notFound.addItem(new InventoryItem(InventoryItem.Type.Transaction, t8hash));
+        NotFoundMessage notFound = new NotFoundMessage(UNITTEST);
+        notFound.addItem(new InventoryItem(InventoryItem.Type.TRANSACTION, t7hash));
+        notFound.addItem(new InventoryItem(InventoryItem.Type.TRANSACTION, t8hash));
         inbound(writeTarget, notFound);
         assertFalse(futures.isDone());
         // It will recursively ask for the dependencies of t2: t5 and t4, but not t3 because it already found t4.
         getdata = (GetDataMessage) outbound(writeTarget);
         assertEquals(getdata.getItems().get(0).hash, t2.getInput(0).getOutpoint().getHash());
         // t5 isn't found and t4 is.
-        notFound = new NotFoundMessage(PARAMS);
-        notFound.addItem(new InventoryItem(InventoryItem.Type.Transaction, t5hash));
+        notFound = new NotFoundMessage(UNITTEST);
+        notFound.addItem(new InventoryItem(InventoryItem.Type.TRANSACTION, t5hash));
         inbound(writeTarget, notFound);
         assertFalse(futures.isDone());
         // Request t4 ...
         getdata = (GetDataMessage) outbound(writeTarget);
-        assertEquals(t4.getHash(), getdata.getItems().get(0).hash);
+        assertEquals(t4.getTxId(), getdata.getItems().get(0).hash);
         inbound(writeTarget, t4);
         // Continue to explore the t4 branch and ask for t6, which is in the chain.
         getdata = (GetDataMessage) outbound(writeTarget);
         assertEquals(t6hash, getdata.getItems().get(0).hash);
-        notFound = new NotFoundMessage(PARAMS);
-        notFound.addItem(new InventoryItem(InventoryItem.Type.Transaction, t6hash));
+        notFound = new NotFoundMessage(UNITTEST);
+        notFound.addItem(new InventoryItem(InventoryItem.Type.TRANSACTION, t6hash));
         inbound(writeTarget, notFound);
         pingAndWait(writeTarget);
         // That's it, we explored the entire tree.
@@ -661,26 +640,26 @@ public void recursiveDependencyDownload_depthLimited() throws Exception {
         //   t1 -> t2 -> t3 -> [t4]
         // The ones in brackets are assumed to be in the chain and are represented only by hashes.
         Sha256Hash t4hash = Sha256Hash.wrap("2b801dd82f01d17bbde881687bf72bc62e2faa8ab8133d36fcb8c3abe7459da6");
-        Transaction t3 = new Transaction(PARAMS);
-        t3.addInput(new TransactionInput(PARAMS, t3, new byte[]{}, new TransactionOutPoint(PARAMS, 0, t4hash)));
+        Transaction t3 = new Transaction(UNITTEST);
+        t3.addInput(new TransactionInput(UNITTEST, t3, new byte[]{}, new TransactionOutPoint(UNITTEST, 0, t4hash)));
         t3.addOutput(COIN, new ECKey());
-        t3 = FakeTxBuilder.roundTripTransaction(PARAMS, t3);
-        Transaction t2 = new Transaction(PARAMS);
+        t3 = FakeTxBuilder.roundTripTransaction(UNITTEST, t3);
+        Transaction t2 = new Transaction(UNITTEST);
         t2.addInput(t3.getOutput(0));
         t2.addOutput(COIN, new ECKey());
-        t2 = FakeTxBuilder.roundTripTransaction(PARAMS, t2);
-        Transaction t1 = new Transaction(PARAMS);
+        t2 = FakeTxBuilder.roundTripTransaction(UNITTEST, t2);
+        Transaction t1 = new Transaction(UNITTEST);
         t1.addInput(t2.getOutput(0));
         t1.addOutput(COIN, new ECKey());
-        t1 = FakeTxBuilder.roundTripTransaction(PARAMS, t1);
+        t1 = FakeTxBuilder.roundTripTransaction(UNITTEST, t1);
 
         // Announce the first one. Wait for it to be downloaded.
-        InventoryMessage inv = new InventoryMessage(PARAMS);
+        InventoryMessage inv = new InventoryMessage(UNITTEST);
         inv.addTransaction(t1);
         inbound(writeTarget, inv);
         GetDataMessage getdata = (GetDataMessage) outbound(writeTarget);
         Threading.waitForUserCode();
-        assertEquals(t1.getHash(), getdata.getItems().get(0).hash);
+        assertEquals(t1.getTxId(), getdata.getItems().get(0).hash);
         inbound(writeTarget, t1);
         pingAndWait(writeTarget);
         // We want its dependencies so ask for them.
@@ -689,7 +668,7 @@ public void recursiveDependencyDownload_depthLimited() throws Exception {
         // level 1
         getdata = (GetDataMessage) outbound(writeTarget);
         assertEquals(1, getdata.getItems().size());
-        assertEquals(t2.getHash(), getdata.getItems().get(0).hash);
+        assertEquals(t2.getTxId(), getdata.getItems().get(0).hash);
         inbound(writeTarget, t2);
         // no level 2
         getdata = (GetDataMessage) outbound(writeTarget);
@@ -708,7 +687,7 @@ public void timeLockedTransactionNew() throws Exception {
         connectWithVersion(70001, VersionMessage.NODE_NETWORK);
         // Test that if we receive a relevant transaction that has a lock time, it doesn't result in a notification
         // until we explicitly opt in to seeing those.
-        Wallet wallet = new Wallet(PARAMS);
+        Wallet wallet = new Wallet(UNITTEST);
         ECKey key = wallet.freshReceiveKey();
         peer.addWallet(wallet);
         final Transaction[] vtx = new Transaction[1];
@@ -719,16 +698,16 @@ public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coi
             }
         });
         // Send a normal relevant transaction, it's received correctly.
-        Transaction t1 = FakeTxBuilder.createFakeTx(PARAMS, COIN, key);
+        Transaction t1 = FakeTxBuilder.createFakeTx(UNITTEST, COIN, key);
         inbound(writeTarget, t1);
         GetDataMessage getdata = (GetDataMessage) outbound(writeTarget);
-        inbound(writeTarget, new NotFoundMessage(PARAMS, getdata.getItems()));
+        inbound(writeTarget, new NotFoundMessage(UNITTEST, getdata.getItems()));
         pingAndWait(writeTarget);
         Threading.waitForUserCode();
         assertNotNull(vtx[0]);
         vtx[0] = null;
         // Send a timelocked transaction, nothing happens.
-        Transaction t2 = FakeTxBuilder.createFakeTx(PARAMS, valueOf(2, 0), key);
+        Transaction t2 = FakeTxBuilder.createFakeTx(UNITTEST, valueOf(2, 0), key);
         t2.setLockTime(999999);
         inbound(writeTarget, t2);
         Threading.waitForUserCode();
@@ -737,7 +716,7 @@ public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coi
         wallet.setAcceptRiskyTransactions(true);
         inbound(writeTarget, t2);
         getdata = (GetDataMessage) outbound(writeTarget);
-        inbound(writeTarget, new NotFoundMessage(PARAMS, getdata.getItems()));
+        inbound(writeTarget, new NotFoundMessage(UNITTEST, getdata.getItems()));
         pingAndWait(writeTarget);
         Threading.waitForUserCode();
         assertEquals(t2, vtx[0]);
@@ -759,7 +738,7 @@ public void acceptTimeLockedDependency() throws Exception {
     private void checkTimeLockedDependency(boolean shouldAccept) throws Exception {
         // Initial setup.
         connectWithVersion(70001, VersionMessage.NODE_NETWORK);
-        Wallet wallet = new Wallet(PARAMS);
+        Wallet wallet = new Wallet(UNITTEST);
         ECKey key = wallet.freshReceiveKey();
         wallet.setAcceptRiskyTransactions(shouldAccept);
         peer.addWallet(wallet);
@@ -771,36 +750,36 @@ public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coi
             }
         });
         // t1 -> t2 [locked] -> t3 (not available)
-        Transaction t2 = new Transaction(PARAMS);
+        Transaction t2 = new Transaction(UNITTEST);
         t2.setLockTime(999999);
         // Add a fake input to t3 that goes nowhere.
-        Sha256Hash t3 = Sha256Hash.of("abc".getBytes(Charset.forName("UTF-8")));
-        t2.addInput(new TransactionInput(PARAMS, t2, new byte[]{}, new TransactionOutPoint(PARAMS, 0, t3)));
+        Sha256Hash t3 = Sha256Hash.of("abc".getBytes(StandardCharsets.UTF_8));
+        t2.addInput(new TransactionInput(UNITTEST, t2, new byte[]{}, new TransactionOutPoint(UNITTEST, 0, t3)));
         t2.getInput(0).setSequenceNumber(0xDEADBEEF);
         t2.addOutput(COIN, new ECKey());
-        Transaction t1 = new Transaction(PARAMS);
+        Transaction t1 = new Transaction(UNITTEST);
         t1.addInput(t2.getOutput(0));
         t1.addOutput(COIN, key);  // Make it relevant.
         // Announce t1.
-        InventoryMessage inv = new InventoryMessage(PARAMS);
+        InventoryMessage inv = new InventoryMessage(UNITTEST);
         inv.addTransaction(t1);
         inbound(writeTarget, inv);
         // Send it.
         GetDataMessage getdata = (GetDataMessage) outbound(writeTarget);
-        assertEquals(t1.getHash(), getdata.getItems().get(0).hash);
+        assertEquals(t1.getTxId(), getdata.getItems().get(0).hash);
         inbound(writeTarget, t1);
         // Nothing arrived at our event listener yet.
         assertNull(vtx[0]);
         // We request t2.
         getdata = (GetDataMessage) outbound(writeTarget);
-        assertEquals(t2.getHash(), getdata.getItems().get(0).hash);
+        assertEquals(t2.getTxId(), getdata.getItems().get(0).hash);
         inbound(writeTarget, t2);
         // We request t3.
         getdata = (GetDataMessage) outbound(writeTarget);
         assertEquals(t3, getdata.getItems().get(0).hash);
         // Can't find it: bottom of tree.
-        NotFoundMessage notFound = new NotFoundMessage(PARAMS);
-        notFound.addItem(new InventoryItem(InventoryItem.Type.Transaction, t3));
+        NotFoundMessage notFound = new NotFoundMessage(UNITTEST);
+        notFound.addItem(new InventoryItem(InventoryItem.Type.TRANSACTION, t3));
         inbound(writeTarget, notFound);
         pingAndWait(writeTarget);
         Threading.waitForUserCode();
@@ -812,6 +791,7 @@ public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coi
     }
 
     @Test
+    @Ignore
     public void disconnectOldVersions1() throws Exception {
         // Set up the connection with an old version.
         final SettableFuture<Void> connectedFuture = SettableFuture.create();
@@ -868,15 +848,15 @@ public void run() {
             }
         });
         connect();
-        Transaction t1 = new Transaction(PARAMS);
-        t1.addInput(new TransactionInput(PARAMS, t1, new byte[]{}));
-        t1.addOutput(COIN, new ECKey().toAddress(PARAMS));
-        Transaction t2 = new Transaction(PARAMS);
+        Transaction t1 = new Transaction(UNITTEST);
+        t1.addInput(new TransactionInput(UNITTEST, t1, new byte[]{}));
+        t1.addOutput(COIN, LegacyAddress.fromKey(UNITTEST, new ECKey()));
+        Transaction t2 = new Transaction(UNITTEST);
         t2.addInput(t1.getOutput(0));
         t2.addOutput(COIN, wallet.currentChangeAddress());
         inbound(writeTarget, t2);
-        final InventoryItem inventoryItem = new InventoryItem(InventoryItem.Type.Transaction, t2.getInput(0).getOutpoint().getHash());
-        final NotFoundMessage nfm = new NotFoundMessage(PARAMS, Lists.newArrayList(inventoryItem));
+        final InventoryItem inventoryItem = new InventoryItem(InventoryItem.Type.TRANSACTION, t2.getInput(0).getOutpoint().getHash());
+        final NotFoundMessage nfm = new NotFoundMessage(UNITTEST, Lists.newArrayList(inventoryItem));
         inbound(writeTarget, nfm);
         pingAndWait(writeTarget);
         Threading.waitForUserCode();
@@ -889,8 +869,8 @@ public void getUTXOs() throws Exception {
         // Basic test of support for BIP 64: getutxos support. The Lighthouse unit tests exercise this stuff more
         // thoroughly.
         connectWithVersion(GetUTXOsMessage.MIN_PROTOCOL_VERSION, VersionMessage.NODE_NETWORK | VersionMessage.NODE_GETUTXOS);
-        TransactionOutPoint op1 = new TransactionOutPoint(PARAMS, 1, Sha256Hash.of("foo".getBytes()));
-        TransactionOutPoint op2 = new TransactionOutPoint(PARAMS, 2, Sha256Hash.of("bar".getBytes()));
+        TransactionOutPoint op1 = new TransactionOutPoint(UNITTEST, 1, Sha256Hash.of("foo".getBytes()));
+        TransactionOutPoint op2 = new TransactionOutPoint(UNITTEST, 2, Sha256Hash.of("bar".getBytes()));
 
         ListenableFuture<UTXOsMessage> future1 = peer.getUTXOs(ImmutableList.of(op1));
         ListenableFuture<UTXOsMessage> future2 = peer.getUTXOs(ImmutableList.of(op2));
@@ -905,18 +885,19 @@ public void getUTXOs() throws Exception {
         assertFalse(future1.isDone());
 
         ECKey key = new ECKey();
-        TransactionOutput out1 = new TransactionOutput(PARAMS, null, Coin.CENT, key);
-        UTXOsMessage response1 = new UTXOsMessage(PARAMS, ImmutableList.of(out1), new long[]{UTXOsMessage.MEMPOOL_HEIGHT}, Sha256Hash.ZERO_HASH, 1234);
+        TransactionOutput out1 = new TransactionOutput(UNITTEST, null, Coin.CENT, key);
+        UTXOsMessage response1 = new UTXOsMessage(UNITTEST, ImmutableList.of(out1), new long[]{UTXOsMessage.MEMPOOL_HEIGHT}, Sha256Hash.ZERO_HASH, 1234);
         inbound(writeTarget, response1);
         assertEquals(future1.get(), response1);
 
-        TransactionOutput out2 = new TransactionOutput(PARAMS, null, Coin.FIFTY_COINS, key);
-        UTXOsMessage response2 = new UTXOsMessage(PARAMS, ImmutableList.of(out2), new long[]{1000}, Sha256Hash.ZERO_HASH, 1234);
+        TransactionOutput out2 = new TransactionOutput(UNITTEST, null, Coin.FIFTY_COINS, key);
+        UTXOsMessage response2 = new UTXOsMessage(UNITTEST, ImmutableList.of(out2), new long[]{1000}, Sha256Hash.ZERO_HASH, 1234);
         inbound(writeTarget, response2);
         assertEquals(future2.get(), response2);
     }
 
     @Test
+    @Ignore
     public void badMessage() throws Exception {
         // Bring up an actual network connection and feed it bogus data.
         final SettableFuture<Void> result = SettableFuture.create();
@@ -934,17 +915,16 @@ public void onPeerDisconnected(Peer p, int peerCount) {
                 peerDisconnected.set(null);
             }
         });
-        final NetworkParameters params = TestNet3Params.get();
-        MessageSerializer serializer = params.getDefaultSerializer();
+        MessageSerializer serializer = TESTNET.getDefaultSerializer();
         // Now write some bogus truncated message.
         ByteArrayOutputStream out = new ByteArrayOutputStream();
-        serializer.serialize("inv", new InventoryMessage(PARAMS) {
+        serializer.serialize("inv", new InventoryMessage(UNITTEST) {
             @Override
             public void bitcoinSerializeToStream(OutputStream stream) throws IOException {
                 // Add some hashes.
-                addItem(new InventoryItem(InventoryItem.Type.Transaction, Sha256Hash.of(new byte[]{1})));
-                addItem(new InventoryItem(InventoryItem.Type.Transaction, Sha256Hash.of(new byte[]{2})));
-                addItem(new InventoryItem(InventoryItem.Type.Transaction, Sha256Hash.of(new byte[]{3})));
+                addItem(new InventoryItem(InventoryItem.Type.TRANSACTION, Sha256Hash.of(new byte[]{1})));
+                addItem(new InventoryItem(InventoryItem.Type.TRANSACTION, Sha256Hash.of(new byte[]{2})));
+                addItem(new InventoryItem(InventoryItem.Type.TRANSACTION, Sha256Hash.of(new byte[]{3})));
 
                 // Write out a copy that's truncated in the middle.
                 ByteArrayOutputStream bos = new ByteArrayOutputStream();
diff --git a/core/src/test/java/org/bitcoinj/core/PostgresFullPrunedBlockChainTest.java b/core/src/test/java/org/bitcoinj/core/PostgresFullPrunedBlockChainTest.java
index 57b448b9d17..47755eca2af 100644
--- a/core/src/test/java/org/bitcoinj/core/PostgresFullPrunedBlockChainTest.java
+++ b/core/src/test/java/org/bitcoinj/core/PostgresFullPrunedBlockChainTest.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/test/java/org/bitcoinj/core/VersionedChecksummedBytesTest.java b/core/src/test/java/org/bitcoinj/core/PrefixedChecksummedBytesTest.java
similarity index 53%
rename from core/src/test/java/org/bitcoinj/core/VersionedChecksummedBytesTest.java
rename to core/src/test/java/org/bitcoinj/core/PrefixedChecksummedBytesTest.java
index 702527e623c..9f0f0ff0a3f 100644
--- a/core/src/test/java/org/bitcoinj/core/VersionedChecksummedBytesTest.java
+++ b/core/src/test/java/org/bitcoinj/core/PrefixedChecksummedBytesTest.java
@@ -25,27 +25,35 @@
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertTrue;
 
-/**
- *
- */
-public class VersionedChecksummedBytesTest {
-    static final NetworkParameters testParams = TestNet3Params.get();
-    static final NetworkParameters mainParams = MainNetParams.get();
+public class PrefixedChecksummedBytesTest {
+    private static final NetworkParameters TESTNET = TestNet3Params.get();
+    private static final NetworkParameters MAINNET = MainNetParams.get();
+
+    private static class PrefixedChecksummedBytesToTest extends PrefixedChecksummedBytes {
+        public PrefixedChecksummedBytesToTest(NetworkParameters params, byte[] bytes) {
+            super(params, bytes);
+        }
+
+        @Override
+        public String toString() {
+            return Base58.encodeChecked(params.getAddressHeader(), bytes);
+        }
+    }
 
     @Test
     public void stringification() throws Exception {
         // Test a testnet address.
-        VersionedChecksummedBytes a = new VersionedChecksummedBytes(testParams.getAddressHeader(), HEX.decode("fda79a24e50ff70ff42f7d89585da5bd19d9e5cc"));
+        PrefixedChecksummedBytes a = new PrefixedChecksummedBytesToTest(TESTNET, HEX.decode("fda79a24e50ff70ff42f7d89585da5bd19d9e5cc"));
         assertEquals("n4eA2nbYqErp7H6jebchxAN59DmNpksexv", a.toString());
 
-        VersionedChecksummedBytes b = new VersionedChecksummedBytes(mainParams.getAddressHeader(), HEX.decode("4a22c3c4cbb31e4d03b15550636762bda0baf85a"));
+        PrefixedChecksummedBytes b = new PrefixedChecksummedBytesToTest(MAINNET, HEX.decode("4a22c3c4cbb31e4d03b15550636762bda0baf85a"));
         assertEquals("17kzeh4N8g49GFvdDzSf8PjaPfyoD1MndL", b.toString());
     }
 
     @Test
     public void cloning() throws Exception {
-        VersionedChecksummedBytes a = new VersionedChecksummedBytes(testParams.getAddressHeader(), HEX.decode("fda79a24e50ff70ff42f7d89585da5bd19d9e5cc"));
-        VersionedChecksummedBytes b = a.clone();
+        PrefixedChecksummedBytes a = new PrefixedChecksummedBytesToTest(TESTNET, HEX.decode("fda79a24e50ff70ff42f7d89585da5bd19d9e5cc"));
+        PrefixedChecksummedBytes b = a.clone();
 
         assertEquals(a, b);
         assertNotSame(a, b);
@@ -53,8 +61,8 @@ public void cloning() throws Exception {
 
     @Test
     public void comparisonCloneEqualTo() throws Exception {
-        VersionedChecksummedBytes a = new VersionedChecksummedBytes(testParams.getAddressHeader(), HEX.decode("fda79a24e50ff70ff42f7d89585da5bd19d9e5cc"));
-        VersionedChecksummedBytes b = a.clone();
+        PrefixedChecksummedBytes a = new PrefixedChecksummedBytesToTest(TESTNET, HEX.decode("fda79a24e50ff70ff42f7d89585da5bd19d9e5cc"));
+        PrefixedChecksummedBytes b = a.clone();
 
         assertTrue(a.compareTo(b) == 0);
     }
diff --git a/core/src/test/java/org/bitcoinj/core/SegwitAddressTest.java b/core/src/test/java/org/bitcoinj/core/SegwitAddressTest.java
new file mode 100644
index 00000000000..a01207682cb
--- /dev/null
+++ b/core/src/test/java/org/bitcoinj/core/SegwitAddressTest.java
@@ -0,0 +1,213 @@
+/*
+ * Copyright by the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bitcoinj.core;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Locale;
+
+import org.bitcoinj.params.MainNetParams;
+import org.bitcoinj.params.TestNet3Params;
+import org.bitcoinj.script.Script;
+import org.bitcoinj.script.Script.ScriptType;
+import org.bitcoinj.script.ScriptBuilder;
+import org.bitcoinj.script.ScriptPattern;
+import org.junit.Test;
+
+import com.google.common.base.MoreObjects;
+
+public class SegwitAddressTest {
+    private static final MainNetParams MAINNET = MainNetParams.get();
+    private static final TestNet3Params TESTNET = TestNet3Params.get();
+
+    @Test
+    public void example_p2wpkh_mainnet() {
+        String bech32 = "bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4";
+
+        SegwitAddress address = SegwitAddress.fromBech32(MAINNET, bech32);
+
+        assertEquals(MAINNET, address.params);
+        assertEquals("0014751e76e8199196d454941c45d1b3a323f1433bd6",
+                Utils.HEX.encode(ScriptBuilder.createOutputScript(address).getProgram()));
+        assertEquals(ScriptType.P2WPKH, address.getOutputScriptType());
+        assertEquals(bech32.toLowerCase(Locale.ROOT), address.toBech32());
+        assertEquals(bech32.toLowerCase(Locale.ROOT), address.toString());
+    }
+
+    @Test
+    public void example_p2wsh_mainnet() {
+        String bech32 = "bc1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3qccfmv3";
+
+        SegwitAddress address = SegwitAddress.fromBech32(MAINNET, bech32);
+
+        assertEquals(MAINNET, address.params);
+        assertEquals("00201863143c14c5166804bd19203356da136c985678cd4d27a1b8c6329604903262",
+                Utils.HEX.encode(ScriptBuilder.createOutputScript(address).getProgram()));
+        assertEquals(ScriptType.P2WSH, address.getOutputScriptType());
+        assertEquals(bech32.toLowerCase(Locale.ROOT), address.toBech32());
+        assertEquals(bech32.toLowerCase(Locale.ROOT), address.toString());
+    }
+
+    @Test
+    public void example_p2wpkh_testnet() {
+        String bech32 = "tb1qw508d6qejxtdg4y5r3zarvary0c5xw7kxpjzsx";
+
+        SegwitAddress address = SegwitAddress.fromBech32(TESTNET, bech32);
+
+        assertEquals(TESTNET, address.params);
+        assertEquals("0014751e76e8199196d454941c45d1b3a323f1433bd6",
+                Utils.HEX.encode(ScriptBuilder.createOutputScript(address).getProgram()));
+        assertEquals(ScriptType.P2WPKH, address.getOutputScriptType());
+        assertEquals(bech32.toLowerCase(Locale.ROOT), address.toBech32());
+        assertEquals(bech32.toLowerCase(Locale.ROOT), address.toString());
+    }
+
+    @Test
+    public void example_p2wsh_testnet() {
+        String bech32 = "tb1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3q0sl5k7";
+
+        SegwitAddress address = SegwitAddress.fromBech32(TESTNET, bech32);
+
+        assertEquals(TESTNET, address.params);
+        assertEquals("00201863143c14c5166804bd19203356da136c985678cd4d27a1b8c6329604903262",
+                Utils.HEX.encode(ScriptBuilder.createOutputScript(address).getProgram()));
+        assertEquals(ScriptType.P2WSH, address.getOutputScriptType());
+        assertEquals(bech32.toLowerCase(Locale.ROOT), address.toBech32());
+        assertEquals(bech32.toLowerCase(Locale.ROOT), address.toString());
+    }
+
+    @Test
+    public void validAddresses() {
+        for (AddressData valid : VALID_ADDRESSES) {
+            SegwitAddress address = SegwitAddress.fromBech32(null, valid.address);
+
+            assertEquals(valid.expectedParams, address.params);
+            assertEquals(valid.expectedScriptPubKey,
+                    Utils.HEX.encode(ScriptBuilder.createOutputScript(address).getProgram()));
+            assertEquals(valid.address.toLowerCase(Locale.ROOT), address.toBech32());
+            if (valid.expectedWitnessVersion == 0) {
+                Script expectedScriptPubKey = new Script(Utils.HEX.decode(valid.expectedScriptPubKey));
+                assertEquals(address, SegwitAddress.fromHash(valid.expectedParams,
+                        ScriptPattern.extractHashFromP2WH(expectedScriptPubKey)));
+            }
+            assertEquals(valid.expectedWitnessVersion, address.getWitnessVersion());
+        }
+    }
+
+    private static class AddressData {
+        final String address;
+        final NetworkParameters expectedParams;
+        final String expectedScriptPubKey;
+        final int expectedWitnessVersion;
+
+        AddressData(String address, NetworkParameters expectedParams, String expectedScriptPubKey,
+                int expectedWitnessVersion) {
+            this.address = address;
+            this.expectedParams = expectedParams;
+            this.expectedScriptPubKey = expectedScriptPubKey;
+            this.expectedWitnessVersion = expectedWitnessVersion;
+        }
+
+        @Override
+        public String toString() {
+            return MoreObjects.toStringHelper(this).add("address", address).add("params", expectedParams.getId())
+                    .add("scriptPubKey", expectedScriptPubKey).add("witnessVersion", expectedWitnessVersion).toString();
+        }
+    }
+
+    private static AddressData[] VALID_ADDRESSES = {
+            new AddressData("BC1QW508D6QEJXTDG4Y5R3ZARVARY0C5XW7KV8F3T4", MAINNET,
+                    "0014751e76e8199196d454941c45d1b3a323f1433bd6", 0),
+            new AddressData("tb1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3q0sl5k7", TESTNET,
+                    "00201863143c14c5166804bd19203356da136c985678cd4d27a1b8c6329604903262", 0),
+            new AddressData("bc1pw508d6qejxtdg4y5r3zarvary0c5xw7kw508d6qejxtdg4y5r3zarvary0c5xw7k7grplx", MAINNET,
+                    "5128751e76e8199196d454941c45d1b3a323f1433bd6751e76e8199196d454941c45d1b3a323f1433bd6", 1),
+            new AddressData("BC1SW50QA3JX3S", MAINNET, "6002751e", 16),
+            new AddressData("bc1zw508d6qejxtdg4y5r3zarvaryvg6kdaj", MAINNET, "5210751e76e8199196d454941c45d1b3a323", 2),
+            new AddressData("tb1qqqqqp399et2xygdj5xreqhjjvcmzhxw4aywxecjdzew6hylgvsesrxh6hy", TESTNET,
+                    "0020000000c4a5cad46221b2a187905e5266362b99d5e91c6ce24d165dab93e86433", 0) };
+
+    @Test
+    public void invalidAddresses() {
+        for (String invalid : INVALID_ADDRESSES) {
+            try {
+                SegwitAddress.fromBech32(null, invalid);
+                fail(invalid);
+            } catch (AddressFormatException x) {
+                // expected
+            }
+        }
+    }
+
+    private static String[] INVALID_ADDRESSES = { //
+            "tc1qw508d6qejxtdg4y5r3zarvary0c5xw7kg3g4ty", // Invalid human-readable part
+            "bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t5", // Invalid checksum
+            "BC13W508D6QEJXTDG4Y5R3ZARVARY0C5XW7KN40WF2", // Invalid witness version
+            "bc1rw5uspcuh", // Invalid program length
+            "bc10w508d6qejxtdg4y5r3zarvary0c5xw7kw508d6qejxtdg4y5r3zarvary0c5xw7kw5rljs90", // Invalid program length
+            "BC1QR508D6QEJXTDG4Y5R3ZARVARYV98GJ9P", // Invalid program length for witness version 0 (per BIP141)
+            "tb1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3q0sL5k7", // Mixed case
+            "bc1zw508d6qejxtdg4y5r3zarvaryvqyzf3du", // Zero padding of more than 4 bits
+            "tb1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3pjxtptv", // Non-zero padding in 8-to-5 conversion
+            "bc1gmk9yu", // Empty data section
+    };
+
+    @Test(expected = AddressFormatException.InvalidDataLength.class)
+    public void fromBech32_version0_invalidLength() {
+        SegwitAddress.fromBech32(null, "BC1QR508D6QEJXTDG4Y5R3ZARVARYV98GJ9P");
+    }
+
+    @Test(expected = AddressFormatException.InvalidDataLength.class)
+    public void fromBech32_tooShort() {
+        SegwitAddress.fromBech32(null, "bc1rw5uspcuh");
+    }
+
+    @Test(expected = AddressFormatException.InvalidDataLength.class)
+    public void fromBech32_tooLong() {
+        SegwitAddress.fromBech32(null, "bc10w508d6qejxtdg4y5r3zarvary0c5xw7kw508d6qejxtdg4y5r3zarvary0c5xw7kw5rljs90");
+    }
+
+    @Test(expected = AddressFormatException.InvalidPrefix.class)
+    public void fromBech32_invalidHrp() {
+        SegwitAddress.fromBech32(null, "tc1qw508d6qejxtdg4y5r3zarvary0c5xw7kg3g4ty");
+    }
+
+    @Test(expected = AddressFormatException.WrongNetwork.class)
+    public void fromBech32_wrongNetwork() {
+        SegwitAddress.fromBech32(TESTNET, "bc1zw508d6qejxtdg4y5r3zarvaryvg6kdaj");
+    }
+
+    @Test
+    public void testJavaSerialization() throws Exception {
+        SegwitAddress address = SegwitAddress.fromBech32(null, "BC1SW50QA3JX3S");
+
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        new ObjectOutputStream(os).writeObject(address);
+        PrefixedChecksummedBytes addressCopy = (PrefixedChecksummedBytes) new ObjectInputStream(
+                new ByteArrayInputStream(os.toByteArray())).readObject();
+
+        assertEquals(address, addressCopy);
+        assertEquals(address.params, addressCopy.params);
+        assertArrayEquals(address.bytes, addressCopy.bytes);
+    }
+}
diff --git a/core/src/test/java/org/bitcoinj/core/SendHeadersMessageTest.java b/core/src/test/java/org/bitcoinj/core/SendHeadersMessageTest.java
new file mode 100644
index 00000000000..b5c8f69f7f2
--- /dev/null
+++ b/core/src/test/java/org/bitcoinj/core/SendHeadersMessageTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2017 Anton Kumaigorodski
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bitcoinj.core;
+
+import org.bitcoinj.params.RegTestParams;
+import org.junit.Test;
+
+import java.nio.ByteBuffer;
+
+import static org.bitcoinj.core.Utils.HEX;
+import static org.junit.Assert.assertTrue;
+
+public class SendHeadersMessageTest {
+    private static final NetworkParameters REGTEST = RegTestParams.get();
+
+    @Test
+    public void decodeAndEncode() throws Exception {
+        byte[] message = HEX
+                .decode("00000000fabfb5da73656e646865616465727300000000005df6e0e2fabfb5da70696e670000000000000000080000009a"
+                        + "65b9cc9840c9729e4502b200000000000000000000000000000d000000000000000000000000000000000000000000000000007ad82"
+                        + "872c28ac782102f5361746f7368693a302e31342e312fe41d000001fabfb5da76657261636b000000000000000000005df6e0e2fabf"
+                        + "b5da616c65727400000000000000a80000001bf9aaea60010000000000000000000000ffffff7f00000000ffffff7ffeffff7f01fff"
+                        + "fff7f00000000ffffff7f00ffffff7f002f555247454e543a20416c657274206b657920636f6d70726f6d697365642c207570677261"
+                        + "6465207265717569726564004630440220653febd6410f470f6bae11cad19c48413becb1ac2c17f908fd0fd53bdc3abd5202206d0e9"
+                        + "c96fe88d4a0f01ed9dedae2b6f9e00da94cad0fecaae66ecf689bf71b50000000000000000000000000000000000000000000000000");
+
+        ByteBuffer buffer = ByteBuffer.wrap(message);
+        BitcoinSerializer serializer = new BitcoinSerializer(REGTEST, false);
+        assertTrue(serializer.deserialize(buffer) instanceof SendHeadersMessage);
+    }
+}
diff --git a/core/src/test/java/org/bitcoinj/core/TransactionBroadcastTest.java b/core/src/test/java/org/bitcoinj/core/TransactionBroadcastTest.java
index 820303e18f9..f41c7f00657 100644
--- a/core/src/test/java/org/bitcoinj/core/TransactionBroadcastTest.java
+++ b/core/src/test/java/org/bitcoinj/core/TransactionBroadcastTest.java
@@ -66,7 +66,7 @@ public void tearDown() {
     @Test
     public void fourPeers() throws Exception {
         InboundMessageQueuer[] channels = { connectPeer(1), connectPeer(2), connectPeer(3), connectPeer(4) };
-        Transaction tx = new Transaction(PARAMS);
+        Transaction tx = FakeTxBuilder.createFakeTx(UNITTEST);
         tx.getConfidence().setSource(TransactionConfidence.Source.SELF);
         TransactionBroadcast broadcast = new TransactionBroadcast(peerGroup, tx);
         final AtomicDouble lastProgress = new AtomicDouble();
@@ -109,7 +109,7 @@ public void lateProgressCallback() throws Exception {
         // immediately with the latest state. This avoids API users writing accidentally racy code when they use
         // a convenience method like peerGroup.broadcastTransaction.
         InboundMessageQueuer[] channels = { connectPeer(1), connectPeer(2), connectPeer(3), connectPeer(4) };
-        Transaction tx = FakeTxBuilder.createFakeTx(PARAMS, CENT, address);
+        Transaction tx = FakeTxBuilder.createFakeTx(UNITTEST, CENT, address);
         tx.getConfidence().setSource(TransactionConfidence.Source.SELF);
         TransactionBroadcast broadcast = peerGroup.broadcastTransaction(tx);
         inbound(channels[1], InventoryMessage.with(tx));
@@ -127,14 +127,14 @@ public void onBroadcastProgress(double progress) {
     @Test
     public void rejectHandling() throws Exception {
         InboundMessageQueuer[] channels = { connectPeer(0), connectPeer(1), connectPeer(2), connectPeer(3), connectPeer(4) };
-        Transaction tx = new Transaction(PARAMS);
+        Transaction tx = FakeTxBuilder.createFakeTx(UNITTEST);
         TransactionBroadcast broadcast = new TransactionBroadcast(peerGroup, tx);
         ListenableFuture<Transaction> future = broadcast.broadcast();
         // 0 and 3 are randomly selected to receive the broadcast.
         assertEquals(tx, outbound(channels[1]));
         assertEquals(tx, outbound(channels[2]));
         assertEquals(tx, outbound(channels[4]));
-        RejectMessage reject = new RejectMessage(PARAMS, RejectMessage.RejectCode.DUST, tx.getHash(), "tx", "dust");
+        RejectMessage reject = new RejectMessage(UNITTEST, RejectMessage.RejectCode.DUST, tx.getTxId(), "tx", "dust");
         inbound(channels[1], reject);
         inbound(channels[4], reject);
         try {
@@ -159,7 +159,7 @@ public void retryFailedBroadcast() throws Exception {
         assertEquals(FIFTY_COINS, wallet.getBalance());
 
         // Now create a spend, and expect the announcement on p1.
-        Address dest = new ECKey().toAddress(PARAMS);
+        Address dest = LegacyAddress.fromKey(UNITTEST, new ECKey());
         Wallet.SendResult sendResult = wallet.sendCoins(peerGroup, dest, COIN);
         assertFalse(sendResult.broadcastComplete.isDone());
         Transaction t1;
@@ -186,7 +186,7 @@ public void peerGroupWalletIntegration() throws Exception {
         // Make sure we can create spends, and that they are announced. Then do the same with offline mode.
 
         // Set up connections and block chain.
-        VersionMessage ver = new VersionMessage(PARAMS, 2);
+        VersionMessage ver = new VersionMessage(UNITTEST, 2);
         ver.localServices = VersionMessage.NODE_NETWORK;
         InboundMessageQueuer p1 = connectPeer(1, ver);
         InboundMessageQueuer p2 = connectPeer(2);
@@ -208,7 +208,7 @@ public void onTransactionConfidenceChanged(Wallet wallet, Transaction tx) {
         });
 
         // Now create a spend, and expect the announcement on p1.
-        Address dest = new ECKey().toAddress(PARAMS);
+        Address dest = LegacyAddress.fromKey(UNITTEST, new ECKey());
         Wallet.SendResult sendResult = wallet.sendCoins(peerGroup, dest, COIN);
         assertNotNull(sendResult.tx);
         Threading.waitForUserCode();
@@ -229,7 +229,7 @@ public void onTransactionConfidenceChanged(Wallet wallet, Transaction tx) {
         // 49 BTC in change.
         assertEquals(valueOf(49, 0), t1.getValueSentToMe(wallet));
         // The future won't complete until it's heard back from the network on p2.
-        InventoryMessage inv = new InventoryMessage(PARAMS);
+        InventoryMessage inv = new InventoryMessage(UNITTEST);
         inv.addTransaction(t1);
         inbound(p2, inv);
         pingAndWait(p2);
@@ -251,6 +251,6 @@ public void onTransactionConfidenceChanged(Wallet wallet, Transaction tx) {
         // Add the wallet to the peer group (simulate initialization). Transactions should be announced.
         peerGroup.addWallet(wallet);
         // Transaction announced to the first peer. No extra Bloom filter because no change address was needed.
-        assertEquals(t3.getHash(), outbound(p1).getHash());
+        assertEquals(t3.getTxId(), outbound(p1).getHash());
     }
 }
diff --git a/core/src/test/java/org/bitcoinj/core/TransactionInputTest.java b/core/src/test/java/org/bitcoinj/core/TransactionInputTest.java
new file mode 100644
index 00000000000..48d957a39be
--- /dev/null
+++ b/core/src/test/java/org/bitcoinj/core/TransactionInputTest.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright by the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bitcoinj.core;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.util.List;
+
+import org.bitcoinj.params.UnitTestParams;
+import org.bitcoinj.script.ScriptBuilder;
+import org.bitcoinj.testing.FakeTxBuilder;
+import org.bitcoinj.wallet.AllowUnconfirmedCoinSelector;
+import org.bitcoinj.wallet.SendRequest;
+import org.bitcoinj.wallet.Wallet;
+import org.junit.Test;
+
+import com.google.common.collect.Lists;
+
+public class TransactionInputTest {
+    private static final NetworkParameters UNITTEST = UnitTestParams.get();
+
+    @Test
+    public void testStandardWalletDisconnect() throws Exception {
+        Wallet w = new Wallet(new Context(UNITTEST));
+        w.setCoinSelector(new AllowUnconfirmedCoinSelector());
+        Address a = w.currentReceiveAddress();
+        Transaction tx1 = FakeTxBuilder.createFakeTxWithoutChangeAddress(UNITTEST, Coin.COIN, a);
+        w.receivePending(tx1, null);
+        Transaction tx2 = new Transaction(UNITTEST);
+        tx2.addOutput(Coin.valueOf(99000000), new ECKey());
+        w.completeTx(SendRequest.forTx(tx2));
+
+        TransactionInput txInToDisconnect = tx2.getInput(0);
+
+        assertEquals(tx1, txInToDisconnect.getOutpoint().fromTx);
+        assertNull(txInToDisconnect.getOutpoint().connectedOutput);
+
+        txInToDisconnect.disconnect();
+
+        assertNull(txInToDisconnect.getOutpoint().fromTx);
+        assertNull(txInToDisconnect.getOutpoint().connectedOutput);
+    }
+
+    @Test
+    public void testUTXOWalletDisconnect() throws Exception {
+        Wallet w = new Wallet(new Context(UNITTEST));
+        Address a = w.currentReceiveAddress();
+        final UTXO utxo = new UTXO(Sha256Hash.of(new byte[] { 1, 2, 3 }), 1, Coin.COIN, 0, false,
+                ScriptBuilder.createOutputScript(a));
+        w.setUTXOProvider(new UTXOProvider() {
+            @Override
+            public NetworkParameters getParams() {
+                return UNITTEST;
+            }
+
+            @Override
+            public List<UTXO> getOpenTransactionOutputs(List<ECKey> addresses) throws UTXOProviderException {
+                return Lists.newArrayList(utxo);
+            }
+
+            @Override
+            public int getChainHeadHeight() throws UTXOProviderException {
+                return Integer.MAX_VALUE;
+            }
+        });
+
+        Transaction tx2 = new Transaction(UNITTEST);
+        tx2.addOutput(Coin.valueOf(99000000), new ECKey());
+        w.completeTx(SendRequest.forTx(tx2));
+
+        TransactionInput txInToDisconnect = tx2.getInput(0);
+
+        assertNull(txInToDisconnect.getOutpoint().fromTx);
+        assertEquals(utxo.getHash(), txInToDisconnect.getOutpoint().connectedOutput.getParentTransactionHash());
+
+        txInToDisconnect.disconnect();
+
+        assertNull(txInToDisconnect.getOutpoint().fromTx);
+        assertNull(txInToDisconnect.getOutpoint().connectedOutput);
+    }
+}
diff --git a/core/src/test/java/org/bitcoinj/core/TransactionOutputTest.java b/core/src/test/java/org/bitcoinj/core/TransactionOutputTest.java
index 5c637d6c800..80c291526d0 100644
--- a/core/src/test/java/org/bitcoinj/core/TransactionOutputTest.java
+++ b/core/src/test/java/org/bitcoinj/core/TransactionOutputTest.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -18,6 +20,7 @@
 import org.bitcoinj.params.MainNetParams;
 import org.bitcoinj.script.Script;
 import org.bitcoinj.script.ScriptBuilder;
+import org.bitcoinj.script.ScriptPattern;
 import org.bitcoinj.testing.TestWithWallet;
 import org.bitcoinj.wallet.SendRequest;
 import org.hamcrest.CoreMatchers;
@@ -49,7 +52,7 @@ public void testMultiSigOutputToString() throws Exception {
         ECKey otherKey = new ECKey();
 
         // Create multi-sig transaction
-        Transaction multiSigTransaction = new Transaction(PARAMS);
+        Transaction multiSigTransaction = new Transaction(UNITTEST);
         ImmutableList<ECKey> keys = ImmutableList.of(myKey, otherKey);
 
         Script scriptPubKey = ScriptBuilder.createMultiSigOutputScript(2, keys);
@@ -65,24 +68,25 @@ public void testMultiSigOutputToString() throws Exception {
     @Test
     public void testP2SHOutputScript() throws Exception {
         String P2SHAddressString = "35b9vsyH1KoFT5a5KtrKusaCcPLkiSo1tU";
-        Address P2SHAddress = Address.fromBase58(MainNetParams.get(), P2SHAddressString);
+        Address P2SHAddress = LegacyAddress.fromBase58(MAINNET, P2SHAddressString);
         Script script = ScriptBuilder.createOutputScript(P2SHAddress);
-        Transaction tx = new Transaction(MainNetParams.get());
+        Transaction tx = new Transaction(MAINNET);
         tx.addOutput(Coin.COIN, script);
-        assertEquals(P2SHAddressString, tx.getOutput(0).getAddressFromP2SH(MainNetParams.get()).toString());
+        assertEquals(P2SHAddressString, tx.getOutput(0).getScriptPubKey().getToAddress(MAINNET).toString());
     }
 
     @Test
     public void getAddressTests() throws Exception {
-        Transaction tx = new Transaction(MainNetParams.get());
+        Transaction tx = new Transaction(MAINNET);
         tx.addOutput(Coin.CENT, ScriptBuilder.createOpReturnScript("hello world!".getBytes()));
-        assertNull(tx.getOutput(0).getAddressFromP2SH(PARAMS));
-        assertNull(tx.getOutput(0).getAddressFromP2PKHScript(PARAMS));
+        assertTrue(ScriptPattern.isOpReturn(tx.getOutput(0).getScriptPubKey()));
+        assertFalse(ScriptPattern.isP2PK(tx.getOutput(0).getScriptPubKey()));
+        assertFalse(ScriptPattern.isP2PKH(tx.getOutput(0).getScriptPubKey()));
     }
 
     @Test
     public void getMinNonDustValue() throws Exception {
-        TransactionOutput payToAddressOutput = new TransactionOutput(PARAMS, null, Coin.COIN, myAddress);
+        TransactionOutput payToAddressOutput = new TransactionOutput(UNITTEST, null, Coin.COIN, myAddress);
         assertEquals(Transaction.MIN_NONDUST_OUTPUT, payToAddressOutput.getMinNonDustValue());
     }
 }
diff --git a/core/src/test/java/org/bitcoinj/core/TransactionTest.java b/core/src/test/java/org/bitcoinj/core/TransactionTest.java
index 34e9b27f7f2..2016a1dc010 100644
--- a/core/src/test/java/org/bitcoinj/core/TransactionTest.java
+++ b/core/src/test/java/org/bitcoinj/core/TransactionTest.java
@@ -25,10 +25,13 @@
 import org.easymock.*;
 import org.junit.*;
 
+import java.io.IOException;
+import java.io.OutputStream;
 import java.math.BigInteger;
 import java.util.*;
 import static org.bitcoinj.core.Utils.HEX;
 
+import static org.bitcoinj.core.Utils.uint32ToByteStreamLE;
 import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
 
@@ -39,15 +42,16 @@
  * so we make sure to cover it here as well.
  */
 public class TransactionTest {
-    private static final NetworkParameters PARAMS = UnitTestParams.get();
-    private static final Address ADDRESS = new ECKey().toAddress(PARAMS);
+    private static final NetworkParameters UNITTEST = UnitTestParams.get();
+    private static final NetworkParameters TESTNET = TestNet3Params.get();
+    private static final Address ADDRESS = LegacyAddress.fromKey(UNITTEST, new ECKey());
 
     private Transaction tx;
 
     @Before
     public void setUp() throws Exception {
-        Context context = new Context(PARAMS);
-        tx = FakeTxBuilder.createFakeTx(PARAMS);
+        Context context = new Context(UNITTEST);
+        tx = FakeTxBuilder.createFakeTx(UNITTEST);
     }
 
     @Test(expected = VerificationException.EmptyInputsOrOutputs.class)
@@ -84,7 +88,7 @@ public void negativeOutput() throws Exception {
 
     @Test(expected = VerificationException.ExcessiveValue.class)
     public void exceedsMaxMoney2() throws Exception {
-        Coin half = PARAMS.getMaxMoney().divide(2).add(Coin.SATOSHI);
+        Coin half = UNITTEST.getMaxMoney().divide(2).add(Coin.SATOSHI);
         tx.getOutput(0).setValue(half);
         tx.addOutput(half, ADDRESS);
         tx.verify();
@@ -119,7 +123,7 @@ public void testEstimatedLockTime_WhenParameterSignifiesBlockHeight() {
         BlockChain mockBlockChain = createMock(BlockChain.class);
         EasyMock.expect(mockBlockChain.estimateBlockTime(TEST_LOCK_TIME)).andReturn(now);
 
-        Transaction tx = FakeTxBuilder.createFakeTx(PARAMS);
+        Transaction tx = FakeTxBuilder.createFakeTx(UNITTEST);
         tx.setLockTime(TEST_LOCK_TIME); // less than five hundred million
 
         replay(mockBlockChain);
@@ -129,12 +133,12 @@ public void testEstimatedLockTime_WhenParameterSignifiesBlockHeight() {
 
     @Test
     public void testOptimalEncodingMessageSize() {
-        Transaction tx = new Transaction(PARAMS);
+        Transaction tx = new Transaction(UNITTEST);
 
         int length = tx.length;
 
         // add basic transaction input, check the length
-        tx.addOutput(new TransactionOutput(PARAMS, null, Coin.COIN, ADDRESS));
+        tx.addOutput(new TransactionOutput(UNITTEST, null, Coin.COIN, ADDRESS));
         length += getCombinedLength(tx.getOutputs());
 
         // add basic output, check the length
@@ -152,7 +156,7 @@ private int getCombinedLength(List<? extends Message> list) {
 
     @Test
     public void testIsMatureReturnsFalseIfTransactionIsCoinbaseAndConfidenceTypeIsNotEqualToBuilding() {
-        Transaction tx = FakeTxBuilder.createFakeCoinbaseTx(PARAMS);
+        Transaction tx = FakeTxBuilder.createFakeCoinbaseTx(UNITTEST);
 
         tx.getConfidence().setConfidenceType(ConfidenceType.UNKNOWN);
         assertEquals(tx.isMature(), false);
@@ -171,16 +175,31 @@ public void testCLTVPaymentChannelTransactionSpending() {
         ECKey from = new ECKey(), to = new ECKey(), incorrect = new ECKey();
         Script outputScript = ScriptBuilder.createCLTVPaymentChannelOutput(time, from, to);
 
-        Transaction tx = new Transaction(PARAMS);
-        tx.addInput(new TransactionInput(PARAMS, tx, new byte[] {}));
+        Transaction tx = new Transaction(UNITTEST);
+        tx.addInput(new TransactionInput(UNITTEST, tx, new byte[] {}));
         tx.getInput(0).setSequenceNumber(0);
         tx.setLockTime(time.subtract(BigInteger.ONE).longValue());
         TransactionSignature fromSig =
-                tx.calculateSignature(0, from, outputScript, Transaction.SigHash.SINGLE, false);
+                tx.calculateSignature(
+                        0,
+                        from,
+                        outputScript,
+                        Transaction.SigHash.SINGLE,
+                        false);
         TransactionSignature toSig =
-                tx.calculateSignature(0, to, outputScript, Transaction.SigHash.SINGLE, false);
+                tx.calculateSignature(
+                        0,
+                        to,
+                        outputScript,
+                        Transaction.SigHash.SINGLE,
+                        false);
         TransactionSignature incorrectSig =
-                tx.calculateSignature(0, incorrect, outputScript, Transaction.SigHash.SINGLE, false);
+                tx.calculateSignature(
+                        0,
+                        incorrect,
+                        outputScript,
+                        Transaction.SigHash.SINGLE,
+                        false);
         Script scriptSig =
                 ScriptBuilder.createCLTVPaymentChannelInput(fromSig, toSig);
         Script refundSig =
@@ -218,14 +237,24 @@ public void testCLTVPaymentChannelTransactionRefund() {
         ECKey from = new ECKey(), to = new ECKey(), incorrect = new ECKey();
         Script outputScript = ScriptBuilder.createCLTVPaymentChannelOutput(time, from, to);
 
-        Transaction tx = new Transaction(PARAMS);
-        tx.addInput(new TransactionInput(PARAMS, tx, new byte[] {}));
+        Transaction tx = new Transaction(UNITTEST);
+        tx.addInput(new TransactionInput(UNITTEST, tx, new byte[] {}));
         tx.getInput(0).setSequenceNumber(0);
         tx.setLockTime(time.add(BigInteger.ONE).longValue());
         TransactionSignature fromSig =
-                tx.calculateSignature(0, from, outputScript, Transaction.SigHash.SINGLE, false);
+                tx.calculateSignature(
+                        0,
+                        from,
+                        outputScript,
+                        Transaction.SigHash.SINGLE,
+                        false);
         TransactionSignature incorrectSig =
-                tx.calculateSignature(0, incorrect, outputScript, Transaction.SigHash.SINGLE, false);
+                tx.calculateSignature(
+                        0,
+                        incorrect,
+                        outputScript,
+                        Transaction.SigHash.SINGLE,
+                        false);
         Script scriptSig =
                 ScriptBuilder.createCLTVPaymentChannelRefund(fromSig);
         Script invalidScriptSig =
@@ -244,9 +273,229 @@ public void testCLTVPaymentChannelTransactionRefund() {
         } catch (ScriptException e) { }
     }
 
+    @Test
+    public void witnessTransaction() {
+        String hex;
+        Transaction tx;
+
+        // Roundtrip without witness
+        hex = "0100000003362c10b042d48378b428d60c5c98d8b8aca7a03e1a2ca1048bfd469934bbda95010000008b483045022046c8bc9fb0e063e2fc8c6b1084afe6370461c16cbf67987d97df87827917d42d022100c807fa0ab95945a6e74c59838cc5f9e850714d8850cec4db1e7f3bcf71d5f5ef0141044450af01b4cc0d45207bddfb47911744d01f768d23686e9ac784162a5b3a15bc01e6653310bdd695d8c35d22e9bb457563f8de116ecafea27a0ec831e4a3e9feffffffffc19529a54ae15c67526cc5e20e535973c2d56ef35ff51bace5444388331c4813000000008b48304502201738185959373f04cc73dbbb1d061623d51dc40aac0220df56dabb9b80b72f49022100a7f76bde06369917c214ee2179e583fefb63c95bf876eb54d05dfdf0721ed772014104e6aa2cf108e1c650e12d8dd7ec0a36e478dad5a5d180585d25c30eb7c88c3df0c6f5fd41b3e70b019b777abd02d319bf724de184001b3d014cb740cb83ed21a6ffffffffbaae89b5d2e3ca78fd3f13cf0058784e7c089fb56e1e596d70adcfa486603967010000008b483045022055efbaddb4c67c1f1a46464c8f770aab03d6b513779ad48735d16d4c5b9907c2022100f469d50a5e5556fc2c932645f6927ac416aa65bc83d58b888b82c3220e1f0b73014104194b3f8aa08b96cae19b14bd6c32a92364bea3051cb9f018b03e3f09a57208ff058f4b41ebf96b9911066aef3be22391ac59175257af0984d1432acb8f2aefcaffffffff0340420f00000000001976a914c0fbb13eb10b57daa78b47660a4ffb79c29e2e6b88ac204e0000000000001976a9142cae94ffdc05f8214ccb2b697861c9c07e3948ee88ac1c2e0100000000001976a9146e03561cd4d6033456cc9036d409d2bf82721e9888ac00000000";
+        tx = new Transaction(NetworkParameters.fromID(NetworkParameters.ID_MAINNET), HEX.decode(hex));
+        assertFalse(tx.hasWitnesses());
+        assertEquals(3, tx.getInputs().size());
+        for (TransactionInput in : tx.getInputs())
+            assertFalse(in.hasWitness());
+        assertEquals(3, tx.getOutputs().size());
+        assertEquals(hex, HEX.encode(tx.bitcoinSerialize()));
+        assertEquals("Uncorrect hash", "38d4cfeb57d6685753b7a3b3534c3cb576c34ca7344cd4582f9613ebf0c2b02a",
+                tx.getTxId().toString());
+        assertEquals(tx.getWTxId(), tx.getTxId());
+        assertEquals(hex.length() / 2, tx.getMessageSize());
+
+        // Roundtrip with witness
+        hex = "0100000000010213206299feb17742091c3cb2ab45faa3aa87922d3c030cafb3f798850a2722bf0000000000feffffffa12f2424b9599898a1d30f06e1ce55eba7fabfeee82ae9356f07375806632ff3010000006b483045022100fcc8cf3014248e1a0d6dcddf03e80f7e591605ad0dbace27d2c0d87274f8cd66022053fcfff64f35f22a14deb657ac57f110084fb07bb917c3b42e7d033c54c7717b012102b9e4dcc33c9cc9cb5f42b96dddb3b475b067f3e21125f79e10c853e5ca8fba31feffffff02206f9800000000001976a9144841b9874d913c430048c78a7b18baebdbea440588ac8096980000000000160014e4873ef43eac347471dd94bc899c51b395a509a502483045022100dd8250f8b5c2035d8feefae530b10862a63030590a851183cb61b3672eb4f26e022057fe7bc8593f05416c185d829b574290fb8706423451ebd0a0ae50c276b87b43012102179862f40b85fa43487500f1d6b13c864b5eb0a83999738db0f7a6b91b2ec64f00db080000";
+        tx = new Transaction(NetworkParameters.fromID(NetworkParameters.ID_MAINNET), HEX.decode(hex));
+        assertTrue(tx.hasWitnesses());
+        assertEquals(2, tx.getInputs().size());
+        assertTrue(tx.getInput(0).hasWitness());
+        assertFalse(tx.getInput(1).hasWitness());
+        assertEquals(2, tx.getOutputs().size());
+        assertEquals(hex, HEX.encode(tx.bitcoinSerialize()));
+        assertEquals("Uncorrect hash", "99e7484eafb6e01622c395c8cae7cb9f8822aab6ba993696b39df8b60b0f4b11",
+                tx.getTxId().toString());
+        assertNotEquals(tx.getWTxId(), tx.getTxId());
+        assertEquals(hex.length() / 2, tx.getMessageSize());
+    }
+
+    @Test
+    public void testWitnessSignatureP2WPKH() {
+        // test vector P2WPKH from:
+        // https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki
+        String txHex = "01000000" // version
+                + "02" // num txIn
+                + "fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f" + "00000000" + "00" + "eeffffff" // txIn
+                + "ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a" + "01000000" + "00" + "ffffffff" // txIn
+                + "02" // num txOut
+                + "202cb20600000000" + "1976a914" + "8280b37df378db99f66f85c95a783a76ac7a6d59" + "88ac" // txOut
+                + "9093510d00000000" + "1976a914" + "3bde42dbee7e4dbe6a21b2d50ce2f0167faa8159" + "88ac" // txOut
+                + "11000000"; // nLockTime
+        Transaction tx = new Transaction(TESTNET, HEX.decode(txHex));
+        assertEquals(txHex, HEX.encode(tx.bitcoinSerialize()));
+        assertEquals(txHex.length() / 2, tx.getMessageSize());
+        assertEquals(2, tx.getInputs().size());
+        assertEquals(2, tx.getOutputs().size());
+        TransactionInput txIn0 = tx.getInput(0);
+        TransactionInput txIn1 = tx.getInput(1);
+
+        ECKey key0 = ECKey.fromPrivate(HEX.decode("bbc27228ddcb9209d7fd6f36b02f7dfa6252af40bb2f1cbc7a557da8027ff866"));
+        Script scriptPubKey0 = ScriptBuilder.createP2PKOutputScript(key0);
+        assertEquals("2103c9f4836b9a4f77fc0d81f7bcb01b7f1b35916864b9476c241ce9fc198bd25432ac",
+                HEX.encode(scriptPubKey0.getProgram()));
+        ECKey key1 = ECKey.fromPrivate(HEX.decode("619c335025c7f4012e556c2a58b2506e30b8511b53ade95ea316fd8c3286feb9"));
+        assertEquals("025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee6357", key1.getPublicKeyAsHex());
+        Script scriptPubKey1 = ScriptBuilder.createP2WPKHOutputScript(key1);
+        assertEquals("00141d0f172a0ecb48aee1be1f2687d2963ae33f71a1", HEX.encode(scriptPubKey1.getProgram()));
+        txIn1.connect(new TransactionOutput(TESTNET, null, Coin.COIN.multiply(6), scriptPubKey1.getProgram()));
+
+        assertEquals("63cec688ee06a91e913875356dd4dea2f8e0f2a2659885372da2a37e32c7532e",
+                tx.hashForSignature(0, scriptPubKey0, Transaction.SigHash.ALL, false).toString());
+        TransactionSignature txSig0 = tx.calculateSignature(0, key0,
+                scriptPubKey0,
+                Transaction.SigHash.ALL, false);
+        assertEquals("30450221008b9d1dc26ba6a9cb62127b02742fa9d754cd3bebf337f7a55d114c8e5cdd30be022040529b194ba3f9281a99f2b1c0a19c0489bc22ede944ccf4ecbab4cc618ef3ed01",
+                HEX.encode(txSig0.encodeToBitcoin()));
+
+        Script witnessScript = ScriptBuilder.createP2PKHOutputScript(key1);
+        assertEquals("76a9141d0f172a0ecb48aee1be1f2687d2963ae33f71a188ac",
+                HEX.encode(witnessScript.getProgram()));
+
+        assertEquals("c37af31116d1b27caf68aae9e3ac82f1477929014d5b917657d0eb49478cb670",
+                tx.hashForWitnessSignature(1, witnessScript, txIn1.getValue(), Transaction.SigHash.ALL, false).toString());
+        TransactionSignature txSig1 = tx.calculateWitnessSignature(1, key1,
+                witnessScript, txIn1.getValue(),
+                Transaction.SigHash.ALL, false);
+        assertEquals("304402203609e17b84f6a7d30c80bfa610b5b4542f32a8a0d5447a12fb1366d7f01cc44a0220573a954c4518331561406f90300e8f3358f51928d43c212a8caed02de67eebee"
+                        + "01",
+                HEX.encode(txSig1.encodeToBitcoin()));
+
+        assertFalse(correctlySpends(txIn0, scriptPubKey0, 0));
+        txIn0.setScriptSig(new ScriptBuilder().data(txSig0.encodeToBitcoin()).build());
+        assertTrue(correctlySpends(txIn0, scriptPubKey0, 0));
+
+        assertFalse(correctlySpends(txIn1, scriptPubKey1, 1));
+        txIn1.setWitness(TransactionWitness.redeemP2WPKH(txSig1, key1));
+        // no redeem script for p2wpkh
+        assertTrue(correctlySpends(txIn1, scriptPubKey1, 1));
+
+        String signedTxHex = "01000000" // version
+                + "00" // marker
+                + "01" // flag
+                + "02" // num txIn
+                + "fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f" + "00000000"
+                + "494830450221008b9d1dc26ba6a9cb62127b02742fa9d754cd3bebf337f7a55d114c8e5cdd30be022040529b194ba3f9281a99f2b1c0a19c0489bc22ede944ccf4ecbab4cc618ef3ed01"
+                + "eeffffff" // txIn
+                + "ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a" + "01000000" + "00" + "ffffffff" // txIn
+                + "02" // num txOut
+                + "202cb20600000000" + "1976a914" + "8280b37df378db99f66f85c95a783a76ac7a6d59" + "88ac" // txOut
+                + "9093510d00000000" + "1976a914" + "3bde42dbee7e4dbe6a21b2d50ce2f0167faa8159" + "88ac" // txOut
+                + "00" // witness (empty)
+                + "02" // witness (2 pushes)
+                + "47" // push length
+                + "304402203609e17b84f6a7d30c80bfa610b5b4542f32a8a0d5447a12fb1366d7f01cc44a0220573a954c4518331561406f90300e8f3358f51928d43c212a8caed02de67eebee01" // push
+                + "21" // push length
+                + "025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee6357" // push
+                + "11000000"; // nLockTime
+        assertEquals(signedTxHex, HEX.encode(tx.bitcoinSerialize()));
+        assertEquals(signedTxHex.length() / 2, tx.getMessageSize());
+    }
+
+    @Test
+    public void testWitnessSignatureP2SH_P2WPKH() {
+        // test vector P2SH-P2WPKH from:
+        // https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki
+        String txHex = "01000000" // version
+                + "01" // num txIn
+                + "db6b1b20aa0fd7b23880be2ecbd4a98130974cf4748fb66092ac4d3ceb1a5477" + "01000000" + "00" + "feffffff" // txIn
+                + "02" // num txOut
+                + "b8b4eb0b00000000" + "1976a914" + "a457b684d7f0d539a46a45bbc043f35b59d0d963" + "88ac" // txOut
+                + "0008af2f00000000" + "1976a914" + "fd270b1ee6abcaea97fea7ad0402e8bd8ad6d77c" + "88ac" // txOut
+                + "92040000"; // nLockTime
+        Transaction tx = new Transaction(TESTNET, HEX.decode(txHex));
+        assertEquals(txHex, HEX.encode(tx.bitcoinSerialize()));
+        assertEquals(txHex.length() / 2, tx.getMessageSize());
+        assertEquals(1, tx.getInputs().size());
+        assertEquals(2, tx.getOutputs().size());
+        TransactionInput txIn = tx.getInput(0);
+
+        ECKey key = ECKey.fromPrivate(
+                HEX.decode("eb696a065ef48a2192da5b28b694f87544b30fae8327c4510137a922f32c6dcf"));
+        assertEquals("03ad1d8e89212f0b92c74d23bb710c00662ad1470198ac48c43f7d6f93a2a26873",
+                key.getPublicKeyAsHex());
+
+        Script redeemScript = ScriptBuilder.createP2WPKHOutputScript(key);
+        assertEquals("001479091972186c449eb1ded22b78e40d009bdf0089",
+                HEX.encode(redeemScript.getProgram()));
+
+        byte[] p2wpkhHash = Utils.sha256hash160(redeemScript.getProgram());
+        Script scriptPubKey = ScriptBuilder.createP2SHOutputScript(p2wpkhHash);
+        assertEquals("a9144733f37cf4db86fbc2efed2500b4f4e49f31202387",
+                HEX.encode(scriptPubKey.getProgram()));
+
+        Script witnessScript = ScriptBuilder.createP2PKHOutputScript(key);
+        assertEquals("76a91479091972186c449eb1ded22b78e40d009bdf008988ac",
+                HEX.encode(witnessScript.getProgram()));
+
+        assertEquals("64f3b0f4dd2bb3aa1ce8566d220cc74dda9df97d8490cc81d89d735c92e59fb6",
+                tx.hashForWitnessSignature(0, witnessScript, Coin.COIN.multiply(10), Transaction.SigHash.ALL, false)
+                        .toString());
+        TransactionSignature txSig = tx.calculateWitnessSignature(0, key,
+                witnessScript, Coin.COIN.multiply(10),
+                Transaction.SigHash.ALL, false);
+        assertEquals("3044022047ac8e878352d3ebbde1c94ce3a10d057c24175747116f8288e5d794d12d482f0220217f36a485cae903c713331d877c1f64677e3622ad4010726870540656fe9dcb"
+                        + "01",
+                HEX.encode(txSig.encodeToBitcoin()));
+
+        assertFalse(correctlySpends(txIn, scriptPubKey, 0));
+        txIn.setWitness(TransactionWitness.redeemP2WPKH(txSig, key));
+        txIn.setScriptSig(new ScriptBuilder().data(redeemScript.getProgram()).build());
+        assertTrue(correctlySpends(txIn, scriptPubKey, 0));
+
+        String signedTxHex = "01000000" // version
+                + "00" // marker
+                + "01" // flag
+                + "01" // num txIn
+                + "db6b1b20aa0fd7b23880be2ecbd4a98130974cf4748fb66092ac4d3ceb1a5477" + "01000000" // txIn
+                + "1716001479091972186c449eb1ded22b78e40d009bdf0089" + "feffffff" // txIn
+                + "02" // num txOut
+                + "b8b4eb0b00000000" + "1976a914" + "a457b684d7f0d539a46a45bbc043f35b59d0d963" + "88ac" // txOut
+                + "0008af2f00000000" + "1976a914" + "fd270b1ee6abcaea97fea7ad0402e8bd8ad6d77c" + "88ac" // txOut
+                + "02" // witness (2 pushes)
+                + "47" // push length
+                + "3044022047ac8e878352d3ebbde1c94ce3a10d057c24175747116f8288e5d794d12d482f0220217f36a485cae903c713331d877c1f64677e3622ad4010726870540656fe9dcb01" // push
+                + "21" // push length
+                + "03ad1d8e89212f0b92c74d23bb710c00662ad1470198ac48c43f7d6f93a2a26873" // push
+                + "92040000"; // nLockTime
+        assertEquals(signedTxHex, HEX.encode(tx.bitcoinSerialize()));
+        assertEquals(signedTxHex.length() / 2, tx.getMessageSize());
+    }
+
+    @Test
+    public void testWitnessSignatureP2SH_P2WSHSingleAnyoneCanPay() throws Exception {
+        // test vector P2SH-P2WSH from the final example at:
+        // https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki#p2sh-p2wsh
+        String txHex = "01000000" // version
+                + "01" // num txIn
+                + "36641869ca081e70f394c6948e8af409e18b619df2ed74aa106c1ca29787b96e" + "01000000" + "00" + "ffffffff" // txIn
+                + "02" // num txOut
+                + "00e9a43500000000" + "1976a914" + "389ffce9cd9ae88dcc0631e88a821ffdbe9bfe26" + "88ac" // txOut
+                + "c0832f0500000000" + "1976a914" + "7480a33f950689af511e6e84c138dbbd3c3ee415" + "88ac" // txOut
+                + "00000000"; // nLockTime
+        Transaction tx = new Transaction(TESTNET, HEX.decode(txHex));
+
+        ECKey pubKey = ECKey.fromPublicOnly(HEX.decode(
+                "02d8b661b0b3302ee2f162b09e07a55ad5dfbe673a9f01d9f0c19617681024306b"));
+        Script script = new Script(HEX.decode(
+                "56210307b8ae49ac90a048e9b53357a2354b3334e9c8bee813ecb98e99a7e07e8c3ba32103b28f0c28bfab54554ae8c658ac5c3e0ce6e79ad336331f78c428dd43eea8449b21034b8113d703413d57761b8b9781957b8c0ac1dfe69f492580ca4195f50376ba4a21033400f6afecb833092a9a21cfdf1ed1376e58c5d1f47de74683123987e967a8f42103a6d48b1131e94ba04d9737d61acdaa1322008af9602b3b14862c07a1789aac162102d8b661b0b3302ee2f162b09e07a55ad5dfbe673a9f01d9f0c19617681024306b56ae"));
+        Sha256Hash hash = tx.hashForWitnessSignature(0, script, Coin.valueOf(987654321L),
+                Transaction.SigHash.SINGLE, true);
+        TransactionSignature signature = TransactionSignature.decodeFromBitcoin(HEX.decode(
+                "30440220525406a1482936d5a21888260dc165497a90a15669636d8edca6b9fe490d309c022032af0c646a34a44d1f4576bf6a4a74b67940f8faa84c7df9abe12a01a11e2b4783"), true, true);
+        assertTrue(pubKey.verify(hash, signature));
+    }
+
+    private boolean correctlySpends(TransactionInput txIn, Script scriptPubKey, int inputIndex) {
+        try {
+            txIn.getScriptSig().correctlySpends(txIn.getParentTransaction(), inputIndex, txIn.getWitness(),
+                    txIn.getValue(), scriptPubKey, Script.ALL_VERIFY_FLAGS);
+            return true;
+        } catch (ScriptException x) {
+            return false;
+        }
+    }
+
     @Test
     public void testToStringWhenLockTimeIsSpecifiedInBlockHeight() {
-        Transaction tx = FakeTxBuilder.createFakeTx(PARAMS);
+        Transaction tx = FakeTxBuilder.createFakeTx(UNITTEST);
         TransactionInput input = tx.getInput(0);
         input.setSequenceNumber(42);
 
@@ -262,7 +511,7 @@ public void testToStringWhenLockTimeIsSpecifiedInBlockHeight() {
 
         replay(mockBlockChain);
 
-        String str = tx.toString(mockBlockChain);
+        String str = tx.toString(mockBlockChain, null);
 
         assertEquals(str.contains("block " + TEST_LOCK_TIME), true);
         assertEquals(str.contains("estimated to be reached at"), true);
@@ -270,11 +519,11 @@ public void testToStringWhenLockTimeIsSpecifiedInBlockHeight() {
 
     @Test
     public void testToStringWhenIteratingOverAnInputCatchesAnException() {
-        Transaction tx = FakeTxBuilder.createFakeTx(PARAMS);
-        TransactionInput ti = new TransactionInput(PARAMS, tx, new byte[0]) {
+        Transaction tx = FakeTxBuilder.createFakeTx(UNITTEST);
+        TransactionInput ti = new TransactionInput(UNITTEST, tx, new byte[0]) {
             @Override
             public Script getScriptSig() throws ScriptException {
-                throw new ScriptException("");
+                throw new ScriptException(ScriptError.SCRIPT_ERR_UNKNOWN_ERROR, "");
             }
         };
 
@@ -284,22 +533,22 @@ public Script getScriptSig() throws ScriptException {
 
     @Test
     public void testToStringWhenThereAreZeroInputs() {
-        Transaction tx = new Transaction(PARAMS);
+        Transaction tx = new Transaction(UNITTEST);
         assertEquals(tx.toString().contains("No inputs!"), true);
     }
 
     @Test
     public void testTheTXByHeightComparator() {
-        Transaction tx1 = FakeTxBuilder.createFakeTx(PARAMS);
+        Transaction tx1 = FakeTxBuilder.createFakeTx(UNITTEST);
         tx1.getConfidence().setAppearedAtChainHeight(1);
 
-        Transaction tx2 = FakeTxBuilder.createFakeTx(PARAMS);
+        Transaction tx2 = FakeTxBuilder.createFakeTx(UNITTEST);
         tx2.getConfidence().setAppearedAtChainHeight(2);
 
-        Transaction tx3 = FakeTxBuilder.createFakeTx(PARAMS);
+        Transaction tx3 = FakeTxBuilder.createFakeTx(UNITTEST);
         tx3.getConfidence().setAppearedAtChainHeight(3);
 
-        SortedSet<Transaction> set = new TreeSet<Transaction>(Transaction.SORT_TX_BY_HEIGHT);
+        SortedSet<Transaction> set = new TreeSet<>(Transaction.SORT_TX_BY_HEIGHT);
         set.add(tx2);
         set.add(tx1);
         set.add(tx3);
@@ -319,10 +568,10 @@ public void testTheTXByHeightComparator() {
     @Test(expected = ScriptException.class)
     public void testAddSignedInputThrowsExceptionWhenScriptIsNotToRawPubKeyAndIsNotToAddress() {
         ECKey key = new ECKey();
-        Address addr = key.toAddress(PARAMS);
-        Transaction fakeTx = FakeTxBuilder.createFakeTx(PARAMS, Coin.COIN, addr);
+        Address addr = LegacyAddress.fromKey(UNITTEST, key);
+        Transaction fakeTx = FakeTxBuilder.createFakeTx(UNITTEST, Coin.COIN, addr);
 
-        Transaction tx = new Transaction(PARAMS);
+        Transaction tx = new Transaction(UNITTEST);
         tx.addOutput(fakeTx.getOutput(0));
 
         Script script = ScriptBuilder.createOpReturnScript(new byte[0]);
@@ -332,7 +581,7 @@ public void testAddSignedInputThrowsExceptionWhenScriptIsNotToRawPubKeyAndIsNotT
 
     @Test
     public void testPrioSizeCalc() throws Exception {
-        Transaction tx1 = FakeTxBuilder.createFakeTx(PARAMS, Coin.COIN, ADDRESS);
+        Transaction tx1 = FakeTxBuilder.createFakeTx(UNITTEST, Coin.COIN, ADDRESS);
         int size1 = tx1.getMessageSize();
         int size2 = tx1.getMessageSizeForPriorityCalc();
         assertEquals(113, size1 - size2);
@@ -347,9 +596,10 @@ public void testPrioSizeCalc() throws Exception {
     @Test
     public void testCoinbaseHeightCheck() throws VerificationException {
         // Coinbase transaction from block 300,000
-        final byte[] transactionBytes = HEX.decode("01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff4803e09304062f503253482f0403c86d53087ceca141295a00002e522cfabe6d6d7561cf262313da1144026c8f7a43e3899c44f6145f39a36507d36679a8b7006104000000000000000000000001c8704095000000001976a91480ad90d403581fa3bf46086a91b2d9d4125db6c188ac00000000");
+        final byte[] transactionBytes = HEX.decode(
+                "01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff4803e09304062f503253482f0403c86d53087ceca141295a00002e522cfabe6d6d7561cf262313da1144026c8f7a43e3899c44f6145f39a36507d36679a8b7006104000000000000000000000001c8704095000000001976a91480ad90d403581fa3bf46086a91b2d9d4125db6c188ac00000000");
         final int height = 300000;
-        final Transaction transaction = PARAMS.getDefaultSerializer().makeTransaction(transactionBytes);
+        final Transaction transaction = UNITTEST.getDefaultSerializer().makeTransaction(transactionBytes);
         transaction.checkCoinBaseHeight(height);
     }
 
@@ -361,20 +611,16 @@ public void testCoinbaseHeightCheck() throws VerificationException {
     public void testCoinbaseHeightCheckWithDamagedScript() throws VerificationException {
         // Coinbase transaction from block 224,430
         final byte[] transactionBytes = HEX.decode(
-            "010000000100000000000000000000000000000000000000000000000000000000"
-            + "00000000ffffffff3b03ae6c0300044bd7031a0400000000522cfabe6d6d0000"
-            + "0000000000b7b8bf0100000068692066726f6d20706f6f6c7365727665726aac"
-            + "1eeeed88ffffffff01e0587597000000001976a91421c0d001728b3feaf11551"
-            + "5b7c135e779e9f442f88ac00000000");
+            "01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff3b03ae6c0300044bd7031a0400000000522cfabe6d6d00000000000000b7b8bf0100000068692066726f6d20706f6f6c7365727665726aac1eeeed88ffffffff01e0587597000000001976a91421c0d001728b3feaf115515b7c135e779e9f442f88ac00000000");
         final int height = 224430;
-        final Transaction transaction = PARAMS.getDefaultSerializer().makeTransaction(transactionBytes);
+        final Transaction transaction = UNITTEST.getDefaultSerializer().makeTransaction(transactionBytes);
         transaction.checkCoinBaseHeight(height);
     }
 
     @Test
     public void optInFullRBF() {
         // a standard transaction as wallets would create
-        Transaction tx = FakeTxBuilder.createFakeTx(PARAMS);
+        Transaction tx = FakeTxBuilder.createFakeTx(UNITTEST);
         assertFalse(tx.isOptInFullRBF());
 
         tx.getInputs().get(0).setSequenceNumber(TransactionInput.NO_SEQUENCE - 2);
@@ -386,22 +632,141 @@ public void optInFullRBF() {
      */
     @Test
     public void testHashForSignatureThreadSafety() {
-        Block genesis = UnitTestParams.get().getGenesisBlock();
-        Block block1 = genesis.createNextBlock(new ECKey().toAddress(UnitTestParams.get()),
+        Block genesis = UNITTEST.getGenesisBlock();
+        Block block1 = genesis.createNextBlock(LegacyAddress.fromKey(UNITTEST, new ECKey()),
                     genesis.getTransactions().get(0).getOutput(0).getOutPointFor());
 
         final Transaction tx = block1.getTransactions().get(1);
-        final String txHash = tx.getHashAsString();
-        final String txNormalizedHash = tx.hashForSignature(0, new byte[0], Transaction.SigHash.ALL.byteValue()).toString();
+        final Sha256Hash txHash = tx.getTxId();
+        final String txNormalizedHash = tx.hashForSignature(
+                0,
+                new byte[0],
+                Transaction.SigHash.ALL.byteValue())
+                .toString();
 
         for (int i = 0; i < 100; i++) {
             // ensure the transaction object itself was not modified; if it was, the hash will change
-            assertEquals(txHash, tx.getHashAsString());
+            assertEquals(txHash, tx.getTxId());
             new Thread(){
                 public void run() {
-                    assertEquals(txNormalizedHash, tx.hashForSignature(0, new byte[0], Transaction.SigHash.ALL.byteValue()).toString());
+                    assertEquals(
+                            txNormalizedHash,
+                            tx.hashForSignature(
+                                    0,
+                                    new byte[0],
+                                    Transaction.SigHash.ALL.byteValue())
+                                    .toString());
                 }
             };
         }
     }
+
+    @Test
+    public void parseTransactionWithHugeDeclaredInputsSize() throws Exception {
+        Transaction tx = new HugeDeclaredSizeTransaction(UNITTEST, true, false, false);
+        byte[] serializedTx = tx.bitcoinSerialize();
+        try {
+            new Transaction(UNITTEST, serializedTx);
+            fail("We expect ProtocolException with the fixed code and OutOfMemoryError with the buggy code, so this is weird");
+        } catch (ProtocolException e) {
+            //Expected, do nothing
+        }
+    }
+
+    @Test
+    public void parseTransactionWithHugeDeclaredOutputsSize() throws Exception {
+        Transaction tx = new HugeDeclaredSizeTransaction(UNITTEST, false, true, false);
+        byte[] serializedTx = tx.bitcoinSerialize();
+        try {
+            new Transaction(UNITTEST, serializedTx);
+            fail("We expect ProtocolException with the fixed code and OutOfMemoryError with the buggy code, so this is weird");
+        } catch (ProtocolException e) {
+            //Expected, do nothing
+        }
+    }
+
+    @Test
+    public void parseTransactionWithHugeDeclaredWitnessPushCountSize() throws Exception {
+        Transaction tx = new HugeDeclaredSizeTransaction(UNITTEST, false, false, true);
+        byte[] serializedTx = tx.bitcoinSerialize();
+        try {
+            new Transaction(UNITTEST, serializedTx);
+            fail("We expect ProtocolException with the fixed code and OutOfMemoryError with the buggy code, so this is weird");
+        } catch (ProtocolException e) {
+            //Expected, do nothing
+        }
+    }
+
+    private static class HugeDeclaredSizeTransaction extends Transaction {
+
+        private boolean hackInputsSize;
+        private boolean hackOutputsSize;
+        private boolean hackWitnessPushCountSize;
+
+        public HugeDeclaredSizeTransaction(NetworkParameters params, boolean hackInputsSize, boolean hackOutputsSize, boolean hackWitnessPushCountSize) {
+            super(params);
+            this.protocolVersion = NetworkParameters.ProtocolVersion.WITNESS_VERSION.getBitcoinProtocolVersion();
+            Transaction inputTx = new Transaction(params);
+            inputTx.addOutput(Coin.FIFTY_COINS, LegacyAddress.fromKey(params, ECKey.fromPrivate(BigInteger.valueOf(123456))));
+            this.addInput(inputTx.getOutput(0));
+            this.getInput(0).disconnect();
+            TransactionWitness witness = new TransactionWitness(1);
+            witness.setPush(0, new byte[] {0});
+            this.getInput(0).setWitness(witness);
+            Address to = LegacyAddress.fromKey(params, ECKey.fromPrivate(BigInteger.valueOf(1000)));
+            this.addOutput(Coin.COIN, to);
+
+            this.hackInputsSize = hackInputsSize;
+            this.hackOutputsSize = hackOutputsSize;
+            this.hackWitnessPushCountSize = hackWitnessPushCountSize;
+        }
+
+        @Override
+        protected void bitcoinSerializeToStream(OutputStream stream, boolean useSegwit) throws IOException {
+            // version
+            uint32ToByteStreamLE(getVersion(), stream);
+            // marker, flag
+            if (useSegwit) {
+                stream.write(0);
+                stream.write(1);
+            }
+            // txin_count, txins
+            long inputsSize = hackInputsSize ? Integer.MAX_VALUE : getInputs().size();
+            stream.write(new VarInt(inputsSize).encode());
+            for (TransactionInput in : getInputs())
+                in.bitcoinSerialize(stream);
+            // txout_count, txouts
+            long outputsSize = hackOutputsSize ? Integer.MAX_VALUE : getOutputs().size();
+            stream.write(new VarInt(outputsSize).encode());
+            for (TransactionOutput out : getOutputs())
+                out.bitcoinSerialize(stream);
+            // script_witnisses
+            if (useSegwit) {
+                for (TransactionInput in : getInputs()) {
+                    TransactionWitness witness = in.getWitness();
+                    long pushCount = hackWitnessPushCountSize ? Integer.MAX_VALUE : witness.getPushCount();
+                    stream.write(new VarInt(pushCount).encode());
+                    for (int i = 0; i < witness.getPushCount(); i++) {
+                        byte[] push = witness.getPush(i);
+                        stream.write(new VarInt(push.length).encode());
+                        stream.write(push);
+                    }
+
+                    in.getWitness().bitcoinSerializeToStream(stream);
+                }
+            }
+            // lock_time
+            uint32ToByteStreamLE(getLockTime(), stream);
+        }
+    }
+
+    @Test
+    public void getWeightAndVsize() {
+        // example from https://en.bitcoin.it/wiki/Weight_units
+        String txHex = "0100000000010115e180dc28a2327e687facc33f10f2a20da717e5548406f7ae8b4c811072f85603000000171600141d7cd6c75c2e86f4cbf98eaed221b30bd9a0b928ffffffff019caef505000000001976a9141d7cd6c75c2e86f4cbf98eaed221b30bd9a0b92888ac02483045022100f764287d3e99b1474da9bec7f7ed236d6c81e793b20c4b5aa1f3051b9a7daa63022016a198031d5554dbb855bdbe8534776a4be6958bd8d530dc001c32b828f6f0ab0121038262a6c6cec93c2d3ecd6c6072efea86d02ff8e3328bbd0242b20af3425990ac00000000";
+        Transaction tx = new Transaction(UNITTEST, HEX.decode(txHex));
+        assertEquals(218, tx.getMessageSize());
+        assertEquals(542, tx.getWeight());
+        assertEquals(136, tx.getVsize());
+    }
 }
diff --git a/core/src/test/java/org/bitcoinj/core/TransactionWitnessTest.java b/core/src/test/java/org/bitcoinj/core/TransactionWitnessTest.java
new file mode 100644
index 00000000000..2db0d4606a1
--- /dev/null
+++ b/core/src/test/java/org/bitcoinj/core/TransactionWitnessTest.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bitcoinj.core;
+
+import static org.junit.Assert.*;
+
+import org.bitcoinj.crypto.TransactionSignature;
+import org.bitcoinj.script.Script;
+import org.bouncycastle.util.encoders.Hex;
+import org.junit.Test;
+
+public class TransactionWitnessTest {
+
+    @Test
+    public void testToString() throws Exception {
+        TransactionWitness w1 = new TransactionWitness(0);
+        assertEquals("", w1.toString());
+
+        TransactionWitness w2 = new TransactionWitness(2);
+        assertEquals("", w2.toString());
+
+        TransactionWitness w3 = new TransactionWitness(3);
+        w3.setPush(0, Utils.HEX.decode("123aaa"));
+        w3.setPush(1, Utils.HEX.decode("123bbb"));
+        w3.setPush(3, Utils.HEX.decode("123ccc"));
+        assertEquals("123aaa 123bbb EMPTY 123ccc", w3.toString());
+    }
+
+
+    @Test
+    public void testRedeemP2WSH() throws SignatureDecodeException {
+        ECKey.ECDSASignature ecdsaSignature1 = TransactionSignature.decodeFromDER(Hex.decode("3045022100c3d84f7bf41c7eda3b23bbbccebde842a451c1a0aca39df706a3ff2fe78b1e0a02206e2e3c23559798b02302ad6fa5ddbbe87af5cc7d3b9f86b88588253770ab9f79"));
+        TransactionSignature signature1 = new TransactionSignature(ecdsaSignature1, Transaction.SigHash.ALL, false);
+        ECKey.ECDSASignature ecdsaSignature2 = TransactionSignature.decodeFromDER(Hex.decode("3045022100fcfe4a58f2878047ef7c5889fc52a3816ad2dd218807daa3c3eafd4841ffac4d022073454df7e212742f0fee20416b418a2c1340a33eebed5583d19a61088b112832"));
+        TransactionSignature signature2 = new TransactionSignature(ecdsaSignature2, Transaction.SigHash.ALL, false);
+
+        Script witnessScript = new Script(Hex.decode("522102bb65b325a986c5b15bd75e0d81cf149219597617a70995efedec6309b4600fa02103c54f073f5db9f68915019801435058c9232cb72c6528a2ca15af48eb74ca8b9a52ae"));
+
+        TransactionWitness witness = TransactionWitness.redeemP2WSH(witnessScript, signature1, signature2);
+        assertEquals(4, witness.getPushCount());
+        assertArrayEquals(new byte[]{}, witness.getPush(0));
+        assertArrayEquals(signature1.encodeToBitcoin(), witness.getPush(1));
+        assertArrayEquals(signature2.encodeToBitcoin(), witness.getPush(2));
+        assertArrayEquals(witnessScript.getProgram(), witness.getPush(3));
+
+
+    }
+}
diff --git a/core/src/test/java/org/bitcoinj/core/TxConfidenceTableTest.java b/core/src/test/java/org/bitcoinj/core/TxConfidenceTableTest.java
index 0689431c0d2..473a905ce1e 100644
--- a/core/src/test/java/org/bitcoinj/core/TxConfidenceTableTest.java
+++ b/core/src/test/java/org/bitcoinj/core/TxConfidenceTableTest.java
@@ -23,11 +23,18 @@
 
 import java.net.*;
 
-import static org.bitcoinj.core.Coin.*;
-import static org.junit.Assert.*;
+import static org.bitcoinj.core.Coin.COIN;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 public class TxConfidenceTableTest {
-    private static final NetworkParameters PARAMS = UnitTestParams.get();
+    private static final NetworkParameters UNITTEST = UnitTestParams.get();
     private Transaction tx1, tx2;
     private PeerAddress address1, address2, address3;
     private TxConfidenceTable table;
@@ -35,25 +42,25 @@ public class TxConfidenceTableTest {
     @Before
     public void setup() throws Exception {
         BriefLogFormatter.init();
-        Context context = new Context(PARAMS);
+        Context context = new Context(UNITTEST);
         table = context.getConfidenceTable();
 
-        Address to = new ECKey().toAddress(PARAMS);
-        Address change = new ECKey().toAddress(PARAMS);
+        Address to = LegacyAddress.fromKey(UNITTEST, new ECKey());
+        Address change = LegacyAddress.fromKey(UNITTEST, new ECKey());
 
-        tx1 = FakeTxBuilder.createFakeTxWithChangeAddress(PARAMS, COIN, to, change);
-        tx2 = FakeTxBuilder.createFakeTxWithChangeAddress(PARAMS, COIN, to, change);
-        assertEquals(tx1.getHash(), tx2.getHash());
+        tx1 = FakeTxBuilder.createFakeTxWithChangeAddress(UNITTEST, COIN, to, change);
+        tx2 = FakeTxBuilder.createFakeTxWithChangeAddress(UNITTEST, COIN, to, change);
+        assertEquals(tx1.getTxId(), tx2.getTxId());
 
-        address1 = new PeerAddress(PARAMS, InetAddress.getByAddress(new byte[] { 127, 0, 0, 1 }));
-        address2 = new PeerAddress(PARAMS, InetAddress.getByAddress(new byte[] { 127, 0, 0, 2 }));
-        address3 = new PeerAddress(PARAMS, InetAddress.getByAddress(new byte[] { 127, 0, 0, 3 }));
+        address1 = new PeerAddress(UNITTEST, InetAddress.getByAddress(new byte[] { 127, 0, 0, 1 }));
+        address2 = new PeerAddress(UNITTEST, InetAddress.getByAddress(new byte[] { 127, 0, 0, 2 }));
+        address3 = new PeerAddress(UNITTEST, InetAddress.getByAddress(new byte[] { 127, 0, 0, 3 }));
     }
 
     @Test
     public void pinHandlers() throws Exception {
-        Transaction tx = PARAMS.getDefaultSerializer().makeTransaction(tx1.bitcoinSerialize());
-        Sha256Hash hash = tx.getHash();
+        Transaction tx = UNITTEST.getDefaultSerializer().makeTransaction(tx1.bitcoinSerialize());
+        Sha256Hash hash = tx.getTxId();
         table.seen(hash, address1);
         assertEquals(1, tx.getConfidence().numBroadcastPeers());
         final int[] seen = new int[1];
@@ -78,25 +85,59 @@ public void onConfidenceChanged(TransactionConfidence confidence, ChangeReason r
                 run[0] = reason;
             }
         });
-        table.seen(tx1.getHash(), address1);
+        table.seen(tx1.getTxId(), address1);
         assertEquals(TransactionConfidence.Listener.ChangeReason.SEEN_PEERS, run[0]);
         run[0] = null;
-        table.seen(tx1.getHash(), address1);
+        table.seen(tx1.getTxId(), address1);
         assertNull(run[0]);
     }
 
+    @Test
+    public void testSeen() {
+        PeerAddress peer = createMock(PeerAddress.class);
+
+        Sha256Hash brokenHash = createMock(Sha256Hash.class);
+        Sha256Hash correctHash = createMock(Sha256Hash.class);
+
+        TransactionConfidence brokenConfidence = createMock(TransactionConfidence.class);
+        expect(brokenConfidence.getTransactionHash()).andReturn(brokenHash);
+        expect(brokenConfidence.markBroadcastBy(peer)).andThrow(new ArithmeticException("some error"));
+
+        TransactionConfidence correctConfidence = createMock(TransactionConfidence.class);
+        expect(correctConfidence.getTransactionHash()).andReturn(correctHash);
+        expect(correctConfidence.markBroadcastBy(peer)).andReturn(true);
+        correctConfidence.queueListeners(anyObject(TransactionConfidence.Listener.ChangeReason.class));
+        expectLastCall();
+
+        TransactionConfidence.Factory factory = createMock(TransactionConfidence.Factory.class);
+        expect(factory.createConfidence(brokenHash)).andReturn(brokenConfidence);
+        expect(factory.createConfidence(correctHash)).andReturn(correctConfidence);
+
+        replay(factory, brokenConfidence, correctConfidence);
+
+        TxConfidenceTable table = new TxConfidenceTable(1, factory);
+
+        try {
+            table.seen(brokenHash, peer);
+        } catch (ArithmeticException expected) {
+            // do nothing
+        }
+
+        assertNotNull(table.seen(correctHash, peer));
+    }
+
     @Test
     public void invAndDownload() throws Exception {
         // Base case: we see a transaction announced twice and then download it. The count is in the confidence object.
-        assertEquals(0, table.numBroadcastPeers(tx1.getHash()));
-        table.seen(tx1.getHash(), address1);
-        assertEquals(1, table.numBroadcastPeers(tx1.getHash()));
-        table.seen(tx1.getHash(), address2);
-        assertEquals(2, table.numBroadcastPeers(tx1.getHash()));
+        assertEquals(0, table.numBroadcastPeers(tx1.getTxId()));
+        table.seen(tx1.getTxId(), address1);
+        assertEquals(1, table.numBroadcastPeers(tx1.getTxId()));
+        table.seen(tx1.getTxId(), address2);
+        assertEquals(2, table.numBroadcastPeers(tx1.getTxId()));
         assertEquals(2, tx2.getConfidence().numBroadcastPeers());
         // And now we see another inv.
-        table.seen(tx1.getHash(), address3);
+        table.seen(tx1.getTxId(), address3);
         assertEquals(3, tx2.getConfidence().numBroadcastPeers());
-        assertEquals(3, table.numBroadcastPeers(tx1.getHash()));
+        assertEquals(3, table.numBroadcastPeers(tx1.getTxId()));
     }
 }
diff --git a/core/src/test/java/org/bitcoinj/core/UTXOTest.java b/core/src/test/java/org/bitcoinj/core/UTXOTest.java
new file mode 100644
index 00000000000..bc8f7615432
--- /dev/null
+++ b/core/src/test/java/org/bitcoinj/core/UTXOTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2011 Google Inc.
+ * Copyright 2014 Andreas Schildbach
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bitcoinj.core;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+import org.bitcoinj.script.ScriptBuilder;
+import org.junit.Test;
+
+public class UTXOTest {
+
+    @Test
+    public void testJavaSerialization() throws Exception {
+        ECKey key = new ECKey();
+        UTXO utxo = new UTXO(Sha256Hash.of(new byte[]{1,2,3}), 1, Coin.COIN, 10, true, ScriptBuilder.createP2PKOutputScript(key));
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        new ObjectOutputStream(os).writeObject(utxo);
+        UTXO utxoCopy = (UTXO) new ObjectInputStream(
+                new ByteArrayInputStream(os.toByteArray())).readObject();
+        assertEquals(utxo, utxoCopy);
+        assertEquals(utxo.getValue(), utxoCopy.getValue());
+        assertEquals(utxo.getHeight(), utxoCopy.getHeight());
+        assertEquals(utxo.isCoinbase(), utxoCopy.isCoinbase());
+        assertEquals(utxo.getScript(), utxoCopy.getScript());
+    }
+}
diff --git a/core/src/test/java/org/bitcoinj/core/UtilsTest.java b/core/src/test/java/org/bitcoinj/core/UtilsTest.java
index b3171cba20f..f365c58e8b1 100644
--- a/core/src/test/java/org/bitcoinj/core/UtilsTest.java
+++ b/core/src/test/java/org/bitcoinj/core/UtilsTest.java
@@ -1,6 +1,7 @@
 /*
  * Copyright 2011 Thilo Planz
  * Copyright 2014 Andreas Schildbach
+ * Copyright 2017 Nicola Atzei
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +19,7 @@
 package org.bitcoinj.core;
 
 import java.math.BigInteger;
+import java.util.Arrays;
 import java.util.Date;
 
 import org.junit.Test;
@@ -31,23 +33,6 @@ public void testReverseBytes() {
         assertArrayEquals(new byte[]{1, 2, 3, 4, 5}, Utils.reverseBytes(new byte[]{5, 4, 3, 2, 1}));
     }
 
-    @Test
-    public void testReverseDwordBytes() {
-        assertArrayEquals(new byte[]{1, 2, 3, 4, 5, 6, 7, 8}, Utils.reverseDwordBytes(new byte[]{4, 3, 2, 1, 8, 7, 6, 5}, -1));
-        assertArrayEquals(new byte[]{1, 2, 3, 4}, Utils.reverseDwordBytes(new byte[]{4, 3, 2, 1, 8, 7, 6, 5}, 4));
-        assertArrayEquals(new byte[0], Utils.reverseDwordBytes(new byte[]{4, 3, 2, 1, 8, 7, 6, 5}, 0));
-        assertArrayEquals(new byte[0], Utils.reverseDwordBytes(new byte[0], 0));
-    }
-
-    @Test
-    public void testMaxOfMostFreq() throws Exception {
-        assertEquals(0, Utils.maxOfMostFreq());
-        assertEquals(0, Utils.maxOfMostFreq(0, 0, 1));
-        assertEquals(2, Utils.maxOfMostFreq(1, 1, 2, 2));
-        assertEquals(1, Utils.maxOfMostFreq(1, 1, 2, 2, 1));
-        assertEquals(-1, Utils.maxOfMostFreq(-1, -1, 2, 2, -1));
-    }
-
     @Test
     public void compactEncoding() throws Exception {
         assertEquals(new BigInteger("1234560000", 16), Utils.decodeCompactBits(0x05123456L));
@@ -61,4 +46,67 @@ public void dateTimeFormat() {
         assertEquals("2014-11-16T10:54:33Z", Utils.dateTimeFormat(1416135273781L));
         assertEquals("2014-11-16T10:54:33Z", Utils.dateTimeFormat(new Date(1416135273781L)));
     }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void bigIntegerToBytes_convertNegativeNumber() {
+        BigInteger b = BigInteger.valueOf(-1);
+        Utils.bigIntegerToBytes(b, 32);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void bigIntegerToBytes_convertWithNegativeLength() {
+        BigInteger b = BigInteger.valueOf(10);
+        Utils.bigIntegerToBytes(b, -1);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void bigIntegerToBytes_convertWithZeroLength() {
+        BigInteger b = BigInteger.valueOf(10);
+        Utils.bigIntegerToBytes(b, 0);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void bigIntegerToBytes_insufficientLength() {
+        BigInteger b = BigInteger.valueOf(0b1000__0000_0000);   // base 2
+        Utils.bigIntegerToBytes(b, 1);
+    }
+
+    @Test
+    public void bigIntegerToBytes_convertZero() {
+        BigInteger b = BigInteger.valueOf(0);
+        byte[] expected = new byte[]{0b0000_0000};
+        byte[] actual = Utils.bigIntegerToBytes(b, 1);
+        assertTrue(Arrays.equals(expected, actual));
+    }
+
+    @Test
+    public void bigIntegerToBytes_singleByteSignFit() {
+        BigInteger b = BigInteger.valueOf(0b0000_1111);
+        byte[] expected = new byte[]{0b0000_1111};
+        byte[] actual = Utils.bigIntegerToBytes(b, 1);
+        assertTrue(Arrays.equals(expected, actual));
+    }
+
+    @Test
+    public void bigIntegerToBytes_paddedSingleByte() {
+        BigInteger b = BigInteger.valueOf(0b0000_1111);
+        byte[] expected = new byte[]{0, 0b0000_1111};
+        byte[] actual = Utils.bigIntegerToBytes(b, 2);
+        assertTrue(Arrays.equals(expected, actual));
+    }
+
+    @Test
+    public void bigIntegerToBytes_singleByteSignDoesNotFit() {
+        BigInteger b = BigInteger.valueOf(0b1000_0000);     // 128 (2-compl does not fit in one byte)
+        byte[] expected = new byte[]{-128};                 // -128 == 1000_0000 (compl-2)
+        byte[] actual = Utils.bigIntegerToBytes(b, 1);
+        assertTrue(Arrays.equals(expected, actual));
+    }
+
+    @Test
+    public void runtime() {
+        // This test assumes it is run within a Java runtime for desktop computers.
+        assertTrue(Utils.isOpenJDKRuntime() || Utils.isOracleJavaRuntime());
+        assertFalse(Utils.isAndroidRuntime());
+    }
 }
diff --git a/core/src/test/java/org/bitcoinj/core/VarIntTest.java b/core/src/test/java/org/bitcoinj/core/VarIntTest.java
index 8c4e91e7434..6592f900dac 100644
--- a/core/src/test/java/org/bitcoinj/core/VarIntTest.java
+++ b/core/src/test/java/org/bitcoinj/core/VarIntTest.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2011 Google Inc.
+ * Copyright 2018 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +17,11 @@
 
 package org.bitcoinj.core;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-public class VarIntTest extends TestCase {
+public class VarIntTest {
 
     @Test
     public void testBytes() throws Exception {
diff --git a/core/src/test/java/org/bitcoinj/core/VersionMessageTest.java b/core/src/test/java/org/bitcoinj/core/VersionMessageTest.java
index 6a023e5baf8..3ccfe91e83e 100644
--- a/core/src/test/java/org/bitcoinj/core/VersionMessageTest.java
+++ b/core/src/test/java/org/bitcoinj/core/VersionMessageTest.java
@@ -17,38 +17,138 @@
 
 package org.bitcoinj.core;
 
-import org.bitcoinj.params.UnitTestParams;
-import org.junit.Test;
-
 import static org.bitcoinj.core.Utils.HEX;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import java.net.InetAddress;
+
+import org.bitcoinj.params.UnitTestParams;
+import org.junit.Test;
+
 public class VersionMessageTest {
-    @Test
-    // Test that we can decode version messages which miss data which some old nodes may not include
-    public void testDecode() throws Exception {
-        NetworkParameters params = UnitTestParams.get();
+    private static final NetworkParameters UNITTEST = UnitTestParams.get();
 
-        VersionMessage ver = new VersionMessage(params, HEX.decode("7111010000000000000000003334a85500000000000000000000000000000000000000000000ffff7f000001479d000000000000000000000000000000000000ffff7f000001479d00000000000000000f2f626974636f696e6a3a302e31332f0004000000"));
+    @Test
+    public void decode_noRelay_bestHeight_subVer() throws Exception {
+        // Test that we can decode version messages which miss data which some old nodes may not include
+        String hex = "7111010000000000000000003334a85500000000000000000000000000000000000000000000ffff7f000001479d000000000000000000000000000000000000ffff7f000001479d00000000000000000f2f626974636f696e6a3a302e31332f0004000000";
+        VersionMessage ver = new VersionMessage(UNITTEST, HEX.decode(hex));
         assertFalse(ver.relayTxesBeforeFilter);
         assertEquals(1024, ver.bestHeight);
         assertEquals("/bitcoinj:0.13/", ver.subVer);
+    }
 
-        ver = new VersionMessage(params, HEX.decode("711101000000000000000000a634a85500000000000000000000000000000000000000000000ffff7f000001479d000000000000000000000000000000000000ffff7f000001479d00000000000000000f2f626974636f696e6a3a302e31332f0004000001"));
+    @Test
+    public void decode_relay_bestHeight_subVer() throws Exception {
+        String hex = "711101000000000000000000a634a85500000000000000000000000000000000000000000000ffff7f000001479d000000000000000000000000000000000000ffff7f000001479d00000000000000000f2f626974636f696e6a3a302e31332f0004000001";
+        VersionMessage ver = new VersionMessage(UNITTEST, HEX.decode(hex));
         assertTrue(ver.relayTxesBeforeFilter);
         assertEquals(1024, ver.bestHeight);
         assertEquals("/bitcoinj:0.13/", ver.subVer);
+    }
 
-        ver = new VersionMessage(params, HEX.decode("711101000000000000000000c334a85500000000000000000000000000000000000000000000ffff7f000001479d000000000000000000000000000000000000ffff7f000001479d00000000000000000f2f626974636f696e6a3a302e31332f0000000001"));
+    @Test
+    public void decode_relay_noBestHeight_subVer() throws Exception {
+        String hex = "711101000000000000000000c334a85500000000000000000000000000000000000000000000ffff7f000001479d000000000000000000000000000000000000ffff7f000001479d00000000000000000f2f626974636f696e6a3a302e31332f0000000001";
+        VersionMessage ver = new VersionMessage(UNITTEST, HEX.decode(hex));
         assertTrue(ver.relayTxesBeforeFilter);
         assertEquals(0, ver.bestHeight);
         assertEquals("/bitcoinj:0.13/", ver.subVer);
+    }
 
-        ver = new VersionMessage(params, HEX.decode("71110100000000000000000048e5e95000000000000000000000000000000000000000000000ffff7f000001479d000000000000000000000000000000000000ffff7f000001479d0000000000000000"));
+    @Test
+    public void decode_relay_noBestHeight_noSubVer() throws Exception {
+        String hex = "00000000000000000000000048e5e95000000000000000000000000000000000000000000000ffff7f000001479d000000000000000000000000000000000000ffff7f000001479d0000000000000000";
+        VersionMessage ver = new VersionMessage(UNITTEST, HEX.decode(hex));
         assertTrue(ver.relayTxesBeforeFilter);
         assertEquals(0, ver.bestHeight);
         assertEquals("", ver.subVer);
     }
+
+    @Test
+    public void roundTrip_ipv4_currentProtocolVersion() throws Exception {
+        VersionMessage ver = new VersionMessage(UNITTEST, 1234);
+        ver.time = 23456;
+        ver.subVer = "/bitcoinj/";
+        ver.clientVersion = NetworkParameters.ProtocolVersion.CURRENT.getBitcoinProtocolVersion();
+        ver.localServices = 1;
+        ver.fromAddr = new PeerAddress(UNITTEST, InetAddress.getByName("1.2.3.4"), 3888);
+        ver.fromAddr.setParent(ver);
+        ver.receivingAddr = new PeerAddress(UNITTEST, InetAddress.getByName("4.3.2.1"), 8333);
+        ver.receivingAddr.setParent(ver);
+        byte[] serialized = ver.bitcoinSerialize();
+        VersionMessage ver2 = new VersionMessage(UNITTEST, serialized);
+        assertEquals(1234, ver2.bestHeight);
+        assertEquals(23456, ver2.time);
+        assertEquals("/bitcoinj/", ver2.subVer);
+        assertEquals(NetworkParameters.ProtocolVersion.CURRENT.getBitcoinProtocolVersion(), ver2.clientVersion);
+        assertEquals(1, ver2.localServices);
+        assertEquals("1.2.3.4", ver2.fromAddr.getAddr().getHostAddress());
+        assertEquals(3888, ver2.fromAddr.getPort());
+        assertEquals("4.3.2.1", ver2.receivingAddr.getAddr().getHostAddress());
+        assertEquals(8333, ver2.receivingAddr.getPort());
+    }
+
+    @Test
+    public void roundTrip_ipv4_ancientProtocolVersion() throws Exception {
+        VersionMessage ver = new VersionMessage(UNITTEST, 0);
+        ver.time = 23456;
+        ver.clientVersion = 0;
+        ver.localServices = 1;
+        ver.receivingAddr = new PeerAddress(UNITTEST, InetAddress.getByName("4.3.2.1"), 8333);
+        ver.receivingAddr.setParent(ver);
+        byte[] serialized = ver.bitcoinSerialize();
+        VersionMessage ver2 = new VersionMessage(UNITTEST, serialized);
+        assertEquals(23456, ver2.time);
+        assertEquals(0, ver2.clientVersion);
+        assertEquals(1, ver2.localServices);
+        assertEquals("4.3.2.1", ver2.receivingAddr.getAddr().getHostAddress());
+        assertEquals(8333, ver2.receivingAddr.getPort());
+    }
+
+    @Test
+    public void roundTrip_ipv6_currentProtocolVersion() throws Exception {
+        VersionMessage ver = new VersionMessage(UNITTEST, 1234);
+        ver.time = 23456;
+        ver.subVer = "/bitcoinj/";
+        ver.clientVersion = NetworkParameters.ProtocolVersion.CURRENT.getBitcoinProtocolVersion();
+        ver.localServices = 1;
+        ver.fromAddr = new PeerAddress(UNITTEST, InetAddress.getByName("2001:db8:85a3:0:0:8a2e:370:7334"), 3888);
+        ver.fromAddr.setParent(ver);
+        ver.receivingAddr = new PeerAddress(UNITTEST, InetAddress.getByName("2002:db8:85a3:0:0:8a2e:370:7335"), 8333);
+        ver.receivingAddr.setParent(ver);
+        byte[] serialized = ver.bitcoinSerialize();
+        VersionMessage ver2 = new VersionMessage(UNITTEST, serialized);
+        assertEquals(1234, ver2.bestHeight);
+        assertEquals(23456, ver2.time);
+        assertEquals("/bitcoinj/", ver2.subVer);
+        assertEquals(NetworkParameters.ProtocolVersion.CURRENT.getBitcoinProtocolVersion(), ver2.clientVersion);
+        assertEquals(1, ver2.localServices);
+        assertEquals("2001:db8:85a3:0:0:8a2e:370:7334", ver2.fromAddr.getAddr().getHostAddress());
+        assertEquals(3888, ver2.fromAddr.getPort());
+        assertEquals("2002:db8:85a3:0:0:8a2e:370:7335", ver2.receivingAddr.getAddr().getHostAddress());
+        assertEquals(8333, ver2.receivingAddr.getPort());
+    }
+
+    @Test
+    public void roundTrip_ipv6_ancientProtocolVersion() throws Exception {
+        VersionMessage ver = new VersionMessage(UNITTEST, 1234);
+        ver.time = 23456;
+        ver.subVer = "/bitcoinj/";
+        ver.clientVersion = 0;
+        ver.localServices = 1;
+        ver.fromAddr = new PeerAddress(UNITTEST, InetAddress.getByName("2001:db8:85a3:0:0:8a2e:370:7334"), 3888);
+        ver.fromAddr.setParent(ver);
+        ver.receivingAddr = new PeerAddress(UNITTEST, InetAddress.getByName("2002:db8:85a3:0:0:8a2e:370:7335"), 8333);
+        ver.receivingAddr.setParent(ver);
+        byte[] serialized = ver.bitcoinSerialize();
+        VersionMessage ver2 = new VersionMessage(UNITTEST, serialized);
+        assertEquals(23456, ver2.time);
+        assertEquals(0, ver2.clientVersion);
+        assertEquals(1, ver2.localServices);
+        assertEquals("2002:db8:85a3:0:0:8a2e:370:7335", ver2.receivingAddr.getAddr().getHostAddress());
+        assertEquals(8333, ver2.receivingAddr.getPort());
+    }
 }
diff --git a/core/src/test/java/org/bitcoinj/crypto/BIP32Test.java b/core/src/test/java/org/bitcoinj/crypto/BIP32Test.java
index a7ec63283ea..51e3a4e8c0c 100644
--- a/core/src/test/java/org/bitcoinj/crypto/BIP32Test.java
+++ b/core/src/test/java/org/bitcoinj/crypto/BIP32Test.java
@@ -39,6 +39,7 @@
  */
 public class BIP32Test {
     private static final Logger log = LoggerFactory.getLogger(BIP32Test.class);
+    private static final NetworkParameters MAINNET = MainNetParams.get();
 
     HDWTestVector[] tvs = {
             new HDWTestVector(
@@ -114,6 +115,19 @@ public class BIP32Test {
                                     "xpub6FnCn6nSzZAw5Tw7cgR9bi15UV96gLZhjDstkXXxvCLsUXBGXPdSnLFbdpq8p9HmGsApME5hQTZ3emM2rnY5agb9rXpVGyy3bdW6EEgAtqt"
                             )
                     )
+            ),
+            new HDWTestVector(
+                    "4b381541583be4423346c643850da4b320e46a87ae3d2a4e6da11eba819cd4acba45d239319ac14f863b8d5ab5a0d0c64d2e8a1e7d1457df2e5a3c51c73235be",
+                    "xprv9s21ZrQH143K25QhxbucbDDuQ4naNntJRi4KUfWT7xo4EKsHt2QJDu7KXp1A3u7Bi1j8ph3EGsZ9Xvz9dGuVrtHHs7pXeTzjuxBrCmmhgC6",
+                    "xpub661MyMwAqRbcEZVB4dScxMAdx6d4nFc9nvyvH3v4gJL378CSRZiYmhRoP7mBy6gSPSCYk6SzXPTf3ND1cZAceL7SfJ1Z3GC8vBgp2epUt13",
+                    Arrays.asList(
+                            new HDWTestVector.DerivedTestCase(
+                                    "Test3 m/0H",
+                                    new ChildNumber[]{new ChildNumber(0, true)},
+                                    "xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L",
+                                    "xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y"
+                            )
+                   )
             )
     };
 
@@ -127,13 +141,17 @@ public void testVector2() throws Exception {
         testVector(1);
     }
 
+    @Test
+    public void testVector3() throws Exception {
+        testVector(2);
+    }
+
     private void testVector(int testCase) {
         log.info("=======  Test vector {}", testCase);
         HDWTestVector tv = tvs[testCase];
-        NetworkParameters params = MainNetParams.get();
         DeterministicKey masterPrivateKey = HDKeyDerivation.createMasterPrivateKey(HEX.decode(tv.seed));
-        assertEquals(testEncode(tv.priv), testEncode(masterPrivateKey.serializePrivB58(params)));
-        assertEquals(testEncode(tv.pub), testEncode(masterPrivateKey.serializePubB58(params)));
+        assertEquals(testEncode(tv.priv), testEncode(masterPrivateKey.serializePrivB58(MAINNET)));
+        assertEquals(testEncode(tv.pub), testEncode(masterPrivateKey.serializePubB58(MAINNET)));
         DeterministicHierarchy dh = new DeterministicHierarchy(masterPrivateKey);
         for (int i = 0; i < tv.derived.size(); i++) {
             HDWTestVector.DerivedTestCase tc = tv.derived.get(i);
@@ -141,8 +159,8 @@ private void testVector(int testCase) {
             assertEquals(tc.name, String.format(Locale.US, "Test%d %s", testCase + 1, tc.getPathDescription()));
             int depth = tc.path.length - 1;
             DeterministicKey ehkey = dh.deriveChild(Arrays.asList(tc.path).subList(0, depth), false, true, tc.path[depth]);
-            assertEquals(testEncode(tc.priv), testEncode(ehkey.serializePrivB58(params)));
-            assertEquals(testEncode(tc.pub), testEncode(ehkey.serializePubB58(params)));
+            assertEquals(testEncode(tc.priv), testEncode(ehkey.serializePrivB58(MAINNET)));
+            assertEquals(testEncode(tc.pub), testEncode(ehkey.serializePubB58(MAINNET)));
         }
     }
 
diff --git a/core/src/test/java/org/bitcoinj/crypto/BIP38PrivateKeyTest.java b/core/src/test/java/org/bitcoinj/crypto/BIP38PrivateKeyTest.java
index 5cbbc30ec7c..f28f77eb7e8 100644
--- a/core/src/test/java/org/bitcoinj/crypto/BIP38PrivateKeyTest.java
+++ b/core/src/test/java/org/bitcoinj/crypto/BIP38PrivateKeyTest.java
@@ -16,7 +16,10 @@
 
 package org.bitcoinj.crypto;
 
+import org.bitcoinj.core.AddressFormatException;
+import org.bitcoinj.core.Base58;
 import org.bitcoinj.core.ECKey;
+import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.crypto.BIP38PrivateKey.BadPassphraseException;
 import org.bitcoinj.params.MainNetParams;
 import org.bitcoinj.params.TestNet3Params;
@@ -31,9 +34,8 @@
 import static org.junit.Assert.assertNotSame;
 
 public class BIP38PrivateKeyTest {
-
-    private static final MainNetParams MAINNET = MainNetParams.get();
-    private static final TestNet3Params TESTNET = TestNet3Params.get();
+    private static final NetworkParameters MAINNET = MainNetParams.get();
+    private static final NetworkParameters TESTNET = TestNet3Params.get();
 
     @Test
     public void bip38testvector_noCompression_noEcMultiply_test1() throws Exception {
@@ -70,7 +72,7 @@ public void bip38testvector_noCompression_noEcMultiply_test3() throws Exception
 
     @Test
     public void bip38testvector_compression_noEcMultiply_test1() throws Exception {
-        BIP38PrivateKey encryptedKey = BIP38PrivateKey.fromBase58(MainNetParams.get(),
+        BIP38PrivateKey encryptedKey = BIP38PrivateKey.fromBase58(MAINNET,
                 "6PYNKZ1EAgYgmQfmNVamxyXVWHzK5s6DGhwP4J5o44cvXdoY7sRzhtpUeo");
         ECKey key = encryptedKey.decrypt("TestingOneTwoThree");
         assertEquals("L44B5gGEpqEDRS9vVPz7QT35jcBG2r3CZwSwQ4fCewXAhAhqGVpP", key.getPrivateKeyEncoded(MAINNET)
@@ -79,7 +81,7 @@ public void bip38testvector_compression_noEcMultiply_test1() throws Exception {
 
     @Test
     public void bip38testvector_compression_noEcMultiply_test2() throws Exception {
-        BIP38PrivateKey encryptedKey = BIP38PrivateKey.fromBase58(MainNetParams.get(),
+        BIP38PrivateKey encryptedKey = BIP38PrivateKey.fromBase58(MAINNET,
                 "6PYLtMnXvfG3oJde97zRyLYFZCYizPU5T3LwgdYJz1fRhh16bU7u6PPmY7");
         ECKey key = encryptedKey.decrypt("Satoshi");
         assertEquals("KwYgW8gcxj1JWJXhPSu4Fqwzfhp5Yfi42mdYmMa4XqK7NJxXUSK7", key.getPrivateKeyEncoded(MAINNET)
@@ -88,7 +90,7 @@ public void bip38testvector_compression_noEcMultiply_test2() throws Exception {
 
     @Test
     public void bip38testvector_ecMultiply_noCompression_noLotAndSequence_test1() throws Exception {
-        BIP38PrivateKey encryptedKey = BIP38PrivateKey.fromBase58(MainNetParams.get(),
+        BIP38PrivateKey encryptedKey = BIP38PrivateKey.fromBase58(MAINNET,
                 "6PfQu77ygVyJLZjfvMLyhLMQbYnu5uguoJJ4kMCLqWwPEdfpwANVS76gTX");
         ECKey key = encryptedKey.decrypt("TestingOneTwoThree");
         assertEquals("5K4caxezwjGCGfnoPTZ8tMcJBLB7Jvyjv4xxeacadhq8nLisLR2", key.getPrivateKeyEncoded(MAINNET)
@@ -97,7 +99,7 @@ public void bip38testvector_ecMultiply_noCompression_noLotAndSequence_test1() th
 
     @Test
     public void bip38testvector_ecMultiply_noCompression_noLotAndSequence_test2() throws Exception {
-        BIP38PrivateKey encryptedKey = BIP38PrivateKey.fromBase58(MainNetParams.get(),
+        BIP38PrivateKey encryptedKey = BIP38PrivateKey.fromBase58(MAINNET,
                 "6PfLGnQs6VZnrNpmVKfjotbnQuaJK4KZoPFrAjx1JMJUa1Ft8gnf5WxfKd");
         ECKey key = encryptedKey.decrypt("Satoshi");
         assertEquals("5KJ51SgxWaAYR13zd9ReMhJpwrcX47xTJh2D3fGPG9CM8vkv5sH", key.getPrivateKeyEncoded(MAINNET)
@@ -106,7 +108,7 @@ public void bip38testvector_ecMultiply_noCompression_noLotAndSequence_test2() th
 
     @Test
     public void bip38testvector_ecMultiply_noCompression_lotAndSequence_test1() throws Exception {
-        BIP38PrivateKey encryptedKey = BIP38PrivateKey.fromBase58(MainNetParams.get(),
+        BIP38PrivateKey encryptedKey = BIP38PrivateKey.fromBase58(MAINNET,
                 "6PgNBNNzDkKdhkT6uJntUXwwzQV8Rr2tZcbkDcuC9DZRsS6AtHts4Ypo1j");
         ECKey key = encryptedKey.decrypt("MOLON LABE");
         assertEquals("5JLdxTtcTHcfYcmJsNVy1v2PMDx432JPoYcBTVVRHpPaxUrdtf8", key.getPrivateKeyEncoded(MAINNET)
@@ -115,7 +117,7 @@ public void bip38testvector_ecMultiply_noCompression_lotAndSequence_test1() thro
 
     @Test
     public void bip38testvector_ecMultiply_noCompression_lotAndSequence_test2() throws Exception {
-        BIP38PrivateKey encryptedKey = BIP38PrivateKey.fromBase58(MainNetParams.get(),
+        BIP38PrivateKey encryptedKey = BIP38PrivateKey.fromBase58(MAINNET,
                 "6PgGWtx25kUg8QWvwuJAgorN6k9FbE25rv5dMRwu5SKMnfpfVe5mar2ngH");
         ECKey key = encryptedKey.decrypt("ΜΟΛΩΝ ΛΑΒΕ");
         assertEquals("5KMKKuUmAkiNbA3DazMQiLfDq47qs8MAEThm4yL8R2PhV1ov33D", key.getPrivateKeyEncoded(MAINNET)
@@ -149,6 +151,12 @@ public void badPassphrase() throws Exception {
         encryptedKey.decrypt("BAD");
     }
 
+    @Test(expected = AddressFormatException.InvalidDataLength.class)
+    public void fromBase58_invalidLength() {
+        String base58 = Base58.encodeChecked(1, new byte[16]);
+        BIP38PrivateKey.fromBase58(null, base58);
+    }
+
     @Test
     public void testJavaSerialization() throws Exception {
         BIP38PrivateKey testKey = BIP38PrivateKey.fromBase58(TESTNET,
diff --git a/core/src/test/java/org/bitcoinj/crypto/ChildKeyDerivationTest.java b/core/src/test/java/org/bitcoinj/crypto/ChildKeyDerivationTest.java
index 95419356f6e..db7b34499eb 100644
--- a/core/src/test/java/org/bitcoinj/crypto/ChildKeyDerivationTest.java
+++ b/core/src/test/java/org/bitcoinj/crypto/ChildKeyDerivationTest.java
@@ -20,7 +20,7 @@
 import org.bitcoinj.core.*;
 import org.bitcoinj.params.*;
 import org.junit.*;
-import org.spongycastle.crypto.params.*;
+import org.bouncycastle.crypto.params.*;
 
 import static org.bitcoinj.core.Utils.*;
 import static org.junit.Assert.*;
@@ -29,6 +29,10 @@
  * This test is adapted from Armory's BIP 32 tests.
  */
 public class ChildKeyDerivationTest {
+    private static final NetworkParameters MAINNET = MainNetParams.get();
+    private static final NetworkParameters TESTNET = TestNet3Params.get();
+    private static final NetworkParameters UNITTEST = UnitTestParams.get();
+
     private static final int HDW_CHAIN_EXTERNAL = 0;
     private static final int HDW_CHAIN_INTERNAL = 1;
 
@@ -49,8 +53,9 @@ public void testChildKeyDerivation() throws Exception {
                         "cc9c753a63b8678ce647b7457397acef",
                 "7012bc411228495f25d666d55fdce3f10a93908b5f9b9b7baa6e7573603a7bda"
         };
+        assertEquals(0, ckdTestVectors.length % 3);
 
-        for(int i = 0; i < 1; i++) {
+        for(int i = 0; i < ckdTestVectors.length / 3; i++) {
             byte[] priv  = HEX.decode(ckdTestVectors[3 * i]);
             byte[] pub   = HEX.decode(ckdTestVectors[3 * i + 1]);
             byte[] chain = HEX.decode(ckdTestVectors[3 * i + 2]); // chain code
@@ -136,7 +141,7 @@ public void inverseEqualsNormal() throws Exception {
 
     @Test
     public void encryptedDerivation() throws Exception {
-        // Check that encrypting a parent key in the heirarchy and then deriving from it yields a DeterministicKey
+        // Check that encrypting a parent key in the hierarchy and then deriving from it yields a DeterministicKey
         // with no private key component, and that the private key bytes are derived on demand.
         KeyCrypter scrypter = new KeyCrypterScrypt();
         KeyParameter aesKey = scrypter.deriveKey("we never went to the moon");
@@ -188,14 +193,12 @@ public void pubOnlyDerivation() throws Exception {
     @Test
     public void testSerializationMainAndTestNetworks() {
         DeterministicKey key1 = HDKeyDerivation.createMasterPrivateKey("satoshi lives!".getBytes());
-        NetworkParameters params = MainNetParams.get();
-        String pub58 = key1.serializePubB58(params);
-        String priv58 = key1.serializePrivB58(params);
+        String pub58 = key1.serializePubB58(MAINNET);
+        String priv58 = key1.serializePrivB58(MAINNET);
         assertEquals("xpub661MyMwAqRbcF7mq7Aejj5xZNzFfgi3ABamE9FedDHVmViSzSxYTgAQGcATDo2J821q7Y9EAagjg5EP3L7uBZk11PxZU3hikL59dexfLkz3", pub58);
         assertEquals("xprv9s21ZrQH143K2dhN197jMx1ppxRBHFKJpMqdLsF1ewxncv7quRED8N5nksxphju3W7naj1arF56L5PUEWfuSk8h73Sb2uh7bSwyXNrjzhAZ", priv58);
-        params = TestNet3Params.get();
-        pub58 = key1.serializePubB58(params);
-        priv58 = key1.serializePrivB58(params);
+        pub58 = key1.serializePubB58(TESTNET);
+        priv58 = key1.serializePrivB58(TESTNET);
         assertEquals("tpubD6NzVbkrYhZ4WuxgZMdpw1Hvi7MKg6YDjDMXVohmZCFfF17hXBPYpc56rCY1KXFMovN29ik37nZimQseiykRTBTJTZJmjENyv2k3R12BJ1M", pub58);
         assertEquals("tprv8ZgxMBicQKsPdSvtfhyEXbdp95qPWmMK9ukkDHfU8vTGQWrvtnZxe7TEg48Ui7HMsZKMj7CcQRg8YF1ydtFPZBxha5oLa3qeN3iwpYhHPVZ", priv58);
     }
@@ -207,7 +210,7 @@ public void serializeToTextAndBytes() {
 
         // Creation time can't survive the xpub serialization format unfortunately.
         key1.setCreationTimeSeconds(0);
-        NetworkParameters params = MainNetParams.get();
+        NetworkParameters params = MAINNET;
 
         {
             final String pub58 = key1.serializePubB58(params);
@@ -241,15 +244,14 @@ public void serializeToTextAndBytes() {
 
     @Test
     public void parentlessDeserialization() {
-        NetworkParameters params = UnitTestParams.get();
         DeterministicKey key1 = HDKeyDerivation.createMasterPrivateKey("satoshi lives!".getBytes());
         DeterministicKey key2 = HDKeyDerivation.deriveChildKey(key1, ChildNumber.ZERO_HARDENED);
         DeterministicKey key3 = HDKeyDerivation.deriveChildKey(key2, ChildNumber.ZERO_HARDENED);
         DeterministicKey key4 = HDKeyDerivation.deriveChildKey(key3, ChildNumber.ZERO_HARDENED);
         assertEquals(key4.getPath().size(), 3);
-        assertEquals(DeterministicKey.deserialize(params, key4.serializePrivate(params), key3).getPath().size(), 3);
-        assertEquals(DeterministicKey.deserialize(params, key4.serializePrivate(params), null).getPath().size(), 1);
-        assertEquals(DeterministicKey.deserialize(params, key4.serializePrivate(params)).getPath().size(), 1);
+        assertEquals(DeterministicKey.deserialize(UNITTEST, key4.serializePrivate(UNITTEST), key3).getPath().size(), 3);
+        assertEquals(DeterministicKey.deserialize(UNITTEST, key4.serializePrivate(UNITTEST), null).getPath().size(), 1);
+        assertEquals(DeterministicKey.deserialize(UNITTEST, key4.serializePrivate(UNITTEST)).getPath().size(), 1);
     }
 
     /** Reserializing a deserialized key should yield the original input */
@@ -259,8 +261,8 @@ public void reserialization() {
         // https://en.bitcoin.it/wiki/BIP_0032_TestVectors
         String encoded =
             "xpub6D4BDPcP2GT577Vvch3R8wDkScZWzQzMMUm3PWbmWvVJrZwQY4VUNgqFJPMM3No2dFDFGTsxxpG5uJh7n7epu4trkrX7x7DogT5Uv6fcLW5";
-        DeterministicKey key = DeterministicKey.deserializeB58(encoded, MainNetParams.get());
-        assertEquals("Reserialized parentless private HD key is wrong", key.serializePubB58(MainNetParams.get()), encoded);
+        DeterministicKey key = DeterministicKey.deserializeB58(encoded, MAINNET);
+        assertEquals("Reserialized parentless private HD key is wrong", key.serializePubB58(MAINNET), encoded);
         assertEquals("Depth of deserialized parentless public HD key is wrong", key.getDepth(), 3);
         assertEquals("Path size of deserialized parentless public HD key is wrong", key.getPath().size(), 1);
         assertEquals("Parent fingerprint of deserialized parentless public HD key is wrong",
@@ -269,8 +271,8 @@ public void reserialization() {
         // This encoding is the same key but including its private data:
         encoded =
             "xprv9z4pot5VBttmtdRTWfWQmoH1taj2axGVzFqSb8C9xaxKymcFzXBDptWmT7FwuEzG3ryjH4ktypQSAewRiNMjANTtpgP4mLTj34bhnZX7UiM";
-        key = DeterministicKey.deserializeB58(encoded, MainNetParams.get());
-        assertEquals("Reserialized parentless private HD key is wrong", key.serializePrivB58(MainNetParams.get()), encoded);
+        key = DeterministicKey.deserializeB58(encoded, MAINNET);
+        assertEquals("Reserialized parentless private HD key is wrong", key.serializePrivB58(MAINNET), encoded);
         assertEquals("Depth of deserialized parentless private HD key is wrong", key.getDepth(), 3);
         assertEquals("Path size of deserialized parentless private HD key is wrong", key.getPath().size(), 1);
         assertEquals("Parent fingerprint of deserialized parentless private HD key is wrong",
@@ -278,10 +280,10 @@ public void reserialization() {
 
         // These encodings are of the the root key of that hierarchy
         assertEquals("Parent fingerprint of root node public HD key should be zero",
-                          DeterministicKey.deserializeB58("xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB", MainNetParams.get()).getParentFingerprint(),
+                          DeterministicKey.deserializeB58("xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB", MAINNET).getParentFingerprint(),
                           0);
         assertEquals("Parent fingerprint of root node private HD key should be zero",
-                          DeterministicKey.deserializeB58("xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssrdK4PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U", MainNetParams.get()).getParentFingerprint(),
+                          DeterministicKey.deserializeB58("xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssrdK4PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U", MAINNET).getParentFingerprint(),
                           0);
 
     }
diff --git a/core/src/test/java/org/bitcoinj/crypto/KeyCrypterScryptTest.java b/core/src/test/java/org/bitcoinj/crypto/KeyCrypterScryptTest.java
index 8971025fa68..b63f50b8ae8 100644
--- a/core/src/test/java/org/bitcoinj/crypto/KeyCrypterScryptTest.java
+++ b/core/src/test/java/org/bitcoinj/crypto/KeyCrypterScryptTest.java
@@ -28,7 +28,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.security.SecureRandom;
 import java.util.Random;
 import java.util.UUID;
 
@@ -45,14 +44,14 @@ public class KeyCrypterScryptTest {
     private static final CharSequence PASSWORD2 = "0123456789";
 
     private static final CharSequence WRONG_PASSWORD = "thisIsTheWrongPassword";
+    private static final CharSequence WRONG_PASSWORD2 = "anotherWrongPassword";
 
     private ScryptParameters scryptParameters;
 
     @Before
     public void setUp() throws Exception {
-        byte[] salt = new byte[KeyCrypterScrypt.SALT_LENGTH];
-        new SecureRandom().nextBytes(salt);
-        Protos.ScryptParameters.Builder scryptParametersBuilder = Protos.ScryptParameters.newBuilder().setSalt(ByteString.copyFrom(salt));
+        Protos.ScryptParameters.Builder scryptParametersBuilder = Protos.ScryptParameters.newBuilder()
+                .setSalt(ByteString.copyFrom(KeyCrypterScrypt.randomSalt()));
         scryptParameters = scryptParametersBuilder.build();
 
         BriefLogFormatter.init();
@@ -108,15 +107,21 @@ public void testKeyCrypterWrongPassword() throws KeyCrypterException {
             builder.append(i).append(" The quick brown fox");
         }
 
-        EncryptedData data = keyCrypter.encrypt(builder.toString().getBytes(), keyCrypter.deriveKey(PASSWORD2));
+        byte[] plainText = builder.toString().getBytes();
+        EncryptedData data = keyCrypter.encrypt(plainText, keyCrypter.deriveKey(PASSWORD2));
         assertNotNull(data);
 
         try {
-            keyCrypter.decrypt(data, keyCrypter.deriveKey(WRONG_PASSWORD));
-            // TODO: This test sometimes fails due to relying on padding.
+            // This sometimes doesn't throw due to relying on padding...
+            byte[] cipherText = keyCrypter.decrypt(data, keyCrypter.deriveKey(WRONG_PASSWORD));
+            // ...so we also check for length, because that's the 2nd level test we're doing e.g. in ECKey/DeterministicKey...
+            assertNotEquals(plainText.length, cipherText.length);
+            // ...and then try with another wrong password again.
+            keyCrypter.decrypt(data, keyCrypter.deriveKey(WRONG_PASSWORD2));
+            // Note: it can still fail, but it should be extremely rare.
             fail("Decrypt with wrong password did not throw exception");
-        } catch (KeyCrypterException ede) {
-            assertTrue(ede.getMessage().contains("Could not decrypt"));
+        } catch (KeyCrypterException.InvalidCipherText x) {
+            // expected
         }
     }
 
diff --git a/core/src/test/java/org/bitcoinj/crypto/MnemonicCodeTest.java b/core/src/test/java/org/bitcoinj/crypto/MnemonicCodeTest.java
index 0f59546bd0e..f68fe04a7e6 100644
--- a/core/src/test/java/org/bitcoinj/crypto/MnemonicCodeTest.java
+++ b/core/src/test/java/org/bitcoinj/crypto/MnemonicCodeTest.java
@@ -17,140 +17,22 @@
 
 package org.bitcoinj.crypto;
 
-import org.bitcoinj.core.Utils;
+import java.io.IOException;
+import java.util.List;
+
 import com.google.common.collect.Lists;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 import static org.bitcoinj.core.Utils.HEX;
-import static org.junit.Assert.assertEquals;
+import static org.bitcoinj.core.Utils.WHITESPACE_SPLITTER;
 
+/**
+ * Test the various guard clauses of {@link MnemonicCode}.
+ *
+ * See {@link MnemonicCodeVectorsTest} test vectors.
+ */
 public class MnemonicCodeTest {
-    // These vectors are from https://github.com/trezor/python-mnemonic/blob/master/vectors.json
-    String[] vectors = {
-        "00000000000000000000000000000000",
-        "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about",
-        "c55257c360c07c72029aebc1b53c05ed0362ada38ead3e3e9efa3708e53495531f09a6987599d18264c1e1c92f2cf141630c7a3c4ab7c81b2f001698e7463b04",
-
-        "7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f",
-        "legal winner thank year wave sausage worth useful legal winner thank yellow",
-        "2e8905819b8723fe2c1d161860e5ee1830318dbf49a83bd451cfb8440c28bd6fa457fe1296106559a3c80937a1c1069be3a3a5bd381ee6260e8d9739fce1f607",
-
-
-        "80808080808080808080808080808080",
-        "letter advice cage absurd amount doctor acoustic avoid letter advice cage above",
-        "d71de856f81a8acc65e6fc851a38d4d7ec216fd0796d0a6827a3ad6ed5511a30fa280f12eb2e47ed2ac03b5c462a0358d18d69fe4f985ec81778c1b370b652a8",
-
-
-        "ffffffffffffffffffffffffffffffff",
-        "zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo wrong",
-        "ac27495480225222079d7be181583751e86f571027b0497b5b5d11218e0a8a13332572917f0f8e5a589620c6f15b11c61dee327651a14c34e18231052e48c069",
-
-
-        "000000000000000000000000000000000000000000000000",
-        "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon agent",
-        "035895f2f481b1b0f01fcf8c289c794660b289981a78f8106447707fdd9666ca06da5a9a565181599b79f53b844d8a71dd9f439c52a3d7b3e8a79c906ac845fa",
-
-
-        "7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f",
-        "legal winner thank year wave sausage worth useful legal winner thank year wave sausage worth useful legal will",
-        "f2b94508732bcbacbcc020faefecfc89feafa6649a5491b8c952cede496c214a0c7b3c392d168748f2d4a612bada0753b52a1c7ac53c1e93abd5c6320b9e95dd",
-
-
-        "808080808080808080808080808080808080808080808080",
-        "letter advice cage absurd amount doctor acoustic avoid letter advice cage absurd amount doctor acoustic avoid letter always",
-        "107d7c02a5aa6f38c58083ff74f04c607c2d2c0ecc55501dadd72d025b751bc27fe913ffb796f841c49b1d33b610cf0e91d3aa239027f5e99fe4ce9e5088cd65",
-
-
-        "ffffffffffffffffffffffffffffffffffffffffffffffff",
-        "zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo when",
-        "0cd6e5d827bb62eb8fc1e262254223817fd068a74b5b449cc2f667c3f1f985a76379b43348d952e2265b4cd129090758b3e3c2c49103b5051aac2eaeb890a528",
-
-
-        "0000000000000000000000000000000000000000000000000000000000000000",
-        "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon art",
-        "bda85446c68413707090a52022edd26a1c9462295029f2e60cd7c4f2bbd3097170af7a4d73245cafa9c3cca8d561a7c3de6f5d4a10be8ed2a5e608d68f92fcc8",
-
-
-        "7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f",
-        "legal winner thank year wave sausage worth useful legal winner thank year wave sausage worth useful legal winner thank year wave sausage worth title",
-        "bc09fca1804f7e69da93c2f2028eb238c227f2e9dda30cd63699232578480a4021b146ad717fbb7e451ce9eb835f43620bf5c514db0f8add49f5d121449d3e87",
-
-
-        "8080808080808080808080808080808080808080808080808080808080808080",
-        "letter advice cage absurd amount doctor acoustic avoid letter advice cage absurd amount doctor acoustic avoid letter advice cage absurd amount doctor acoustic bless",
-        "c0c519bd0e91a2ed54357d9d1ebef6f5af218a153624cf4f2da911a0ed8f7a09e2ef61af0aca007096df430022f7a2b6fb91661a9589097069720d015e4e982f",
-
-
-        "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-        "zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo vote",
-        "dd48c104698c30cfe2b6142103248622fb7bb0ff692eebb00089b32d22484e1613912f0a5b694407be899ffd31ed3992c456cdf60f5d4564b8ba3f05a69890ad",
-
-
-        "77c2b00716cec7213839159e404db50d",
-        "jelly better achieve collect unaware mountain thought cargo oxygen act hood bridge",
-        "b5b6d0127db1a9d2226af0c3346031d77af31e918dba64287a1b44b8ebf63cdd52676f672a290aae502472cf2d602c051f3e6f18055e84e4c43897fc4e51a6ff",
-
-
-        "b63a9c59a6e641f288ebc103017f1da9f8290b3da6bdef7b",
-        "renew stay biology evidence goat welcome casual join adapt armor shuffle fault little machine walk stumble urge swap",
-        "9248d83e06f4cd98debf5b6f010542760df925ce46cf38a1bdb4e4de7d21f5c39366941c69e1bdbf2966e0f6e6dbece898a0e2f0a4c2b3e640953dfe8b7bbdc5",
-
-
-        "3e141609b97933b66a060dcddc71fad1d91677db872031e85f4c015c5e7e8982",
-        "dignity pass list indicate nasty swamp pool script soccer toe leaf photo multiply desk host tomato cradle drill spread actor shine dismiss champion exotic",
-        "ff7f3184df8696d8bef94b6c03114dbee0ef89ff938712301d27ed8336ca89ef9635da20af07d4175f2bf5f3de130f39c9d9e8dd0472489c19b1a020a940da67",
-
-
-        "0460ef47585604c5660618db2e6a7e7f",
-        "afford alter spike radar gate glance object seek swamp infant panel yellow",
-        "65f93a9f36b6c85cbe634ffc1f99f2b82cbb10b31edc7f087b4f6cb9e976e9faf76ff41f8f27c99afdf38f7a303ba1136ee48a4c1e7fcd3dba7aa876113a36e4",
-
-
-        "72f60ebac5dd8add8d2a25a797102c3ce21bc029c200076f",
-        "indicate race push merry suffer human cruise dwarf pole review arch keep canvas theme poem divorce alter left",
-        "3bbf9daa0dfad8229786ace5ddb4e00fa98a044ae4c4975ffd5e094dba9e0bb289349dbe2091761f30f382d4e35c4a670ee8ab50758d2c55881be69e327117ba",
-
-
-        "2c85efc7f24ee4573d2b81a6ec66cee209b2dcbd09d8eddc51e0215b0b68e416",
-        "clutch control vehicle tonight unusual clog visa ice plunge glimpse recipe series open hour vintage deposit universe tip job dress radar refuse motion taste",
-        "fe908f96f46668b2d5b37d82f558c77ed0d69dd0e7e043a5b0511c48c2f1064694a956f86360c93dd04052a8899497ce9e985ebe0c8c52b955e6ae86d4ff4449",
-
-
-        "eaebabb2383351fd31d703840b32e9e2",
-        "turtle front uncle idea crush write shrug there lottery flower risk shell",
-        "bdfb76a0759f301b0b899a1e3985227e53b3f51e67e3f2a65363caedf3e32fde42a66c404f18d7b05818c95ef3ca1e5146646856c461c073169467511680876c",
-
-
-        "7ac45cfe7722ee6c7ba84fbc2d5bd61b45cb2fe5eb65aa78",
-        "kiss carry display unusual confirm curtain upgrade antique rotate hello void custom frequent obey nut hole price segment",
-        "ed56ff6c833c07982eb7119a8f48fd363c4a9b1601cd2de736b01045c5eb8ab4f57b079403485d1c4924f0790dc10a971763337cb9f9c62226f64fff26397c79",
-
-
-        "4fa1a8bc3e6d80ee1316050e862c1812031493212b7ec3f3bb1b08f168cabeef",
-        "exile ask congress lamp submit jacket era scheme attend cousin alcohol catch course end lucky hurt sentence oven short ball bird grab wing top",
-        "095ee6f817b4c2cb30a5a797360a81a40ab0f9a4e25ecd672a3f58a0b5ba0687c096a6b14d2c0deb3bdefce4f61d01ae07417d502429352e27695163f7447a8c",
-
-
-        "18ab19a9f54a9274f03e5209a2ac8a91",
-        "board flee heavy tunnel powder denial science ski answer betray cargo cat",
-        "6eff1bb21562918509c73cb990260db07c0ce34ff0e3cc4a8cb3276129fbcb300bddfe005831350efd633909f476c45c88253276d9fd0df6ef48609e8bb7dca8",
-
-
-        "18a2e1d81b8ecfb2a333adcb0c17a5b9eb76cc5d05db91a4",
-        "board blade invite damage undo sun mimic interest slam gaze truly inherit resist great inject rocket museum chief",
-        "f84521c777a13b61564234bf8f8b62b3afce27fc4062b51bb5e62bdfecb23864ee6ecf07c1d5a97c0834307c5c852d8ceb88e7c97923c0a3b496bedd4e5f88a9",
-
-
-        "15da872c95a13dd738fbf50e427583ad61f18fd99f628c417a61cf8343c90419",
-        "beyond stage sleep clip because twist token leaf atom beauty genius food business side grid unable middle armed observe pair crouch tonight away coconut",
-        "b15509eaa2d09d3efd3e006ef42151b30367dc6e3aa5e44caba3fe4d3e352e65101fbdb86a96776b91946ff06f8eac594dc6ee1d3e82a42dfe1b40fef6bcc3fd"
-    };
 
     private MnemonicCode mc;
 
@@ -159,23 +41,6 @@ public void setup() throws IOException {
         mc = new MnemonicCode();
     }
 
-    @Test
-    public void testVectors() throws Exception {
-        for (int ii = 0; ii < vectors.length; ii += 3) {
-            String vecData = vectors[ii];
-            String vecCode = vectors[ii+1];
-            String vecSeed = vectors[ii+2];
-
-            List<String> code = mc.toMnemonic(HEX.decode(vecData));
-            byte[] seed = MnemonicCode.toSeed(code, "TREZOR");
-            byte[] entropy = mc.toEntropy(split(vecCode));
-
-            assertEquals(vecData, HEX.encode(entropy));
-            assertEquals(vecCode, Utils.join(code));
-            assertEquals(vecSeed, HEX.encode(seed));
-        }
-    }
-
     @Test(expected = MnemonicException.MnemonicLengthException.class)
     public void testBadEntropyLength() throws Exception {
         byte[] entropy = HEX.decode("7f7f7f7f7f7f7f7f7f7f7f7f7f7f");
@@ -184,19 +49,19 @@ public void testBadEntropyLength() throws Exception {
 
     @Test(expected = MnemonicException.MnemonicLengthException.class)
     public void testBadLength() throws Exception {
-        List<String> words = split("risk tiger venture dinner age assume float denial penalty hello");
+        List<String> words = WHITESPACE_SPLITTER.splitToList("risk tiger venture dinner age assume float denial penalty hello");
         mc.check(words);
     }
 
     @Test(expected = MnemonicException.MnemonicWordException.class)
     public void testBadWord() throws Exception {
-        List<String> words = split("risk tiger venture dinner xyzzy assume float denial penalty hello game wing");
+        List<String> words = WHITESPACE_SPLITTER.splitToList("risk tiger venture dinner xyzzy assume float denial penalty hello game wing");
         mc.check(words);
     }
 
     @Test(expected = MnemonicException.MnemonicChecksumException.class)
     public void testBadChecksum() throws Exception {
-        List<String> words = split("bless cloud wheel regular tiny venue bird web grief security dignity zoo");
+        List<String> words = WHITESPACE_SPLITTER.splitToList("bless cloud wheel regular tiny venue bird web grief security dignity zoo");
         mc.check(words);
     }
 
@@ -212,7 +77,9 @@ public void testEmptyEntropy() throws Exception {
         mc.toMnemonic(entropy);
     }
 
-    public static List<String> split(String words) {
-        return new ArrayList<String>(Arrays.asList(words.split("\\s+")));
+    @Test(expected = NullPointerException.class)
+    public void testNullPassphrase() throws Exception {
+        List<String> code = WHITESPACE_SPLITTER.splitToList("legal winner thank year wave sausage worth useful legal winner thank yellow");
+        MnemonicCode.toSeed(code, null);
     }
 }
diff --git a/core/src/test/java/org/bitcoinj/crypto/MnemonicCodeVectorsTest.java b/core/src/test/java/org/bitcoinj/crypto/MnemonicCodeVectorsTest.java
new file mode 100644
index 00000000000..c84d52243fc
--- /dev/null
+++ b/core/src/test/java/org/bitcoinj/crypto/MnemonicCodeVectorsTest.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright 2013 Ken Sedgwick
+ * Copyright 2014 Andreas Schildbach
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bitcoinj.crypto;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import static org.bitcoinj.core.Utils.HEX;
+import static org.bitcoinj.core.Utils.SPACE_JOINER;
+import static org.bitcoinj.core.Utils.WHITESPACE_SPLITTER;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * This is a parametrized test class to execute all {@link MnemonicCode} test vectors.
+ */
+@RunWith(value = Parameterized.class)
+public class MnemonicCodeVectorsTest {
+
+    private MnemonicCode mc;
+    private String vectorEntropy;
+    private String vectorMnemonicCode;
+    private String vectorSeed;
+    private String vectorPassphrase;
+
+    public MnemonicCodeVectorsTest(String vectorEntropy, String vectorMnemonicCode, String vectorSeed, String vectorPassphrase) {
+        this.vectorEntropy = vectorEntropy;
+        this.vectorMnemonicCode = vectorMnemonicCode;
+        this.vectorSeed = vectorSeed;
+        this.vectorPassphrase = vectorPassphrase;
+    }
+
+    @Before
+    public void setup() throws IOException {
+        mc = new MnemonicCode();
+    }
+
+    @Test
+    public void testMnemonicCode() throws Exception {
+        final List<String> mnemonicCode = mc.toMnemonic(HEX.decode(vectorEntropy));
+        final byte[] seed = MnemonicCode.toSeed(mnemonicCode, vectorPassphrase);
+        final byte[] entropy = mc.toEntropy(WHITESPACE_SPLITTER.splitToList(vectorMnemonicCode));
+
+        assertEquals(vectorEntropy, HEX.encode(entropy));
+        assertEquals(vectorMnemonicCode, SPACE_JOINER.join(mnemonicCode));
+        assertEquals(vectorSeed, HEX.encode(seed));
+    }
+
+    /**
+     * This method defines and supplies the parameters (test vectors) to be used in the testing of {@link MnemonicCode}.
+     * @return A list of groups of test vectors
+     */
+    @Parameterized.Parameters(name = "Vector set {index} (entropy={0}, passphrase={3})")
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[][]{
+                /*
+                 * The following vectors are from https://github.com/trezor/python-mnemonic/blob/master/vectors.json
+                 */
+                {
+                        "00000000000000000000000000000000",
+                        "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about",
+                        "c55257c360c07c72029aebc1b53c05ed0362ada38ead3e3e9efa3708e53495531f09a6987599d18264c1e1c92f2cf141630c7a3c4ab7c81b2f001698e7463b04",
+                        "TREZOR"
+                }, {
+                        "7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f",
+                        "legal winner thank year wave sausage worth useful legal winner thank yellow",
+                        "2e8905819b8723fe2c1d161860e5ee1830318dbf49a83bd451cfb8440c28bd6fa457fe1296106559a3c80937a1c1069be3a3a5bd381ee6260e8d9739fce1f607",
+                        "TREZOR"
+                }, {
+                        "80808080808080808080808080808080",
+                        "letter advice cage absurd amount doctor acoustic avoid letter advice cage above",
+                        "d71de856f81a8acc65e6fc851a38d4d7ec216fd0796d0a6827a3ad6ed5511a30fa280f12eb2e47ed2ac03b5c462a0358d18d69fe4f985ec81778c1b370b652a8",
+                        "TREZOR"
+                }, {
+                        "ffffffffffffffffffffffffffffffff",
+                        "zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo wrong",
+                        "ac27495480225222079d7be181583751e86f571027b0497b5b5d11218e0a8a13332572917f0f8e5a589620c6f15b11c61dee327651a14c34e18231052e48c069",
+                        "TREZOR"
+                }, {
+                        "000000000000000000000000000000000000000000000000",
+                        "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon agent",
+                        "035895f2f481b1b0f01fcf8c289c794660b289981a78f8106447707fdd9666ca06da5a9a565181599b79f53b844d8a71dd9f439c52a3d7b3e8a79c906ac845fa",
+                        "TREZOR"
+                }, {
+                        "7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f",
+                        "legal winner thank year wave sausage worth useful legal winner thank year wave sausage worth useful legal will",
+                        "f2b94508732bcbacbcc020faefecfc89feafa6649a5491b8c952cede496c214a0c7b3c392d168748f2d4a612bada0753b52a1c7ac53c1e93abd5c6320b9e95dd",
+                        "TREZOR"
+                }, {
+                        "808080808080808080808080808080808080808080808080",
+                        "letter advice cage absurd amount doctor acoustic avoid letter advice cage absurd amount doctor acoustic avoid letter always",
+                        "107d7c02a5aa6f38c58083ff74f04c607c2d2c0ecc55501dadd72d025b751bc27fe913ffb796f841c49b1d33b610cf0e91d3aa239027f5e99fe4ce9e5088cd65",
+                        "TREZOR"
+                }, {
+                        "ffffffffffffffffffffffffffffffffffffffffffffffff",
+                        "zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo when",
+                        "0cd6e5d827bb62eb8fc1e262254223817fd068a74b5b449cc2f667c3f1f985a76379b43348d952e2265b4cd129090758b3e3c2c49103b5051aac2eaeb890a528",
+                        "TREZOR"
+                }, {
+                        "0000000000000000000000000000000000000000000000000000000000000000",
+                        "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon art",
+                        "bda85446c68413707090a52022edd26a1c9462295029f2e60cd7c4f2bbd3097170af7a4d73245cafa9c3cca8d561a7c3de6f5d4a10be8ed2a5e608d68f92fcc8",
+                        "TREZOR"
+                }, {
+                        "7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f",
+                        "legal winner thank year wave sausage worth useful legal winner thank year wave sausage worth useful legal winner thank year wave sausage worth title",
+                        "bc09fca1804f7e69da93c2f2028eb238c227f2e9dda30cd63699232578480a4021b146ad717fbb7e451ce9eb835f43620bf5c514db0f8add49f5d121449d3e87",
+                        "TREZOR"
+                }, {
+                        "8080808080808080808080808080808080808080808080808080808080808080",
+                        "letter advice cage absurd amount doctor acoustic avoid letter advice cage absurd amount doctor acoustic avoid letter advice cage absurd amount doctor acoustic bless",
+                        "c0c519bd0e91a2ed54357d9d1ebef6f5af218a153624cf4f2da911a0ed8f7a09e2ef61af0aca007096df430022f7a2b6fb91661a9589097069720d015e4e982f",
+                        "TREZOR"
+                }, {
+                        "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                        "zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo vote",
+                        "dd48c104698c30cfe2b6142103248622fb7bb0ff692eebb00089b32d22484e1613912f0a5b694407be899ffd31ed3992c456cdf60f5d4564b8ba3f05a69890ad",
+                        "TREZOR"
+                }, {
+                        "9e885d952ad362caeb4efe34a8e91bd2",
+                        "ozone drill grab fiber curtain grace pudding thank cruise elder eight picnic",
+                        "274ddc525802f7c828d8ef7ddbcdc5304e87ac3535913611fbbfa986d0c9e5476c91689f9c8a54fd55bd38606aa6a8595ad213d4c9c9f9aca3fb217069a41028",
+                        "TREZOR"
+                }, {
+                        "6610b25967cdcca9d59875f5cb50b0ea75433311869e930b",
+                        "gravity machine north sort system female filter attitude volume fold club stay feature office ecology stable narrow fog",
+                        "628c3827a8823298ee685db84f55caa34b5cc195a778e52d45f59bcf75aba68e4d7590e101dc414bc1bbd5737666fbbef35d1f1903953b66624f910feef245ac",
+                        "TREZOR"
+                }, {
+                        "68a79eaca2324873eacc50cb9c6eca8cc68ea5d936f98787c60c7ebc74e6ce7c",
+                        "hamster diagram private dutch cause delay private meat slide toddler razor book happy fancy gospel tennis maple dilemma loan word shrug inflict delay length",
+                        "64c87cde7e12ecf6704ab95bb1408bef047c22db4cc7491c4271d170a1b213d20b385bc1588d9c7b38f1b39d415665b8a9030c9ec653d75e65f847d8fc1fc440",
+                        "TREZOR"
+                }, {
+                        "c0ba5a8e914111210f2bd131f3d5e08d",
+                        "scheme spot photo card baby mountain device kick cradle pact join borrow",
+                        "ea725895aaae8d4c1cf682c1bfd2d358d52ed9f0f0591131b559e2724bb234fca05aa9c02c57407e04ee9dc3b454aa63fbff483a8b11de949624b9f1831a9612",
+                        "TREZOR"
+                }, {
+                        "6d9be1ee6ebd27a258115aad99b7317b9c8d28b6d76431c3",
+                        "horn tenant knee talent sponsor spell gate clip pulse soap slush warm silver nephew swap uncle crack brave",
+                        "fd579828af3da1d32544ce4db5c73d53fc8acc4ddb1e3b251a31179cdb71e853c56d2fcb11aed39898ce6c34b10b5382772db8796e52837b54468aeb312cfc3d",
+                        "TREZOR"
+                }, {
+                        "9f6a2878b2520799a44ef18bc7df394e7061a224d2c33cd015b157d746869863",
+                        "panda eyebrow bullet gorilla call smoke muffin taste mesh discover soft ostrich alcohol speed nation flash devote level hobby quick inner drive ghost inside",
+                        "72be8e052fc4919d2adf28d5306b5474b0069df35b02303de8c1729c9538dbb6fc2d731d5f832193cd9fb6aeecbc469594a70e3dd50811b5067f3b88b28c3e8d",
+                        "TREZOR"
+                }, {
+                        "23db8160a31d3e0dca3688ed941adbf3",
+                        "cat swing flag economy stadium alone churn speed unique patch report train",
+                        "deb5f45449e615feff5640f2e49f933ff51895de3b4381832b3139941c57b59205a42480c52175b6efcffaa58a2503887c1e8b363a707256bdd2b587b46541f5",
+                        "TREZOR"
+                }, {
+                        "8197a4a47f0425faeaa69deebc05ca29c0a5b5cc76ceacc0",
+                        "light rule cinnamon wrap drastic word pride squirrel upgrade then income fatal apart sustain crack supply proud access",
+                        "4cbdff1ca2db800fd61cae72a57475fdc6bab03e441fd63f96dabd1f183ef5b782925f00105f318309a7e9c3ea6967c7801e46c8a58082674c860a37b93eda02",
+                        "TREZOR"
+                }, {
+                        "066dca1a2bb7e8a1db2832148ce9933eea0f3ac9548d793112d9a95c9407efad",
+                        "all hour make first leader extend hole alien behind guard gospel lava path output census museum junior mass reopen famous sing advance salt reform",
+                        "26e975ec644423f4a4c4f4215ef09b4bd7ef924e85d1d17c4cf3f136c2863cf6df0a475045652c57eb5fb41513ca2a2d67722b77e954b4b3fc11f7590449191d",
+                        "TREZOR"
+                }, {
+                        "f30f8c1da665478f49b001d94c5fc452",
+                        "vessel ladder alter error federal sibling chat ability sun glass valve picture",
+                        "2aaa9242daafcee6aa9d7269f17d4efe271e1b9a529178d7dc139cd18747090bf9d60295d0ce74309a78852a9caadf0af48aae1c6253839624076224374bc63f",
+                        "TREZOR"
+                }, {
+                        "c10ec20dc3cd9f652c7fac2f1230f7a3c828389a14392f05",
+                        "scissors invite lock maple supreme raw rapid void congress muscle digital elegant little brisk hair mango congress clump",
+                        "7b4a10be9d98e6cba265566db7f136718e1398c71cb581e1b2f464cac1ceedf4f3e274dc270003c670ad8d02c4558b2f8e39edea2775c9e232c7cb798b069e88",
+                        "TREZOR"
+                }, {
+                        "f585c11aec520db57dd353c69554b21a89b20fb0650966fa0a9d6f74fd989d8f",
+                        "void come effort suffer camp survey warrior heavy shoot primary clutch crush open amazing screen patrol group space point ten exist slush involve unfold",
+                        "01f5bced59dec48e362f2c45b5de68b9fd6c92c6634f44d6d40aab69056506f0e35524a518034ddc1192e1dacd32c1ed3eaa3c3b131c88ed8e7e54c49a5d0998",
+                        "TREZOR"
+                },
+
+                /*
+                 * The following vectors were created to test the absence of a passphrase,
+                 * and were determined using the reference implementation at https://github.com/trezor/python-mnemonic.
+                 */
+                {
+                        "00000000000000000000000000000000",
+                        "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about",
+                        "5eb00bbddcf069084889a8ab9155568165f5c453ccb85e70811aaed6f6da5fc19a5ac40b389cd370d086206dec8aa6c43daea6690f20ad3d8d48b2d2ce9e38e4",
+                        ""
+                }, {
+                        "7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f7f",
+                        "legal winner thank year wave sausage worth useful legal winner thank yellow",
+                        "878386efb78845b3355bd15ea4d39ef97d179cb712b77d5c12b6be415fffeffe5f377ba02bf3f8544ab800b955e51fbff09828f682052a20faa6addbbddfb096",
+                        ""
+                }, {
+                        "80808080808080808080808080808080",
+                        "letter advice cage absurd amount doctor acoustic avoid letter advice cage above",
+                        "77d6be9708c8218738934f84bbbb78a2e048ca007746cb764f0673e4b1812d176bbb173e1a291f31cf633f1d0bad7d3cf071c30e98cd0688b5bcce65ecaceb36",
+                        ""
+                }, {
+                        "ffffffffffffffffffffffffffffffff",
+                        "zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo wrong",
+                        "b6a6d8921942dd9806607ebc2750416b289adea669198769f2e15ed926c3aa92bf88ece232317b4ea463e84b0fcd3b53577812ee449ccc448eb45e6f544e25b6",
+                        ""
+                }, {
+                        "f30f8c1da665478f49b001d94c5fc452",
+                        "vessel ladder alter error federal sibling chat ability sun glass valve picture",
+                        "e2d7f9a462875c1325f44f321392edc8eaafebf1547c89d72d10b41b4ee23af3fb0ab010f39f5cbea3b3aa671161b58262b6a508bcbe2d34ee272a942534d45f",
+                        ""
+                }, {
+                        "c10ec20dc3cd9f652c7fac2f1230f7a3c828389a14392f05",
+                        "scissors invite lock maple supreme raw rapid void congress muscle digital elegant little brisk hair mango congress clump",
+                        "a555426999448df9022c3afc2ed0e4aebff3a0ac37d8a395f81412e14994efc960ed168d39a80478e0467a3d5cfc134fef2767c1d3a27f18e3afeb11bfc8e6ad",
+                        ""
+                }, {
+                        "f585c11aec520db57dd353c69554b21a89b20fb0650966fa0a9d6f74fd989d8f",
+                        "void come effort suffer camp survey warrior heavy shoot primary clutch crush open amazing screen patrol group space point ten exist slush involve unfold",
+                        "b873212f885ccffbf4692afcb84bc2e55886de2dfa07d90f5c3c239abc31c0a6ce047e30fd8bf6a281e71389aa82d73df74c7bbfb3b06b4639a5cee775cccd3c",
+                        ""
+                }
+        });
+    }
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/bitcoinj/net/NetworkAbstractionTests.java b/core/src/test/java/org/bitcoinj/net/NetworkAbstractionTests.java
index e0ea3809666..e4f8daa6d0d 100644
--- a/core/src/test/java/org/bitcoinj/net/NetworkAbstractionTests.java
+++ b/core/src/test/java/org/bitcoinj/net/NetworkAbstractionTests.java
@@ -106,7 +106,7 @@ public ProtobufConnection<TwoWayChannelMessage> getNewConnection(InetAddress ine
                     return null;
                 }
 
-                return new ProtobufConnection<TwoWayChannelMessage>(new ProtobufConnection.Listener<Protos.TwoWayChannelMessage>() {
+                return new ProtobufConnection<>(new ProtobufConnection.Listener<Protos.TwoWayChannelMessage>() {
                     @Override
                     public void messageReceived(ProtobufConnection<TwoWayChannelMessage> handler, Protos.TwoWayChannelMessage msg) {
                         handler.write(msg);
@@ -127,7 +127,7 @@ public void connectionClosed(ProtobufConnection<TwoWayChannelMessage> handler) {
         server.startAsync();
         server.awaitRunning();
 
-        ProtobufConnection<TwoWayChannelMessage> clientHandler = new ProtobufConnection<TwoWayChannelMessage>(
+        ProtobufConnection<TwoWayChannelMessage> clientHandler = new ProtobufConnection<>(
                 new ProtobufConnection.Listener<Protos.TwoWayChannelMessage>() {
                     @Override
                     public synchronized void messageReceived(ProtobufConnection<TwoWayChannelMessage> handler, Protos.TwoWayChannelMessage msg) {
@@ -149,7 +149,7 @@ public void connectionClosed(ProtobufConnection<TwoWayChannelMessage> handler) {
         client1ConnectionOpened.get();
         client1Disconnected.get();
 
-        clientHandler = new ProtobufConnection<TwoWayChannelMessage>(
+        clientHandler = new ProtobufConnection<>(
                 new ProtobufConnection.Listener<Protos.TwoWayChannelMessage>() {
                     @Override
                     public synchronized void messageReceived(ProtobufConnection<TwoWayChannelMessage> handler, Protos.TwoWayChannelMessage msg) {
@@ -198,7 +198,7 @@ public void basicClientServerTest() throws Exception {
         NioServer server = new NioServer(new StreamConnectionFactory() {
             @Override
             public ProtobufConnection<TwoWayChannelMessage> getNewConnection(InetAddress inetAddress, int port) {
-                return new ProtobufConnection<TwoWayChannelMessage>(new ProtobufConnection.Listener<Protos.TwoWayChannelMessage>() {
+                return new ProtobufConnection<>(new ProtobufConnection.Listener<Protos.TwoWayChannelMessage>() {
                     @Override
                     public void messageReceived(ProtobufConnection<TwoWayChannelMessage> handler, Protos.TwoWayChannelMessage msg) {
                         handler.write(msg);
@@ -220,7 +220,7 @@ public void connectionClosed(ProtobufConnection<TwoWayChannelMessage> handler) {
         server.startAsync();
         server.awaitRunning();
 
-        ProtobufConnection<TwoWayChannelMessage> clientHandler = new ProtobufConnection<TwoWayChannelMessage>(
+        ProtobufConnection<TwoWayChannelMessage> clientHandler = new ProtobufConnection<>(
                 new ProtobufConnection.Listener<Protos.TwoWayChannelMessage>() {
                     @Override
                     public synchronized void messageReceived(ProtobufConnection<TwoWayChannelMessage> handler, Protos.TwoWayChannelMessage msg) {
@@ -276,7 +276,7 @@ public void basicTimeoutTest() throws Exception {
         NioServer server = new NioServer(new StreamConnectionFactory() {
             @Override
             public ProtobufConnection<TwoWayChannelMessage> getNewConnection(InetAddress inetAddress, int port) {
-                return new ProtobufConnection<TwoWayChannelMessage>(new ProtobufConnection.Listener<Protos.TwoWayChannelMessage>() {
+                return new ProtobufConnection<>(new ProtobufConnection.Listener<Protos.TwoWayChannelMessage>() {
                     @Override
                     public void messageReceived(ProtobufConnection<TwoWayChannelMessage> handler, Protos.TwoWayChannelMessage msg) {
                         fail.set(true);
@@ -304,7 +304,7 @@ public synchronized void connectionClosed(ProtobufConnection<TwoWayChannelMessag
         server.startAsync();
         server.awaitRunning();
 
-        openConnection(new InetSocketAddress("localhost", 4243), new ProtobufConnection<TwoWayChannelMessage>(
+        openConnection(new InetSocketAddress("localhost", 4243), new ProtobufConnection<>(
                 new ProtobufConnection.Listener<Protos.TwoWayChannelMessage>() {
                     @Override
                     public void messageReceived(ProtobufConnection<TwoWayChannelMessage> handler, Protos.TwoWayChannelMessage msg) {
@@ -329,7 +329,7 @@ public void connectionClosed(ProtobufConnection<TwoWayChannelMessage> handler) {
         serverConnection1Closed.get();
         long closeDelayFinish = System.currentTimeMillis();
 
-        ProtobufConnection<TwoWayChannelMessage> client2Handler = new ProtobufConnection<TwoWayChannelMessage>(
+        ProtobufConnection<TwoWayChannelMessage> client2Handler = new ProtobufConnection<>(
                 new ProtobufConnection.Listener<Protos.TwoWayChannelMessage>() {
                     @Override
                     public void messageReceived(ProtobufConnection<TwoWayChannelMessage> handler, Protos.TwoWayChannelMessage msg) {
@@ -363,7 +363,7 @@ public void connectionClosed(ProtobufConnection<TwoWayChannelMessage> handler) {
 
     @Test
     public void largeDataTest() throws Exception {
-        /** Test various large-data handling, essentially testing {@link ProtobufConnection#receiveBytes(java.nio.ByteBuffer)} */
+        // Test various large-data handling, essentially testing {@link ProtobufConnection#receiveBytes(java.nio.ByteBuffer)}
         final SettableFuture<Void> serverConnectionOpen = SettableFuture.create();
         final SettableFuture<Void> clientConnectionOpen = SettableFuture.create();
         final SettableFuture<Void> serverConnectionClosed = SettableFuture.create();
@@ -375,7 +375,7 @@ public void largeDataTest() throws Exception {
         NioServer server = new NioServer(new StreamConnectionFactory() {
             @Override
             public ProtobufConnection<TwoWayChannelMessage> getNewConnection(InetAddress inetAddress, int port) {
-                return new ProtobufConnection<TwoWayChannelMessage>(new ProtobufConnection.Listener<Protos.TwoWayChannelMessage>() {
+                return new ProtobufConnection<>(new ProtobufConnection.Listener<Protos.TwoWayChannelMessage>() {
                     @Override
                     public void messageReceived(ProtobufConnection<TwoWayChannelMessage> handler, Protos.TwoWayChannelMessage msg) {
                         handler.write(msg);
@@ -396,7 +396,7 @@ public void connectionClosed(ProtobufConnection<TwoWayChannelMessage> handler) {
         server.startAsync();
         server.awaitRunning();
 
-        ProtobufConnection<TwoWayChannelMessage> clientHandler = new ProtobufConnection<TwoWayChannelMessage>(
+        ProtobufConnection<TwoWayChannelMessage> clientHandler = new ProtobufConnection<>(
                 new ProtobufConnection.Listener<Protos.TwoWayChannelMessage>() {
                     @Override
                     public synchronized void messageReceived(ProtobufConnection<TwoWayChannelMessage> handler, Protos.TwoWayChannelMessage msg) {
@@ -526,7 +526,7 @@ public void testConnectionEventHandlers() throws Exception {
         NioServer server = new NioServer(new StreamConnectionFactory() {
             @Override
             public ProtobufConnection<TwoWayChannelMessage> getNewConnection(InetAddress inetAddress, int port) {
-                return new ProtobufConnection<TwoWayChannelMessage>(new ProtobufConnection.Listener<Protos.TwoWayChannelMessage>() {
+                return new ProtobufConnection<>(new ProtobufConnection.Listener<Protos.TwoWayChannelMessage>() {
                     @Override
                     public void messageReceived(ProtobufConnection<TwoWayChannelMessage> handler, Protos.TwoWayChannelMessage msg) {
                         handler.write(msg);
@@ -560,7 +560,7 @@ public synchronized void connectionClosed(ProtobufConnection<TwoWayChannelMessag
         server.startAsync();
         server.awaitRunning();
 
-        ProtobufConnection<TwoWayChannelMessage> client1Handler = new ProtobufConnection<TwoWayChannelMessage>(
+        ProtobufConnection<TwoWayChannelMessage> client1Handler = new ProtobufConnection<>(
                 new ProtobufConnection.Listener<Protos.TwoWayChannelMessage>() {
                     @Override
                     public void messageReceived(ProtobufConnection<TwoWayChannelMessage> handler, Protos.TwoWayChannelMessage msg) {
@@ -582,7 +582,7 @@ public void connectionClosed(ProtobufConnection<TwoWayChannelMessage> handler) {
         client1ConnectionOpen.get();
         serverConnection1Open.get();
 
-        ProtobufConnection<TwoWayChannelMessage> client2Handler = new ProtobufConnection<TwoWayChannelMessage>(
+        ProtobufConnection<TwoWayChannelMessage> client2Handler = new ProtobufConnection<>(
                 new ProtobufConnection.Listener<Protos.TwoWayChannelMessage>() {
                     @Override
                     public void messageReceived(ProtobufConnection<TwoWayChannelMessage> handler, Protos.TwoWayChannelMessage msg) {
@@ -604,7 +604,7 @@ public void connectionClosed(ProtobufConnection<TwoWayChannelMessage> handler) {
         client2ConnectionOpen.get();
         serverConnection2Open.get();
 
-        ProtobufConnection<TwoWayChannelMessage> client3Handler = new ProtobufConnection<TwoWayChannelMessage>(
+        ProtobufConnection<TwoWayChannelMessage> client3Handler = new ProtobufConnection<>(
                 new ProtobufConnection.Listener<Protos.TwoWayChannelMessage>() {
                     @Override
                     public void messageReceived(ProtobufConnection<TwoWayChannelMessage> handler, Protos.TwoWayChannelMessage msg) {
diff --git a/core/src/test/java/org/bitcoinj/net/discovery/SeedPeersTest.java b/core/src/test/java/org/bitcoinj/net/discovery/SeedPeersTest.java
index 626a354766b..4ffba51ae60 100644
--- a/core/src/test/java/org/bitcoinj/net/discovery/SeedPeersTest.java
+++ b/core/src/test/java/org/bitcoinj/net/discovery/SeedPeersTest.java
@@ -17,6 +17,7 @@
 
 package org.bitcoinj.net.discovery;
 
+import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.params.MainNetParams;
 import org.junit.Test;
 
@@ -28,16 +29,18 @@
 import static org.junit.Assert.assertThat;
 
 public class SeedPeersTest {
+    private static final NetworkParameters MAINNET = MainNetParams.get();
+
     @Test
     public void getPeer_one() throws Exception{
-        SeedPeers seedPeers = new SeedPeers(MainNetParams.get());
+        SeedPeers seedPeers = new SeedPeers(MAINNET);
         assertThat(seedPeers.getPeer(), notNullValue());
     }
     
     @Test
     public void getPeer_all() throws Exception{
-        SeedPeers seedPeers = new SeedPeers(MainNetParams.get());
-        for (int i = 0; i < MainNetParams.get().getAddrSeeds().length; ++i) {
+        SeedPeers seedPeers = new SeedPeers(MAINNET);
+        for (int i = 0; i < MAINNET.getAddrSeeds().length; ++i) {
             assertThat("Failed on index: "+i, seedPeers.getPeer(), notNullValue());
         }
         assertThat(seedPeers.getPeer(), equalTo(null));
@@ -45,8 +48,8 @@ public void getPeer_all() throws Exception{
     
     @Test
     public void getPeers_length() throws Exception{
-        SeedPeers seedPeers = new SeedPeers(MainNetParams.get());
+        SeedPeers seedPeers = new SeedPeers(MAINNET);
         InetSocketAddress[] addresses = seedPeers.getPeers(0, 0, TimeUnit.SECONDS);
-        assertThat(addresses.length, equalTo(MainNetParams.get().getAddrSeeds().length));
+        assertThat(addresses.length, equalTo(MAINNET.getAddrSeeds().length));
     }
 }
diff --git a/core/src/test/java/org/bitcoinj/protocols/channels/ChannelConnectionTest.java b/core/src/test/java/org/bitcoinj/protocols/channels/ChannelConnectionTest.java
index ad909503b69..63e943588bd 100644
--- a/core/src/test/java/org/bitcoinj/protocols/channels/ChannelConnectionTest.java
+++ b/core/src/test/java/org/bitcoinj/protocols/channels/ChannelConnectionTest.java
@@ -17,6 +17,8 @@
 package org.bitcoinj.protocols.channels;
 
 import org.bitcoinj.core.*;
+import org.bitcoinj.protocols.channels.PaymentChannelClient.VersionSelector;
+import org.bitcoinj.script.ScriptPattern;
 import org.bitcoinj.testing.TestWithWallet;
 import org.bitcoinj.utils.Threading;
 import org.bitcoinj.wallet.Wallet;
@@ -34,7 +36,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import javax.annotation.Nullable;
 import java.io.ByteArrayInputStream;
@@ -48,6 +50,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.bitcoinj.core.Coin.*;
+import static org.bitcoinj.protocols.channels.PaymentChannelClient.VersionSelector.*;
 import static org.bitcoinj.protocols.channels.PaymentChannelCloseException.CloseReason;
 import static org.bitcoinj.testing.FakeTxBuilder.createFakeBlock;
 import static org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType;
@@ -75,28 +78,34 @@ public TransactionBroadcast broadcastTransaction(Transaction tx) {
      * version of the channel.
      */
     @Parameterized.Parameters(name = "{index}: ChannelConnectionTest({0})")
-    public static Collection<PaymentChannelClient.VersionSelector> data() {
+    public static Collection<PaymentChannelClient.DefaultClientChannelProperties> data() {
         return Arrays.asList(
-                PaymentChannelClient.VersionSelector.VERSION_1,
-                PaymentChannelClient.VersionSelector.VERSION_2_ALLOW_1);
+                new PaymentChannelClient.DefaultClientChannelProperties() {
+                    @Override
+                    public VersionSelector versionSelector() { return VERSION_1;}
+                },
+                new PaymentChannelClient.DefaultClientChannelProperties() {
+                    @Override
+                    public VersionSelector versionSelector() { return VERSION_2_ALLOW_1;}
+                });
     }
 
     @Parameterized.Parameter
-    public PaymentChannelClient.VersionSelector versionSelector;
+    public IPaymentChannelClient.ClientChannelProperties clientChannelProperties;
 
     /**
-     * Returns <code>true</code> if we are using a protocol version that requires the exchange of refunds.
+     * Returns {@code true} if we are using a protocol version that requires the exchange of refunds.
      */
     private boolean useRefunds() {
-        return versionSelector == PaymentChannelClient.VersionSelector.VERSION_1;
+        return clientChannelProperties.versionSelector() == VERSION_1;
     }
 
     /**
-     * Returns <code>true</code> if the contract being used is a multisig contract
+     * Returns {@code true} if the contract being used is a multisig contract
      * @return
      */
     private boolean isMultiSigContract() {
-        return versionSelector == PaymentChannelClient.VersionSelector.VERSION_1;
+        return clientChannelProperties.versionSelector() == VERSION_1;
     }
 
     @Override
@@ -104,19 +113,19 @@ private boolean isMultiSigContract() {
     public void setUp() throws Exception {
         super.setUp();
         Utils.setMockClock(); // Use mock clock
-        Context.propagate(new Context(PARAMS, 3, Coin.ZERO, false)); // Shorter event horizon for unit tests.
+        Context.propagate(new Context(UNITTEST, 3, Coin.ZERO, false)); // Shorter event horizon for unit tests.
         sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, COIN);
         sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, COIN);
         wallet.addExtension(new StoredPaymentChannelClientStates(wallet, failBroadcaster));
-        serverWallet = new Wallet(PARAMS);
+        serverWallet = new Wallet(UNITTEST);
         serverWallet.addExtension(new StoredPaymentChannelServerStates(serverWallet, failBroadcaster));
         serverWallet.freshReceiveKey();
-        // Use an atomic boolean to indicate failure because fail()/assert*() dont work in network threads
+        // Use an atomic boolean to indicate failure because fail()/assert*() don't work in network threads
         fail = new AtomicBoolean(false);
 
         // Set up a way to monitor broadcast transactions. When you expect a broadcast, you must release a permit
         // to the broadcastTxPause semaphore so state can be queried in between.
-        broadcasts = new LinkedBlockingQueue<Transaction>();
+        broadcasts = new LinkedBlockingQueue<>();
         broadcastTxPause = new Semaphore(0);
         mockBroadcaster = new TransactionBroadcaster() {
             @Override
@@ -169,7 +178,7 @@ private void exectuteSimpleChannelTest(KeyParameter userKeySetup) throws Excepti
         // Test with network code and without any issues. We'll broadcast two txns: multisig contract and settle transaction.
         final SettableFuture<ListenableFuture<PaymentChannelV1ServerState>> serverCloseFuture = SettableFuture.create();
         final SettableFuture<Sha256Hash> channelOpenFuture = SettableFuture.create();
-        final BlockingQueue<ChannelTestUtils.UpdatePair> q = new LinkedBlockingQueue<ChannelTestUtils.UpdatePair>();
+        final BlockingQueue<ChannelTestUtils.UpdatePair> q = new LinkedBlockingQueue<>();
         final PaymentChannelServerListener server = new PaymentChannelServerListener(mockBroadcaster, serverWallet, 30, COIN,
                 new PaymentChannelServerListener.HandlerFactory() {
                     @Nullable
@@ -197,14 +206,14 @@ public void channelClosed(CloseReason reason) {
         server.bindAndStart(4243);
 
         PaymentChannelClientConnection client = new PaymentChannelClientConnection(
-                new InetSocketAddress("localhost", 4243), 30, wallet, myKey, COIN, "", PaymentChannelClient.DEFAULT_TIME_WINDOW, userKeySetup, versionSelector);
+                new InetSocketAddress("localhost", 4243), 30, wallet, myKey, COIN, "", userKeySetup, clientChannelProperties);
 
         // Wait for the multi-sig tx to be transmitted.
         broadcastTxPause.release();
         Transaction broadcastMultiSig = broadcasts.take();
         // Wait for the channel to finish opening.
         client.getChannelOpenFuture().get();
-        assertEquals(broadcastMultiSig.getHash(), channelOpenFuture.get());
+        assertEquals(broadcastMultiSig.getTxId(), channelOpenFuture.get());
         assertEquals(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE, client.state().getValueSpent());
 
         // Set up an autosave listener to make sure the server is saving the wallet after each payment increase.
@@ -239,7 +248,7 @@ public void onAfterAutoSave(File newlySavedFile) {
         latch.await();
 
         StoredPaymentChannelServerStates channels = (StoredPaymentChannelServerStates)serverWallet.getExtensions().get(StoredPaymentChannelServerStates.EXTENSION_ID);
-        StoredServerChannel storedServerChannel = channels.getChannel(broadcastMultiSig.getHash());
+        StoredServerChannel storedServerChannel = channels.getChannel(broadcastMultiSig.getTxId());
         PaymentChannelServerState serverState = storedServerChannel.getOrCreateState(serverWallet, mockBroadcaster);
 
         // Check that you can call settle multiple times with no exceptions.
@@ -280,7 +289,7 @@ public void testServerErrorHandling_badTransaction() throws Exception {
         }
         // Gives the server crap and checks proper error responses are sent.
         ChannelTestUtils.RecordingPair pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster);
-        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, Sha256Hash.ZERO_HASH, pair.clientRecorder, versionSelector);
+        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, Sha256Hash.ZERO_HASH, null, clientChannelProperties, pair.clientRecorder);
         PaymentChannelServer server = pair.server;
         server.connectionOpen();
         client.connectionOpen();
@@ -305,7 +314,7 @@ public void testServerErrorHandling_badTransaction() throws Exception {
     public void testServerErrorHandling_killSocketOnClose() throws Exception {
         // Make sure the server closes the socket on CLOSE
         ChannelTestUtils.RecordingPair pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster);
-        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, Sha256Hash.ZERO_HASH, pair.clientRecorder, versionSelector);
+        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, Sha256Hash.ZERO_HASH, null, clientChannelProperties, pair.clientRecorder);
         PaymentChannelServer server = pair.server;
         server.connectionOpen();
         client.connectionOpen();
@@ -323,7 +332,7 @@ public void testServerErrorHandling_killSocketOnClose() throws Exception {
     public void testServerErrorHandling_killSocketOnError() throws Exception {
         // Make sure the server closes the socket on ERROR
         ChannelTestUtils.RecordingPair pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster);
-        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, Sha256Hash.ZERO_HASH, pair.clientRecorder, versionSelector);
+        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, Sha256Hash.ZERO_HASH, null, clientChannelProperties, pair.clientRecorder);
         PaymentChannelServer server = pair.server;
         server.connectionOpen();
         client.connectionOpen();
@@ -347,7 +356,7 @@ public void testClientErrorHandlingIncreasePaymentError() throws Exception {
         // Open up a normal channel.
         ChannelTestUtils.RecordingPair pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster);
         pair.server.connectionOpen();
-        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, someServerId, pair.clientRecorder, versionSelector);
+        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, someServerId, null, clientChannelProperties, pair.clientRecorder);
         PaymentChannelServer server = pair.server;
         client.connectionOpen();
         server.receiveMessage(pair.clientRecorder.checkNextMsg(MessageType.CLIENT_VERSION));
@@ -402,7 +411,7 @@ public void testChannelResume() throws Exception {
         // Open up a normal channel.
         ChannelTestUtils.RecordingPair pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster);
         pair.server.connectionOpen();
-        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, someServerId, pair.clientRecorder, versionSelector);
+        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, someServerId, null, clientChannelProperties, pair.clientRecorder);
         PaymentChannelServer server = pair.server;
         client.connectionOpen();
         server.receiveMessage(pair.clientRecorder.checkNextMsg(MessageType.CLIENT_VERSION));
@@ -462,7 +471,7 @@ public void testChannelResume() throws Exception {
                 (StoredPaymentChannelClientStates) wallet.getExtensions().get(StoredPaymentChannelClientStates.EXTENSION_ID);
 
         pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster);
-        client = new PaymentChannelClient(wallet, myKey, COIN, someServerId, pair.clientRecorder, versionSelector);
+        client = new PaymentChannelClient(wallet, myKey, COIN, someServerId, null, clientChannelProperties, pair.clientRecorder);
         server = pair.server;
         client.connectionOpen();
         server.connectionOpen();
@@ -489,7 +498,7 @@ public void testChannelResume() throws Exception {
 
         // Now open up a new client with the same id and make sure the server disconnects the previous client.
         pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster);
-        client = new PaymentChannelClient(wallet, myKey, COIN, someServerId, pair.clientRecorder, versionSelector);
+        client = new PaymentChannelClient(wallet, myKey, COIN, someServerId, null, clientChannelProperties, pair.clientRecorder);
         server = pair.server;
         client.connectionOpen();
         server.connectionOpen();
@@ -501,7 +510,7 @@ public void testChannelResume() throws Exception {
         }
         // Make sure the server allows two simultaneous opens. It will close the first and allow resumption of the second.
         pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster);
-        client = new PaymentChannelClient(wallet, myKey, COIN, someServerId, pair.clientRecorder, versionSelector);
+        client = new PaymentChannelClient(wallet, myKey, COIN, someServerId, null, clientChannelProperties, pair.clientRecorder);
         server = pair.server;
         client.connectionOpen();
         server.connectionOpen();
@@ -532,9 +541,9 @@ public void testChannelResume() throws Exception {
         newClientStates.deserializeWalletExtension(wallet, clientStoredChannels.serializeWalletExtension());
         broadcastTxPause.release();
         if (isMultiSigContract()) {
-            assertTrue(broadcasts.take().getOutput(0).getScriptPubKey().isSentToMultiSig());
+            assertTrue(ScriptPattern.isSentToMultisig(broadcasts.take().getOutput(0).getScriptPubKey()));
         } else {
-            assertTrue(broadcasts.take().getOutput(0).getScriptPubKey().isPayToScriptHash());
+            assertTrue(ScriptPattern.isP2SH(broadcasts.take().getOutput(0).getScriptPubKey()));
         }
         broadcastTxPause.release();
         assertEquals(TransactionConfidence.Source.SELF, broadcasts.take().getConfidence().getSource());
@@ -585,7 +594,7 @@ public void testBadResumeHash() throws InterruptedException {
     public void testClientUnknownVersion() throws Exception {
         // Tests client rejects unknown version
         ChannelTestUtils.RecordingPair pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster);
-        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, Sha256Hash.ZERO_HASH, pair.clientRecorder, versionSelector);
+        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, Sha256Hash.ZERO_HASH, null, clientChannelProperties, pair.clientRecorder);
         client.connectionOpen();
         pair.clientRecorder.checkNextMsg(MessageType.CLIENT_VERSION);
         client.receiveMessage(Protos.TwoWayChannelMessage.newBuilder()
@@ -605,7 +614,7 @@ public void testClientTimeWindowUnacceptable() throws Exception {
         // Tests that clients reject too large time windows
         ChannelTestUtils.RecordingPair pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster, 100);
         PaymentChannelServer server = pair.server;
-        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, Sha256Hash.ZERO_HASH, pair.clientRecorder, versionSelector);
+        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, Sha256Hash.ZERO_HASH, null, clientChannelProperties, pair.clientRecorder);
         client.connectionOpen();
         server.connectionOpen();
         server.receiveMessage(pair.clientRecorder.checkNextMsg(MessageType.CLIENT_VERSION));
@@ -630,7 +639,7 @@ public void testClientTimeWindowUnacceptable() throws Exception {
     public void testValuesAreRespected() throws Exception {
         ChannelTestUtils.RecordingPair pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster);
         PaymentChannelServer server = pair.server;
-        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, Sha256Hash.ZERO_HASH, pair.clientRecorder, versionSelector);
+        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, Sha256Hash.ZERO_HASH, null, clientChannelProperties, pair.clientRecorder);
         client.connectionOpen();
         server.connectionOpen();
         server.receiveMessage(pair.clientRecorder.checkNextMsg(MessageType.CLIENT_VERSION));
@@ -656,7 +665,7 @@ public void testValuesAreRespected() throws Exception {
         pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster);
         server = pair.server;
         final Coin myValue = COIN.multiply(10);
-        client = new PaymentChannelClient(wallet, myKey, myValue, Sha256Hash.ZERO_HASH, pair.clientRecorder, versionSelector);
+        client = new PaymentChannelClient(wallet, myKey, myValue, Sha256Hash.ZERO_HASH, null, clientChannelProperties, pair.clientRecorder);
         client.connectionOpen();
         server.connectionOpen();
         server.receiveMessage(pair.clientRecorder.checkNextMsg(MessageType.CLIENT_VERSION));
@@ -669,7 +678,7 @@ public void testValuesAreRespected() throws Exception {
                 .setType(MessageType.INITIATE).build());
         if (useRefunds()) {
             final Protos.TwoWayChannelMessage provideRefund = pair.clientRecorder.checkNextMsg(MessageType.PROVIDE_REFUND);
-            Transaction refund = new Transaction(PARAMS, provideRefund.getProvideRefund().getTx().toByteArray());
+            Transaction refund = new Transaction(UNITTEST, provideRefund.getProvideRefund().getTx().toByteArray());
             assertEquals(myValue, refund.getOutput(0).getValue());
         } else {
             assertEquals(2, client.state().getMajorVersion());
@@ -680,11 +689,11 @@ public void testValuesAreRespected() throws Exception {
 
     @Test
     public void testEmptyWallet() throws Exception {
-        Wallet emptyWallet = new Wallet(PARAMS);
+        Wallet emptyWallet = new Wallet(UNITTEST);
         emptyWallet.freshReceiveKey();
         ChannelTestUtils.RecordingPair pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster);
         PaymentChannelServer server = pair.server;
-        PaymentChannelClient client = new PaymentChannelClient(emptyWallet, myKey, COIN, Sha256Hash.ZERO_HASH, pair.clientRecorder, versionSelector);
+        PaymentChannelClient client = new PaymentChannelClient(emptyWallet, myKey, COIN, Sha256Hash.ZERO_HASH, null, clientChannelProperties, pair.clientRecorder);
         client.connectionOpen();
         server.connectionOpen();
         server.receiveMessage(pair.clientRecorder.checkNextMsg(MessageType.CLIENT_VERSION));
@@ -706,7 +715,7 @@ public void testEmptyWallet() throws Exception {
     public void testClientRefusesNonCanonicalKey() throws Exception {
         ChannelTestUtils.RecordingPair pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster);
         PaymentChannelServer server = pair.server;
-        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, Sha256Hash.ZERO_HASH, pair.clientRecorder, versionSelector);
+        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, Sha256Hash.ZERO_HASH, null, clientChannelProperties, pair.clientRecorder);
         client.connectionOpen();
         server.connectionOpen();
         server.receiveMessage(pair.clientRecorder.checkNextMsg(MessageType.CLIENT_VERSION));
@@ -724,7 +733,7 @@ public void testClientRefusesNonCanonicalKey() throws Exception {
     public void testClientResumeNothing() throws Exception {
         ChannelTestUtils.RecordingPair pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster);
         PaymentChannelServer server = pair.server;
-        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, Sha256Hash.ZERO_HASH, pair.clientRecorder, versionSelector);
+        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, Sha256Hash.ZERO_HASH, null, clientChannelProperties, pair.clientRecorder);
         client.connectionOpen();
         server.connectionOpen();
         server.receiveMessage(pair.clientRecorder.checkNextMsg(MessageType.CLIENT_VERSION));
@@ -738,7 +747,7 @@ public void testClientResumeNothing() throws Exception {
     @Test
     public void testClientRandomMessage() throws Exception {
         ChannelTestUtils.RecordingPair pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster);
-        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, Sha256Hash.ZERO_HASH, pair.clientRecorder, versionSelector);
+        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, Sha256Hash.ZERO_HASH, null, clientChannelProperties, pair.clientRecorder);
 
         client.connectionOpen();
         pair.clientRecorder.checkNextMsg(MessageType.CLIENT_VERSION);
@@ -759,7 +768,7 @@ public void testDontResumeEmptyChannels() throws Exception {
         Sha256Hash someServerId = Sha256Hash.ZERO_HASH;
         ChannelTestUtils.RecordingPair pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster);
         pair.server.connectionOpen();
-        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, someServerId, pair.clientRecorder, versionSelector);
+        PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, someServerId, null, clientChannelProperties, pair.clientRecorder);
         PaymentChannelServer server = pair.server;
         client.connectionOpen();
         server.receiveMessage(pair.clientRecorder.checkNextMsg(MessageType.CLIENT_VERSION));
@@ -792,7 +801,7 @@ public void testDontResumeEmptyChannels() throws Exception {
         client.connectionClosed();
 
         // Now try opening a new channel with the same server ID and verify the client asks for a new channel.
-        client = new PaymentChannelClient(wallet, myKey, COIN, someServerId, pair.clientRecorder, versionSelector);
+        client = new PaymentChannelClient(wallet, myKey, COIN, someServerId, null, clientChannelProperties, pair.clientRecorder);
         client.connectionOpen();
         Protos.TwoWayChannelMessage msg = pair.clientRecorder.checkNextMsg(MessageType.CLIENT_VERSION);
         assertFalse(msg.getClientVersion().hasPreviousChannelContractHash());
@@ -807,7 +816,7 @@ public void repeatedChannels() throws Exception {
             Sha256Hash someServerId = Sha256Hash.ZERO_HASH;
             ChannelTestUtils.RecordingPair pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster);
             pair.server.connectionOpen();
-            PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, someServerId, pair.clientRecorder, versionSelector);
+            PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, someServerId, null, clientChannelProperties, pair.clientRecorder);
             PaymentChannelServer server = pair.server;
             client.connectionOpen();
             server.receiveMessage(pair.clientRecorder.checkNextMsg(MessageType.CLIENT_VERSION));
@@ -848,10 +857,10 @@ public void repeatedChannels() throws Exception {
             Transaction settlement1 = broadcasts.take();
             // Server sends back the settle TX it just broadcast.
             final Protos.TwoWayChannelMessage closeMsg = pair.serverRecorder.checkNextMsg(MessageType.CLOSE);
-            final Transaction settlement2 = new Transaction(PARAMS, closeMsg.getSettlement().getTx().toByteArray());
+            final Transaction settlement2 = new Transaction(UNITTEST, closeMsg.getSettlement().getTx().toByteArray());
             assertEquals(settlement1, settlement2);
             client.receiveMessage(closeMsg);
-            assertNotNull(wallet.getTransaction(settlement2.getHash()));   // Close TX entered the wallet.
+            assertNotNull(wallet.getTransaction(settlement2.getTxId()));   // Close TX entered the wallet.
             sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, settlement1);
             client.connectionClosed();
             server.connectionClosed();
@@ -861,7 +870,7 @@ public void repeatedChannels() throws Exception {
             Sha256Hash someServerId = Sha256Hash.ZERO_HASH;
             ChannelTestUtils.RecordingPair pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster);
             pair.server.connectionOpen();
-            PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, someServerId, pair.clientRecorder, versionSelector);
+            PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, someServerId, null, clientChannelProperties, pair.clientRecorder);
             PaymentChannelServer server = pair.server;
             client.connectionOpen();
             final Protos.TwoWayChannelMessage msg = pair.clientRecorder.checkNextMsg(MessageType.CLIENT_VERSION);
@@ -892,7 +901,7 @@ public void repeatedChannels() throws Exception {
             Sha256Hash someServerId = Sha256Hash.ZERO_HASH;
             ChannelTestUtils.RecordingPair pair = ChannelTestUtils.makeRecorders(serverWallet, mockBroadcaster);
             pair.server.connectionOpen();
-            PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, someServerId, pair.clientRecorder, versionSelector);
+            PaymentChannelClient client = new PaymentChannelClient(wallet, myKey, COIN, someServerId, null, clientChannelProperties, pair.clientRecorder);
             PaymentChannelServer server = pair.server;
             client.connectionOpen();
             server.receiveMessage(pair.clientRecorder.checkNextMsg(MessageType.CLIENT_VERSION));
diff --git a/core/src/test/java/org/bitcoinj/protocols/channels/ChannelTestUtils.java b/core/src/test/java/org/bitcoinj/protocols/channels/ChannelTestUtils.java
index 0f9cd2701fd..7aea8c044ab 100644
--- a/core/src/test/java/org/bitcoinj/protocols/channels/ChannelTestUtils.java
+++ b/core/src/test/java/org/bitcoinj/protocols/channels/ChannelTestUtils.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -24,6 +26,7 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.protobuf.ByteString;
 import org.bitcoin.paymentchannel.Protos;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import javax.annotation.Nullable;
 import java.util.concurrent.BlockingQueue;
@@ -36,7 +39,7 @@
  */
 public class ChannelTestUtils {
     public static class RecordingServerConnection implements PaymentChannelServer.ServerConnection {
-        public BlockingQueue<Object> q = new LinkedBlockingQueue<Object>();
+        public BlockingQueue<Object> q = new LinkedBlockingQueue<>();
 
         @Override
         public void sendToClient(Protos.TwoWayChannelMessage msg) {
@@ -59,6 +62,12 @@ public ListenableFuture<ByteString> paymentIncrease(Coin by, Coin to, @Nullable
             return Futures.immediateFuture(ByteString.copyFromUtf8(by.toPlainString()));
         }
 
+        @Nullable
+        @Override
+        public ListenableFuture<KeyParameter> getUserKey() {
+            return null;
+        }
+
         public Protos.TwoWayChannelMessage getNextMsg() throws InterruptedException {
             return (Protos.TwoWayChannelMessage) q.take();
         }
@@ -76,7 +85,7 @@ public void checkTotalPayment(Coin valueSoFar) throws InterruptedException {
     }
 
     public static class RecordingClientConnection implements PaymentChannelClient.ClientConnection {
-        public BlockingQueue<Object> q = new LinkedBlockingQueue<Object>();
+        public BlockingQueue<Object> q = new LinkedBlockingQueue<>();
         static final int IGNORE_EXPIRE = -1;
         private final int maxExpireTime;
 
diff --git a/core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelClientTest.java b/core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelClientTest.java
index 4d0d6467773..cb355b72606 100644
--- a/core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelClientTest.java
+++ b/core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelClientTest.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -24,7 +26,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -32,6 +34,9 @@
 
 import static org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage;
 import static org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType.*;
+import static org.bitcoinj.protocols.channels.PaymentChannelClient.VersionSelector.VERSION_1;
+import static org.bitcoinj.protocols.channels.PaymentChannelClient.VersionSelector.VERSION_2;
+import static org.bitcoinj.protocols.channels.PaymentChannelClient.VersionSelector.VERSION_2_ALLOW_1;
 import static org.easymock.EasyMock.capture;
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.replay;
@@ -53,16 +58,25 @@ public class PaymentChannelClientTest {
      * version of the channel.
      */
     @Parameterized.Parameters(name = "{index}: PaymentChannelClientTest({0})")
-    public static Collection<PaymentChannelClient.VersionSelector> data() {
+    public static Collection<PaymentChannelClient.DefaultClientChannelProperties> data() {
         return Arrays.asList(
-                PaymentChannelClient.VersionSelector.VERSION_1,
-                PaymentChannelClient.VersionSelector.VERSION_2_ALLOW_1,
-                PaymentChannelClient.VersionSelector.VERSION_2
+                new PaymentChannelClient.DefaultClientChannelProperties() {
+                    @Override
+                    public PaymentChannelClient.VersionSelector versionSelector() { return VERSION_1;}
+                },
+                new PaymentChannelClient.DefaultClientChannelProperties() {
+                    @Override
+                    public PaymentChannelClient.VersionSelector versionSelector() { return VERSION_2_ALLOW_1;}
+                },
+                new PaymentChannelClient.DefaultClientChannelProperties() {
+                    @Override
+                    public PaymentChannelClient.VersionSelector versionSelector() { return VERSION_2;}
+                }
         );
     }
 
     @Parameterized.Parameter
-    public PaymentChannelClient.VersionSelector versionSelector;
+    public IPaymentChannelClient.ClientChannelProperties clientChannelProperties;
 
     @Before
     public void before() {
@@ -71,12 +85,12 @@ public void before() {
         maxValue = Coin.COIN;
         serverHash = Sha256Hash.of("serverId".getBytes());
         connection = createMock(IPaymentChannelClient.ClientConnection.class);
-        clientVersionCapture = new Capture<TwoWayChannelMessage>();
+        clientVersionCapture = new Capture<>();
     }
 
     @Test
     public void shouldSendClientVersionOnChannelOpen() throws Exception {
-        PaymentChannelClient dut = new PaymentChannelClient(wallet, ecKey, maxValue, serverHash, connection, versionSelector);
+        PaymentChannelClient dut = new PaymentChannelClient(wallet, ecKey, maxValue, serverHash, null, clientChannelProperties, connection);
         connection.sendToServer(capture(clientVersionCapture));
         EasyMock.expect(wallet.getExtensions()).andReturn(new HashMap<String, WalletExtension>());
         replay(connection, wallet);
@@ -85,10 +99,20 @@ public void shouldSendClientVersionOnChannelOpen() throws Exception {
     }
     @Test
     public void shouldSendTimeWindowInClientVersion() throws Exception {
-        long timeWindow = 4000;
+        final long timeWindow = 4000;
         KeyParameter userKey = null;
         PaymentChannelClient dut =
-                new PaymentChannelClient(wallet, ecKey, maxValue, serverHash, timeWindow, userKey, connection, versionSelector);
+                new PaymentChannelClient(wallet, ecKey, maxValue, serverHash, userKey, new PaymentChannelClient.DefaultClientChannelProperties() {
+                    @Override
+                    public long timeWindow() {
+                        return timeWindow;
+                    }
+
+                    @Override
+                    public PaymentChannelClient.VersionSelector versionSelector() {
+                        return clientChannelProperties.versionSelector();
+                    }
+                }, connection);
         connection.sendToServer(capture(clientVersionCapture));
         EasyMock.expect(wallet.getExtensions()).andReturn(new HashMap<String, WalletExtension>());
         replay(connection, wallet);
@@ -102,7 +126,7 @@ private void assertClientVersion(long expectedTimeWindow) {
         assertEquals("Wrong type " + type, CLIENT_VERSION, type);
         final Protos.ClientVersion clientVersion = response.getClientVersion();
         final int major = clientVersion.getMajor();
-        final int requestedVersion = versionSelector.getRequestedMajorVersion();
+        final int requestedVersion = clientChannelProperties.versionSelector().getRequestedMajorVersion();
         assertEquals("Wrong major version " + major, requestedVersion, major);
         final long actualTimeWindow = clientVersion.getTimeWindowSecs();
         assertEquals("Wrong timeWindow " + actualTimeWindow, expectedTimeWindow, actualTimeWindow );
diff --git a/core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelServerTest.java b/core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelServerTest.java
index e9e797d2d83..ddb3346742c 100644
--- a/core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelServerTest.java
+++ b/core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelServerTest.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -28,11 +30,11 @@
 import java.util.Arrays;
 import java.util.Collection;
 
-import static junit.framework.TestCase.assertTrue;
 import static org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage;
 import static org.bitcoin.paymentchannel.Protos.TwoWayChannelMessage.MessageType;
 import static org.easymock.EasyMock.*;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 @RunWith(Parameterized.class)
 public class PaymentChannelServerTest {
@@ -47,7 +49,7 @@ public void setUp() {
         broadcaster = createMock(TransactionBroadcaster.class);
         wallet = createMock(Wallet.class);
         connection = createMock(PaymentChannelServer.ServerConnection.class);
-        serverVersionCapture = new Capture<TwoWayChannelMessage>();
+        serverVersionCapture = new Capture<>();
         connection.sendToClient(capture(serverVersionCapture));
         Utils.setMockClock();
     }
@@ -67,7 +69,7 @@ public static Collection<Integer> data() {
     @Test
     public void shouldAcceptDefaultTimeWindow() {
         final TwoWayChannelMessage message = createClientVersionMessage();
-        final Capture<TwoWayChannelMessage> initiateCapture = new Capture<TwoWayChannelMessage>();
+        final Capture<TwoWayChannelMessage> initiateCapture = new Capture<>();
         connection.sendToClient(capture(initiateCapture));
         replay(connection);
 
@@ -86,11 +88,20 @@ public void shouldTruncateTooSmallTimeWindow() {
         final int minTimeWindow = 20000;
         final int timeWindow = minTimeWindow - 1;
         final TwoWayChannelMessage message = createClientVersionMessage(timeWindow);
-        final Capture<TwoWayChannelMessage> initiateCapture = new Capture<TwoWayChannelMessage>();
+        final Capture<TwoWayChannelMessage> initiateCapture = new Capture<>();
         connection.sendToClient(capture(initiateCapture));
 
         replay(connection);
-        dut = new PaymentChannelServer(broadcaster, wallet, Coin.CENT, minTimeWindow, 40000, connection);
+        dut = new PaymentChannelServer(broadcaster, wallet, Coin.CENT, new PaymentChannelServer.DefaultServerChannelProperties() {
+            @Override
+            public long getMinTimeWindow() {
+                return minTimeWindow;
+            }
+            @Override
+            public long getMaxTimeWindow() {
+                return 40000;
+            }
+        }, connection);
 
         dut.connectionOpen();
         dut.receiveMessage(message);
@@ -105,11 +116,18 @@ public void shouldTruncateTooLargeTimeWindow() {
         final int maxTimeWindow = 40000;
         final int timeWindow = maxTimeWindow + 1;
         final TwoWayChannelMessage message = createClientVersionMessage(timeWindow);
-        final Capture<TwoWayChannelMessage> initiateCapture = new Capture<TwoWayChannelMessage>();
+        final Capture<TwoWayChannelMessage> initiateCapture = new Capture<>();
         connection.sendToClient(capture(initiateCapture));
         replay(connection);
 
-        dut = new PaymentChannelServer(broadcaster, wallet, Coin.CENT, 20000, maxTimeWindow, connection);
+        dut = new PaymentChannelServer(broadcaster, wallet, Coin.CENT, new PaymentChannelServer.DefaultServerChannelProperties(){
+            @Override
+            public long getMaxTimeWindow() {
+                return maxTimeWindow;
+            }
+            @Override
+            public long getMinTimeWindow() { return 20000; }
+        }, connection);
 
         dut.connectionOpen();
         dut.receiveMessage(message);
@@ -121,23 +139,40 @@ public void shouldTruncateTooLargeTimeWindow() {
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldNotAllowTimeWindowLessThan2h() {
-        dut = new PaymentChannelServer(broadcaster, wallet, Coin.CENT, 7199, 40000, connection);
+        dut = new PaymentChannelServer(broadcaster, wallet, Coin.CENT, new PaymentChannelServer.DefaultServerChannelProperties(){
+            @Override
+            public long getMaxTimeWindow() { return 40000; }
+            @Override
+            public long getMinTimeWindow() {
+                return 7199;
+            }
+        }, connection);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void shouldNotAllowNegativeTimeWindow() {
-        dut = new PaymentChannelServer(broadcaster, wallet, Coin.CENT, 40001, 40000, connection);
+        dut = new PaymentChannelServer(broadcaster, wallet, Coin.CENT, new PaymentChannelServer.DefaultServerChannelProperties(){
+            @Override
+            public long getMaxTimeWindow() { return 40000; }
+            @Override
+            public long getMinTimeWindow() { return 40001; }
+        }, connection);
     }
 
     @Test
     public void shouldAllowExactTimeWindow() {
         final TwoWayChannelMessage message = createClientVersionMessage();
-        final Capture<TwoWayChannelMessage> initiateCapture = new Capture<TwoWayChannelMessage>();
+        final Capture<TwoWayChannelMessage> initiateCapture = new Capture<>();
         connection.sendToClient(capture(initiateCapture));
         replay(connection);
         final int expire = 24 * 60 * 60 - 60;  // This the default defined in paymentchannel.proto
 
-        dut = new PaymentChannelServer(broadcaster, wallet, Coin.CENT, expire, expire, connection);
+        dut = new PaymentChannelServer(broadcaster, wallet, Coin.CENT, new PaymentChannelServer.DefaultServerChannelProperties(){
+            @Override
+            public long getMaxTimeWindow() { return expire; }
+            @Override
+            public long getMinTimeWindow() { return expire; }
+        }, connection);
         dut.connectionOpen();
         long expectedExpire = Utils.currentTimeSeconds() + expire;
         dut.receiveMessage(message);
diff --git a/core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelStateTest.java b/core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelStateTest.java
index 708b472bc5a..c068f4ead5d 100644
--- a/core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelStateTest.java
+++ b/core/src/test/java/org/bitcoinj/protocols/channels/PaymentChannelStateTest.java
@@ -19,6 +19,7 @@
 import org.bitcoinj.core.*;
 import org.bitcoinj.script.Script;
 import org.bitcoinj.script.ScriptBuilder;
+import org.bitcoinj.script.ScriptPattern;
 import org.bitcoinj.testing.TestWithWallet;
 import org.bitcoinj.wallet.SendRequest;
 import org.bitcoinj.wallet.Wallet;
@@ -70,7 +71,7 @@ public static Collection<PaymentChannelClient.VersionSelector> data() {
     public PaymentChannelClient.VersionSelector versionSelector;
 
     /**
-     * Returns <code>true</code> if we are using a protocol version that requires the exchange of refunds.
+     * Returns {@code true} if we are using a protocol version that requires the exchange of refunds.
      */
     private boolean useRefunds() {
         return versionSelector == PaymentChannelClient.VersionSelector.VERSION_1;
@@ -91,7 +92,7 @@ public TxFuturePair(Transaction tx, SettableFuture<Transaction> future) {
     public void setUp() throws Exception {
         Utils.setMockClock(); // Use mock clock
         super.setUp();
-        Context.propagate(new Context(PARAMS, 100, Coin.ZERO, false));
+        Context.propagate(new Context(UNITTEST, 100, Coin.ZERO, false));
         wallet.addExtension(new StoredPaymentChannelClientStates(wallet, new TransactionBroadcaster() {
             @Override
             public TransactionBroadcast broadcastTransaction(Transaction tx) {
@@ -100,12 +101,12 @@ public TransactionBroadcast broadcastTransaction(Transaction tx) {
             }
         }));
         sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, COIN);
-        chain = new BlockChain(PARAMS, wallet, blockStore); // Recreate chain as sendMoneyToWallet will confuse it
-        serverWallet = new Wallet(PARAMS);
+        chain = new BlockChain(UNITTEST, wallet, blockStore); // Recreate chain as sendMoneyToWallet will confuse it
+        serverWallet = new Wallet(UNITTEST);
         serverKey = serverWallet.freshReceiveKey();
         chain.addWallet(serverWallet);
 
-        broadcasts = new LinkedBlockingQueue<TxFuturePair>();
+        broadcasts = new LinkedBlockingQueue<>();
         mockBroadcaster = new TransactionBroadcaster() {
             @Override
             public TransactionBroadcast broadcastTransaction(Transaction tx) {
@@ -237,7 +238,7 @@ public void basic() throws Exception {
         // Send the refund tx from client to server and get back the signature.
         Transaction refund;
         if (useRefunds()) {
-            refund = new Transaction(PARAMS, clientV1State().getIncompleteRefundTransaction().bitcoinSerialize());
+            refund = new Transaction(UNITTEST, clientV1State().getIncompleteRefundTransaction().bitcoinSerialize());
             byte[] refundSig = serverV1State().provideRefundTransaction(refund, myKey.getPubKey());
             assertEquals(PaymentChannelServerState.State.WAITING_FOR_MULTISIG_CONTRACT, serverState.getState());
             // This verifies that the refund can spend the multi-sig output when run.
@@ -250,17 +251,17 @@ public void basic() throws Exception {
         assertEquals(PaymentChannelClientState.State.PROVIDE_MULTISIG_CONTRACT_TO_SERVER, clientState.getState());
 
         // Validate the multisig contract looks right.
-        Transaction multisigContract = new Transaction(PARAMS, clientState.getContract().bitcoinSerialize());
+        Transaction multisigContract = new Transaction(UNITTEST, clientState.getContract().bitcoinSerialize());
         assertEquals(PaymentChannelClientState.State.READY, clientState.getState());
         assertEquals(2, multisigContract.getOutputs().size());   // One multi-sig, one change.
         Script script = multisigContract.getOutput(0).getScriptPubKey();
         if (versionSelector == PaymentChannelClient.VersionSelector.VERSION_1) {
-            assertTrue(script.isSentToMultiSig());
+            assertTrue(ScriptPattern.isSentToMultisig(script));
         } else {
-            assertTrue(script.isPayToScriptHash());
+            assertTrue(ScriptPattern.isP2SH(script));
         }
         script = multisigContract.getOutput(1).getScriptPubKey();
-        assertTrue(script.isSentToAddress());
+        assertTrue(ScriptPattern.isP2PKH(script));
         assertTrue(wallet.getPendingTransactions().contains(multisigContract));
 
         // Provide the server with the multisig contract and simulate successful propagation/acceptance.
@@ -277,14 +278,14 @@ public void basic() throws Exception {
         assertEquals(2, wallet.getTransactions(false).size());
         Iterator<Transaction> walletTransactionIterator = wallet.getTransactions(false).iterator();
         Transaction clientWalletMultisigContract = walletTransactionIterator.next();
-        assertFalse(clientWalletMultisigContract.getHash().equals(clientState.getRefundTransaction().getHash()));
-        if (!clientWalletMultisigContract.getHash().equals(multisigContract.getHash())) {
+        assertFalse(clientWalletMultisigContract.getTxId().equals(clientState.getRefundTransaction().getTxId()));
+        if (!clientWalletMultisigContract.getTxId().equals(multisigContract.getTxId())) {
             clientWalletMultisigContract = walletTransactionIterator.next();
-            assertFalse(clientWalletMultisigContract.getHash().equals(clientState.getRefundTransaction().getHash()));
+            assertFalse(clientWalletMultisigContract.getTxId().equals(clientState.getRefundTransaction().getTxId()));
         } else
-            assertFalse(walletTransactionIterator.next().getHash().equals(clientState.getRefundTransaction().getHash()));
-        assertEquals(multisigContract.getHash(), clientWalletMultisigContract.getHash());
-        assertFalse(clientWalletMultisigContract.getInput(0).getConnectedOutput().getSpentBy().getParentTransaction().getHash().equals(refund.getHash()));
+            assertFalse(walletTransactionIterator.next().getTxId().equals(clientState.getRefundTransaction().getTxId()));
+        assertEquals(multisigContract.getTxId(), clientWalletMultisigContract.getTxId());
+        assertFalse(clientWalletMultisigContract.getInput(0).getConnectedOutput().getSpentBy().getParentTransaction().getTxId().equals(refund.getTxId()));
 
         // Both client and server are now in the ready state. Simulate a few micropayments of 0.005 bitcoins.
         Coin size = HALF_COIN.divide(100);
@@ -308,7 +309,7 @@ public void basic() throws Exception {
         final TxFuturePair pair2 = broadcasts.take();
         Transaction closeTx = pair2.tx;
         pair2.future.set(closeTx);
-        final Transaction reserializedCloseTx = new Transaction(PARAMS, closeTx.bitcoinSerialize());
+        final Transaction reserializedCloseTx = new Transaction(UNITTEST, closeTx.bitcoinSerialize());
         assertEquals(PaymentChannelServerState.State.CLOSED, serverState.getState());
         // ... and on the client side.
         wallet.receivePending(reserializedCloseTx, null);
@@ -326,11 +327,11 @@ public void basic() throws Exception {
 
         walletTransactionIterator = wallet.getTransactions(false).iterator();
         Transaction clientWalletCloseTransaction = walletTransactionIterator.next();
-        if (!clientWalletCloseTransaction.getHash().equals(closeTx.getHash()))
+        if (!clientWalletCloseTransaction.getTxId().equals(closeTx.getTxId()))
             clientWalletCloseTransaction = walletTransactionIterator.next();
-        if (!clientWalletCloseTransaction.getHash().equals(closeTx.getHash()))
+        if (!clientWalletCloseTransaction.getTxId().equals(closeTx.getTxId()))
             clientWalletCloseTransaction = walletTransactionIterator.next();
-        assertEquals(closeTx.getHash(), clientWalletCloseTransaction.getHash());
+        assertEquals(closeTx.getTxId(), clientWalletCloseTransaction.getTxId());
         assertNotNull(clientWalletCloseTransaction.getInput(0).getConnectedOutput());
     }
 
@@ -340,9 +341,9 @@ public void setupDoS() throws Exception {
         // we can broadcast the refund and get our balance back.
 
         // Spend the client wallet's one coin
-        Transaction spendCoinTx = wallet.sendCoinsOffline(SendRequest.to(new ECKey().toAddress(PARAMS), COIN));
+        Transaction spendCoinTx = wallet.sendCoinsOffline(SendRequest.to(LegacyAddress.fromKey(UNITTEST, new ECKey()), COIN));
         assertEquals(Coin.ZERO, wallet.getBalance());
-        chain.add(makeSolvedTestBlock(blockStore.getChainHead().getHeader(), spendCoinTx, createFakeTx(PARAMS, CENT, myAddress)));
+        chain.add(makeSolvedTestBlock(blockStore.getChainHead().getHeader(), spendCoinTx, createFakeTx(UNITTEST, CENT, myAddress)));
         assertEquals(CENT, wallet.getBalance());
 
         // Set the wallet's stored states to use our real test PeerGroup
@@ -364,7 +365,7 @@ public void setupDoS() throws Exception {
 
         if (useRefunds()) {
             // Send the refund tx from client to server and get back the signature.
-            Transaction refund = new Transaction(PARAMS, clientV1State().getIncompleteRefundTransaction().bitcoinSerialize());
+            Transaction refund = new Transaction(UNITTEST, clientV1State().getIncompleteRefundTransaction().bitcoinSerialize());
             byte[] refundSig = serverV1State().provideRefundTransaction(refund, myKey.getPubKey());
             assertEquals(PaymentChannelServerState.State.WAITING_FOR_MULTISIG_CONTRACT, serverState.getState());
             // This verifies that the refund can spend the multi-sig output when run.
@@ -375,17 +376,17 @@ public void setupDoS() throws Exception {
         assertEquals(PaymentChannelClientState.State.PROVIDE_MULTISIG_CONTRACT_TO_SERVER, clientState.getState());
 
         // Validate the multisig contract looks right.
-        Transaction multisigContract = new Transaction(PARAMS, clientState.getContract().bitcoinSerialize());
+        Transaction multisigContract = new Transaction(UNITTEST, clientState.getContract().bitcoinSerialize());
         assertEquals(PaymentChannelClientState.State.READY, clientState.getState());
         assertEquals(2, multisigContract.getOutputs().size());   // One multi-sig, one change.
         Script script = multisigContract.getOutput(0).getScriptPubKey();
         if (versionSelector == PaymentChannelClient.VersionSelector.VERSION_1) {
-            assertTrue(script.isSentToMultiSig());
+            assertTrue(ScriptPattern.isSentToMultisig(script));
         } else {
-            assertTrue(script.isPayToScriptHash());
+            assertTrue(ScriptPattern.isP2SH(script));
         }
         script = multisigContract.getOutput(1).getScriptPubKey();
-        assertTrue(script.isSentToAddress());
+        assertTrue(ScriptPattern.isP2PKH(script));
         assertTrue(wallet.getPendingTransactions().contains(multisigContract));
 
         // Provide the server with the multisig contract and simulate successful propagation/acceptance.
@@ -423,16 +424,16 @@ public void setupDoS() throws Exception {
         clientState.doStoreChannelInWallet(Sha256Hash.of(new byte[]{}));
         TxFuturePair clientBroadcastedMultiSig = broadcasts.take();
         TxFuturePair broadcastRefund = broadcasts.take();
-        assertEquals(clientBroadcastedMultiSig.tx.getHash(), multisigContract.getHash());
+        assertEquals(clientBroadcastedMultiSig.tx.getTxId(), multisigContract.getTxId());
         for (TransactionInput input : clientBroadcastedMultiSig.tx.getInputs())
             input.verify();
         clientBroadcastedMultiSig.future.set(clientBroadcastedMultiSig.tx);
 
         Transaction clientBroadcastedRefund = broadcastRefund.tx;
-        assertEquals(clientBroadcastedRefund.getHash(), clientState.getRefundTransaction().getHash());
+        assertEquals(clientBroadcastedRefund.getTxId(), clientState.getRefundTransaction().getTxId());
         for (TransactionInput input : clientBroadcastedRefund.getInputs()) {
             // If the multisig output is connected, the wallet will fail to deserialize
-            if (input.getOutpoint().getHash().equals(clientBroadcastedMultiSig.tx.getHash()))
+            if (input.getOutpoint().getHash().equals(clientBroadcastedMultiSig.tx.getTxId()))
                 assertNull(input.getConnectedOutput().getSpentBy());
             input.verify(clientBroadcastedMultiSig.tx.getOutput(0));
         }
@@ -471,23 +472,23 @@ public void checkBadData() throws Exception {
         if (useRefunds()) {
             // Test refund transaction with any number of issues
             byte[] refundTxBytes = clientV1State().getIncompleteRefundTransaction().bitcoinSerialize();
-            Transaction refund = new Transaction(PARAMS, refundTxBytes);
-            refund.addOutput(Coin.ZERO, new ECKey().toAddress(PARAMS));
+            Transaction refund = new Transaction(UNITTEST, refundTxBytes);
+            refund.addOutput(Coin.ZERO, LegacyAddress.fromKey(UNITTEST, new ECKey()));
             try {
                 serverV1State().provideRefundTransaction(refund, myKey.getPubKey());
                 fail();
             } catch (VerificationException e) {
             }
 
-            refund = new Transaction(PARAMS, refundTxBytes);
-            refund.addInput(new TransactionInput(PARAMS, refund, new byte[]{}, new TransactionOutPoint(PARAMS, 42, refund.getHash())));
+            refund = new Transaction(UNITTEST, refundTxBytes);
+            refund.addInput(new TransactionInput(UNITTEST, refund, new byte[]{}, new TransactionOutPoint(UNITTEST, 42, refund.getTxId())));
             try {
                 serverV1State().provideRefundTransaction(refund, myKey.getPubKey());
                 fail();
             } catch (VerificationException e) {
             }
 
-            refund = new Transaction(PARAMS, refundTxBytes);
+            refund = new Transaction(UNITTEST, refundTxBytes);
             refund.setLockTime(0);
             try {
                 serverV1State().provideRefundTransaction(refund, myKey.getPubKey());
@@ -495,7 +496,7 @@ public void checkBadData() throws Exception {
             } catch (VerificationException e) {
             }
 
-            refund = new Transaction(PARAMS, refundTxBytes);
+            refund = new Transaction(UNITTEST, refundTxBytes);
             refund.getInput(0).setSequenceNumber(TransactionInput.NO_SEQUENCE);
             try {
                 serverV1State().provideRefundTransaction(refund, myKey.getPubKey());
@@ -503,7 +504,7 @@ public void checkBadData() throws Exception {
             } catch (VerificationException e) {
             }
 
-            refund = new Transaction(PARAMS, refundTxBytes);
+            refund = new Transaction(UNITTEST, refundTxBytes);
             byte[] refundSig = serverV1State().provideRefundTransaction(refund, myKey.getPubKey());
             try {
                 serverV1State().provideRefundTransaction(refund, myKey.getPubKey());
@@ -564,7 +565,7 @@ public void checkBadData() throws Exception {
 
         byte[] multisigContractSerialized = clientState.getContract().bitcoinSerialize();
 
-        Transaction multisigContract = new Transaction(PARAMS, multisigContractSerialized);
+        Transaction multisigContract = new Transaction(UNITTEST, multisigContractSerialized);
         multisigContract.clearOutputs();
         // Swap order of client and server keys to check correct failure
         if (versionSelector == PaymentChannelClient.VersionSelector.VERSION_1) {
@@ -581,7 +582,7 @@ public void checkBadData() throws Exception {
             assertTrue(e.getMessage().contains("client and server in that order"));
         }
 
-        multisigContract = new Transaction(PARAMS, multisigContractSerialized);
+        multisigContract = new Transaction(UNITTEST, multisigContractSerialized);
         multisigContract.clearOutputs();
         if (versionSelector == PaymentChannelClient.VersionSelector.VERSION_1) {
             multisigContract.addOutput(Coin.ZERO, ScriptBuilder.createMultiSigOutputScript(2, Lists.newArrayList(myKey, serverKey)));
@@ -597,15 +598,15 @@ public void checkBadData() throws Exception {
             assertTrue(e.getMessage().contains("zero value"));
         }
 
-        multisigContract = new Transaction(PARAMS, multisigContractSerialized);
+        multisigContract = new Transaction(UNITTEST, multisigContractSerialized);
         multisigContract.clearOutputs();
-        multisigContract.addOutput(new TransactionOutput(PARAMS, multisigContract, HALF_COIN, new byte[] {0x01}));
+        multisigContract.addOutput(new TransactionOutput(UNITTEST, multisigContract, HALF_COIN, new byte[] {0x01}));
         try {
             serverState.provideContract(multisigContract);
             fail();
         } catch (VerificationException e) {}
 
-        multisigContract = new Transaction(PARAMS, multisigContractSerialized);
+        multisigContract = new Transaction(UNITTEST, multisigContractSerialized);
         ListenableFuture<PaymentChannelServerState> multisigStateFuture = serverState.provideContract(multisigContract);
         try { serverState.provideContract(multisigContract); fail(); } catch (IllegalStateException e) {}
         assertEquals(PaymentChannelServerState.State.WAITING_FOR_MULTISIG_ACCEPTANCE, serverState.getState());
@@ -688,16 +689,16 @@ public void checkBadData() throws Exception {
     @Test
     public void feesTest() throws Exception {
         // Test that transactions are getting the necessary fees
-        Context.propagate(new Context(PARAMS, 100, Coin.ZERO, true));
+        Context.propagate(new Context(UNITTEST, 100, Coin.ZERO, true));
 
         // Spend the client wallet's one coin
-        final SendRequest request = SendRequest.to(new ECKey().toAddress(PARAMS), COIN);
+        final SendRequest request = SendRequest.to(LegacyAddress.fromKey(UNITTEST, new ECKey()), COIN);
         request.ensureMinRequiredFee = false;
         wallet.sendCoinsOffline(request);
         assertEquals(Coin.ZERO, wallet.getBalance());
 
         chain.add(makeSolvedTestBlock(blockStore.getChainHead().getHeader(),
-                createFakeTx(PARAMS, CENT.add(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE), myAddress)));
+                createFakeTx(UNITTEST, CENT.add(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE), myAddress)));
         assertEquals(CENT.add(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE), wallet.getBalance());
 
         Utils.setMockClock(); // Use mock clock
@@ -729,19 +730,23 @@ public void feesTest() throws Exception {
         assertEquals(PaymentChannelClientState.State.NEW, clientState.getState());
         // We'll have to pay REFERENCE_DEFAULT_MIN_TX_FEE twice (multisig+refund), and we'll end up getting back nearly nothing...
         clientState.initiate();
-        assertEquals(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.multiply(2), clientState.getRefundTxFees());
+        // Hardcoded tx length because actual length may vary depending on actual signature length
+        // The value is close to clientState.getContractInternal().unsafeBitcoinSerialize().length;
+        int contractSize = versionSelector == PaymentChannelClient.VersionSelector.VERSION_1 ? 273 : 225;
+        Coin expectedFees = Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.multiply(contractSize).divide(1000).add(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE);
+        assertEquals(expectedFees, clientState.getRefundTxFees());
         assertEquals(getInitialClientState(), clientState.getState());
 
         // Now actually use a more useful CENT
         clientState = makeClientState(wallet, myKey, ECKey.fromPublicOnly(serverKey.getPubKey()), CENT, EXPIRE_TIME);
         assertEquals(PaymentChannelClientState.State.NEW, clientState.getState());
         clientState.initiate();
-        assertEquals(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.multiply(2), clientState.getRefundTxFees());
+        assertEquals(expectedFees, clientState.getRefundTxFees());
         assertEquals(getInitialClientState(), clientState.getState());
 
         if (useRefunds()) {
             // Send the refund tx from client to server and get back the signature.
-            Transaction refund = new Transaction(PARAMS, clientV1State().getIncompleteRefundTransaction().bitcoinSerialize());
+            Transaction refund = new Transaction(UNITTEST, clientV1State().getIncompleteRefundTransaction().bitcoinSerialize());
             byte[] refundSig = serverV1State().provideRefundTransaction(refund, myKey.getPubKey());
             assertEquals(PaymentChannelServerState.State.WAITING_FOR_MULTISIG_CONTRACT, serverState.getState());
             // This verifies that the refund can spend the multi-sig output when run.
@@ -752,7 +757,7 @@ public void feesTest() throws Exception {
         assertEquals(PaymentChannelClientState.State.PROVIDE_MULTISIG_CONTRACT_TO_SERVER, clientState.getState());
 
         // Get the multisig contract
-        Transaction multisigContract = new Transaction(PARAMS, clientState.getContract().bitcoinSerialize());
+        Transaction multisigContract = new Transaction(UNITTEST, clientState.getContract().bitcoinSerialize());
         assertEquals(PaymentChannelClientState.State.READY, clientState.getState());
 
         // Provide the server with the multisig contract and simulate successful propagation/acceptance.
@@ -807,7 +812,7 @@ public void feesTest() throws Exception {
     @Test
     public void serverAddsFeeTest() throws Exception {
         // Test that the server properly adds the necessary fee at the end (or just drops the payment if its not worth it)
-        Context.propagate(new Context(PARAMS, 100, Coin.ZERO, true));
+        Context.propagate(new Context(UNITTEST, 100, Coin.ZERO, true));
 
         Utils.setMockClock(); // Use mock clock
         final long EXPIRE_TIME = Utils.currentTimeMillis()/1000 + 60*60*24;
@@ -817,30 +822,26 @@ public void serverAddsFeeTest() throws Exception {
 
         switch (versionSelector) {
             case VERSION_1:
-                clientState = new PaymentChannelV1ClientState(wallet, myKey, ECKey.fromPublicOnly(serverKey.getPubKey()), CENT, EXPIRE_TIME) {
-                    @Override
-                    protected void editContractSendRequest(SendRequest req) {
-                        req.coinSelector = wallet.getCoinSelector();
-                    }
-                };
+                clientState = new PaymentChannelV1ClientState(wallet, myKey, ECKey.fromPublicOnly(serverKey.getPubKey()), CENT, EXPIRE_TIME) ;
                 break;
             case VERSION_2_ALLOW_1:
             case VERSION_2:
-                clientState = new PaymentChannelV2ClientState(wallet, myKey, ECKey.fromPublicOnly(serverKey.getPubKey()), CENT, EXPIRE_TIME) {
-                    @Override
-                    protected void editContractSendRequest(SendRequest req) {
-                        req.coinSelector = wallet.getCoinSelector();
-                    }
-                };
+                clientState = new PaymentChannelV2ClientState(wallet, myKey, ECKey.fromPublicOnly(serverKey.getPubKey()), CENT, EXPIRE_TIME);
                 break;
         }
         assertEquals(PaymentChannelClientState.State.NEW, clientState.getState());
-        clientState.initiate();
+        clientState.initiate(null, new PaymentChannelClient.DefaultClientChannelProperties() {
+            @Override
+            public SendRequest modifyContractSendRequest(SendRequest sendRequest) {
+                sendRequest.coinSelector = wallet.getCoinSelector();
+                return sendRequest;
+            }
+        });
         assertEquals(getInitialClientState(), clientState.getState());
 
         if (useRefunds()) {
             // Send the refund tx from client to server and get back the signature.
-            Transaction refund = new Transaction(PARAMS, clientV1State().getIncompleteRefundTransaction().bitcoinSerialize());
+            Transaction refund = new Transaction(UNITTEST, clientV1State().getIncompleteRefundTransaction().bitcoinSerialize());
             byte[] refundSig = serverV1State().provideRefundTransaction(refund, myKey.getPubKey());
             assertEquals(PaymentChannelServerState.State.WAITING_FOR_MULTISIG_CONTRACT, serverState.getState());
             // This verifies that the refund can spend the multi-sig output when run.
@@ -851,17 +852,17 @@ protected void editContractSendRequest(SendRequest req) {
         assertEquals(PaymentChannelClientState.State.PROVIDE_MULTISIG_CONTRACT_TO_SERVER, clientState.getState());
 
         // Validate the multisig contract looks right.
-        Transaction multisigContract = new Transaction(PARAMS, clientState.getContract().bitcoinSerialize());
+        Transaction multisigContract = new Transaction(UNITTEST, clientState.getContract().bitcoinSerialize());
         assertEquals(PaymentChannelV1ClientState.State.READY, clientState.getState());
         assertEquals(2, multisigContract.getOutputs().size());   // One multi-sig, one change.
         Script script = multisigContract.getOutput(0).getScriptPubKey();
         if (versionSelector == PaymentChannelClient.VersionSelector.VERSION_1) {
-            assertTrue(script.isSentToMultiSig());
+            assertTrue(ScriptPattern.isSentToMultisig(script));
         } else {
-            assertTrue(script.isPayToScriptHash());
+            assertTrue(ScriptPattern.isP2SH(script));
         }
         script = multisigContract.getOutput(1).getScriptPubKey();
-        assertTrue(script.isSentToAddress());
+        assertTrue(ScriptPattern.isP2PKH(script));
         assertTrue(wallet.getPendingTransactions().contains(multisigContract));
 
         // Provide the server with the multisig contract and simulate successful propagation/acceptance.
@@ -874,10 +875,12 @@ protected void editContractSendRequest(SendRequest req) {
         pair.future.set(pair.tx);
         assertEquals(PaymentChannelServerState.State.READY, serverState.getState());
 
+        int expectedSize = versionSelector == PaymentChannelClient.VersionSelector.VERSION_1 ? 271 : 355;
+        Coin expectedFee = Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.multiply(expectedSize).divide(1000);
         // Both client and server are now in the ready state, split the channel in half
-        byte[] signature = clientState.incrementPaymentBy(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.subtract(Coin.SATOSHI), null)
+        byte[] signature = clientState.incrementPaymentBy(expectedFee.subtract(Coin.SATOSHI), null)
                 .signature.encodeToBitcoin();
-        Coin totalRefund = CENT.subtract(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.subtract(SATOSHI));
+        Coin totalRefund = CENT.subtract(expectedFee.subtract(SATOSHI));
         serverState.incrementPayment(totalRefund, signature);
 
         // We need to pay MIN_TX_FEE, but we only have MIN_NONDUST_OUTPUT
@@ -885,10 +888,11 @@ protected void editContractSendRequest(SendRequest req) {
             serverState.close();
             fail();
         } catch (InsufficientMoneyException e) {
+            assertTrue(e.getMessage().contains("Insufficient money,  missing "));
         }
 
         // Now give the server enough coins to pay the fee
-        sendMoneyToWallet(serverWallet, AbstractBlockChain.NewBlockType.BEST_CHAIN, COIN, serverKey.toAddress(PARAMS));
+        sendMoneyToWallet(serverWallet, AbstractBlockChain.NewBlockType.BEST_CHAIN, COIN, LegacyAddress.fromKey(UNITTEST, serverKey));
 
         // The contract is still not worth redeeming - its worth less than we pay in fee
         try {
@@ -898,8 +902,8 @@ protected void editContractSendRequest(SendRequest req) {
             assertTrue(e.getMessage().contains("more in fees"));
         }
 
-        signature = clientState.incrementPaymentBy(SATOSHI, null).signature.encodeToBitcoin();
-        totalRefund = totalRefund.subtract(SATOSHI);
+        signature = clientState.incrementPaymentBy(SATOSHI.multiply(20), null).signature.encodeToBitcoin();
+        totalRefund = totalRefund.subtract(SATOSHI.multiply(20));
         serverState.incrementPayment(totalRefund, signature);
 
         // And settle the channel.
@@ -928,7 +932,7 @@ public void doubleSpendContractTest() throws Exception {
 
         Transaction refund;
         if (useRefunds()) {
-            refund = new Transaction(PARAMS, clientV1State().getIncompleteRefundTransaction().bitcoinSerialize());
+            refund = new Transaction(UNITTEST, clientV1State().getIncompleteRefundTransaction().bitcoinSerialize());
             // Send the refund tx from client to server and get back the signature.
             byte[] refundSig = serverV1State().provideRefundTransaction(refund, myKey.getPubKey());
             assertEquals(PaymentChannelV1ServerState.State.WAITING_FOR_MULTISIG_CONTRACT, serverState.getState());
@@ -942,17 +946,17 @@ public void doubleSpendContractTest() throws Exception {
         assertEquals(PaymentChannelClientState.State.PROVIDE_MULTISIG_CONTRACT_TO_SERVER, clientState.getState());
 
         // Validate the multisig contract looks right.
-        Transaction multisigContract = new Transaction(PARAMS, clientState.getContract().bitcoinSerialize());
+        Transaction multisigContract = new Transaction(UNITTEST, clientState.getContract().bitcoinSerialize());
         assertEquals(PaymentChannelClientState.State.READY, clientState.getState());
         assertEquals(2, multisigContract.getOutputs().size());   // One multi-sig, one change.
         Script script = multisigContract.getOutput(0).getScriptPubKey();
         if (versionSelector == PaymentChannelClient.VersionSelector.VERSION_1) {
-            assertTrue(script.isSentToMultiSig());
+            assertTrue(ScriptPattern.isSentToMultisig(script));
         } else {
-            assertTrue(script.isPayToScriptHash());
+            assertTrue(ScriptPattern.isP2SH(script));
         }
         script = multisigContract.getOutput(1).getScriptPubKey();
-        assertTrue(script.isSentToAddress());
+        assertTrue(ScriptPattern.isP2PKH(script));
         assertTrue(wallet.getPendingTransactions().contains(multisigContract));
 
         // Provide the server with the multisig contract and simulate successful propagation/acceptance.
@@ -969,14 +973,14 @@ public void doubleSpendContractTest() throws Exception {
         assertEquals(2, wallet.getTransactions(false).size());
         Iterator<Transaction> walletTransactionIterator = wallet.getTransactions(false).iterator();
         Transaction clientWalletMultisigContract = walletTransactionIterator.next();
-        assertFalse(clientWalletMultisigContract.getHash().equals(clientState.getRefundTransaction().getHash()));
-        if (!clientWalletMultisigContract.getHash().equals(multisigContract.getHash())) {
+        assertFalse(clientWalletMultisigContract.getTxId().equals(clientState.getRefundTransaction().getTxId()));
+        if (!clientWalletMultisigContract.getTxId().equals(multisigContract.getTxId())) {
             clientWalletMultisigContract = walletTransactionIterator.next();
-            assertFalse(clientWalletMultisigContract.getHash().equals(clientState.getRefundTransaction().getHash()));
+            assertFalse(clientWalletMultisigContract.getTxId().equals(clientState.getRefundTransaction().getTxId()));
         } else
-            assertFalse(walletTransactionIterator.next().getHash().equals(clientState.getRefundTransaction().getHash()));
-        assertEquals(multisigContract.getHash(), clientWalletMultisigContract.getHash());
-        assertFalse(clientWalletMultisigContract.getInput(0).getConnectedOutput().getSpentBy().getParentTransaction().getHash().equals(refund.getHash()));
+            assertFalse(walletTransactionIterator.next().getTxId().equals(clientState.getRefundTransaction().getTxId()));
+        assertEquals(multisigContract.getTxId(), clientWalletMultisigContract.getTxId());
+        assertFalse(clientWalletMultisigContract.getInput(0).getConnectedOutput().getSpentBy().getParentTransaction().getTxId().equals(refund.getTxId()));
 
         // Both client and server are now in the ready state. Simulate a few micropayments of 0.005 bitcoins.
         Coin size = HALF_COIN.divide(100);
@@ -988,13 +992,13 @@ public void doubleSpendContractTest() throws Exception {
         }
 
         // Now create a double-spend and send it to the server
-        Transaction doubleSpendContract = new Transaction(PARAMS);
-        doubleSpendContract.addInput(new TransactionInput(PARAMS, doubleSpendContract, new byte[0],
+        Transaction doubleSpendContract = new Transaction(UNITTEST);
+        doubleSpendContract.addInput(new TransactionInput(UNITTEST, doubleSpendContract, new byte[0],
                 multisigContract.getInput(0).getOutpoint()));
         doubleSpendContract.addOutput(HALF_COIN, myKey);
-        doubleSpendContract = new Transaction(PARAMS, doubleSpendContract.bitcoinSerialize());
+        doubleSpendContract = new Transaction(UNITTEST, doubleSpendContract.bitcoinSerialize());
 
-        StoredBlock block = new StoredBlock(PARAMS.getGenesisBlock().createNextBlock(myKey.toAddress(PARAMS)), BigInteger.TEN, 1);
+        StoredBlock block = new StoredBlock(UNITTEST.getGenesisBlock().createNextBlock(LegacyAddress.fromKey(UNITTEST, myKey)), BigInteger.TEN, 1);
         serverWallet.receiveFromBlock(doubleSpendContract, block, AbstractBlockChain.NewBlockType.BEST_CHAIN, 0);
 
         // Now if we try to spend again the server will reject it since it saw a double-spend
diff --git a/core/src/test/java/org/bitcoinj/protocols/payments/PaymentProtocolTest.java b/core/src/test/java/org/bitcoinj/protocols/payments/PaymentProtocolTest.java
index f7c805fce6b..b734ea22e1b 100644
--- a/core/src/test/java/org/bitcoinj/protocols/payments/PaymentProtocolTest.java
+++ b/core/src/test/java/org/bitcoinj/protocols/payments/PaymentProtocolTest.java
@@ -16,7 +16,13 @@
 
 package org.bitcoinj.protocols.payments;
 
-import org.bitcoinj.core.*;
+import org.bitcoinj.core.Address;
+import org.bitcoinj.core.Coin;
+import org.bitcoinj.core.ECKey;
+import org.bitcoinj.core.LegacyAddress;
+import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.core.Transaction;
+import org.bitcoinj.core.Utils;
 import org.bitcoinj.crypto.X509Utils;
 import org.bitcoinj.params.TestNet3Params;
 import org.bitcoinj.params.UnitTestParams;
@@ -41,11 +47,12 @@
 import static org.junit.Assert.*;
 
 public class PaymentProtocolTest {
+    private static final NetworkParameters UNITTEST = UnitTestParams.get();
+    private static final NetworkParameters TESTNET = TestNet3Params.get();
 
     // static test data
-    private static final NetworkParameters NETWORK_PARAMS = UnitTestParams.get();
     private static final Coin AMOUNT = Coin.SATOSHI;
-    private static final Address TO_ADDRESS = new ECKey().toAddress(NETWORK_PARAMS);
+    private static final Address TO_ADDRESS = LegacyAddress.fromKey(UNITTEST, new ECKey());
     private static final String MEMO = "memo";
     private static final String PAYMENT_URL = "https://example.com";
     private static final byte[] MERCHANT_DATA = { 0, 1, 2 };
@@ -93,7 +100,7 @@ public void testSignAndVerifyExpired() throws Exception {
 
     private Protos.PaymentRequest minimalPaymentRequest() {
         Protos.PaymentDetails.Builder paymentDetails = Protos.PaymentDetails.newBuilder();
-        paymentDetails.setTime(System.currentTimeMillis());
+        paymentDetails.setTime(Utils.currentTimeSeconds());
         Protos.PaymentRequest.Builder paymentRequest = Protos.PaymentRequest.newBuilder();
         paymentRequest.setSerializedPaymentDetails(paymentDetails.build().toByteString());
         return paymentRequest.build();
@@ -102,7 +109,7 @@ private Protos.PaymentRequest minimalPaymentRequest() {
     @Test
     public void testPaymentRequest() throws Exception {
         // Create
-        PaymentRequest paymentRequest = PaymentProtocol.createPaymentRequest(TestNet3Params.get(), AMOUNT, TO_ADDRESS, MEMO,
+        PaymentRequest paymentRequest = PaymentProtocol.createPaymentRequest(TESTNET, AMOUNT, TO_ADDRESS, MEMO,
                 PAYMENT_URL, MERCHANT_DATA).build();
         byte[] paymentRequestBytes = paymentRequest.toByteArray();
 
@@ -121,17 +128,17 @@ public void testPaymentRequest() throws Exception {
     @Test
     public void testPaymentMessage() throws Exception {
         // Create
-        List<Transaction> transactions = new LinkedList<Transaction>();
-        transactions.add(FakeTxBuilder.createFakeTx(NETWORK_PARAMS, AMOUNT, TO_ADDRESS));
+        List<Transaction> transactions = new LinkedList<>();
+        transactions.add(FakeTxBuilder.createFakeTx(UNITTEST, AMOUNT, TO_ADDRESS));
         Coin refundAmount = Coin.SATOSHI;
-        Address refundAddress = new ECKey().toAddress(NETWORK_PARAMS);
+        Address refundAddress = LegacyAddress.fromKey(UNITTEST, new ECKey());
         Payment payment = PaymentProtocol.createPaymentMessage(transactions, refundAmount, refundAddress, MEMO,
                 MERCHANT_DATA);
         byte[] paymentBytes = payment.toByteArray();
 
         // Parse
         Payment parsedPayment = Payment.parseFrom(paymentBytes);
-        List<Transaction> parsedTransactions = PaymentProtocol.parseTransactionsFromPaymentMessage(NETWORK_PARAMS,
+        List<Transaction> parsedTransactions = PaymentProtocol.parseTransactionsFromPaymentMessage(UNITTEST,
                 parsedPayment);
         assertEquals(transactions, parsedTransactions);
         assertEquals(1, parsedPayment.getRefundToCount());
diff --git a/core/src/test/java/org/bitcoinj/protocols/payments/PaymentSessionTest.java b/core/src/test/java/org/bitcoinj/protocols/payments/PaymentSessionTest.java
index 41d5de3affc..6f215392c57 100644
--- a/core/src/test/java/org/bitcoinj/protocols/payments/PaymentSessionTest.java
+++ b/core/src/test/java/org/bitcoinj/protocols/payments/PaymentSessionTest.java
@@ -17,7 +17,16 @@
 
 package org.bitcoinj.protocols.payments;
 
-import org.bitcoinj.core.*;
+import org.bitcoinj.core.Address;
+import org.bitcoinj.core.Coin;
+import org.bitcoinj.core.Context;
+import org.bitcoinj.core.ECKey;
+import org.bitcoinj.core.LegacyAddress;
+import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.core.Transaction;
+import org.bitcoinj.core.TransactionInput;
+import org.bitcoinj.core.TransactionOutput;
+import org.bitcoinj.core.Utils;
 import org.bitcoinj.crypto.TrustStoreLoader;
 import org.bitcoinj.params.MainNetParams;
 import org.bitcoinj.params.TestNet3Params;
@@ -25,6 +34,7 @@
 import com.google.protobuf.ByteString;
 import org.bitcoin.protocols.payments.Protos;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.InputStream;
@@ -36,12 +46,14 @@
 import static org.junit.Assert.*;
 
 public class PaymentSessionTest {
-    private static final NetworkParameters PARAMS = TestNet3Params.get();
+    private static final NetworkParameters TESTNET = TestNet3Params.get();
+    private static final NetworkParameters MAINNET = MainNetParams.get();
+
     private static final String simplePaymentUrl = "http://a.simple.url.com/";
     private static final String paymentRequestMemo = "send coinz noa plz kthx";
     private static final String paymentMemo = "take ze coinz";
     private static final ByteString merchantData = ByteString.copyFromUtf8("merchant data");
-    private static final long time = System.currentTimeMillis() / 1000L;
+    private static final long time = Utils.currentTimeSeconds();
     private ECKey serverKey;
     private Transaction tx;
     private TransactionOutput outputToMe;
@@ -49,9 +61,10 @@ public class PaymentSessionTest {
 
     @Before
     public void setUp() throws Exception {
+        new Context(TESTNET);
         serverKey = new ECKey();
-        tx = new Transaction(PARAMS);
-        outputToMe = new TransactionOutput(PARAMS, tx, coin, serverKey);
+        tx = new Transaction(TESTNET);
+        outputToMe = new TransactionOutput(TESTNET, tx, coin, serverKey);
         tx.addOutput(outputToMe);
     }
 
@@ -68,10 +81,10 @@ public void testSimplePayment() throws Exception {
 
         // Send the payment and verify that the correct information is sent.
         // Add a dummy input to tx so it is considered valid.
-        tx.addInput(new TransactionInput(PARAMS, tx, outputToMe.getScriptBytes()));
-        ArrayList<Transaction> txns = new ArrayList<Transaction>();
+        tx.addInput(new TransactionInput(TESTNET, tx, outputToMe.getScriptBytes()));
+        ArrayList<Transaction> txns = new ArrayList<>();
         txns.add(tx);
-        Address refundAddr = new Address(PARAMS, serverKey.getPubKeyHash());
+        Address refundAddr = LegacyAddress.fromKey(TESTNET, serverKey);
         paymentSession.sendPayment(txns, refundAddr, paymentMemo);
         assertEquals(1, paymentSession.getPaymentLog().size());
         assertEquals(simplePaymentUrl, paymentSession.getPaymentLog().get(0).getUrl().toString());
@@ -80,7 +93,7 @@ public void testSimplePayment() throws Exception {
         assertEquals(merchantData, payment.getMerchantData());
         assertEquals(1, payment.getRefundToCount());
         assertEquals(coin.value, payment.getRefundTo(0).getAmount());
-        TransactionOutput refundOutput = new TransactionOutput(PARAMS, null, coin, refundAddr);
+        TransactionOutput refundOutput = new TransactionOutput(TESTNET, null, coin, refundAddr);
         ByteString refundScript = ByteString.copyFrom(refundOutput.getScriptBytes());
         assertTrue(refundScript.equals(payment.getRefundTo(0).getScript()));
     }
@@ -108,8 +121,8 @@ public void testExpiredPaymentRequest() throws Exception {
         assertTrue(paymentSession.isExpired());
         // Send the payment and verify that an exception is thrown.
         // Add a dummy input to tx so it is considered valid.
-        tx.addInput(new TransactionInput(PARAMS, tx, outputToMe.getScriptBytes()));
-        ArrayList<Transaction> txns = new ArrayList<Transaction>();
+        tx.addInput(new TransactionInput(TESTNET, tx, outputToMe.getScriptBytes()));
+        ArrayList<Transaction> txns = new ArrayList<>();
         txns.add(tx);
         try {
             paymentSession.sendPayment(txns, null, null);
@@ -122,6 +135,7 @@ public void testExpiredPaymentRequest() throws Exception {
     }
 
     @Test
+    @Ignore("certificate expired")
     public void testPkiVerification() throws Exception {
         InputStream in = getClass().getResourceAsStream("pki_test.bitcoinpaymentrequest");
         Protos.PaymentRequest paymentRequest = Protos.PaymentRequest.newBuilder().mergeFrom(in).build();
@@ -135,14 +149,14 @@ public void testPkiVerification() throws Exception {
     public void testWrongNetwork() throws Exception {
         // Create a PaymentRequest and make sure the correct values are parsed by the PaymentSession.
         MockPaymentSession paymentSession = new MockPaymentSession(newSimplePaymentRequest("main"));
-        assertEquals(MainNetParams.get(), paymentSession.getNetworkParameters());
+        assertEquals(MAINNET, paymentSession.getNetworkParameters());
 
         // Send the payment and verify that the correct information is sent.
         // Add a dummy input to tx so it is considered valid.
-        tx.addInput(new TransactionInput(PARAMS, tx, outputToMe.getScriptBytes()));
-        ArrayList<Transaction> txns = new ArrayList<Transaction>();
+        tx.addInput(new TransactionInput(TESTNET, tx, outputToMe.getScriptBytes()));
+        ArrayList<Transaction> txns = new ArrayList<>();
         txns.add(tx);
-        Address refundAddr = new Address(PARAMS, serverKey.getPubKeyHash());
+        Address refundAddr = LegacyAddress.fromKey(TESTNET, serverKey);
         paymentSession.sendPayment(txns, refundAddr, paymentMemo);
         assertEquals(1, paymentSession.getPaymentLog().size());
     }
@@ -187,7 +201,7 @@ private Protos.PaymentRequest newExpiredPaymentRequest() {
     }
 
     private class MockPaymentSession extends PaymentSession {
-        private ArrayList<PaymentLogItem> paymentLog = new ArrayList<PaymentLogItem>();
+        private ArrayList<PaymentLogItem> paymentLog = new ArrayList<>();
 
         public MockPaymentSession(Protos.PaymentRequest request) throws PaymentProtocolException {
             super(request);
diff --git a/core/src/test/java/org/bitcoinj/script/ScriptBuilderTest.java b/core/src/test/java/org/bitcoinj/script/ScriptBuilderTest.java
new file mode 100644
index 00000000000..19e14abb837
--- /dev/null
+++ b/core/src/test/java/org/bitcoinj/script/ScriptBuilderTest.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2018 Nicola Atzei
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bitcoinj.script;
+
+import static org.bitcoinj.script.ScriptOpCodes.OP_FALSE;
+import static org.bitcoinj.script.ScriptOpCodes.OP_TRUE;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class ScriptBuilderTest {
+
+    @Test
+    public void testNumber() {
+        for (int i = -100; i <= 100; i++) {
+            Script s = new ScriptBuilder().number(i).build();
+            for (ScriptChunk ch : s.chunks) {
+                assertTrue(Integer.toString(i), ch.isShortestPossiblePushData());
+            }
+        }
+    }
+
+    @Test
+    public void numberBuilderZero() {
+        // Test encoding of zero, which should result in an opcode
+        final ScriptBuilder builder = new ScriptBuilder();
+
+        // 0 should encode directly to 0
+        builder.number(0);
+        assertArrayEquals(new byte[] {
+            0x00         // Pushed data
+        }, builder.build().getProgram());
+    }
+
+    @Test
+    public void numberBuilderPositiveOpCode() {
+        final ScriptBuilder builder = new ScriptBuilder();
+
+        builder.number(5);
+        assertArrayEquals(new byte[] {
+            0x55         // Pushed data
+        }, builder.build().getProgram());
+    }
+
+    @Test
+    public void numberBuilderBigNum() {
+        ScriptBuilder builder = new ScriptBuilder();
+        // 21066 should take up three bytes including the length byte
+        // at the start
+
+        builder.number(0x524a);
+        assertArrayEquals(new byte[] {
+            0x02,             // Length of the pushed data
+            0x4a, 0x52        // Pushed data
+        }, builder.build().getProgram());
+
+        // Test the trimming code ignores zeroes in the middle
+        builder = new ScriptBuilder();
+        builder.number(0x110011);
+        assertEquals(4, builder.build().getProgram().length);
+
+        // Check encoding of a value where signed/unsigned encoding differs
+        // because the most significant byte is 0x80, and therefore a
+        // sign byte has to be added to the end for the signed encoding.
+        builder = new ScriptBuilder();
+        builder.number(0x8000);
+        assertArrayEquals(new byte[] {
+            0x03,             // Length of the pushed data
+            0x00, (byte) 0x80, 0x00  // Pushed data
+        }, builder.build().getProgram());
+    }
+
+    @Test
+    public void numberBuilderNegative() {
+        // Check encoding of a negative value
+        final ScriptBuilder builder = new ScriptBuilder();
+        builder.number(-5);
+        assertArrayEquals(new byte[] {
+            0x01,        // Length of the pushed data
+            ((byte) 133) // Pushed data
+        }, builder.build().getProgram());
+    }
+
+    @Test
+    public void numberBuilder16() {
+        ScriptBuilder builder = new ScriptBuilder();
+        // Numbers greater than 16 must be encoded with PUSHDATA
+        builder.number(15).number(16).number(17);
+        builder.number(0, 17).number(1, 16).number(2, 15);
+        Script script = builder.build();
+        assertEquals("PUSHDATA(1)[11] 16 15 15 16 PUSHDATA(1)[11]", script.toString());
+    }
+
+    @Test
+    public void testOpTrue() {
+        byte[] expected = new byte[] { OP_TRUE };
+        byte[] s = new ScriptBuilder().opTrue().build().getProgram();
+        assertArrayEquals(expected, s);
+    }
+
+    @Test
+    public void testOpFalse() {
+        byte[] expected = new byte[] { OP_FALSE };
+        byte[] s = new ScriptBuilder().opFalse().build().getProgram();
+        assertArrayEquals(expected, s);
+    }
+}
diff --git a/core/src/test/java/org/bitcoinj/script/ScriptChunkTest.java b/core/src/test/java/org/bitcoinj/script/ScriptChunkTest.java
index 7ba2ea34d92..29ff2317b33 100644
--- a/core/src/test/java/org/bitcoinj/script/ScriptChunkTest.java
+++ b/core/src/test/java/org/bitcoinj/script/ScriptChunkTest.java
@@ -16,16 +16,25 @@
 
 package org.bitcoinj.script;
 
+import static org.bitcoinj.script.ScriptOpCodes.OP_0;
+import static org.bitcoinj.script.ScriptOpCodes.OP_IF;
 import static org.bitcoinj.script.ScriptOpCodes.OP_PUSHDATA1;
 import static org.bitcoinj.script.ScriptOpCodes.OP_PUSHDATA2;
 import static org.bitcoinj.script.ScriptOpCodes.OP_PUSHDATA4;
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import java.util.Random;
+
 import org.junit.Test;
 
+import com.google.common.primitives.Bytes;
+
 public class ScriptChunkTest {
 
+    private static final Random RANDOM = new Random(42);
+
     @Test
     public void testShortestPossibleDataPush() {
         assertTrue("empty push", new ScriptBuilder().data(new byte[0]).build().getChunks().get(0)
@@ -46,4 +55,60 @@ public void testShortestPossibleDataPush() {
         assertFalse("push of 255 bytes", new ScriptChunk(OP_PUSHDATA2, new byte[255]).isShortestPossiblePushData());
         assertFalse("push of 65535 bytes", new ScriptChunk(OP_PUSHDATA4, new byte[65535]).isShortestPossiblePushData());
     }
+
+    @Test
+    public void testToByteArray_opcode() {
+        byte[] expected = new byte[] { OP_IF };
+        byte[] actual = new ScriptChunk(OP_IF, null).toByteArray();
+        assertArrayEquals(expected, actual);
+    }
+
+    @Test
+    public void testToByteArray_smallNum() {
+        byte[] expected = new byte[] { OP_0 };
+        byte[] actual = new ScriptChunk(OP_0, null).toByteArray();
+        assertArrayEquals(expected, actual);
+    }
+
+    @Test
+    public void testToByteArray_lt_OP_PUSHDATA1() {
+        // < OP_PUSHDATA1
+        for (byte len = 1; len < OP_PUSHDATA1; len++) {
+            byte[] bytes = new byte[len];
+            RANDOM.nextBytes(bytes);
+            byte[] expected = Bytes.concat(new byte[] { len }, bytes);
+            byte[] actual = new ScriptChunk(len, bytes).toByteArray();
+            assertArrayEquals(expected, actual);
+        }
+    }
+
+    @Test
+    public void testToByteArray_OP_PUSHDATA1() {
+        // OP_PUSHDATA1
+        byte[] bytes = new byte[0xFF];
+        RANDOM.nextBytes(bytes);
+        byte[] expected = Bytes.concat(new byte[] { OP_PUSHDATA1, (byte) 0xFF }, bytes);
+        byte[] actual = new ScriptChunk(OP_PUSHDATA1, bytes).toByteArray();
+        assertArrayEquals(expected, actual);
+    }
+
+    @Test
+    public void testToByteArray_OP_PUSHDATA2() {
+        // OP_PUSHDATA2
+        byte[] bytes = new byte[0x0102];
+        RANDOM.nextBytes(bytes);
+        byte[] expected = Bytes.concat(new byte[] { OP_PUSHDATA2, 0x02, 0x01 }, bytes);
+        byte[] actual = new ScriptChunk(OP_PUSHDATA2, bytes).toByteArray();
+        assertArrayEquals(expected, actual);
+    }
+
+    @Test
+    public void testToByteArray_OP_PUSHDATA4() {
+        // OP_PUSHDATA4
+        byte[] bytes = new byte[0x0102];
+        RANDOM.nextBytes(bytes);
+        byte[] expected = Bytes.concat(new byte[] { OP_PUSHDATA4, 0x02, 0x01, 0x00, 0x00 }, bytes);
+        byte[] actual = new ScriptChunk(OP_PUSHDATA4, bytes).toByteArray();
+        assertArrayEquals(expected, actual);
+    }
 }
diff --git a/core/src/test/java/org/bitcoinj/script/ScriptPatternTest.java b/core/src/test/java/org/bitcoinj/script/ScriptPatternTest.java
new file mode 100644
index 00000000000..31cebb141c3
--- /dev/null
+++ b/core/src/test/java/org/bitcoinj/script/ScriptPatternTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2017 John L. Jegutanis
+ * Copyright 2018 Andreas Schildbach
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bitcoinj.script;
+
+import com.google.common.collect.Lists;
+
+import org.bitcoinj.core.ECKey;
+import org.junit.Test;
+
+import java.math.BigInteger;
+import java.util.List;
+
+import static org.junit.Assert.assertTrue;
+
+public class ScriptPatternTest {
+    private List<ECKey> keys = Lists.newArrayList(new ECKey(), new ECKey(), new ECKey());
+
+    @Test
+    public void testCommonScripts() {
+        assertTrue(ScriptPattern.isP2PKH(
+                ScriptBuilder.createP2PKHOutputScript(keys.get(0))
+        ));
+        assertTrue(ScriptPattern.isP2SH(
+                ScriptBuilder.createP2SHOutputScript(2, keys)
+        ));
+        assertTrue(ScriptPattern.isP2PK(
+                ScriptBuilder.createP2PKOutputScript(keys.get(0))
+        ));
+        assertTrue(ScriptPattern.isP2WPKH(
+                ScriptBuilder.createP2WPKHOutputScript(keys.get(0))
+        ));
+        assertTrue(ScriptPattern.isP2WSH(
+                ScriptBuilder.createP2WSHOutputScript(new ScriptBuilder().build())
+        ));
+        assertTrue(ScriptPattern.isSentToMultisig(
+                ScriptBuilder.createMultiSigOutputScript(2, keys)
+        ));
+        assertTrue(ScriptPattern.isSentToCltvPaymentChannel(
+                ScriptBuilder.createCLTVPaymentChannelOutput(BigInteger.ONE, keys.get(0), keys.get(1))
+        ));
+        assertTrue(ScriptPattern.isOpReturn(
+                ScriptBuilder.createOpReturnScript(new byte[10])
+        ));
+    }
+}
diff --git a/core/src/test/java/org/bitcoinj/script/ScriptTest.java b/core/src/test/java/org/bitcoinj/script/ScriptTest.java
index 056a636c6ed..500ccd3d76b 100644
--- a/core/src/test/java/org/bitcoinj/script/ScriptTest.java
+++ b/core/src/test/java/org/bitcoinj/script/ScriptTest.java
@@ -1,6 +1,7 @@
 /*
  * Copyright 2011 Google Inc.
  * Copyright 2014 Andreas Schildbach
+ * Copyright 2017 Thomas König
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +26,6 @@
 import org.bitcoinj.params.MainNetParams;
 import org.bitcoinj.params.TestNet3Params;
 import org.bitcoinj.script.Script.VerifyFlag;
-import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 
@@ -38,7 +38,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.math.BigInteger;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 import static org.bitcoinj.core.Utils.HEX;
@@ -55,23 +55,23 @@ public class ScriptTest {
 
     static final String pubkeyProg = "76a91433e81a941e64cda12c6a299ed322ddbdd03f8d0e88ac";
 
-    private static final NetworkParameters PARAMS = TestNet3Params.get();
+    private static final NetworkParameters TESTNET = TestNet3Params.get();
+    private static final NetworkParameters MAINNET = MainNetParams.get();
 
     private static final Logger log = LoggerFactory.getLogger(ScriptTest.class);
 
     @Before
     public void setUp() throws Exception {
-        Context context = new Context(PARAMS);
+        Context context = new Context(TESTNET);
     }
 
     @Test
     public void testScriptSig() throws Exception {
         byte[] sigProgBytes = HEX.decode(sigProg);
         Script script = new Script(sigProgBytes);
-        // Test we can extract the from address.
-        byte[] hash160 = Utils.sha256hash160(script.getPubKey());
-        Address a = new Address(PARAMS, hash160);
-        assertEquals("mkFQohBpy2HDXrCwyMrYL5RtfrmeiuuPY2", a.toString());
+        assertEquals(
+                "PUSHDATA(71)[304402202b4da291cc39faf8433911988f9f49fc5c995812ca2f94db61468839c228c3e90220628bff3ff32ec95825092fa051cba28558a981fcf59ce184b14f2e215e69106701] PUSHDATA(65)[0414b38f4be3bb9fa0f4f32b74af07152b2f2f630bc02122a491137b6c523e46f18a0d5034418966f93dfc37cc3739ef7b2007213a302b7fba161557f4ad644a1c]",
+                script.toString());
     }
 
     @Test
@@ -80,20 +80,20 @@ public void testScriptPubKey() throws Exception {
         byte[] pubkeyBytes = HEX.decode(pubkeyProg);
         Script pubkey = new Script(pubkeyBytes);
         assertEquals("DUP HASH160 PUSHDATA(20)[33e81a941e64cda12c6a299ed322ddbdd03f8d0e] EQUALVERIFY CHECKSIG", pubkey.toString());
-        Address toAddr = new Address(PARAMS, pubkey.getPubKeyHash());
+        Address toAddr = LegacyAddress.fromPubKeyHash(TESTNET, ScriptPattern.extractHashFromP2PKH(pubkey));
         assertEquals("mkFQohBpy2HDXrCwyMrYL5RtfrmeiuuPY2", toAddr.toString());
     }
 
     @Test
     public void testMultiSig() throws Exception {
         List<ECKey> keys = Lists.newArrayList(new ECKey(), new ECKey(), new ECKey());
-        assertTrue(ScriptBuilder.createMultiSigOutputScript(2, keys).isSentToMultiSig());
+        assertTrue(ScriptPattern.isSentToMultisig(ScriptBuilder.createMultiSigOutputScript(2, keys)));
         Script script = ScriptBuilder.createMultiSigOutputScript(3, keys);
-        assertTrue(script.isSentToMultiSig());
-        List<ECKey> pubkeys = new ArrayList<ECKey>(3);
+        assertTrue(ScriptPattern.isSentToMultisig(script));
+        List<ECKey> pubkeys = new ArrayList<>(3);
         for (ECKey key : keys) pubkeys.add(ECKey.fromPublicOnly(key.getPubKeyPoint()));
         assertEquals(script.getPubKeys(), pubkeys);
-        assertFalse(ScriptBuilder.createOutputScript(new ECKey()).isSentToMultiSig());
+        assertFalse(ScriptPattern.isSentToMultisig(ScriptBuilder.createP2PKOutputScript(new ECKey())));
         try {
             // Fail if we ask for more signatures than keys.
             Script.createMultiSigOutputScript(4, keys);
@@ -112,29 +112,29 @@ public void testMultiSig() throws Exception {
 
     @Test
     public void testP2SHOutputScript() throws Exception {
-        Address p2shAddress = Address.fromBase58(MainNetParams.get(), "35b9vsyH1KoFT5a5KtrKusaCcPLkiSo1tU");
-        assertTrue(ScriptBuilder.createOutputScript(p2shAddress).isPayToScriptHash());
+        Address p2shAddress = LegacyAddress.fromBase58(MAINNET, "35b9vsyH1KoFT5a5KtrKusaCcPLkiSo1tU");
+        assertTrue(ScriptPattern.isP2SH(ScriptBuilder.createOutputScript(p2shAddress)));
     }
 
     @Test
     public void testIp() throws Exception {
         byte[] bytes = HEX.decode("41043e96222332ea7848323c08116dddafbfa917b8e37f0bdf63841628267148588a09a43540942d58d49717ad3fabfe14978cf4f0a8b84d2435dad16e9aa4d7f935ac");
         Script s = new Script(bytes);
-        assertTrue(s.isSentToRawPubKey());
+        assertTrue(ScriptPattern.isP2PK(s));
     }
     
     @Test
     public void testCreateMultiSigInputScript() {
         // Setup transaction and signatures
-        ECKey key1 = DumpedPrivateKey.fromBase58(PARAMS, "cVLwRLTvz3BxDAWkvS3yzT9pUcTCup7kQnfT2smRjvmmm1wAP6QT").getKey();
-        ECKey key2 = DumpedPrivateKey.fromBase58(PARAMS, "cTine92s8GLpVqvebi8rYce3FrUYq78ZGQffBYCS1HmDPJdSTxUo").getKey();
-        ECKey key3 = DumpedPrivateKey.fromBase58(PARAMS, "cVHwXSPRZmL9adctwBwmn4oTZdZMbaCsR5XF6VznqMgcvt1FDDxg").getKey();
+        ECKey key1 = DumpedPrivateKey.fromBase58(TESTNET, "cVLwRLTvz3BxDAWkvS3yzT9pUcTCup7kQnfT2smRjvmmm1wAP6QT").getKey();
+        ECKey key2 = DumpedPrivateKey.fromBase58(TESTNET, "cTine92s8GLpVqvebi8rYce3FrUYq78ZGQffBYCS1HmDPJdSTxUo").getKey();
+        ECKey key3 = DumpedPrivateKey.fromBase58(TESTNET, "cVHwXSPRZmL9adctwBwmn4oTZdZMbaCsR5XF6VznqMgcvt1FDDxg").getKey();
         Script multisigScript = ScriptBuilder.createMultiSigOutputScript(2, Arrays.asList(key1, key2, key3));
         byte[] bytes = HEX.decode("01000000013df681ff83b43b6585fa32dd0e12b0b502e6481e04ee52ff0fdaf55a16a4ef61000000006b483045022100a84acca7906c13c5895a1314c165d33621cdcf8696145080895cbf301119b7cf0220730ff511106aa0e0a8570ff00ee57d7a6f24e30f592a10cae1deffac9e13b990012102b8d567bcd6328fd48a429f9cf4b315b859a58fd28c5088ef3cb1d98125fc4e8dffffffff02364f1c00000000001976a91439a02793b418de8ec748dd75382656453dc99bcb88ac40420f000000000017a9145780b80be32e117f675d6e0ada13ba799bf248e98700000000");
-        Transaction transaction = PARAMS.getDefaultSerializer().makeTransaction(bytes);
+        Transaction transaction = TESTNET.getDefaultSerializer().makeTransaction(bytes);
         TransactionOutput output = transaction.getOutput(1);
-        Transaction spendTx = new Transaction(PARAMS);
-        Address address = Address.fromBase58(PARAMS, "n3CFiCmBXVt5d3HXKQ15EFZyhPz4yj5F3H");
+        Transaction spendTx = new Transaction(TESTNET);
+        Address address = LegacyAddress.fromBase58(TESTNET, "n3CFiCmBXVt5d3HXKQ15EFZyhPz4yj5F3H");
         Script outputScript = ScriptBuilder.createOutputScript(address);
         spendTx.addOutput(output.getValue(), outputScript);
         spendTx.addInput(output);
@@ -172,20 +172,20 @@ public void createAndUpdateEmptyInputScript() throws Exception {
         TransactionSignature dummySig = TransactionSignature.dummy();
         ECKey key = new ECKey();
 
-        // pay-to-pubkey
+        // P2PK
         Script inputScript = ScriptBuilder.createInputScript(dummySig);
         assertThat(inputScript.getChunks().get(0).data, equalTo(dummySig.encodeToBitcoin()));
         inputScript = ScriptBuilder.createInputScript(null);
         assertThat(inputScript.getChunks().get(0).opcode, equalTo(OP_0));
 
-        // pay-to-address
+        // P2PKH
         inputScript = ScriptBuilder.createInputScript(dummySig, key);
         assertThat(inputScript.getChunks().get(0).data, equalTo(dummySig.encodeToBitcoin()));
         inputScript = ScriptBuilder.createInputScript(null, key);
         assertThat(inputScript.getChunks().get(0).opcode, equalTo(OP_0));
         assertThat(inputScript.getChunks().get(1).data, equalTo(key.getPubKey()));
 
-        // pay-to-script-hash
+        // P2SH
         ECKey key2 = new ECKey();
         Script multisigScript = ScriptBuilder.createMultiSigOutputScript(2, Arrays.asList(key, key2));
         inputScript = ScriptBuilder.createP2SHMultiSigInputScript(Arrays.asList(dummySig, dummySig), multisigScript);
@@ -224,11 +224,11 @@ public void createAndUpdateEmptyInputScript() throws Exception {
     @Test
     public void testOp0() {
         // Check that OP_0 doesn't NPE and pushes an empty stack frame.
-        Transaction tx = new Transaction(PARAMS);
-        tx.addInput(new TransactionInput(PARAMS, tx, new byte[] {}));
+        Transaction tx = new Transaction(TESTNET);
+        tx.addInput(new TransactionInput(TESTNET, tx, new byte[] {}));
         Script script = new ScriptBuilder().smallNum(0).build();
 
-        LinkedList<byte[]> stack = new LinkedList<byte[]>();
+        LinkedList<byte[]> stack = new LinkedList<>();
         Script.executeScript(tx, 0, script, stack, Script.ALL_VERIFY_FLAGS);
         assertEquals("OP_0 push length", 0, stack.get(0).length);
     }
@@ -254,7 +254,7 @@ private Script parseScriptString(String string) throws IOException {
             } else if (w.length() >= 2 && w.startsWith("'") && w.endsWith("'")) {
                 // Single-quoted string, pushed as data. NOTE: this is poor-man's
                 // parsing, spaces/tabs/newlines in single-quoted strings won't work.
-                Script.writeBytes(out, w.substring(1, w.length() - 1).getBytes(Charset.forName("UTF-8")));
+                Script.writeBytes(out, w.substring(1, w.length() - 1).getBytes(StandardCharsets.UTF_8));
             } else if (ScriptOpCodes.getOpCode(w) != OP_INVALIDOPCODE) {
                 // opcode, e.g. OP_ADD or OP_1:
                 out.write(ScriptOpCodes.getOpCode(w));
@@ -262,7 +262,7 @@ private Script parseScriptString(String string) throws IOException {
                 // opcode, e.g. OP_ADD or OP_1:
                 out.write(ScriptOpCodes.getOpCode(w.substring(3)));
             } else {
-                throw new RuntimeException("Invalid Data");
+                throw new RuntimeException("Invalid word: '" + w + "'");
             }                        
         }
         
@@ -282,67 +282,90 @@ private Set<VerifyFlag> parseVerifyFlags(String str) {
         }
         return flags;
     }
-    
+
     @Test
-    public void dataDrivenValidScripts() throws Exception {
-        JsonNode json = new ObjectMapper().readTree(new InputStreamReader(getClass().getResourceAsStream(
-                "script_valid.json"), Charsets.UTF_8));
+    public void dataDrivenScripts() throws Exception {
+        JsonNode json = new ObjectMapper()
+                .readTree(new InputStreamReader(getClass().getResourceAsStream("script_tests.json"), StandardCharsets.UTF_8));
         for (JsonNode test : json) {
-            Script scriptSig = parseScriptString(test.get(0).asText());
-            Script scriptPubKey = parseScriptString(test.get(1).asText());
+            if (test.size() == 1)
+                continue; // skip comment
             Set<VerifyFlag> verifyFlags = parseVerifyFlags(test.get(2).asText());
-            try {
-                scriptSig.correctlySpends(new Transaction(PARAMS), 0, scriptPubKey, verifyFlags);
-            } catch (ScriptException e) {
-                System.err.println(test);
-                System.err.flush();
-                throw e;
-            }
-        }
-    }
-    
-    @Test
-    public void dataDrivenInvalidScripts() throws Exception {
-        JsonNode json = new ObjectMapper().readTree(new InputStreamReader(getClass().getResourceAsStream(
-                "script_invalid.json"), Charsets.UTF_8));
-        for (JsonNode test : json) {
+            ScriptError expectedError = ScriptError.fromMnemonic(test.get(3).asText());
             try {
                 Script scriptSig = parseScriptString(test.get(0).asText());
                 Script scriptPubKey = parseScriptString(test.get(1).asText());
-                Set<VerifyFlag> verifyFlags = parseVerifyFlags(test.get(2).asText());
-                scriptSig.correctlySpends(new Transaction(PARAMS), 0, scriptPubKey, verifyFlags);
-                System.err.println(test);
-                System.err.flush();
-                fail();
-            } catch (VerificationException e) {
-                // Expected.
+                Transaction txCredit = buildCreditingTransaction(scriptPubKey);
+                Transaction txSpend = buildSpendingTransaction(txCredit, scriptSig);
+                scriptSig.correctlySpends(txSpend, 0, scriptPubKey, verifyFlags);
+                if (!expectedError.equals(ScriptError.SCRIPT_ERR_OK))
+                    fail(test + " is expected to fail");
+            } catch (ScriptException e) {
+                if (!e.getError().equals(expectedError)) {
+                    System.err.println(test);
+                    e.printStackTrace();
+                    System.err.flush();
+                    throw e;
+                }
             }
         }
     }
-    
+
     private Map<TransactionOutPoint, Script> parseScriptPubKeys(JsonNode inputs) throws IOException {
-        Map<TransactionOutPoint, Script> scriptPubKeys = new HashMap<TransactionOutPoint, Script>();
+        Map<TransactionOutPoint, Script> scriptPubKeys = new HashMap<>();
         for (JsonNode input : inputs) {
             String hash = input.get(0).asText();
             int index = input.get(1).asInt();
             String script = input.get(2).asText();
             Sha256Hash sha256Hash = Sha256Hash.wrap(HEX.decode(hash));
-            scriptPubKeys.put(new TransactionOutPoint(PARAMS, index, sha256Hash), parseScriptString(script));
+            scriptPubKeys.put(new TransactionOutPoint(TESTNET, index, sha256Hash), parseScriptString(script));
         }
         return scriptPubKeys;
     }
 
+    private Transaction buildCreditingTransaction(Script scriptPubKey) {
+        Transaction tx = new Transaction(TESTNET);
+        tx.setVersion(1);
+        tx.setLockTime(0);
+
+        TransactionInput txInput = new TransactionInput(TESTNET, null,
+                new ScriptBuilder().number(0).number(0).build().getProgram());
+        txInput.setSequenceNumber(TransactionInput.NO_SEQUENCE);
+        tx.addInput(txInput);
+
+        TransactionOutput txOutput = new TransactionOutput(TESTNET, tx, Coin.ZERO, scriptPubKey.getProgram());
+        tx.addOutput(txOutput);
+
+        return tx;
+    }
+
+    private Transaction buildSpendingTransaction(Transaction creditingTransaction, Script scriptSig) {
+        Transaction tx = new Transaction(TESTNET);
+        tx.setVersion(1);
+        tx.setLockTime(0);
+
+        TransactionInput txInput = new TransactionInput(TESTNET, creditingTransaction, scriptSig.getProgram());
+        txInput.setSequenceNumber(TransactionInput.NO_SEQUENCE);
+        tx.addInput(txInput);
+
+        TransactionOutput txOutput = new TransactionOutput(TESTNET, tx, creditingTransaction.getOutput(0).getValue(),
+                new Script(new byte[] {}).getProgram());
+        tx.addOutput(txOutput);
+
+        return tx;
+    }
+
     @Test
     public void dataDrivenValidTransactions() throws Exception {
         JsonNode json = new ObjectMapper().readTree(new InputStreamReader(getClass().getResourceAsStream(
-                "tx_valid.json"), Charsets.UTF_8));
+                "tx_valid.json"), StandardCharsets.UTF_8));
         for (JsonNode test : json) {
             if (test.isArray() && test.size() == 1 && test.get(0).isTextual())
                 continue; // This is a comment.
             Transaction transaction = null;
             try {
                 Map<TransactionOutPoint, Script> scriptPubKeys = parseScriptPubKeys(test.get(0));
-                transaction = PARAMS.getDefaultSerializer().makeTransaction(HEX.decode(test.get(1).asText().toLowerCase()));
+                transaction = TESTNET.getDefaultSerializer().makeTransaction(HEX.decode(test.get(1).asText().toLowerCase()));
                 transaction.verify();
                 Set<VerifyFlag> verifyFlags = parseVerifyFlags(test.get(2).asText());
 
@@ -366,12 +389,12 @@ public void dataDrivenValidTransactions() throws Exception {
     @Test
     public void dataDrivenInvalidTransactions() throws Exception {
         JsonNode json = new ObjectMapper().readTree(new InputStreamReader(getClass().getResourceAsStream(
-                "tx_invalid.json"), Charsets.UTF_8));
+                "tx_invalid.json"), StandardCharsets.UTF_8));
         for (JsonNode test : json) {
             if (test.isArray() && test.size() == 1 && test.get(0).isTextual())
                 continue; // This is a comment.
             Map<TransactionOutPoint, Script> scriptPubKeys = parseScriptPubKeys(test.get(0));
-            Transaction transaction = PARAMS.getDefaultSerializer().makeTransaction(HEX.decode(test.get(1).asText().toLowerCase()));
+            Transaction transaction = TESTNET.getDefaultSerializer().makeTransaction(HEX.decode(test.get(1).asText().toLowerCase()));
             Set<VerifyFlag> verifyFlags = parseVerifyFlags(test.get(2).asText());
 
             boolean valid = true;
@@ -383,7 +406,7 @@ public void dataDrivenInvalidTransactions() throws Exception {
 
             // Bitcoin Core checks this case in CheckTransaction, but we leave it to
             // later where we will see an attempt to double-spend, so we explicitly check here
-            HashSet<TransactionOutPoint> set = new HashSet<TransactionOutPoint>();
+            HashSet<TransactionOutPoint> set = new HashSet<>();
             for (TransactionInput input : transaction.getInputs()) {
                 if (set.contains(input.getOutpoint()))
                     valid = false;
@@ -409,86 +432,26 @@ public void dataDrivenInvalidTransactions() throws Exception {
     @Test
     public void testCLTVPaymentChannelOutput() {
         Script script = ScriptBuilder.createCLTVPaymentChannelOutput(BigInteger.valueOf(20), new ECKey(), new ECKey());
-        assertTrue("script is locktime-verify", script.isSentToCLTVPaymentChannel());
+        assertTrue("script is locktime-verify", ScriptPattern.isSentToCltvPaymentChannel(script));
     }
 
     @Test
     public void getToAddress() throws Exception {
-        // pay to pubkey
+        // P2PK
         ECKey toKey = new ECKey();
-        Address toAddress = toKey.toAddress(PARAMS);
-        assertEquals(toAddress, ScriptBuilder.createOutputScript(toKey).getToAddress(PARAMS, true));
+        Address toAddress = LegacyAddress.fromKey(TESTNET, toKey);
+        assertEquals(toAddress, ScriptBuilder.createP2PKOutputScript(toKey).getToAddress(TESTNET, true));
         // pay to pubkey hash
-        assertEquals(toAddress, ScriptBuilder.createOutputScript(toAddress).getToAddress(PARAMS, true));
+        assertEquals(toAddress, ScriptBuilder.createOutputScript(toAddress).getToAddress(TESTNET, true));
         // pay to script hash
         Script p2shScript = ScriptBuilder.createP2SHOutputScript(new byte[20]);
-        Address scriptAddress = Address.fromP2SHScript(PARAMS, p2shScript);
-        assertEquals(scriptAddress, p2shScript.getToAddress(PARAMS, true));
+        Address scriptAddress = LegacyAddress.fromScriptHash(TESTNET,
+                ScriptPattern.extractHashFromP2SH(p2shScript));
+        assertEquals(scriptAddress, p2shScript.getToAddress(TESTNET, true));
     }
 
     @Test(expected = ScriptException.class)
     public void getToAddressNoPubKey() throws Exception {
-        ScriptBuilder.createOutputScript(new ECKey()).getToAddress(PARAMS, false);
-    }
-
-    /** Test encoding of zero, which should result in an opcode */
-    @Test
-    public void numberBuilderZero() {
-        final ScriptBuilder builder = new ScriptBuilder();
-
-        // 0 should encode directly to 0
-        builder.number(0);
-        assertArrayEquals(new byte[] {
-            0x00         // Pushed data
-        }, builder.build().getProgram());
-    }
-
-    @Test
-    public void numberBuilderPositiveOpCode() {
-        final ScriptBuilder builder = new ScriptBuilder();
-
-        builder.number(5);
-        assertArrayEquals(new byte[] {
-            0x55         // Pushed data
-        }, builder.build().getProgram());
-    }
-
-    @Test
-    public void numberBuilderBigNum() {
-        ScriptBuilder builder = new ScriptBuilder();
-        // 21066 should take up three bytes including the length byte
-        // at the start
-
-        builder.number(0x524a);
-        assertArrayEquals(new byte[] {
-            0x02,             // Length of the pushed data
-            0x4a, 0x52        // Pushed data
-        }, builder.build().getProgram());
-
-        // Test the trimming code ignores zeroes in the middle
-        builder = new ScriptBuilder();
-        builder.number(0x110011);
-        assertEquals(4, builder.build().getProgram().length);
-
-        // Check encoding of a value where signed/unsigned encoding differs
-        // because the most significant byte is 0x80, and therefore a
-        // sign byte has to be added to the end for the signed encoding.
-        builder = new ScriptBuilder();
-        builder.number(0x8000);
-        assertArrayEquals(new byte[] {
-            0x03,             // Length of the pushed data
-            0x00, (byte) 0x80, 0x00  // Pushed data
-        }, builder.build().getProgram());
-    }
-
-    @Test
-    public void numberBuilderNegative() {
-        // Check encoding of a negative value
-        final ScriptBuilder builder = new ScriptBuilder();
-        builder.number(-5);
-        assertArrayEquals(new byte[] {
-            0x01,        // Length of the pushed data
-            ((byte) 133) // Pushed data
-        }, builder.build().getProgram());
+        ScriptBuilder.createP2PKOutputScript(new ECKey()).getToAddress(TESTNET, false);
     }
 }
diff --git a/core/src/test/java/org/bitcoinj/store/LevelDBBlockStoreTest.java b/core/src/test/java/org/bitcoinj/store/LevelDBBlockStoreTest.java
index 1d5ffbbfffc..30aea5e5065 100644
--- a/core/src/test/java/org/bitcoinj/store/LevelDBBlockStoreTest.java
+++ b/core/src/test/java/org/bitcoinj/store/LevelDBBlockStoreTest.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -14,7 +16,11 @@
 
 package org.bitcoinj.store;
 
-import org.bitcoinj.core.*;
+import org.bitcoinj.core.Address;
+import org.bitcoinj.core.Context;
+import org.bitcoinj.core.LegacyAddress;
+import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.core.StoredBlock;
 import org.bitcoinj.params.*;
 import org.junit.*;
 
@@ -23,23 +29,24 @@
 import static org.junit.Assert.assertEquals;
 
 public class LevelDBBlockStoreTest {
+    private static final NetworkParameters UNITTEST = UnitTestParams.get();
+
     @Test
     public void basics() throws Exception {
         File f = File.createTempFile("leveldbblockstore", null);
         f.delete();
 
-        NetworkParameters params = UnitTestParams.get();
-        Context context = new Context(params);
+        Context context = new Context(UNITTEST);
         LevelDBBlockStore store = new LevelDBBlockStore(context, f);
         store.reset();
 
         // Check the first block in a new store is the genesis block.
         StoredBlock genesis = store.getChainHead();
-        assertEquals(params.getGenesisBlock(), genesis.getHeader());
+        assertEquals(UNITTEST.getGenesisBlock(), genesis.getHeader());
         assertEquals(0, genesis.getHeight());
 
         // Build a new block.
-        Address to = Address.fromBase58(params, "mrj2K6txjo2QBcSmuAzHj4nD1oXSEJE1Qo");
+        Address to = LegacyAddress.fromBase58(UNITTEST, "mrj2K6txjo2QBcSmuAzHj4nD1oXSEJE1Qo");
         StoredBlock b1 = genesis.build(genesis.getHeader().createNextBlock(to).cloneAsHeader());
         store.put(b1);
         store.setChainHead(b1);
diff --git a/core/src/test/java/org/bitcoinj/store/SPVBlockStoreTest.java b/core/src/test/java/org/bitcoinj/store/SPVBlockStoreTest.java
index 01e20725850..0daaaf5b0ce 100644
--- a/core/src/test/java/org/bitcoinj/store/SPVBlockStoreTest.java
+++ b/core/src/test/java/org/bitcoinj/store/SPVBlockStoreTest.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2013 Google Inc.
+ * Copyright 2018 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,34 +17,50 @@
 
 package org.bitcoinj.store;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNull;
+
+import java.io.File;
+import java.math.BigInteger;
+import java.util.Collections;
+import java.util.concurrent.TimeUnit;
+
 import org.bitcoinj.core.Address;
+import org.bitcoinj.core.Block;
 import org.bitcoinj.core.ECKey;
+import org.bitcoinj.core.LegacyAddress;
 import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.core.Sha256Hash;
 import org.bitcoinj.core.StoredBlock;
+import org.bitcoinj.core.Transaction;
 import org.bitcoinj.params.UnitTestParams;
+import org.junit.Before;
 import org.junit.Test;
 
-import java.io.File;
-
-import static org.junit.Assert.assertEquals;
+import com.google.common.base.Stopwatch;
 
 public class SPVBlockStoreTest {
+    private static final NetworkParameters UNITTEST = UnitTestParams.get();
+    private File blockStoreFile;
+
+    @Before
+    public void setup() throws Exception {
+        blockStoreFile = File.createTempFile("spvblockstore", null);
+        blockStoreFile.delete();
+        blockStoreFile.deleteOnExit();
+    }
 
     @Test
     public void basics() throws Exception {
-        NetworkParameters params = UnitTestParams.get();
-        File f = File.createTempFile("spvblockstore", null);
-        f.delete();
-        f.deleteOnExit();
-        SPVBlockStore store = new SPVBlockStore(params, f);
+        SPVBlockStore store = new SPVBlockStore(UNITTEST, blockStoreFile);
 
-        Address to = new ECKey().toAddress(params);
+        Address to = LegacyAddress.fromKey(UNITTEST, new ECKey());
         // Check the first block in a new store is the genesis block.
         StoredBlock genesis = store.getChainHead();
-        assertEquals(params.getGenesisBlock(), genesis.getHeader());
+        assertEquals(UNITTEST.getGenesisBlock(), genesis.getHeader());
         assertEquals(0, genesis.getHeight());
 
-
         // Build a new block.
         StoredBlock b1 = genesis.build(genesis.getHeader().createNextBlock(to).cloneAsHeader());
         store.put(b1);
@@ -51,11 +68,108 @@ public void basics() throws Exception {
         store.close();
 
         // Check we can get it back out again if we rebuild the store object.
-        store = new SPVBlockStore(params, f);
+        store = new SPVBlockStore(UNITTEST, blockStoreFile);
         StoredBlock b2 = store.get(b1.getHeader().getHash());
         assertEquals(b1, b2);
         // Check the chain head was stored correctly also.
         StoredBlock chainHead = store.getChainHead();
         assertEquals(b1, chainHead);
+        store.close();
+    }
+
+    @Test(expected = BlockStoreException.class)
+    public void twoStores_onSameFile() throws Exception {
+        new SPVBlockStore(UNITTEST, blockStoreFile);
+        new SPVBlockStore(UNITTEST, blockStoreFile);
+    }
+
+    @Test
+    public void twoStores_butSequentially() throws Exception {
+        SPVBlockStore store = new SPVBlockStore(UNITTEST, blockStoreFile);
+        store.close();
+        store = new SPVBlockStore(UNITTEST, blockStoreFile);
+    }
+
+    @Test(expected = BlockStoreException.class)
+    public void twoStores_sequentially_butMismatchingCapacity() throws Exception {
+        SPVBlockStore store = new SPVBlockStore(UNITTEST, blockStoreFile, 10, false);
+        store.close();
+        store = new SPVBlockStore(UNITTEST, blockStoreFile, 20, false);
+    }
+
+    @Test
+    public void twoStores_sequentially_grow() throws Exception {
+        Address to = LegacyAddress.fromKey(UNITTEST, new ECKey());
+        SPVBlockStore store = new SPVBlockStore(UNITTEST, blockStoreFile, 10, true);
+        final StoredBlock block0 = store.getChainHead();
+        final StoredBlock block1 = block0.build(block0.getHeader().createNextBlock(to).cloneAsHeader());
+        store.put(block1);
+        final StoredBlock block2 = block1.build(block1.getHeader().createNextBlock(to).cloneAsHeader());
+        store.put(block2);
+        store.setChainHead(block2);
+        store.close();
+
+        store = new SPVBlockStore(UNITTEST, blockStoreFile, 20, true);
+        final StoredBlock read2 = store.getChainHead();
+        assertEquals(block2, read2);
+        final StoredBlock read1 = read2.getPrev(store);
+        assertEquals(block1, read1);
+        final StoredBlock read0 = read1.getPrev(store);
+        assertEquals(block0, read0);
+        store.close();
+        assertEquals(SPVBlockStore.getFileSize(20), blockStoreFile.length());
+    }
+
+    @Test(expected = BlockStoreException.class)
+    public void twoStores_sequentially_shrink() throws Exception {
+        SPVBlockStore store = new SPVBlockStore(UNITTEST, blockStoreFile, 20, true);
+        store.close();
+        store = new SPVBlockStore(UNITTEST, blockStoreFile, 10, true);
+    }
+
+    @Test
+    public void performanceTest() throws BlockStoreException {
+        // On slow machines, this test could fail. Then either add @Ignore or adapt the threshold and please report to
+        // us.
+        final int ITERATIONS = 100000;
+        final long THRESHOLD_MS = 1500;
+        SPVBlockStore store = new SPVBlockStore(UNITTEST, blockStoreFile);
+        Stopwatch watch = Stopwatch.createStarted();
+        for (int i = 0; i < ITERATIONS; i++) {
+            // Using i as the nonce so that the block hashes are different.
+            Block block = new Block(UNITTEST, 0, Sha256Hash.ZERO_HASH, Sha256Hash.ZERO_HASH, 0, 0, i,
+                    Collections.<Transaction> emptyList());
+            StoredBlock b = new StoredBlock(block, BigInteger.ZERO, i);
+            store.put(b);
+            store.setChainHead(b);
+        }
+        assertTrue("took " + watch + " for " + ITERATIONS + " iterations",
+                watch.elapsed(TimeUnit.MILLISECONDS) < THRESHOLD_MS);
+        store.close();
+    }
+
+    @Test
+    public void oneStoreDelete() throws Exception {
+        // Used to fail on windows
+        // See https://github.com/bitcoinj/bitcoinj/issues/1477#issuecomment-450274821
+        SPVBlockStore store = new SPVBlockStore(UNITTEST, blockStoreFile);
+        store.close();
+        assertTrue(blockStoreFile.delete());
+    }
+
+    public void clear() throws Exception {
+        SPVBlockStore store = new SPVBlockStore(UNITTEST, blockStoreFile);
+
+        // Build a new block.
+        Address to = LegacyAddress.fromKey(UNITTEST, new ECKey());
+        StoredBlock genesis = store.getChainHead();
+        StoredBlock b1 = genesis.build(genesis.getHeader().createNextBlock(to).cloneAsHeader());
+        store.put(b1);
+        store.setChainHead(b1);
+        assertEquals(b1.getHeader().getHash(), store.getChainHead().getHeader().getHash());
+        store.clear();
+        assertNull(store.get(b1.getHeader().getHash()));
+        assertEquals(UNITTEST.getGenesisBlock().getHash(), store.getChainHead().getHeader().getHash());
+        store.close();
     }
 }
diff --git a/core/src/test/java/org/bitcoinj/store/WalletProtobufSerializerTest.java b/core/src/test/java/org/bitcoinj/store/WalletProtobufSerializerTest.java
index 304c962041c..799839d250d 100644
--- a/core/src/test/java/org/bitcoinj/store/WalletProtobufSerializerTest.java
+++ b/core/src/test/java/org/bitcoinj/store/WalletProtobufSerializerTest.java
@@ -17,12 +17,27 @@
 
 package org.bitcoinj.store;
 
-import org.bitcoinj.core.*;
+import org.bitcoinj.core.Address;
+import org.bitcoinj.core.Block;
+import org.bitcoinj.core.BlockChain;
+import org.bitcoinj.core.BlockTest;
+import org.bitcoinj.core.Coin;
+import org.bitcoinj.core.Context;
+import org.bitcoinj.core.ECKey;
+import org.bitcoinj.core.LegacyAddress;
+import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.core.PeerAddress;
+import org.bitcoinj.core.Sha256Hash;
+import org.bitcoinj.core.Transaction;
 import org.bitcoinj.core.Transaction.Purpose;
+import org.bitcoinj.core.TransactionConfidence;
 import org.bitcoinj.core.TransactionConfidence.ConfidenceType;
+import org.bitcoinj.core.TransactionInput;
+import org.bitcoinj.core.Utils;
 import org.bitcoinj.crypto.DeterministicKey;
 import org.bitcoinj.params.MainNetParams;
 import org.bitcoinj.params.UnitTestParams;
+import org.bitcoinj.script.Script;
 import org.bitcoinj.script.ScriptBuilder;
 import org.bitcoinj.testing.FakeTxBuilder;
 import org.bitcoinj.testing.FooWalletExtension;
@@ -30,6 +45,9 @@
 import org.bitcoinj.utils.Threading;
 import org.bitcoinj.wallet.DeterministicKeyChain;
 import org.bitcoinj.wallet.KeyChain;
+import org.bitcoinj.wallet.KeyChainGroup;
+
+import com.google.common.io.ByteStreams;
 import com.google.protobuf.ByteString;
 
 import org.bitcoinj.wallet.MarriedKeyChain;
@@ -38,6 +56,8 @@
 import org.bitcoinj.wallet.Wallet;
 import org.bitcoinj.wallet.WalletExtension;
 import org.bitcoinj.wallet.WalletProtobufSerializer;
+import org.bitcoinj.wallet.WalletTransaction;
+import org.bitcoinj.wallet.WalletTransaction.Pool;
 import org.bitcoinj.wallet.listeners.WalletCoinsReceivedEventListener;
 import org.junit.Before;
 import org.junit.Test;
@@ -58,7 +78,9 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 public class WalletProtobufSerializerTest {
-    private static final NetworkParameters PARAMS = UnitTestParams.get();
+    private static final NetworkParameters UNITTEST = UnitTestParams.get();
+    private static final NetworkParameters MAINNET = MainNetParams.get();
+
     private ECKey myKey;
     private ECKey myWatchedKey;
     private Address myAddress;
@@ -70,17 +92,15 @@ public class WalletProtobufSerializerTest {
     @Before
     public void setUp() throws Exception {
         BriefLogFormatter.initVerbose();
-        Context ctx = new Context(PARAMS);
+        Context ctx = new Context(UNITTEST);
         myWatchedKey = new ECKey();
-        myWallet = new Wallet(PARAMS);
         myKey = new ECKey();
         myKey.setCreationTimeSeconds(123456789L);
-        myWallet.importKey(myKey);
-        myAddress = myKey.toAddress(PARAMS);
-        myWallet = new Wallet(PARAMS);
+        myAddress = LegacyAddress.fromKey(UNITTEST, myKey);
+        myWallet = new Wallet(UNITTEST, KeyChainGroup.builder(UNITTEST).fromRandom(Script.ScriptType.P2PKH).build());
         myWallet.importKey(myKey);
         mScriptCreationTime = new Date().getTime() / 1000 - 1234;
-        myWallet.addWatchedAddress(myWatchedKey.toAddress(PARAMS), mScriptCreationTime);
+        myWallet.addWatchedAddress(LegacyAddress.fromKey(UNITTEST, myWatchedKey), mScriptCreationTime);
         myWallet.setDescription(WALLET_DESCRIPTION);
     }
 
@@ -90,16 +110,14 @@ public void empty() throws Exception {
         Wallet wallet1 = roundTrip(myWallet);
         assertEquals(0, wallet1.getTransactions(true).size());
         assertEquals(Coin.ZERO, wallet1.getBalance());
-        assertArrayEquals(myKey.getPubKey(),
-                wallet1.findKeyFromPubHash(myKey.getPubKeyHash()).getPubKey());
-        assertArrayEquals(myKey.getPrivKeyBytes(),
-                wallet1.findKeyFromPubHash(myKey.getPubKeyHash()).getPrivKeyBytes());
-        assertEquals(myKey.getCreationTimeSeconds(),
-                wallet1.findKeyFromPubHash(myKey.getPubKeyHash()).getCreationTimeSeconds());
+        ECKey foundKey = wallet1.findKeyFromPubKeyHash(myKey.getPubKeyHash(), null);
+        assertArrayEquals(myKey.getPubKey(), foundKey.getPubKey());
+        assertArrayEquals(myKey.getPrivKeyBytes(), foundKey.getPrivKeyBytes());
+        assertEquals(myKey.getCreationTimeSeconds(), foundKey.getCreationTimeSeconds());
         assertEquals(mScriptCreationTime,
                 wallet1.getWatchedScripts().get(0).getCreationTimeSeconds());
         assertEquals(1, wallet1.getWatchedScripts().size());
-        assertEquals(ScriptBuilder.createOutputScript(myWatchedKey.toAddress(PARAMS)),
+        assertEquals(ScriptBuilder.createOutputScript(LegacyAddress.fromKey(UNITTEST, myWatchedKey)),
                 wallet1.getWatchedScripts().get(0));
         assertEquals(WALLET_DESCRIPTION, wallet1.getDescription());
     }
@@ -108,17 +126,18 @@ public void empty() throws Exception {
     public void oneTx() throws Exception {
         // Check basic tx serialization.
         Coin v1 = COIN;
-        Transaction t1 = createFakeTx(PARAMS, v1, myAddress);
-        t1.getConfidence().markBroadcastBy(new PeerAddress(PARAMS, InetAddress.getByName("1.2.3.4")));
-        t1.getConfidence().markBroadcastBy(new PeerAddress(PARAMS, InetAddress.getByName("5.6.7.8")));
+        Transaction t1 = createFakeTx(UNITTEST, v1, myAddress);
+        t1.getConfidence().markBroadcastBy(new PeerAddress(UNITTEST, InetAddress.getByName("1.2.3.4")));
+        t1.getConfidence().markBroadcastBy(new PeerAddress(UNITTEST, InetAddress.getByName("5.6.7.8")));
+        t1.getConfidence().markBroadcastBy(new PeerAddress(UNITTEST, "myHostName", 8888));
         t1.getConfidence().setSource(TransactionConfidence.Source.NETWORK);
         myWallet.receivePending(t1, null);
         Wallet wallet1 = roundTrip(myWallet);
         assertEquals(1, wallet1.getTransactions(true).size());
         assertEquals(v1, wallet1.getBalance(Wallet.BalanceType.ESTIMATED));
-        Transaction t1copy = wallet1.getTransaction(t1.getHash());
+        Transaction t1copy = wallet1.getTransaction(t1.getTxId());
         assertArrayEquals(t1.unsafeBitcoinSerialize(), t1copy.unsafeBitcoinSerialize());
-        assertEquals(2, t1copy.getConfidence().numBroadcastPeers());
+        assertEquals(3, t1copy.getConfidence().numBroadcastPeers());
         assertNotNull(t1copy.getConfidence().getLastBroadcastedAt());
         assertEquals(TransactionConfidence.Source.NETWORK, t1copy.getConfidence().getSource());
         
@@ -130,7 +149,7 @@ public void oneTx() throws Exception {
         
         Protos.Transaction t1p = walletProto.getTransaction(0);
         assertEquals(0, t1p.getBlockHashCount());
-        assertArrayEquals(t1.getHash().getBytes(), t1p.getHash().toByteArray());
+        assertArrayEquals(t1.getTxId().getBytes(), t1p.getHash().toByteArray());
         assertEquals(Protos.Transaction.Pool.PENDING, t1p.getPool());
         assertFalse(t1p.hasLockTime());
         assertFalse(t1p.getTransactionInput(0).hasSequence());
@@ -144,25 +163,25 @@ public void oneTx() throws Exception {
     public void raiseFeeTx() throws Exception {
         // Check basic tx serialization.
         Coin v1 = COIN;
-        Transaction t1 = createFakeTx(PARAMS, v1, myAddress);
+        Transaction t1 = createFakeTx(UNITTEST, v1, myAddress);
         t1.setPurpose(Purpose.RAISE_FEE);
         myWallet.receivePending(t1, null);
         Wallet wallet1 = roundTrip(myWallet);
-        Transaction t1copy = wallet1.getTransaction(t1.getHash());
+        Transaction t1copy = wallet1.getTransaction(t1.getTxId());
         assertEquals(Purpose.RAISE_FEE, t1copy.getPurpose());
     }
 
     @Test
     public void doubleSpend() throws Exception {
         // Check that we can serialize double spends correctly, as this is a slightly tricky case.
-        FakeTxBuilder.DoubleSpends doubleSpends = FakeTxBuilder.createFakeDoubleSpendTxns(PARAMS, myAddress);
+        FakeTxBuilder.DoubleSpends doubleSpends = FakeTxBuilder.createFakeDoubleSpendTxns(UNITTEST, myAddress);
         // t1 spends to our wallet.
         myWallet.receivePending(doubleSpends.t1, null);
         // t2 rolls back t1 and spends somewhere else.
         myWallet.receiveFromBlock(doubleSpends.t2, null, BlockChain.NewBlockType.BEST_CHAIN, 0);
         Wallet wallet1 = roundTrip(myWallet);
         assertEquals(1, wallet1.getTransactions(true).size());
-        Transaction t1 = wallet1.getTransaction(doubleSpends.t1.getHash());
+        Transaction t1 = wallet1.getTransaction(doubleSpends.t1.getTxId());
         assertEquals(ConfidenceType.DEAD, t1.getConfidence().getConfidenceType());
         assertEquals(Coin.ZERO, wallet1.getBalance());
 
@@ -174,12 +193,13 @@ public void doubleSpend() throws Exception {
     public void testKeys() throws Exception {
         for (int i = 0 ; i < 20 ; i++) {
             myKey = new ECKey();
-            myAddress = myKey.toAddress(PARAMS);
-            myWallet = new Wallet(PARAMS);
+            myAddress = LegacyAddress.fromKey(UNITTEST, myKey);
+            myWallet = new Wallet(UNITTEST);
             myWallet.importKey(myKey);
             Wallet wallet1 = roundTrip(myWallet);
-            assertArrayEquals(myKey.getPubKey(), wallet1.findKeyFromPubHash(myKey.getPubKeyHash()).getPubKey());
-            assertArrayEquals(myKey.getPrivKeyBytes(), wallet1.findKeyFromPubHash(myKey.getPubKeyHash()).getPrivKeyBytes());
+            ECKey foundKey = wallet1.findKeyFromPubKeyHash(myKey.getPubKeyHash(), null);
+            assertArrayEquals(myKey.getPubKey(), foundKey.getPubKey());
+            assertArrayEquals(myKey.getPrivKeyBytes(), foundKey.getPrivKeyBytes());
         }
     }
 
@@ -188,13 +208,14 @@ public void testLastBlockSeenHash() throws Exception {
         // Test the lastBlockSeenHash field works.
 
         // LastBlockSeenHash should be empty if never set.
-        Wallet wallet = new Wallet(PARAMS);
+        Wallet wallet = new Wallet(UNITTEST);
         Protos.Wallet walletProto = new WalletProtobufSerializer().walletToProto(wallet);
         ByteString lastSeenBlockHash = walletProto.getLastSeenBlockHash();
         assertTrue(lastSeenBlockHash.isEmpty());
 
         // Create a block.
-        Block block = PARAMS.getDefaultSerializer().makeBlock(BlockTest.blockBytes);
+        Block block = UNITTEST.getDefaultSerializer()
+                .makeBlock(ByteStreams.toByteArray(BlockTest.class.getResourceAsStream("block_testnet700000.dat")));
         Sha256Hash blockHash = block.getHash();
         wallet.setLastBlockSeenHash(blockHash);
         wallet.setLastBlockSeenHeight(1);
@@ -205,7 +226,7 @@ public void testLastBlockSeenHash() throws Exception {
         assertEquals(1, wallet1.getLastBlockSeenHeight());
 
         // Test the Satoshi genesis block (hash of all zeroes) is roundtripped ok.
-        Block genesisBlock = MainNetParams.get().getGenesisBlock();
+        Block genesisBlock = MAINNET.getGenesisBlock();
         wallet.setLastBlockSeenHash(genesisBlock.getHash());
         Wallet wallet2 = roundTrip(wallet);
         assertEquals(genesisBlock.getHash(), wallet2.getLastBlockSeenHash());
@@ -213,17 +234,17 @@ public void testLastBlockSeenHash() throws Exception {
 
     @Test
     public void testSequenceNumber() throws Exception {
-        Wallet wallet = new Wallet(PARAMS);
-        Transaction tx1 = createFakeTx(PARAMS, Coin.COIN, wallet.currentReceiveAddress());
+        Wallet wallet = new Wallet(UNITTEST);
+        Transaction tx1 = createFakeTx(UNITTEST, Coin.COIN, wallet.currentReceiveAddress());
         tx1.getInput(0).setSequenceNumber(TransactionInput.NO_SEQUENCE);
         wallet.receivePending(tx1, null);
-        Transaction tx2 = createFakeTx(PARAMS, Coin.COIN, wallet.currentReceiveAddress());
+        Transaction tx2 = createFakeTx(UNITTEST, Coin.COIN, wallet.currentReceiveAddress());
         tx2.getInput(0).setSequenceNumber(TransactionInput.NO_SEQUENCE - 1);
         wallet.receivePending(tx2, null);
         Wallet walletCopy = roundTrip(wallet);
-        Transaction tx1copy = checkNotNull(walletCopy.getTransaction(tx1.getHash()));
+        Transaction tx1copy = checkNotNull(walletCopy.getTransaction(tx1.getTxId()));
         assertEquals(TransactionInput.NO_SEQUENCE, tx1copy.getInput(0).getSequenceNumber());
-        Transaction tx2copy = checkNotNull(walletCopy.getTransaction(tx2.getHash()));
+        Transaction tx2copy = checkNotNull(walletCopy.getTransaction(tx2.getTxId()));
         assertEquals(TransactionInput.NO_SEQUENCE - 1, tx2copy.getInput(0).getSequenceNumber());
     }
 
@@ -231,9 +252,9 @@ public void testSequenceNumber() throws Exception {
     public void testAppearedAtChainHeightDepthAndWorkDone() throws Exception {
         // Test the TransactionConfidence appearedAtChainHeight, depth and workDone field are stored.
 
-        BlockChain chain = new BlockChain(PARAMS, myWallet, new MemoryBlockStore(PARAMS));
+        BlockChain chain = new BlockChain(UNITTEST, myWallet, new MemoryBlockStore(UNITTEST));
 
-        final ArrayList<Transaction> txns = new ArrayList<Transaction>(2);
+        final ArrayList<Transaction> txns = new ArrayList<>(2);
         myWallet.addCoinsReceivedEventListener(new WalletCoinsReceivedEventListener() {
             @Override
             public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coin newBalance) {
@@ -242,7 +263,7 @@ public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coi
         });
 
         // Start by building two blocks on top of the genesis block.
-        Block b1 = PARAMS.getGenesisBlock().createNextBlock(myAddress);
+        Block b1 = UNITTEST.getGenesisBlock().createNextBlock(myAddress);
         BigInteger work1 = b1.getWork();
         assertTrue(work1.signum() > 0);
 
@@ -313,22 +334,20 @@ public void testRoundTripNormalWallet() throws Exception {
         Wallet wallet1 = roundTrip(myWallet);
         assertEquals(0, wallet1.getTransactions(true).size());
         assertEquals(Coin.ZERO, wallet1.getBalance());
-        assertArrayEquals(myKey.getPubKey(),
-                wallet1.findKeyFromPubHash(myKey.getPubKeyHash()).getPubKey());
-        assertArrayEquals(myKey.getPrivKeyBytes(),
-                wallet1.findKeyFromPubHash(myKey.getPubKeyHash()).getPrivKeyBytes());
-        assertEquals(myKey.getCreationTimeSeconds(),
-                wallet1.findKeyFromPubHash(myKey.getPubKeyHash()).getCreationTimeSeconds());
+        ECKey foundKey = wallet1.findKeyFromPubKeyHash(myKey.getPubKeyHash(), null);
+        assertArrayEquals(myKey.getPubKey(), foundKey.getPubKey());
+        assertArrayEquals(myKey.getPrivKeyBytes(), foundKey.getPrivKeyBytes());
+        assertEquals(myKey.getCreationTimeSeconds(), foundKey.getCreationTimeSeconds());
     }
 
     @Test
     public void testRoundTripWatchingWallet() throws Exception {
         final String xpub = "tpubD9LrDvFDrB6wYNhbR2XcRRaT4yCa37TjBR3YthBQvrtEwEq6CKeEXUs3TppQd38rfxmxD1qLkC99iP3vKcKwLESSSYdFAftbrpuhSnsw6XM";
         final long creationTimeSeconds = 1457019819;
-        Wallet wallet = Wallet.fromWatchingKeyB58(PARAMS, xpub, creationTimeSeconds);
+        Wallet wallet = Wallet.fromWatchingKeyB58(UNITTEST, xpub, creationTimeSeconds);
         Wallet wallet2 = roundTrip(wallet);
         Wallet wallet3 = roundTrip(wallet2);
-        assertEquals(xpub, wallet.getWatchingKey().serializePubB58(PARAMS));
+        assertEquals(xpub, wallet.getWatchingKey().serializePubB58(UNITTEST));
         assertEquals(creationTimeSeconds, wallet.getWatchingKey().getCreationTimeSeconds());
         assertEquals(creationTimeSeconds, wallet2.getWatchingKey().getCreationTimeSeconds());
         assertEquals(creationTimeSeconds, wallet3.getWatchingKey().getCreationTimeSeconds());
@@ -340,9 +359,9 @@ public void testRoundTripWatchingWallet() throws Exception {
     @Test
     public void testRoundTripMarriedWallet() throws Exception {
         // create 2-of-2 married wallet
-        myWallet = new Wallet(PARAMS);
-        final DeterministicKeyChain partnerChain = new DeterministicKeyChain(new SecureRandom());
-        DeterministicKey partnerKey = DeterministicKey.deserializeB58(null, partnerChain.getWatchingKey().serializePubB58(PARAMS), PARAMS);
+        myWallet = new Wallet(UNITTEST);
+        final DeterministicKeyChain partnerChain = DeterministicKeyChain.builder().random(new SecureRandom()).build();
+        DeterministicKey partnerKey = DeterministicKey.deserializeB58(null, partnerChain.getWatchingKey().serializePubB58(UNITTEST), UNITTEST);
         MarriedKeyChain chain = MarriedKeyChain.builder()
                 .random(new SecureRandom())
                 .followingKeys(partnerKey)
@@ -358,20 +377,32 @@ public void testRoundTripMarriedWallet() throws Exception {
         assertEquals(myAddress, wallet1.currentAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS));
     }
 
+    @Test
+    public void roundtripVersionTwoTransaction() throws Exception {
+        Transaction tx = new Transaction(UNITTEST, Utils.HEX.decode(
+                "0200000001d7902864af9310420c6e606b814c8f89f7902d40c130594e85df2e757a7cc301070000006b483045022100ca1757afa1af85c2bb014382d9ce411e1628d2b3d478df9d5d3e9e93cb25dcdd02206c5d272b31a23baf64e82793ee5c816e2bbef251e733a638b630ff2331fc83ba0121026ac2316508287761befbd0f7495ea794b396dbc5b556bf276639f56c0bd08911feffffff0274730700000000001976a91456da2d038a098c42390c77ef163e1cc23aedf24088ac91062300000000001976a9148ebf3467b9a8d7ae7b290da719e61142793392c188ac22e00600"));
+        assertEquals(tx.getVersion(), 2);
+        assertEquals(tx.getTxId().toString(), "0321b1413ed9048199815bd6bc2650cab1a9e8d543f109a42c769b1f18df4174");
+        myWallet.addWalletTransaction(new WalletTransaction(Pool.UNSPENT, tx));
+        Wallet wallet1 = roundTrip(myWallet);
+        Transaction tx2 = wallet1.getTransaction(tx.getTxId());
+        assertEquals(checkNotNull(tx2).getVersion(), 2);
+    }
+
     @Test
     public void coinbaseTxns() throws Exception {
         // Covers issue 420 where the outpoint index of a coinbase tx input was being mis-serialized.
-        Block b = PARAMS.getGenesisBlock().createNextBlockWithCoinbase(Block.BLOCK_VERSION_GENESIS, myKey.getPubKey(), FIFTY_COINS, Block.BLOCK_HEIGHT_GENESIS);
+        Block b = UNITTEST.getGenesisBlock().createNextBlockWithCoinbase(Block.BLOCK_VERSION_GENESIS, myKey.getPubKey(), FIFTY_COINS, Block.BLOCK_HEIGHT_GENESIS);
         Transaction coinbase = b.getTransactions().get(0);
         assertTrue(coinbase.isCoinBase());
-        BlockChain chain = new BlockChain(PARAMS, myWallet, new MemoryBlockStore(PARAMS));
+        BlockChain chain = new BlockChain(UNITTEST, myWallet, new MemoryBlockStore(UNITTEST));
         assertTrue(chain.add(b));
         // Wallet now has a coinbase tx in it.
         assertEquals(1, myWallet.getTransactions(true).size());
-        assertTrue(myWallet.getTransaction(coinbase.getHash()).isCoinBase());
+        assertTrue(myWallet.getTransaction(coinbase.getTxId()).isCoinBase());
         Wallet wallet2 = roundTrip(myWallet);
         assertEquals(1, wallet2.getTransactions(true).size());
-        assertTrue(wallet2.getTransaction(coinbase.getHash()).isCoinBase());
+        assertTrue(wallet2.getTransaction(coinbase.getTxId()).isCoinBase());
     }
 
     @Test
@@ -388,21 +419,21 @@ public void extensions() throws Exception {
         Protos.Wallet proto = new WalletProtobufSerializer().walletToProto(myWallet);
         // Initial extension is mandatory: try to read it back into a wallet that doesn't know about it.
         try {
-            new WalletProtobufSerializer().readWallet(PARAMS, null, proto);
+            new WalletProtobufSerializer().readWallet(UNITTEST, null, proto);
             fail();
         } catch (UnreadableWalletException e) {
             assertTrue(e.getMessage().contains("mandatory"));
         }
-        Wallet wallet = new WalletProtobufSerializer().readWallet(PARAMS,
+        Wallet wallet = new WalletProtobufSerializer().readWallet(UNITTEST,
                 new WalletExtension[]{ new FooWalletExtension("com.whatever.required", true) },
                 proto);
         assertTrue(wallet.getExtensions().containsKey("com.whatever.required"));
 
         // Non-mandatory extensions are ignored if the wallet doesn't know how to read them.
-        Wallet wallet2 = new Wallet(PARAMS);
+        Wallet wallet2 = new Wallet(UNITTEST);
         wallet2.addExtension(new FooWalletExtension("com.whatever.optional", false));
         Protos.Wallet proto2 = new WalletProtobufSerializer().walletToProto(wallet2);
-        Wallet wallet5 = new WalletProtobufSerializer().readWallet(PARAMS, null, proto2);
+        Wallet wallet5 = new WalletProtobufSerializer().readWallet(UNITTEST, null, proto2);
         assertEquals(0, wallet5.getExtensions().size());
     }
 
@@ -431,7 +462,7 @@ public void deserializeWalletExtension(Wallet containingWallet, byte[] data) thr
         };
         myWallet.addExtension(extension);
         Protos.Wallet proto = new WalletProtobufSerializer().walletToProto(myWallet);
-        Wallet wallet = new WalletProtobufSerializer().readWallet(PARAMS, new WalletExtension[]{extension}, proto);
+        Wallet wallet = new WalletProtobufSerializer().readWallet(UNITTEST, new WalletExtension[]{extension}, proto);
         assertEquals(0, wallet.getExtensions().size());
     }
 
@@ -439,6 +470,19 @@ public void deserializeWalletExtension(Wallet containingWallet, byte[] data) thr
     public void versions() throws Exception {
         Protos.Wallet.Builder proto = Protos.Wallet.newBuilder(new WalletProtobufSerializer().walletToProto(myWallet));
         proto.setVersion(2);
-        new WalletProtobufSerializer().readWallet(PARAMS, null, proto.build());
+        new WalletProtobufSerializer().readWallet(UNITTEST, null, proto.build());
+    }
+
+    @Test
+    public void storeWitnessTransactions() throws Exception {
+        // 3 inputs, inputs 0 and 2 have witnesses but not input 1
+        Transaction tx = new Transaction(UNITTEST, Utils.HEX.decode(
+                "02000000000103fc8a5bea59392369e8a1b635395e507a5cbaeffd926e6967a00d17c669aef1d3010000001716001403c80a334ed6a92cf400d8c708522ea0d6fa5593ffffffffc0166d2218a2613b5384fc2c31238b1b6fa337080a1384220734e1bfd3629d3f0100000000ffffffffc0166d2218a2613b5384fc2c31238b1b6fa337080a1384220734e1bfd3629d3f0200000000ffffffff01a086010000000000220020eb72e573a9513d982a01f0e6a6b53e92764db81a0c26d2be94c5fc5b69a0db7d02473044022048e895b7af715303ce273a2be03d6110ed69b5700679f4f036000f8ba6eddd2802205f780423fcce9b3632ed41681b0a86f5d123766b71f303558c39c1be5fe43e2601210259eb16169df80dbe5856d082a226d84a97d191c895f8046c3544df525028a874000220c0166d2218a2613b5384fc2c31238b1b6fa337080a1384220734e1bfd3629d3f20c0166d2218a2613b5384fc2c31238b1b6fa337080a1384220734e1bfd3629d3f00000000"));
+        assertTrue(tx.hasWitnesses());
+        assertEquals(tx.getTxId().toString(), "1c687396f4710f26206dbdd8bf07a28c76398be6750226ddfaf05a1a80d30034");
+        myWallet.addWalletTransaction(new WalletTransaction(Pool.UNSPENT, tx));
+        Wallet wallet1 = roundTrip(myWallet);
+        Transaction tx2 = wallet1.getTransaction(tx.getTxId());
+        assertEquals(tx.getInput(0).getWitness(), tx2.getInput(0).getWitness());
     }
 }
diff --git a/core/src/test/java/org/bitcoinj/testing/FakeTxBuilder.java b/core/src/test/java/org/bitcoinj/testing/FakeTxBuilder.java
index 8bb1ff72228..c53e74eb5b4 100644
--- a/core/src/test/java/org/bitcoinj/testing/FakeTxBuilder.java
+++ b/core/src/test/java/org/bitcoinj/testing/FakeTxBuilder.java
@@ -17,7 +17,23 @@
 
 package org.bitcoinj.testing;
 
-import org.bitcoinj.core.*;
+import org.bitcoinj.core.Address;
+import org.bitcoinj.core.Block;
+import org.bitcoinj.core.Coin;
+import org.bitcoinj.core.ECKey;
+import org.bitcoinj.core.LegacyAddress;
+import org.bitcoinj.core.MessageSerializer;
+import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.core.ProtocolException;
+import org.bitcoinj.core.Sha256Hash;
+import org.bitcoinj.core.StoredBlock;
+import org.bitcoinj.core.Transaction;
+import org.bitcoinj.core.TransactionConfidence;
+import org.bitcoinj.core.TransactionInput;
+import org.bitcoinj.core.TransactionOutPoint;
+import org.bitcoinj.core.TransactionOutput;
+import org.bitcoinj.core.Utils;
+import org.bitcoinj.core.VerificationException;
 import org.bitcoinj.crypto.TransactionSignature;
 import org.bitcoinj.script.ScriptBuilder;
 import org.bitcoinj.store.BlockStore;
@@ -34,12 +50,12 @@
 public class FakeTxBuilder {
     /** Create a fake transaction, without change. */
     public static Transaction createFakeTx(final NetworkParameters params) {
-        return createFakeTxWithoutChangeAddress(params, Coin.COIN, new ECKey().toAddress(params));
+        return createFakeTxWithoutChangeAddress(params, Coin.COIN, LegacyAddress.fromKey(params, new ECKey()));
     }
 
     /** Create a fake transaction, without change. */
     public static Transaction createFakeTxWithoutChange(final NetworkParameters params, final TransactionOutput output) {
-        Transaction prevTx = FakeTxBuilder.createFakeTx(params, Coin.COIN, new ECKey().toAddress(params));
+        Transaction prevTx = FakeTxBuilder.createFakeTx(params, Coin.COIN, LegacyAddress.fromKey(params, new ECKey()));
         Transaction tx = new Transaction(params);
         tx.addOutput(output);
         tx.addInput(prevTx.getOutput(0));
@@ -53,7 +69,7 @@ public static Transaction createFakeCoinbaseTx(final NetworkParameters params) {
         Transaction tx = new Transaction(params);
         tx.addInput(input);
         TransactionOutput outputToMe = new TransactionOutput(params, tx, Coin.FIFTY_COINS,
-                new ECKey().toAddress(params));
+                LegacyAddress.fromKey(params, new ECKey()));
         tx.addOutput(outputToMe);
 
         checkState(tx.isCoinBase());
@@ -123,7 +139,7 @@ public static Transaction createFakeTxWithoutChangeAddress(NetworkParameters par
      * else to simulate change. There is one random input.
      */
     public static Transaction createFakeTx(NetworkParameters params, Coin value, Address to) {
-        return createFakeTxWithChangeAddress(params, value, to, new ECKey().toAddress(params));
+        return createFakeTxWithChangeAddress(params, value, to, LegacyAddress.fromKey(params, new ECKey()));
     }
 
     /**
@@ -157,7 +173,7 @@ public static Transaction[] createFakeTx(NetworkParameters params, Coin value,
         Transaction t = new Transaction(params);
         TransactionOutput outputToMe = new TransactionOutput(params, t, value, to);
         t.addOutput(outputToMe);
-        TransactionOutput change = new TransactionOutput(params, t, valueOf(1, 11), new ECKey().toAddress(params));
+        TransactionOutput change = new TransactionOutput(params, t, valueOf(1, 11), LegacyAddress.fromKey(params, new ECKey()));
         t.addOutput(change);
         // Make a feeder tx that sends to the from address specified. This feeder tx is not really valid but it doesn't
         // matter for our purposes.
@@ -203,7 +219,7 @@ public static class DoubleSpends {
     public static DoubleSpends createFakeDoubleSpendTxns(NetworkParameters params, Address to) {
         DoubleSpends doubleSpends = new DoubleSpends();
         Coin value = COIN;
-        Address someBadGuy = new ECKey().toAddress(params);
+        Address someBadGuy = LegacyAddress.fromKey(params, new ECKey());
 
         doubleSpends.prevTx = new Transaction(params);
         TransactionOutput prevOut = new TransactionOutput(params, doubleSpends.prevTx, value, someBadGuy);
@@ -245,7 +261,7 @@ public static BlockPair createFakeBlock(BlockStore blockStore, StoredBlock previ
                                             Transaction... transactions) {
         try {
             Block previousBlock = previousStoredBlock.getHeader();
-            Address to = new ECKey().toAddress(previousBlock.getParams());
+            Address to = LegacyAddress.fromKey(previousBlock.getParams(), new ECKey());
             Block b = previousBlock.createNextBlock(to, version, timeSeconds, height);
             // Coinbase tx was already added.
             for (Transaction tx : transactions) {
@@ -297,7 +313,7 @@ public static Block makeSolvedTestBlock(BlockStore blockStore, Address coinsTo)
     }
 
     public static Block makeSolvedTestBlock(Block prev, Transaction... transactions) throws BlockStoreException {
-        Address to = new ECKey().toAddress(prev.getParams());
+        Address to = LegacyAddress.fromKey(prev.getParams(), new ECKey());
         Block b = prev.createNextBlock(to);
         // Coinbase tx already exists.
         for (Transaction tx : transactions) {
diff --git a/core/src/test/java/org/bitcoinj/testing/FooWalletExtension.java b/core/src/test/java/org/bitcoinj/testing/FooWalletExtension.java
index 0f108a5ba2e..e1c3797f283 100644
--- a/core/src/test/java/org/bitcoinj/testing/FooWalletExtension.java
+++ b/core/src/test/java/org/bitcoinj/testing/FooWalletExtension.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/test/java/org/bitcoinj/testing/InboundMessageQueuer.java b/core/src/test/java/org/bitcoinj/testing/InboundMessageQueuer.java
index d286639a758..91525be62e8 100644
--- a/core/src/test/java/org/bitcoinj/testing/InboundMessageQueuer.java
+++ b/core/src/test/java/org/bitcoinj/testing/InboundMessageQueuer.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -17,6 +19,7 @@
 import org.bitcoinj.core.*;
 import com.google.common.util.concurrent.SettableFuture;
 
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.util.HashMap;
 import java.util.Map;
@@ -24,17 +27,17 @@
 import java.util.concurrent.BlockingQueue;
 
 /**
- * An extension of {@link org.bitcoinj.core.PeerSocketHandler} that keeps inbound messages in a queue for later processing
+ * An extension of {@link PeerSocketHandler} that keeps inbound messages in a queue for later processing
  */
 public abstract class InboundMessageQueuer extends PeerSocketHandler {
-    public final BlockingQueue<Message> inboundMessages = new ArrayBlockingQueue<Message>(1000);
-    public final Map<Long, SettableFuture<Void>> mapPingFutures = new HashMap<Long, SettableFuture<Void>>();
+    public final BlockingQueue<Message> inboundMessages = new ArrayBlockingQueue<>(1000);
+    public final Map<Long, SettableFuture<Void>> mapPingFutures = new HashMap<>();
 
     public Peer peer;
     public BloomFilter lastReceivedFilter;
 
     protected InboundMessageQueuer(NetworkParameters params) {
-        super(params, new InetSocketAddress("127.0.0.1", 2000));
+        super(params, new InetSocketAddress(InetAddress.getLoopbackAddress(), 2000));
     }
 
     public Message nextMessage() {
diff --git a/core/src/test/java/org/bitcoinj/testing/MockTransactionBroadcaster.java b/core/src/test/java/org/bitcoinj/testing/MockTransactionBroadcaster.java
index 3a2935eee63..5180800e48c 100644
--- a/core/src/test/java/org/bitcoinj/testing/MockTransactionBroadcaster.java
+++ b/core/src/test/java/org/bitcoinj/testing/MockTransactionBroadcaster.java
@@ -22,6 +22,7 @@
 
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
 
 import java.util.concurrent.LinkedBlockingQueue;
@@ -52,7 +53,7 @@ public void succeed() {
         }
     }
 
-    private final LinkedBlockingQueue<TxFuturePair> broadcasts = new LinkedBlockingQueue<TxFuturePair>();
+    private final LinkedBlockingQueue<TxFuturePair> broadcasts = new LinkedBlockingQueue<>();
 
     /** Sets this mock broadcaster on the given wallet. */
     public MockTransactionBroadcaster(Wallet wallet) {
@@ -88,7 +89,7 @@ public void onSuccess(Transaction result) {
                 @Override
                 public void onFailure(Throwable t) {
                 }
-            });
+            }, MoreExecutors.directExecutor());
             return TransactionBroadcast.createMockBroadcast(tx, result);
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
diff --git a/core/src/test/java/org/bitcoinj/testing/NopTransactionSigner.java b/core/src/test/java/org/bitcoinj/testing/NopTransactionSigner.java
index e5d016dda41..0ea6bb393af 100644
--- a/core/src/test/java/org/bitcoinj/testing/NopTransactionSigner.java
+++ b/core/src/test/java/org/bitcoinj/testing/NopTransactionSigner.java
@@ -34,17 +34,6 @@ public boolean isReady() {
         return isReady;
     }
 
-    @Override
-    public byte[] serialize() {
-        return isReady ? new byte[]{1} : new byte[]{0};
-    }
-
-    @Override
-    public void deserialize(byte[] data) {
-        if (data.length > 0)
-            isReady = data[0] == 1;
-    }
-
     @Override
     public boolean signInputs(ProposedTransaction t, KeyBag keyBag) {
         return false;
diff --git a/core/src/test/java/org/bitcoinj/testing/TestWithNetworkConnections.java b/core/src/test/java/org/bitcoinj/testing/TestWithNetworkConnections.java
index b44b2547b6c..22099b6aff0 100644
--- a/core/src/test/java/org/bitcoinj/testing/TestWithNetworkConnections.java
+++ b/core/src/test/java/org/bitcoinj/testing/TestWithNetworkConnections.java
@@ -22,10 +22,12 @@
 import org.bitcoinj.core.*;
 import org.bitcoinj.net.*;
 import org.bitcoinj.params.UnitTestParams;
+import org.bitcoinj.script.Script;
 import org.bitcoinj.store.BlockStore;
 import org.bitcoinj.store.MemoryBlockStore;
 import org.bitcoinj.utils.BriefLogFormatter;
 import org.bitcoinj.utils.Threading;
+import org.bitcoinj.wallet.KeyChainGroup;
 import org.bitcoinj.wallet.Wallet;
 
 import com.google.common.util.concurrent.SettableFuture;
@@ -48,7 +50,7 @@
  */
 public class TestWithNetworkConnections {
     public static final int PEER_SERVERS = 5;
-    protected static final NetworkParameters PARAMS = UnitTestParams.get();
+    protected static final NetworkParameters UNITTEST = UnitTestParams.get();
     protected Context context;
     protected BlockStore blockStore;
     protected BlockChain blockChain;
@@ -59,7 +61,7 @@ public class TestWithNetworkConnections {
 
     private NioServer[] peerServers = new NioServer[PEER_SERVERS];
     private final ClientConnectionManager channels;
-    protected final BlockingQueue<InboundMessageQueuer> newPeerWriteTargetQueue = new LinkedBlockingQueue<InboundMessageQueuer>();
+    protected final BlockingQueue<InboundMessageQueuer> newPeerWriteTargetQueue = new LinkedBlockingQueue<>();
 
     public enum ClientType {
         NIO_CLIENT_MANAGER,
@@ -79,20 +81,23 @@ else if (clientType == ClientType.BLOCKING_CLIENT_MANAGER)
     }
 
     public void setUp() throws Exception {
-        setUp(new MemoryBlockStore(UnitTestParams.get()));
+        setUp(new MemoryBlockStore(UNITTEST));
     }
     
     public void setUp(BlockStore blockStore) throws Exception {
         BriefLogFormatter.init();
-        Context.propagate(new Context(PARAMS, 100, Coin.ZERO, false));
+        Context.propagate(new Context(UNITTEST, 100, Coin.ZERO, false));
         this.blockStore = blockStore;
         // Allow subclasses to override the wallet object with their own.
         if (wallet == null) {
-            wallet = new Wallet(PARAMS);
+            // Reduce the number of keys we need to work with to speed up these tests.
+            KeyChainGroup kcg = KeyChainGroup.builder(UNITTEST).lookaheadSize(4).lookaheadThreshold(2)
+                    .fromRandom(Script.ScriptType.P2PKH).build();
+            wallet = new Wallet(UNITTEST, kcg);
             key = wallet.freshReceiveKey();
-            address = key.toAddress(PARAMS);
+            address = LegacyAddress.fromKey(UNITTEST, key);
         }
-        blockChain = new BlockChain(PARAMS, wallet, blockStore);
+        blockChain = new BlockChain(UNITTEST, wallet, blockStore);
 
         startPeerServers();
         if (clientType == ClientType.NIO_CLIENT_MANAGER || clientType == ClientType.BLOCKING_CLIENT_MANAGER) {
@@ -100,7 +105,7 @@ public void setUp(BlockStore blockStore) throws Exception {
             channels.awaitRunning();
         }
 
-        socketAddress = new InetSocketAddress("127.0.0.1", 1111);
+        socketAddress = new InetSocketAddress(InetAddress.getLoopbackAddress(), 1111);
     }
 
     protected void startPeerServers() throws IOException {
@@ -114,7 +119,7 @@ protected void startPeerServer(int i) throws IOException {
             @Nullable
             @Override
             public StreamConnection getNewConnection(InetAddress inetAddress, int port) {
-                return new InboundMessageQueuer(PARAMS) {
+                return new InboundMessageQueuer(UNITTEST) {
                     @Override
                     public void connectionClosed() {
                     }
@@ -125,7 +130,7 @@ public void connectionOpened() {
                     }
                 };
             }
-        }, new InetSocketAddress("127.0.0.1", 2000 + i));
+        }, new InetSocketAddress(InetAddress.getLoopbackAddress(), 2000 + i));
         peerServers[i].startAsync();
         peerServers[i].awaitRunning();
     }
@@ -158,11 +163,11 @@ public void onPeerDisconnected(Peer p, int peerCount) {
             }
         });
         if (clientType == ClientType.NIO_CLIENT_MANAGER || clientType == ClientType.BLOCKING_CLIENT_MANAGER)
-            channels.openConnection(new InetSocketAddress("127.0.0.1", 2000), peer);
+            channels.openConnection(new InetSocketAddress(InetAddress.getLoopbackAddress(), 2000), peer);
         else if (clientType == ClientType.NIO_CLIENT)
-            new NioClient(new InetSocketAddress("127.0.0.1", 2000), peer, 100);
+            new NioClient(new InetSocketAddress(InetAddress.getLoopbackAddress(), 2000), peer, 100);
         else if (clientType == ClientType.BLOCKING_CLIENT)
-            new BlockingClient(new InetSocketAddress("127.0.0.1", 2000), peer, 100, SocketFactory.getDefault(), null);
+            new BlockingClient(new InetSocketAddress(InetAddress.getLoopbackAddress(), 2000), peer, 100, SocketFactory.getDefault(), null);
         else
             throw new RuntimeException();
         // Claim we are connected to a different IP that what we really are, so tx confidence broadcastBy sets work
diff --git a/core/src/test/java/org/bitcoinj/testing/TestWithPeerGroup.java b/core/src/test/java/org/bitcoinj/testing/TestWithPeerGroup.java
index f36e82e4617..2b208b0da42 100644
--- a/core/src/test/java/org/bitcoinj/testing/TestWithPeerGroup.java
+++ b/core/src/test/java/org/bitcoinj/testing/TestWithPeerGroup.java
@@ -22,6 +22,8 @@
 import org.bitcoinj.net.*;
 import org.bitcoinj.store.*;
 import org.bitcoinj.utils.*;
+import org.junit.Rule;
+import org.junit.rules.Timeout;
 
 import java.net.*;
 import java.util.concurrent.*;
@@ -46,18 +48,23 @@ public TestWithPeerGroup(ClientType clientType) {
         this.clientType = clientType;
     }
 
+    @Rule
+    public Timeout globalTimeout = Timeout.seconds(10);
+
     @Override
     public void setUp() throws Exception {
-        setUp(new MemoryBlockStore(PARAMS));
+        setUp(new MemoryBlockStore(UNITTEST));
     }
 
     @Override
     public void setUp(BlockStore blockStore) throws Exception {
         super.setUp(blockStore);
 
-        remoteVersionMessage = new VersionMessage(PARAMS, 1);
-        remoteVersionMessage.localServices = VersionMessage.NODE_NETWORK;
-        remoteVersionMessage.clientVersion = NotFoundMessage.MIN_PROTOCOL_VERSION;
+        remoteVersionMessage = new VersionMessage(UNITTEST, 1);
+        remoteVersionMessage.localServices =
+                VersionMessage.NODE_NETWORK | VersionMessage.NODE_BLOOM | VersionMessage.NODE_WITNESS;
+        remoteVersionMessage.clientVersion =
+                NetworkParameters.ProtocolVersion.WITNESS_VERSION.getBitcoinProtocolVersion();
         blockJobs = false;
         initPeerGroup();
     }
@@ -89,7 +96,7 @@ protected void initPeerGroup() {
     protected final Semaphore jobBlocks = new Semaphore(0);
 
     private PeerGroup createPeerGroup(final ClientConnectionManager manager) {
-        return new PeerGroup(PARAMS, blockChain, manager) {
+        return new PeerGroup(UNITTEST, blockChain, manager) {
             @Override
             protected ListeningScheduledExecutorService createPrivateExecutor() {
                 return MoreExecutors.listeningDecorator(new ScheduledThreadPoolExecutor(1, new ContextPropagatingThreadFactory("PeerGroup test thread")) {
@@ -113,7 +120,7 @@ public void run() {
 
     protected InboundMessageQueuer connectPeerWithoutVersionExchange(int id) throws Exception {
         Preconditions.checkArgument(id < PEER_SERVERS);
-        InetSocketAddress remoteAddress = new InetSocketAddress("127.0.0.1", 2000 + id);
+        InetSocketAddress remoteAddress = new InetSocketAddress(InetAddress.getLoopbackAddress(), 2000 + id);
         Peer peer = peerGroup.connectTo(remoteAddress).getConnectionOpenFuture().get();
         InboundMessageQueuer writeTarget = newPeerWriteTargetQueue.take();
         writeTarget.peer = peer;
diff --git a/core/src/test/java/org/bitcoinj/testing/TestWithWallet.java b/core/src/test/java/org/bitcoinj/testing/TestWithWallet.java
index 8f77fb6171f..7b16d48ca26 100644
--- a/core/src/test/java/org/bitcoinj/testing/TestWithWallet.java
+++ b/core/src/test/java/org/bitcoinj/testing/TestWithWallet.java
@@ -16,8 +16,20 @@
 
 package org.bitcoinj.testing;
 
-import org.bitcoinj.core.*;
+import org.bitcoinj.core.AbstractBlockChain;
+import org.bitcoinj.core.Address;
+import org.bitcoinj.core.Block;
+import org.bitcoinj.core.BlockChain;
+import org.bitcoinj.core.Coin;
+import org.bitcoinj.core.Context;
+import org.bitcoinj.core.ECKey;
+import org.bitcoinj.core.LegacyAddress;
+import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.core.Transaction;
+import org.bitcoinj.core.VerificationException;
+import org.bitcoinj.params.MainNetParams;
 import org.bitcoinj.params.UnitTestParams;
+import org.bitcoinj.script.Script;
 import org.bitcoinj.store.BlockStore;
 import org.bitcoinj.store.MemoryBlockStore;
 import org.bitcoinj.utils.BriefLogFormatter;
@@ -37,7 +49,9 @@
  * fee per kilobyte to zero in setUp.
  */
 public class TestWithWallet {
-    protected static final NetworkParameters PARAMS = UnitTestParams.get();
+    protected static final NetworkParameters UNITTEST = UnitTestParams.get();
+    protected static final NetworkParameters MAINNET = MainNetParams.get();
+
     protected ECKey myKey;
     protected Address myAddress;
     protected Wallet wallet;
@@ -46,12 +60,12 @@ public class TestWithWallet {
 
     public void setUp() throws Exception {
         BriefLogFormatter.init();
-        Context.propagate(new Context(PARAMS, 100, Coin.ZERO, false));
-        wallet = new Wallet(PARAMS);
+        Context.propagate(new Context(UNITTEST, 100, Coin.ZERO, false));
+        wallet = Wallet.createDeterministic(UNITTEST, Script.ScriptType.P2PKH);
         myKey = wallet.currentReceiveKey();
-        myAddress = myKey.toAddress(PARAMS);
-        blockStore = new MemoryBlockStore(PARAMS);
-        chain = new BlockChain(PARAMS, wallet, blockStore);
+        myAddress = LegacyAddress.fromKey(UNITTEST, myKey);
+        blockStore = new MemoryBlockStore(UNITTEST);
+        chain = new BlockChain(UNITTEST, wallet, blockStore);
     }
 
     public void tearDown() throws Exception {
@@ -73,19 +87,19 @@ protected Transaction sendMoneyToWallet(Wallet wallet, AbstractBlockChain.NewBlo
                 wallet.notifyNewBestBlock(bp.storedBlock);
         }
         if (transactions.length == 1)
-            return wallet.getTransaction(transactions[0].getHash());  // Can be null if tx is a double spend that's otherwise irrelevant.
+            return wallet.getTransaction(transactions[0].getTxId());  // Can be null if tx is a double spend that's otherwise irrelevant.
         else
             return null;
     }
 
     @Nullable
     protected Transaction sendMoneyToWallet(Wallet wallet, AbstractBlockChain.NewBlockType type, Coin value, Address toAddress) throws VerificationException {
-        return sendMoneyToWallet(wallet, type, createFakeTx(PARAMS, value, toAddress));
+        return sendMoneyToWallet(wallet, type, createFakeTx(UNITTEST, value, toAddress));
     }
 
     @Nullable
     protected Transaction sendMoneyToWallet(Wallet wallet, AbstractBlockChain.NewBlockType type, Coin value, ECKey toPubKey) throws VerificationException {
-        return sendMoneyToWallet(wallet, type, createFakeTx(PARAMS, value, toPubKey));
+        return sendMoneyToWallet(wallet, type, createFakeTx(UNITTEST, value, toPubKey));
     }
 
     @Nullable
diff --git a/core/src/test/java/org/bitcoinj/uri/BitcoinURITest.java b/core/src/test/java/org/bitcoinj/uri/BitcoinURITest.java
index bd1e31d8fa5..7de1bea4fde 100644
--- a/core/src/test/java/org/bitcoinj/uri/BitcoinURITest.java
+++ b/core/src/test/java/org/bitcoinj/uri/BitcoinURITest.java
@@ -17,6 +17,7 @@
 package org.bitcoinj.uri;
 
 import org.bitcoinj.core.Address;
+import org.bitcoinj.core.LegacyAddress;
 import org.bitcoinj.params.MainNetParams;
 import org.bitcoinj.params.TestNet3Params;
 import com.google.common.collect.ImmutableList;
@@ -24,18 +25,24 @@
 
 import static org.bitcoinj.core.Coin.*;
 import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.core.SegwitAddress;
+
 import static org.junit.Assert.*;
 
+import java.util.Locale;
+
 public class BitcoinURITest {
     private BitcoinURI testObject = null;
 
     private static final NetworkParameters MAINNET = MainNetParams.get();
+    private static final NetworkParameters TESTNET = TestNet3Params.get();
     private static final String MAINNET_GOOD_ADDRESS = "1KzTSfqjF2iKCduwz59nv2uqh1W2JsTxZH";
+    private static final String MAINNET_GOOD_SEGWIT_ADDRESS = "bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4";
     private static final String BITCOIN_SCHEME = MAINNET.getUriScheme();
 
     @Test
     public void testConvertToBitcoinURI() throws Exception {
-        Address goodAddress = Address.fromBase58(MAINNET, MAINNET_GOOD_ADDRESS);
+        Address goodAddress = LegacyAddress.fromBase58(MAINNET, MAINNET_GOOD_ADDRESS);
         
         // simple example
         assertEquals("bitcoin:" + MAINNET_GOOD_ADDRESS + "?amount=12.34&label=Hello&message=AMessage", BitcoinURI.convertToBitcoinURI(goodAddress, parseCoin("12.34"), "Hello", "AMessage"));
@@ -78,16 +85,39 @@ public String getUriScheme() {
         };
 
         assertEquals("test:" + MAINNET_GOOD_ADDRESS + "?amount=12.34&label=Hello&message=AMessage",
-             BitcoinURI.convertToBitcoinURI(Address.fromBase58(alternativeParameters, MAINNET_GOOD_ADDRESS), parseCoin("12.34"), "Hello", "AMessage"));
+             BitcoinURI.convertToBitcoinURI(LegacyAddress.fromBase58(alternativeParameters, MAINNET_GOOD_ADDRESS), parseCoin("12.34"), "Hello", "AMessage"));
+    }
+
+    @Test
+    public void testConvertToBitcoinURI_segwit() throws Exception {
+        assertEquals("bitcoin:" + MAINNET_GOOD_SEGWIT_ADDRESS + "?message=segwit%20rules", BitcoinURI.convertToBitcoinURI(
+                SegwitAddress.fromBech32(MAINNET, MAINNET_GOOD_SEGWIT_ADDRESS), null, null, "segwit rules"));
     }
 
     @Test
-    public void testGood_Simple() throws BitcoinURIParseException {
+    public void testGood_legacy() throws BitcoinURIParseException {
         testObject = new BitcoinURI(MAINNET, BITCOIN_SCHEME + ":" + MAINNET_GOOD_ADDRESS);
-        assertNotNull(testObject);
+        assertEquals(MAINNET_GOOD_ADDRESS, testObject.getAddress().toString());
+        assertNull("Unexpected amount", testObject.getAmount());
+        assertNull("Unexpected label", testObject.getLabel());
+        assertEquals("Unexpected label", 20, testObject.getAddress().getHash().length);
+    }
+
+    @Test
+    public void testGood_uppercaseScheme() throws BitcoinURIParseException {
+        testObject = new BitcoinURI(MAINNET, BITCOIN_SCHEME.toUpperCase(Locale.US) + ":" + MAINNET_GOOD_ADDRESS);
+        assertEquals(MAINNET_GOOD_ADDRESS, testObject.getAddress().toString());
+        assertNull("Unexpected amount", testObject.getAmount());
+        assertNull("Unexpected label", testObject.getLabel());
+        assertEquals("Unexpected label", 20, testObject.getAddress().getHash().length);
+    }
+
+    @Test
+    public void testGood_segwit() throws BitcoinURIParseException {
+        testObject = new BitcoinURI(MAINNET, BITCOIN_SCHEME + ":" + MAINNET_GOOD_SEGWIT_ADDRESS);
+        assertEquals(MAINNET_GOOD_SEGWIT_ADDRESS, testObject.getAddress().toString());
         assertNull("Unexpected amount", testObject.getAmount());
         assertNull("Unexpected label", testObject.getLabel());
-        assertEquals("Unexpected label", 20, testObject.getAddress().getHash160().length);
     }
 
     /**
@@ -149,7 +179,7 @@ public void testBad_Address() {
     @Test
     public void testBad_IncorrectAddressType() {
         try {
-            testObject = new BitcoinURI(TestNet3Params.get(), BITCOIN_SCHEME + ":" + MAINNET_GOOD_ADDRESS);
+            testObject = new BitcoinURI(TESTNET, BITCOIN_SCHEME + ":" + MAINNET_GOOD_ADDRESS);
             fail("Expecting BitcoinURIParseException");
         } catch (BitcoinURIParseException e) {
             assertTrue(e.getMessage().contains("Bad address"));
@@ -378,7 +408,7 @@ public void testBad_TooLargeAmount() throws BitcoinURIParseException {
     @Test
     public void testPaymentProtocolReq() throws Exception {
         // Non-backwards compatible form ...
-        BitcoinURI uri = new BitcoinURI(TestNet3Params.get(), "bitcoin:?r=https%3A%2F%2Fbitcoincore.org%2F%7Egavin%2Ff.php%3Fh%3Db0f02e7cea67f168e25ec9b9f9d584f9");
+        BitcoinURI uri = new BitcoinURI(TESTNET, "bitcoin:?r=https%3A%2F%2Fbitcoincore.org%2F%7Egavin%2Ff.php%3Fh%3Db0f02e7cea67f168e25ec9b9f9d584f9");
         assertEquals("https://bitcoincore.org/~gavin/f.php?h=b0f02e7cea67f168e25ec9b9f9d584f9", uri.getPaymentRequestUrl());
         assertEquals(ImmutableList.of("https://bitcoincore.org/~gavin/f.php?h=b0f02e7cea67f168e25ec9b9f9d584f9"),
                 uri.getPaymentRequestUrls());
@@ -403,7 +433,7 @@ public void testNoPaymentProtocolReq() throws Exception {
 
     @Test
     public void testUnescapedPaymentProtocolReq() throws Exception {
-        BitcoinURI uri = new BitcoinURI(TestNet3Params.get(),
+        BitcoinURI uri = new BitcoinURI(TESTNET,
                 "bitcoin:?r=https://merchant.com/pay.php?h%3D2a8628fc2fbe");
         assertEquals("https://merchant.com/pay.php?h=2a8628fc2fbe", uri.getPaymentRequestUrl());
         assertEquals(ImmutableList.of("https://merchant.com/pay.php?h=2a8628fc2fbe"), uri.getPaymentRequestUrls());
diff --git a/core/src/test/java/org/bitcoinj/utils/BaseTaggableObjectTest.java b/core/src/test/java/org/bitcoinj/utils/BaseTaggableObjectTest.java
index 1705ea68b76..9973042aa36 100644
--- a/core/src/test/java/org/bitcoinj/utils/BaseTaggableObjectTest.java
+++ b/core/src/test/java/org/bitcoinj/utils/BaseTaggableObjectTest.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/test/java/org/bitcoinj/utils/BtcFormatTest.java b/core/src/test/java/org/bitcoinj/utils/BtcFormatTest.java
index 598498f5c8b..0f43d01e24d 100644
--- a/core/src/test/java/org/bitcoinj/utils/BtcFormatTest.java
+++ b/core/src/test/java/org/bitcoinj/utils/BtcFormatTest.java
@@ -17,6 +17,7 @@
 package org.bitcoinj.utils;
 
 import org.bitcoinj.core.Coin;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -44,7 +45,7 @@ public class BtcFormatTest {
 
     @Parameters
     public static Set<Locale[]> data() {
-        Set<Locale[]> localeSet = new HashSet<Locale[]>();
+        Set<Locale[]> localeSet = new HashSet<>();
         for (Locale locale : Locale.getAvailableLocales()) {
             localeSet.add(new Locale[]{locale});
         }
@@ -71,6 +72,7 @@ public void prefixTest() { // prefix b/c symbol is prefixed
         assertEquals("µ฿0.01", usFormat.format(1));
     }
 
+    @Ignore("non-determinism between OpenJDK versions")
     @Test
     public void suffixTest() {
         BtcFormat deFormat = BtcFormat.getSymbolInstance(Locale.GERMANY);
@@ -148,6 +150,7 @@ public void symbolCollisionTest() {
         }
     }
 
+    @Ignore("non-determinism between OpenJDK versions")
     @Test
     public void argumentTypeTest() {
         BtcFormat usFormat = BtcFormat.getSymbolInstance(Locale.US);
@@ -282,6 +285,7 @@ public void characterIteratorTest() {
         assertEquals(fa.hashCode(), fb.hashCode());
     }
 
+    @Ignore("non-determinism between OpenJDK versions")
     @Test
     public void parseTest() throws java.text.ParseException {
         BtcFormat us = BtcFormat.getSymbolInstance(Locale.US);
@@ -664,6 +668,7 @@ public void parsePositionTest() {
         );
     }
 
+    @Ignore("non-determinism between OpenJDK versions")
     @Test
     public void currencyCodeTest() {
         /* Insert needed space AFTER currency-code */
@@ -1157,6 +1162,7 @@ public void btcRounding() throws Exception {
         assertEquals("11.223344556677", megaFormat.format(Coin.valueOf(1122334455667700l), 0, REPEATING_TRIPLETS));
     }
 
+    @Ignore("non-determinism between OpenJDK versions")
     @Test
     public void negativeTest() throws Exception {
         assertEquals("-1,00 BTC", BtcFormat.getInstance(FRANCE).format(COIN.multiply(-1)));
@@ -1266,6 +1272,7 @@ public void equalityTest() throws Exception {
 
     }
 
+    @Ignore("non-determinism between OpenJDK versions")
     @Test
     public void attributeTest() throws Exception {
         String codePat = BtcFormat.getCodeInstance(Locale.US).pattern();
@@ -1281,6 +1288,7 @@ public void attributeTest() throws Exception {
         assertEquals('๐', BtcFormat.getInstance(new Locale("th","TH","TH")).symbols().getZeroDigit());
     }
 
+    @Ignore("non-determinism between OpenJDK versions")
     @Test
     public void toStringTest() {
         assertEquals("Auto-format ฿#,##0.00;(฿#,##0.00)", BtcFormat.getSymbolInstance(Locale.US).toString());
@@ -1330,6 +1338,7 @@ public void patternDecimalPlaces() {
         assertEquals("mBTC 1000.000", f.format(COIN));
     }
 
+    @Ignore("non-determinism between OpenJDK versions")
     @Test
     public void builderTest() {
         Locale locale;
diff --git a/core/src/test/java/org/bitcoinj/utils/ExponentialBackoffTest.java b/core/src/test/java/org/bitcoinj/utils/ExponentialBackoffTest.java
index 5add9cad36f..2faf3fe2b8d 100644
--- a/core/src/test/java/org/bitcoinj/utils/ExponentialBackoffTest.java
+++ b/core/src/test/java/org/bitcoinj/utils/ExponentialBackoffTest.java
@@ -31,7 +31,7 @@ public class ExponentialBackoffTest {
 
     @Before
     public void setUp() {
-        Utils.setMockClock(System.currentTimeMillis() / 1000);
+        Utils.setMockClock(Utils.currentTimeSeconds());
         params = new ExponentialBackoff.Params();
         backoff = new ExponentialBackoff(params);
     }
@@ -60,7 +60,7 @@ public void testFailure() {
 
     @Test
     public void testInQueue() {
-        PriorityQueue<ExponentialBackoff> queue = new PriorityQueue<ExponentialBackoff>();
+        PriorityQueue<ExponentialBackoff> queue = new PriorityQueue<>();
         ExponentialBackoff backoff1 = new ExponentialBackoff(params);
         backoff.trackFailure();
         backoff.trackFailure();
diff --git a/core/src/test/java/org/bitcoinj/utils/FiatTest.java b/core/src/test/java/org/bitcoinj/utils/FiatTest.java
index 8b89a9c95c4..91053d0d82d 100644
--- a/core/src/test/java/org/bitcoinj/utils/FiatTest.java
+++ b/core/src/test/java/org/bitcoinj/utils/FiatTest.java
@@ -18,6 +18,7 @@
 
 import static org.bitcoinj.utils.Fiat.parseFiat;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
@@ -31,6 +32,28 @@ public void testParseAndValueOf() {
         assertEquals(Fiat.valueOf("EUR", -10000), parseFiat("EUR", "-1"));
     }
 
+    @Test
+    public void testParseFiat() {
+        assertEquals(1, Fiat.parseFiat("EUR", "0.0001").value);
+        assertEquals(1, Fiat.parseFiat("EUR", "0.00010").value);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testParseFiatOverprecise() {
+        Fiat.parseFiat("EUR", "0.00011");
+    }
+
+    @Test
+    public void testParseFiatInexact() {
+        assertEquals(1, Fiat.parseFiatInexact("EUR", "0.0001").value);
+        assertEquals(1, Fiat.parseFiatInexact("EUR", "0.00011").value);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testParseFiatInexactInvalidAmount() {
+        Fiat.parseFiatInexact("USD", "33.xx");
+    }
+
     @Test
     public void testToFriendlyString() {
         assertEquals("1.00 EUR", parseFiat("EUR", "1").toFriendlyString());
@@ -56,4 +79,66 @@ public void testToPlainString() {
         assertEquals("3", parseFiat("EUR", "3.000").toPlainString());
         assertEquals("4", parseFiat("EUR", "4.0000").toPlainString());
     }
+
+    @Test
+    public void testComparing() {
+        assertTrue(parseFiat("EUR", "1.11").isLessThan(parseFiat("EUR", "6.66")));
+        assertTrue(parseFiat("EUR", "6.66").isGreaterThan(parseFiat("EUR", "2.56")));
+    }
+
+    @Test
+    public void testSign() {
+        assertTrue(parseFiat("EUR", "-1").isNegative());
+        assertTrue(parseFiat("EUR", "-1").negate().isPositive());
+        assertTrue(parseFiat("EUR", "1").isPositive());
+        assertTrue(parseFiat("EUR", "0.00").isZero());
+
+    }
+
+    @Test
+    public void testCurrencyCode() {
+        assertEquals("RUB", parseFiat("RUB", "66.6").getCurrencyCode());
+    }
+
+    @Test
+    public void testValueFetching() {
+        Fiat fiat = parseFiat("USD", "666");
+        assertEquals(6660000, fiat.longValue());
+        assertEquals("6660000", fiat.toString());
+    }
+
+    @Test
+    public void testOperations() {
+        Fiat fiatA = parseFiat("USD", "666");
+        Fiat fiatB = parseFiat("USD", "2");
+
+        Fiat sumResult = fiatA.add(fiatB);
+        assertEquals(6680000, sumResult.getValue());
+        assertEquals("USD", sumResult.getCurrencyCode());
+
+        Fiat subResult = fiatA.subtract(fiatB);
+        assertEquals(6640000, subResult.getValue());
+        assertEquals("USD", subResult.getCurrencyCode());
+
+        Fiat divResult = fiatA.divide(2);
+        assertEquals(3330000, divResult.getValue());
+        assertEquals("USD", divResult.getCurrencyCode());
+
+        long ldivResult = fiatA.divide(fiatB);
+        assertEquals(333, ldivResult);
+
+        Fiat mulResult = fiatA.multiply(2);
+        assertEquals(13320000, mulResult.getValue());
+
+        Fiat[] fiats = fiatA.divideAndRemainder(3);
+        assertEquals(2, fiats.length);
+
+        Fiat fiat1 = fiats[0];
+        assertEquals(2220000, fiat1.getValue());
+        assertEquals("USD", fiat1.getCurrencyCode());
+
+        Fiat fiat2 = fiats[1];
+        assertEquals(0, fiat2.getValue());
+        assertEquals("USD", fiat2.getCurrencyCode());
+    }
 }
diff --git a/core/src/test/java/org/bitcoinj/utils/MonetaryFormatTest.java b/core/src/test/java/org/bitcoinj/utils/MonetaryFormatTest.java
index efae1379bd3..078b49d94da 100644
--- a/core/src/test/java/org/bitcoinj/utils/MonetaryFormatTest.java
+++ b/core/src/test/java/org/bitcoinj/utils/MonetaryFormatTest.java
@@ -24,6 +24,7 @@
 
 import java.util.Locale;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 import org.bitcoinj.core.Coin;
@@ -215,6 +216,11 @@ public void standardCodes() throws Exception {
         assertEquals("µBTC 0", MonetaryFormat.UBTC.format(Coin.ZERO).toString());
     }
 
+    @Test
+    public void standardSymbol() throws Exception {
+        assertEquals(MonetaryFormat.SYMBOL_BTC + " 0.00", new MonetaryFormat(true).format(Coin.ZERO).toString());
+    }
+
     @Test
     public void customCode() throws Exception {
         assertEquals("dBTC 0", MonetaryFormat.UBTC.code(1, "dBTC").shift(1).format(Coin.ZERO).toString());
@@ -251,6 +257,12 @@ public void withLocale() throws Exception {
         final Coin value = Coin.valueOf(-1234567890l);
         assertEquals("-12.34567890", NO_CODE.withLocale(Locale.US).format(value).toString());
         assertEquals("-12,34567890", NO_CODE.withLocale(Locale.GERMANY).format(value).toString());
+    }
+
+    @Ignore("non-determinism between OpenJDK versions")
+    @Test
+    public void withLocaleDevanagari() throws Exception {
+        final Coin value = Coin.valueOf(-1234567890l);
         assertEquals("-१२.३४५६७८९०", NO_CODE.withLocale(new Locale("hi", "IN")).format(value).toString()); // Devanagari
     }
 
@@ -340,4 +352,18 @@ public void parseInvalidHugeNegativeNumber() throws Exception {
     public void fiat() throws Exception {
         assertEquals(ONE_EURO, NO_CODE.parseFiat("EUR", "1"));
     }
+
+    @Test
+    public void testEquals() {
+        MonetaryFormat mf1 = new MonetaryFormat(true);
+        MonetaryFormat mf2 = new MonetaryFormat(true);
+        assertEquals(mf1, mf2);
+    }
+
+    @Test
+    public void testHashCode() {
+        MonetaryFormat mf1 = new MonetaryFormat(true);
+        MonetaryFormat mf2 = new MonetaryFormat(true);
+        assertEquals(mf1.hashCode(), mf2.hashCode());
+    }
 }
diff --git a/core/src/test/java/org/bitcoinj/utils/VersionTallyTest.java b/core/src/test/java/org/bitcoinj/utils/VersionTallyTest.java
index 4520221012c..c6e328ebd2d 100644
--- a/core/src/test/java/org/bitcoinj/utils/VersionTallyTest.java
+++ b/core/src/test/java/org/bitcoinj/utils/VersionTallyTest.java
@@ -30,7 +30,7 @@
 import org.junit.Before;
 
 public class VersionTallyTest {
-    private static final NetworkParameters PARAMS = UnitTestParams.get();
+    private static final NetworkParameters UNITTEST = UnitTestParams.get();
 
     public VersionTallyTest() {
     }
@@ -38,7 +38,7 @@ public VersionTallyTest() {
     @Before
     public void setUp() throws Exception {
         BriefLogFormatter.initVerbose();
-        Context context = new Context(PARAMS);
+        Context context = new Context(UNITTEST);
     }
 
     /**
@@ -46,12 +46,12 @@ public void setUp() throws Exception {
      */
     @Test
     public void testNullWhileEmpty() {
-        VersionTally instance = new VersionTally(PARAMS);
-        for (int i = 0; i < PARAMS.getMajorityWindow(); i++) {
+        VersionTally instance = new VersionTally(UNITTEST);
+        for (int i = 0; i < UNITTEST.getMajorityWindow(); i++) {
             assertNull(instance.getCountAtOrAbove(1));
             instance.add(1);
         }
-        assertEquals(PARAMS.getMajorityWindow(), instance.getCountAtOrAbove(1).intValue());
+        assertEquals(UNITTEST.getMajorityWindow(), instance.getCountAtOrAbove(1).intValue());
     }
 
     /**
@@ -59,8 +59,8 @@ public void testNullWhileEmpty() {
      */
     @Test
     public void testSize() {
-        VersionTally instance = new VersionTally(PARAMS);
-        assertEquals(PARAMS.getMajorityWindow(), instance.size());
+        VersionTally instance = new VersionTally(UNITTEST);
+        assertEquals(UNITTEST.getMajorityWindow(), instance.size());
     }
 
     /**
@@ -68,46 +68,46 @@ public void testSize() {
      */
     @Test
     public void testVersionCounts() {
-        VersionTally instance = new VersionTally(PARAMS);
+        VersionTally instance = new VersionTally(UNITTEST);
 
         // Fill the tally with 1s
-        for (int i = 0; i < PARAMS.getMajorityWindow(); i++) {
+        for (int i = 0; i < UNITTEST.getMajorityWindow(); i++) {
             assertNull(instance.getCountAtOrAbove(1));
             instance.add(1);
         }
-        assertEquals(PARAMS.getMajorityWindow(), instance.getCountAtOrAbove(1).intValue());
+        assertEquals(UNITTEST.getMajorityWindow(), instance.getCountAtOrAbove(1).intValue());
 
         // Check the count updates as we replace with 2s
-        for (int i = 0; i < PARAMS.getMajorityWindow(); i++) {
+        for (int i = 0; i < UNITTEST.getMajorityWindow(); i++) {
             assertEquals(i, instance.getCountAtOrAbove(2).intValue());
             instance.add(2);
         }
  
         // Inject a rogue 1
         instance.add(1);
-        assertEquals(PARAMS.getMajorityWindow() - 1, instance.getCountAtOrAbove(2).intValue());
+        assertEquals(UNITTEST.getMajorityWindow() - 1, instance.getCountAtOrAbove(2).intValue());
 
         // Check we accept high values as well
         instance.add(10);
-        assertEquals(PARAMS.getMajorityWindow() - 1, instance.getCountAtOrAbove(2).intValue());
+        assertEquals(UNITTEST.getMajorityWindow() - 1, instance.getCountAtOrAbove(2).intValue());
     }
 
     @Test
     public void testInitialize() throws BlockStoreException {
-        final BlockStore blockStore = new MemoryBlockStore(PARAMS);
-        final BlockChain chain = new BlockChain(PARAMS, blockStore);
+        final BlockStore blockStore = new MemoryBlockStore(UNITTEST);
+        final BlockChain chain = new BlockChain(UNITTEST, blockStore);
 
         // Build a historical chain of version 2 blocks
         long timeSeconds = 1231006505;
         StoredBlock chainHead = null;
-        for (int height = 0; height < PARAMS.getMajorityWindow(); height++) {
+        for (int height = 0; height < UNITTEST.getMajorityWindow(); height++) {
             chainHead = FakeTxBuilder.createFakeBlock(blockStore, 2, timeSeconds, height).storedBlock;
             assertEquals(2, chainHead.getHeader().getVersion());
             timeSeconds += 60;
         }
 
-        VersionTally instance = new VersionTally(PARAMS);
+        VersionTally instance = new VersionTally(UNITTEST);
         instance.initialize(blockStore, chainHead);
-        assertEquals(PARAMS.getMajorityWindow(), instance.getCountAtOrAbove(2).intValue());
+        assertEquals(UNITTEST.getMajorityWindow(), instance.getCountAtOrAbove(2).intValue());
     }
 }
diff --git a/core/src/test/java/org/bitcoinj/wallet/BasicKeyChainTest.java b/core/src/test/java/org/bitcoinj/wallet/BasicKeyChainTest.java
index a3de7ff8bee..15a2cc8d55d 100644
--- a/core/src/test/java/org/bitcoinj/wallet/BasicKeyChainTest.java
+++ b/core/src/test/java/org/bitcoinj/wallet/BasicKeyChainTest.java
@@ -50,7 +50,7 @@ public class BasicKeyChainTest {
     @Before
     public void setup() {
         chain = new BasicKeyChain();
-        onKeysAdded = new AtomicReference<List<ECKey>>();
+        onKeysAdded = new AtomicReference<>();
         onKeysAddedRan = new AtomicBoolean();
         chain.addEventListener(new AbstractKeyChainEventListener() {
             @Override
diff --git a/core/src/test/java/org/bitcoinj/wallet/DefaultCoinSelectorTest.java b/core/src/test/java/org/bitcoinj/wallet/DefaultCoinSelectorTest.java
index 20d651966a2..ccb6d86b578 100644
--- a/core/src/test/java/org/bitcoinj/wallet/DefaultCoinSelectorTest.java
+++ b/core/src/test/java/org/bitcoinj/wallet/DefaultCoinSelectorTest.java
@@ -29,7 +29,8 @@
 import static org.junit.Assert.*;
 
 public class DefaultCoinSelectorTest extends TestWithWallet {
-    private static final NetworkParameters PARAMS = UnitTestParams.get();
+    private static final NetworkParameters UNITTEST = UnitTestParams.get();
+    private static final NetworkParameters REGTEST = RegTestParams.get();
 
     @Before
     @Override
@@ -47,19 +48,19 @@ public void tearDown() throws Exception {
     @Test
     public void selectable() throws Exception {
         Transaction t;
-        t = new Transaction(PARAMS);
+        t = new Transaction(UNITTEST);
         t.getConfidence().setConfidenceType(TransactionConfidence.ConfidenceType.PENDING);
         assertFalse(DefaultCoinSelector.isSelectable(t));
         t.getConfidence().setSource(TransactionConfidence.Source.SELF);
         assertFalse(DefaultCoinSelector.isSelectable(t));
-        t.getConfidence().markBroadcastBy(new PeerAddress(PARAMS, InetAddress.getByName("1.2.3.4")));
-        assertFalse(DefaultCoinSelector.isSelectable(t));
-        t.getConfidence().markBroadcastBy(new PeerAddress(PARAMS, InetAddress.getByName("5.6.7.8")));
+        t.getConfidence().markBroadcastBy(new PeerAddress(UNITTEST, InetAddress.getByName("1.2.3.4")));
+        assertTrue(DefaultCoinSelector.isSelectable(t));
+        t.getConfidence().markBroadcastBy(new PeerAddress(UNITTEST, InetAddress.getByName("5.6.7.8")));
         assertTrue(DefaultCoinSelector.isSelectable(t));
-        t = new Transaction(PARAMS);
+        t = new Transaction(UNITTEST);
         t.getConfidence().setConfidenceType(TransactionConfidence.ConfidenceType.BUILDING);
         assertTrue(DefaultCoinSelector.isSelectable(t));
-        t = new Transaction(RegTestParams.get());
+        t = new Transaction(REGTEST);
         t.getConfidence().setConfidenceType(TransactionConfidence.ConfidenceType.PENDING);
         t.getConfidence().setSource(TransactionConfidence.Source.SELF);
         assertTrue(DefaultCoinSelector.isSelectable(t));
@@ -78,7 +79,7 @@ public void depthOrdering() throws Exception {
         assertEquals(COIN, selection.valueGathered);
 
         // Check we ordered them correctly (by depth).
-        ArrayList<TransactionOutput> candidates = new ArrayList<TransactionOutput>();
+        ArrayList<TransactionOutput> candidates = new ArrayList<>();
         candidates.add(t2.getOutput(0));
         candidates.add(t1.getOutput(0));
         DefaultCoinSelector.sortOutputs(candidates);
@@ -98,7 +99,7 @@ public void coinAgeOrdering() throws Exception {
         Transaction t3 = checkNotNull(sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, CENT));
 
         // Should be ordered t2, t1, t3.
-        ArrayList<TransactionOutput> candidates = new ArrayList<TransactionOutput>();
+        ArrayList<TransactionOutput> candidates = new ArrayList<>();
         candidates.add(t3.getOutput(0));
         candidates.add(t2.getOutput(0));
         candidates.add(t1.getOutput(0));
@@ -111,12 +112,12 @@ public void coinAgeOrdering() throws Exception {
     @Test
     public void identicalInputs() throws Exception {
         // Add four outputs to a transaction with same value and destination. Select them all.
-        Transaction t = new Transaction(PARAMS);
+        Transaction t = new Transaction(UNITTEST);
         java.util.List<TransactionOutput> outputs = Arrays.asList(
-            new TransactionOutput(PARAMS, t, Coin.valueOf(30302787), myAddress),
-            new TransactionOutput(PARAMS, t, Coin.valueOf(30302787), myAddress),
-            new TransactionOutput(PARAMS, t, Coin.valueOf(30302787), myAddress),
-            new TransactionOutput(PARAMS, t, Coin.valueOf(30302787), myAddress)
+            new TransactionOutput(UNITTEST, t, Coin.valueOf(30302787), myAddress),
+            new TransactionOutput(UNITTEST, t, Coin.valueOf(30302787), myAddress),
+            new TransactionOutput(UNITTEST, t, Coin.valueOf(30302787), myAddress),
+            new TransactionOutput(UNITTEST, t, Coin.valueOf(30302787), myAddress)
         );
         t.getConfidence().setConfidenceType(TransactionConfidence.ConfidenceType.BUILDING);
 
diff --git a/core/src/test/java/org/bitcoinj/wallet/DefaultRiskAnalysisTest.java b/core/src/test/java/org/bitcoinj/wallet/DefaultRiskAnalysisTest.java
index 7fdbd291e97..5a146d4e251 100644
--- a/core/src/test/java/org/bitcoinj/wallet/DefaultRiskAnalysisTest.java
+++ b/core/src/test/java/org/bitcoinj/wallet/DefaultRiskAnalysisTest.java
@@ -28,13 +28,14 @@
 
 import java.util.*;
 
+import static com.google.common.base.Preconditions.checkState;
 import static org.bitcoinj.core.Coin.*;
 import static org.bitcoinj.script.ScriptOpCodes.*;
 import static org.junit.Assert.*;
 
 public class DefaultRiskAnalysisTest {
     // Uses mainnet because isStandard checks are disabled on testnet.
-    private static final NetworkParameters PARAMS = MainNetParams.get();
+    private static final NetworkParameters MAINNET = MainNetParams.get();
     private Wallet wallet;
     private final int TIMESTAMP = 1384190189;
     private static final ECKey key1 = new ECKey();
@@ -42,7 +43,7 @@ public class DefaultRiskAnalysisTest {
 
     @Before
     public void setup() {
-        wallet = new Wallet(new Context(PARAMS)) {
+        wallet = new Wallet(new Context(MAINNET)) {
             @Override
             public int getLastBlockSeenHeight() {
                 return 1000;
@@ -57,7 +58,7 @@ public long getLastBlockSeenTimeSecs() {
 
     @Test(expected = IllegalStateException.class)
     public void analysisCantBeUsedTwice() {
-        Transaction tx = new Transaction(PARAMS);
+        Transaction tx = new Transaction(MAINNET);
         DefaultRiskAnalysis analysis = DefaultRiskAnalysis.FACTORY.create(wallet, tx, NO_DEPS);
         assertEquals(RiskAnalysis.Result.OK, analysis.analyze());
         assertNull(analysis.getNonFinal());
@@ -68,8 +69,8 @@ public void analysisCantBeUsedTwice() {
     @Test
     public void nonFinal() throws Exception {
         // Verify that just having a lock time in the future is not enough to be considered risky (it's still final).
-        Transaction tx = new Transaction(PARAMS);
-        TransactionInput input = tx.addInput(PARAMS.getGenesisBlock().getTransactions().get(0).getOutput(0));
+        Transaction tx = new Transaction(MAINNET);
+        TransactionInput input = tx.addInput(MAINNET.getGenesisBlock().getTransactions().get(0).getOutput(0));
         tx.addOutput(COIN, key1);
         tx.setLockTime(TIMESTAMP + 86400);
         DefaultRiskAnalysis analysis = DefaultRiskAnalysis.FACTORY.create(wallet, tx, NO_DEPS);
@@ -90,8 +91,8 @@ public void nonFinal() throws Exception {
 
     @Test
     public void selfCreatedAreNotRisky() {
-        Transaction tx = new Transaction(PARAMS);
-        tx.addInput(PARAMS.getGenesisBlock().getTransactions().get(0).getOutput(0)).setSequenceNumber(1);
+        Transaction tx = new Transaction(MAINNET);
+        tx.addInput(MAINNET.getGenesisBlock().getTransactions().get(0).getOutput(0)).setSequenceNumber(1);
         tx.addOutput(COIN, key1);
         tx.setLockTime(TIMESTAMP + 86400);
 
@@ -111,11 +112,11 @@ public void selfCreatedAreNotRisky() {
     @Test
     public void nonFinalDependency() {
         // Final tx has a dependency that is non-final.
-        Transaction tx1 = new Transaction(PARAMS);
-        tx1.addInput(PARAMS.getGenesisBlock().getTransactions().get(0).getOutput(0)).setSequenceNumber(1);
+        Transaction tx1 = new Transaction(MAINNET);
+        tx1.addInput(MAINNET.getGenesisBlock().getTransactions().get(0).getOutput(0)).setSequenceNumber(1);
         TransactionOutput output = tx1.addOutput(COIN, key1);
         tx1.setLockTime(TIMESTAMP + 86400);
-        Transaction tx2 = new Transaction(PARAMS);
+        Transaction tx2 = new Transaction(MAINNET);
         tx2.addInput(output);
         tx2.addOutput(COIN, new ECKey());
 
@@ -126,18 +127,18 @@ public void nonFinalDependency() {
 
     @Test
     public void nonStandardDust() {
-        Transaction standardTx = new Transaction(PARAMS);
-        standardTx.addInput(PARAMS.getGenesisBlock().getTransactions().get(0).getOutput(0));
+        Transaction standardTx = new Transaction(MAINNET);
+        standardTx.addInput(MAINNET.getGenesisBlock().getTransactions().get(0).getOutput(0));
         standardTx.addOutput(COIN, key1);
         assertEquals(RiskAnalysis.Result.OK, DefaultRiskAnalysis.FACTORY.create(wallet, standardTx, NO_DEPS).analyze());
 
-        Transaction dustTx = new Transaction(PARAMS);
-        dustTx.addInput(PARAMS.getGenesisBlock().getTransactions().get(0).getOutput(0));
+        Transaction dustTx = new Transaction(MAINNET);
+        dustTx.addInput(MAINNET.getGenesisBlock().getTransactions().get(0).getOutput(0));
         dustTx.addOutput(Coin.SATOSHI, key1); // 1 Satoshi
         assertEquals(RiskAnalysis.Result.NON_STANDARD, DefaultRiskAnalysis.FACTORY.create(wallet, dustTx, NO_DEPS).analyze());
 
-        Transaction edgeCaseTx = new Transaction(PARAMS);
-        edgeCaseTx.addInput(PARAMS.getGenesisBlock().getTransactions().get(0).getOutput(0));
+        Transaction edgeCaseTx = new Transaction(MAINNET);
+        edgeCaseTx.addInput(MAINNET.getGenesisBlock().getTransactions().get(0).getOutput(0));
         edgeCaseTx.addOutput(DefaultRiskAnalysis.MIN_ANALYSIS_NONDUST_OUTPUT, key1); // Dust threshold
         assertEquals(RiskAnalysis.Result.OK, DefaultRiskAnalysis.FACTORY.create(wallet, edgeCaseTx, NO_DEPS).analyze());
     }
@@ -147,14 +148,14 @@ public void nonShortestPossiblePushData() {
         ScriptChunk nonStandardChunk = new ScriptChunk(OP_PUSHDATA1, new byte[75]);
         byte[] nonStandardScript = new ScriptBuilder().addChunk(nonStandardChunk).build().getProgram();
         // Test non-standard script as an input.
-        Transaction tx = new Transaction(PARAMS);
+        Transaction tx = new Transaction(MAINNET);
         assertEquals(DefaultRiskAnalysis.RuleViolation.NONE, DefaultRiskAnalysis.isStandard(tx));
-        tx.addInput(new TransactionInput(PARAMS, null, nonStandardScript));
+        tx.addInput(new TransactionInput(MAINNET, null, nonStandardScript));
         assertEquals(DefaultRiskAnalysis.RuleViolation.SHORTEST_POSSIBLE_PUSHDATA, DefaultRiskAnalysis.isStandard(tx));
         // Test non-standard script as an output.
         tx.clearInputs();
         assertEquals(DefaultRiskAnalysis.RuleViolation.NONE, DefaultRiskAnalysis.isStandard(tx));
-        tx.addOutput(new TransactionOutput(PARAMS, null, COIN, nonStandardScript));
+        tx.addOutput(new TransactionOutput(MAINNET, null, COIN, nonStandardScript));
         assertEquals(DefaultRiskAnalysis.RuleViolation.SHORTEST_POSSIBLE_PUSHDATA, DefaultRiskAnalysis.isStandard(tx));
     }
 
@@ -163,38 +164,38 @@ public void canonicalSignature() {
         TransactionSignature sig = TransactionSignature.dummy();
         Script scriptOk = ScriptBuilder.createInputScript(sig);
         assertEquals(RuleViolation.NONE,
-                DefaultRiskAnalysis.isInputStandard(new TransactionInput(PARAMS, null, scriptOk.getProgram())));
+                DefaultRiskAnalysis.isInputStandard(new TransactionInput(MAINNET, null, scriptOk.getProgram())));
 
         byte[] sigBytes = sig.encodeToBitcoin();
         // Appending a zero byte makes the signature uncanonical without violating DER encoding.
         Script scriptUncanonicalEncoding = new ScriptBuilder().data(Arrays.copyOf(sigBytes, sigBytes.length + 1))
                 .build();
         assertEquals(RuleViolation.SIGNATURE_CANONICAL_ENCODING,
-                DefaultRiskAnalysis.isInputStandard(new TransactionInput(PARAMS, null, scriptUncanonicalEncoding
+                DefaultRiskAnalysis.isInputStandard(new TransactionInput(MAINNET, null, scriptUncanonicalEncoding
                         .getProgram())));
     }
 
     @Test
-    public void canonicalSignatureLowS() {
+    public void canonicalSignatureLowS() throws Exception {
         // First, a synthetic test.
         TransactionSignature sig = TransactionSignature.dummy();
         Script scriptHighS = ScriptBuilder
                 .createInputScript(new TransactionSignature(sig.r, ECKey.CURVE.getN().subtract(sig.s)));
         assertEquals(RuleViolation.SIGNATURE_CANONICAL_ENCODING,
-                DefaultRiskAnalysis.isInputStandard(new TransactionInput(PARAMS, null, scriptHighS.getProgram())));
+                DefaultRiskAnalysis.isInputStandard(new TransactionInput(MAINNET, null, scriptHighS.getProgram())));
 
         // This is a real transaction. Its signatures S component is "low".
-        Transaction tx1 = new Transaction(PARAMS, Utils.HEX.decode(
+        Transaction tx1 = new Transaction(MAINNET, Utils.HEX.decode(
                 "010000000200a2be4376b7f47250ad9ad3a83b6aa5eb6a6d139a1f50771704d77aeb8ce76c010000006a4730440220055723d363cd2d4fe4e887270ebdf5c4b99eaf233a5c09f9404f888ec8b839350220763c3794d310b384ce86decfb05787e5bfa5d31983db612a2dde5ffec7f396ae012102ef47e27e0c4bdd6dc83915f185d972d5eb8515c34d17bad584a9312e59f4e0bcffffffff52239451d37757eeacb86d32864ec1ee6b6e131d1e3fee6f1cff512703b71014030000006b483045022100ea266ac4f893d98a623a6fc0e6a961cd5a3f32696721e87e7570a68851917e75022056d75c3b767419f6f6cb8189a0ad78d45971523908dc4892f7594b75fd43a8d00121038bb455ca101ebbb0ecf7f5c01fa1dcb7d14fbf6b7d7ea52ee56f0148e72a736cffffffff0630b15a00000000001976a9146ae477b690cf85f21c2c01e2c8639a5c18dc884e88ac4f260d00000000001976a91498d08c02ab92a671590adb726dddb719695ee12e88ac65753b00000000001976a9140b2eb4ba6d364c82092f25775f56bc10cd92c8f188ac65753b00000000001976a914d1cb414e22081c6ba3a935635c0f1d837d3c5d9188ac65753b00000000001976a914df9d137a0d279471a2796291874c29759071340b88ac3d753b00000000001976a91459f5aa4815e3aa8e1720e8b82f4ac8e6e904e47d88ac00000000"));
-        assertEquals("2a1c8569b2b01ebac647fb94444d1118d4d00e327456a3c518e40d47d72cd5fe", tx1.getHashAsString());
+        assertEquals("2a1c8569b2b01ebac647fb94444d1118d4d00e327456a3c518e40d47d72cd5fe", tx1.getTxId().toString());
 
         assertEquals(RuleViolation.NONE, DefaultRiskAnalysis.isStandard(tx1));
 
         // This tx is the same as the above, except for a "high" S component on the signature of input 1.
         // It was part of the Oct 2015 malleability attack.
-        Transaction tx2 = new Transaction(PARAMS, Utils.HEX.decode(
+        Transaction tx2 = new Transaction(MAINNET, Utils.HEX.decode(
                 "010000000200a2be4376b7f47250ad9ad3a83b6aa5eb6a6d139a1f50771704d77aeb8ce76c010000006a4730440220055723d363cd2d4fe4e887270ebdf5c4b99eaf233a5c09f9404f888ec8b839350220763c3794d310b384ce86decfb05787e5bfa5d31983db612a2dde5ffec7f396ae012102ef47e27e0c4bdd6dc83915f185d972d5eb8515c34d17bad584a9312e59f4e0bcffffffff52239451d37757eeacb86d32864ec1ee6b6e131d1e3fee6f1cff512703b71014030000006c493046022100ea266ac4f893d98a623a6fc0e6a961cd5a3f32696721e87e7570a68851917e75022100a928a3c4898be60909347e765f52872a613d8aada66c57a8c8791316d2f298710121038bb455ca101ebbb0ecf7f5c01fa1dcb7d14fbf6b7d7ea52ee56f0148e72a736cffffffff0630b15a00000000001976a9146ae477b690cf85f21c2c01e2c8639a5c18dc884e88ac4f260d00000000001976a91498d08c02ab92a671590adb726dddb719695ee12e88ac65753b00000000001976a9140b2eb4ba6d364c82092f25775f56bc10cd92c8f188ac65753b00000000001976a914d1cb414e22081c6ba3a935635c0f1d837d3c5d9188ac65753b00000000001976a914df9d137a0d279471a2796291874c29759071340b88ac3d753b00000000001976a91459f5aa4815e3aa8e1720e8b82f4ac8e6e904e47d88ac00000000"));
-        assertEquals("dbe4147cf89b89fd9fa6c8ce6a3e2adecb234db094ec88301ae09073ca17d61d", tx2.getHashAsString());
+        assertEquals("dbe4147cf89b89fd9fa6c8ce6a3e2adecb234db094ec88301ae09073ca17d61d", tx2.getTxId().toString());
         assertFalse(ECKey.ECDSASignature
                 .decodeFromDER(new Script(tx2.getInputs().get(1).getScriptBytes()).getChunks().get(0).data)
                 .isCanonical());
@@ -204,13 +205,13 @@ public void canonicalSignatureLowS() {
 
     @Test
     public void standardOutputs() throws Exception {
-        Transaction tx = new Transaction(PARAMS);
-        tx.addInput(PARAMS.getGenesisBlock().getTransactions().get(0).getOutput(0));
+        Transaction tx = new Transaction(MAINNET);
+        tx.addInput(MAINNET.getGenesisBlock().getTransactions().get(0).getOutput(0));
         // A pay to address output
-        tx.addOutput(Coin.CENT, ScriptBuilder.createOutputScript(key1.toAddress(PARAMS)));
-        // A pay to pubkey output
-        tx.addOutput(Coin.CENT, ScriptBuilder.createOutputScript(key1));
-        tx.addOutput(Coin.CENT, ScriptBuilder.createOutputScript(key1));
+        tx.addOutput(Coin.CENT, ScriptBuilder.createP2PKHOutputScript(key1));
+        // A P2PK output
+        tx.addOutput(Coin.CENT, ScriptBuilder.createP2PKOutputScript(key1));
+        tx.addOutput(Coin.CENT, ScriptBuilder.createP2PKOutputScript(key1));
         // 1-of-2 multisig output.
         ImmutableList<ECKey> keys = ImmutableList.of(key1, new ECKey());
         tx.addOutput(Coin.CENT, ScriptBuilder.createMultiSigOutputScript(1, keys));
@@ -225,10 +226,43 @@ public void standardOutputs() throws Exception {
 
     @Test
     public void optInFullRBF() throws Exception {
-        Transaction tx = FakeTxBuilder.createFakeTx(PARAMS);
+        Transaction tx = FakeTxBuilder.createFakeTx(MAINNET);
         tx.getInput(0).setSequenceNumber(TransactionInput.NO_SEQUENCE - 2);
         DefaultRiskAnalysis analysis = DefaultRiskAnalysis.FACTORY.create(wallet, tx, NO_DEPS);
         assertEquals(RiskAnalysis.Result.NON_FINAL, analysis.analyze());
         assertEquals(tx, analysis.getNonFinal());
     }
+
+    @Test
+    public void relativeLockTime() throws Exception {
+        Transaction tx = FakeTxBuilder.createFakeTx(MAINNET);
+        tx.setVersion(2);
+        checkState(!tx.hasRelativeLockTime());
+
+        tx.getInput(0).setSequenceNumber(TransactionInput.NO_SEQUENCE);
+        DefaultRiskAnalysis analysis = DefaultRiskAnalysis.FACTORY.create(wallet, tx, NO_DEPS);
+        assertEquals(RiskAnalysis.Result.OK, analysis.analyze());
+
+        tx.getInput(0).setSequenceNumber(0);
+        analysis = DefaultRiskAnalysis.FACTORY.create(wallet, tx, NO_DEPS);
+        assertEquals(RiskAnalysis.Result.NON_FINAL, analysis.analyze());
+        assertEquals(tx, analysis.getNonFinal());
+    }
+
+    @Test
+    public void transactionVersions() throws Exception {
+        Transaction tx = FakeTxBuilder.createFakeTx(MAINNET);
+        tx.setVersion(1);
+        DefaultRiskAnalysis analysis = DefaultRiskAnalysis.FACTORY.create(wallet, tx, NO_DEPS);
+        assertEquals(RiskAnalysis.Result.OK, analysis.analyze());
+
+        tx.setVersion(2);
+        analysis = DefaultRiskAnalysis.FACTORY.create(wallet, tx, NO_DEPS);
+        assertEquals(RiskAnalysis.Result.OK, analysis.analyze());
+
+        tx.setVersion(3);
+        analysis = DefaultRiskAnalysis.FACTORY.create(wallet, tx, NO_DEPS);
+        assertEquals(RiskAnalysis.Result.NON_STANDARD, analysis.analyze());
+        assertEquals(tx, analysis.getNonStandard());
+    }
 }
diff --git a/core/src/test/java/org/bitcoinj/wallet/DeterministicKeyChainTest.java b/core/src/test/java/org/bitcoinj/wallet/DeterministicKeyChainTest.java
index 5def319b826..0792be0ad98 100644
--- a/core/src/test/java/org/bitcoinj/wallet/DeterministicKeyChainTest.java
+++ b/core/src/test/java/org/bitcoinj/wallet/DeterministicKeyChainTest.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2013 Google Inc.
+ * Copyright 2018 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,21 +17,32 @@
 
 package org.bitcoinj.wallet;
 
-import org.bitcoinj.core.*;
+import org.bitcoinj.core.Address;
+import org.bitcoinj.core.BloomFilter;
+import org.bitcoinj.core.ECKey;
+import org.bitcoinj.core.LegacyAddress;
+import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.core.Sha256Hash;
+import org.bitcoinj.core.Utils;
 import org.bitcoinj.crypto.*;
 import org.bitcoinj.params.MainNetParams;
 import org.bitcoinj.params.UnitTestParams;
+import org.bitcoinj.script.Script;
 import org.bitcoinj.utils.BriefLogFormatter;
 import org.bitcoinj.utils.Threading;
 import org.bitcoinj.wallet.listeners.AbstractKeyChainEventListener;
 
+import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
+import com.google.common.io.Resources;
+
 import org.junit.Before;
 import org.junit.Test;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.security.SecureRandom;
 import java.util.List;
 
@@ -39,7 +51,13 @@
 
 public class DeterministicKeyChainTest {
     private DeterministicKeyChain chain;
+    private DeterministicKeyChain segwitChain;
+    private DeterministicKeyChain bip44chain;
     private final byte[] ENTROPY = Sha256Hash.hash("don't use a string seed like this in real life".getBytes());
+    private static final NetworkParameters UNITTEST = UnitTestParams.get();
+    private static final NetworkParameters MAINNET = MainNetParams.get();
+    private static final ImmutableList<ChildNumber> BIP44_ACCOUNT_ONE_PATH = ImmutableList.of(new ChildNumber(44, true),
+            new ChildNumber(1, true), ChildNumber.ZERO_HARDENED);
 
     @Before
     public void setup() {
@@ -47,9 +65,17 @@ public void setup() {
         // You should use a random seed instead. The secs constant comes from the unit test file, so we can compare
         // serialized data properly.
         long secs = 1389353062L;
-        chain = new DeterministicKeyChain(ENTROPY, "", secs);
+        chain = DeterministicKeyChain.builder().entropy(ENTROPY, secs)
+                .accountPath(DeterministicKeyChain.ACCOUNT_ZERO_PATH).outputScriptType(Script.ScriptType.P2PKH).build();
         chain.setLookaheadSize(10);
-        assertEquals(secs, checkNotNull(chain.getSeed()).getCreationTimeSeconds());
+
+        segwitChain = DeterministicKeyChain.builder().entropy(ENTROPY, secs)
+                .accountPath(DeterministicKeyChain.ACCOUNT_ONE_PATH).outputScriptType(Script.ScriptType.P2WPKH).build();
+        segwitChain.setLookaheadSize(10);
+
+        bip44chain = DeterministicKeyChain.builder().entropy(ENTROPY, secs).accountPath(BIP44_ACCOUNT_ONE_PATH)
+                .outputScriptType(Script.ScriptType.P2PKH).build();
+        bip44chain.setLookaheadSize(10);
     }
 
     @Test
@@ -59,10 +85,10 @@ public void derive() throws Exception {
         ECKey key2 = chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
         assertFalse(key2.isPubKeyOnly());
 
-        final Address address = Address.fromBase58(UnitTestParams.get(), "n1bQNoEx8uhmCzzA5JPG6sFdtsUQhwiQJV");
-        assertEquals(address, key1.toAddress(UnitTestParams.get()));
-        assertEquals("mnHUcqUVvrfi5kAaXJDQzBb9HsWs78b42R", key2.toAddress(UnitTestParams.get()).toString());
-        assertEquals(key1, chain.findKeyFromPubHash(address.getHash160()));
+        final Address address = LegacyAddress.fromBase58(UNITTEST, "n1bQNoEx8uhmCzzA5JPG6sFdtsUQhwiQJV");
+        assertEquals(address, LegacyAddress.fromKey(UNITTEST, key1));
+        assertEquals("mnHUcqUVvrfi5kAaXJDQzBb9HsWs78b42R", LegacyAddress.fromKey(UNITTEST, key2).toString());
+        assertEquals(key1, chain.findKeyFromPubHash(address.getHash()));
         assertEquals(key2, chain.findKeyFromPubKey(key2.getPubKey()));
 
         key1.sign(Sha256Hash.ZERO_HASH);
@@ -70,7 +96,7 @@ public void derive() throws Exception {
 
         ECKey key3 = chain.getKey(KeyChain.KeyPurpose.CHANGE);
         assertFalse(key3.isPubKeyOnly());
-        assertEquals("mqumHgVDqNzuXNrszBmi7A2UpmwaPMx4HQ", key3.toAddress(UnitTestParams.get()).toString());
+        assertEquals("mqumHgVDqNzuXNrszBmi7A2UpmwaPMx4HQ", LegacyAddress.fromKey(UNITTEST, key3).toString());
         key3.sign(Sha256Hash.ZERO_HASH);
         assertFalse(key3.isPubKeyOnly());
     }
@@ -80,79 +106,57 @@ public void getKeys() throws Exception {
         chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
         chain.getKey(KeyChain.KeyPurpose.CHANGE);
         chain.maybeLookAhead();
-        assertEquals(2, chain.getKeys(false).size());
+        assertEquals(2, chain.getKeys(false, false).size());
     }
 
     @Test
     public void deriveAccountOne() throws Exception {
-        long secs = 1389353062L;
-        DeterministicKeyChain chain1 = new AccountOneChain(ENTROPY, "", secs);
+        final long secs = 1389353062L;
+        final ImmutableList<ChildNumber> accountOne = ImmutableList.of(ChildNumber.ONE);
+        DeterministicKeyChain chain1 = DeterministicKeyChain.builder().accountPath(accountOne)
+                .entropy(ENTROPY, secs).build();
         ECKey key1 = chain1.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
         ECKey key2 = chain1.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
 
-        final Address address = Address.fromBase58(UnitTestParams.get(), "n2nHHRHs7TiZScTuVhZUkzZfTfVgGYwy6X");
-        assertEquals(address, key1.toAddress(UnitTestParams.get()));
-        assertEquals("mnp2j9za5zMuz44vNxrJCXXhZsCdh89QXn", key2.toAddress(UnitTestParams.get()).toString());
-        assertEquals(key1, chain1.findKeyFromPubHash(address.getHash160()));
+        final Address address = LegacyAddress.fromBase58(UNITTEST, "n2nHHRHs7TiZScTuVhZUkzZfTfVgGYwy6X");
+        assertEquals(address, LegacyAddress.fromKey(UNITTEST, key1));
+        assertEquals("mnp2j9za5zMuz44vNxrJCXXhZsCdh89QXn", LegacyAddress.fromKey(UNITTEST, key2).toString());
+        assertEquals(key1, chain1.findKeyFromPubHash(address.getHash()));
         assertEquals(key2, chain1.findKeyFromPubKey(key2.getPubKey()));
 
         key1.sign(Sha256Hash.ZERO_HASH);
 
         ECKey key3 = chain1.getKey(KeyChain.KeyPurpose.CHANGE);
-        assertEquals("mpjRhk13rvV7vmnszcUQVYVQzy4HLTPTQU", key3.toAddress(UnitTestParams.get()).toString());
+        assertEquals("mpjRhk13rvV7vmnszcUQVYVQzy4HLTPTQU", LegacyAddress.fromKey(UNITTEST, key3).toString());
         key3.sign(Sha256Hash.ZERO_HASH);
     }
 
-    static class AccountOneChain extends DeterministicKeyChain {
-        public AccountOneChain(byte[] entropy, String s, long secs) {
-            super(entropy, s, secs);
-        }
-
-        public AccountOneChain(KeyCrypter crypter, DeterministicSeed seed) {
-            super(seed, crypter);
-        }
-
-        @Override
-        protected ImmutableList<ChildNumber> getAccountPath() {
-            return ImmutableList.of(ChildNumber.ONE);
-        }
-    }
-
     @Test
     public void serializeAccountOne() throws Exception {
-        long secs = 1389353062L;
-        DeterministicKeyChain chain1 = new AccountOneChain(ENTROPY, "", secs);
+        final long secs = 1389353062L;
+        final ImmutableList<ChildNumber> accountOne = ImmutableList.of(ChildNumber.ONE);
+        DeterministicKeyChain chain1 = DeterministicKeyChain.builder().accountPath(accountOne)
+                .entropy(ENTROPY, secs).build();
         ECKey key1 = chain1.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
 
-        final Address address = Address.fromBase58(UnitTestParams.get(), "n2nHHRHs7TiZScTuVhZUkzZfTfVgGYwy6X");
-        assertEquals(address, key1.toAddress(UnitTestParams.get()));
+        final Address address = LegacyAddress.fromBase58(UNITTEST, "n2nHHRHs7TiZScTuVhZUkzZfTfVgGYwy6X");
+        assertEquals(address, LegacyAddress.fromKey(UNITTEST, key1));
 
         DeterministicKey watching = chain1.getWatchingKey();
 
         List<Protos.Key> keys = chain1.serializeToProtobuf();
-        KeyChainFactory factory = new KeyChainFactory() {
-            @Override
-            public DeterministicKeyChain makeKeyChain(Protos.Key key, Protos.Key firstSubKey, DeterministicSeed seed, KeyCrypter crypter, boolean isMarried) {
-                return new AccountOneChain(crypter, seed);
-            }
-
-            @Override
-            public DeterministicKeyChain makeWatchingKeyChain(Protos.Key key, Protos.Key firstSubKey, DeterministicKey accountKey, boolean isFollowingKey, boolean isMarried) {
-                throw new UnsupportedOperationException();
-            }
-        };
-
-        chain1 = DeterministicKeyChain.fromProtobuf(keys, null, factory).get(0);
+        chain1 = DeterministicKeyChain.fromProtobuf(keys, null).get(0);
+        assertEquals(accountOne, chain1.getAccountPath());
 
         ECKey key2 = chain1.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
-        assertEquals("mnp2j9za5zMuz44vNxrJCXXhZsCdh89QXn", key2.toAddress(UnitTestParams.get()).toString());
-        assertEquals(key1, chain1.findKeyFromPubHash(address.getHash160()));
+        assertEquals("mnp2j9za5zMuz44vNxrJCXXhZsCdh89QXn", LegacyAddress.fromKey(UNITTEST, key2).toString());
+        assertEquals(key1, chain1.findKeyFromPubHash(address.getHash()));
         assertEquals(key2, chain1.findKeyFromPubKey(key2.getPubKey()));
 
         key1.sign(Sha256Hash.ZERO_HASH);
 
         ECKey key3 = chain1.getKey(KeyChain.KeyPurpose.CHANGE);
-        assertEquals("mpjRhk13rvV7vmnszcUQVYVQzy4HLTPTQU", key3.toAddress(UnitTestParams.get()).toString());
+        assertEquals("mpjRhk13rvV7vmnszcUQVYVQzy4HLTPTQU", LegacyAddress.fromKey(UNITTEST, key3).toString());
         key3.sign(Sha256Hash.ZERO_HASH);
 
         assertEquals(watching, chain1.getWatchingKey());
@@ -169,7 +173,8 @@ public void events() throws Exception {
         // Check that we get the right events at the right time.
         final List<List<ECKey>> listenerKeys = Lists.newArrayList();
         long secs = 1389353062L;
-        chain = new DeterministicKeyChain(ENTROPY, "", secs);
+        chain = DeterministicKeyChain.builder().entropy(ENTROPY, secs).outputScriptType(Script.ScriptType.P2PKH)
+                .build();
         chain.addEventListener(new AbstractKeyChainEventListener() {
             @Override
             public void onKeysAdded(List<ECKey> keys) {
@@ -205,7 +210,7 @@ public void onKeysAdded(List<ECKey> keys) {
     public void random() {
         // Can't test much here but verify the constructor worked and the class is functional. The other tests rely on
         // a fixed seed to be deterministic.
-        chain = new DeterministicKeyChain(new SecureRandom(), 384);
+        chain = DeterministicKeyChain.builder().random(new SecureRandom(), 384).build();
         chain.setLookaheadSize(10);
         chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS).sign(Sha256Hash.ZERO_HASH);
         chain.getKey(KeyChain.KeyPurpose.CHANGE).sign(Sha256Hash.ZERO_HASH);
@@ -236,6 +241,7 @@ public void serializeUnencrypted() throws UnreadableWalletException {
         // Round trip the data back and forth to check it is preserved.
         int oldLookaheadSize = chain.getLookaheadSize();
         chain = DeterministicKeyChain.fromProtobuf(keys, null).get(0);
+        assertEquals(DeterministicKeyChain.ACCOUNT_ZERO_PATH, chain.getAccountPath());
         assertEquals(EXPECTED_SERIALIZATION, protoToString(chain.serializeToProtobuf()));
         assertEquals(key1, chain.findKeyFromPubHash(key1.getPubKeyHash()));
         assertEquals(key2, chain.findKeyFromPubHash(key2.getPubKeyHash()));
@@ -248,6 +254,81 @@ public void serializeUnencrypted() throws UnreadableWalletException {
         assertEquals(oldLookaheadSize, chain.getLookaheadSize());
     }
 
+    @Test
+    public void serializeSegwitUnencrypted() throws UnreadableWalletException {
+        segwitChain.maybeLookAhead();
+        DeterministicKey key1 = segwitChain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
+        DeterministicKey key2 = segwitChain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
+        DeterministicKey key3 = segwitChain.getKey(KeyChain.KeyPurpose.CHANGE);
+        List<Protos.Key> keys = segwitChain.serializeToProtobuf();
+        // 1 mnemonic/seed, 1 master key, 1 account key, 2 internal keys, 3 derived, 20 lookahead and 5 lookahead threshold.
+        int numItems =
+                1  // mnemonic/seed
+              + 1  // master key
+              + 1  // account key
+              + 2  // ext/int parent keys
+              + (segwitChain.getLookaheadSize() + segwitChain.getLookaheadThreshold()) * 2   // lookahead zone on each chain
+        ;
+        assertEquals(numItems, keys.size());
+
+        // Get another key that will be lost during round-tripping, to ensure we can derive it again.
+        DeterministicKey key4 = segwitChain.getKey(KeyChain.KeyPurpose.CHANGE);
+
+        final String EXPECTED_SERIALIZATION = checkSerialization(keys, "deterministic-wallet-segwit-serialization.txt");
+
+        // Round trip the data back and forth to check it is preserved.
+        int oldLookaheadSize = segwitChain.getLookaheadSize();
+        segwitChain = DeterministicKeyChain.fromProtobuf(keys, null).get(0);
+        assertEquals(EXPECTED_SERIALIZATION, protoToString(segwitChain.serializeToProtobuf()));
+        assertEquals(key1, segwitChain.findKeyFromPubHash(key1.getPubKeyHash()));
+        assertEquals(key2, segwitChain.findKeyFromPubHash(key2.getPubKeyHash()));
+        assertEquals(key3, segwitChain.findKeyFromPubHash(key3.getPubKeyHash()));
+        assertEquals(key4, segwitChain.getKey(KeyChain.KeyPurpose.CHANGE));
+        key1.sign(Sha256Hash.ZERO_HASH);
+        key2.sign(Sha256Hash.ZERO_HASH);
+        key3.sign(Sha256Hash.ZERO_HASH);
+        key4.sign(Sha256Hash.ZERO_HASH);
+        assertEquals(oldLookaheadSize, segwitChain.getLookaheadSize());
+    }
+
+    @Test
+    public void serializeUnencryptedBIP44() throws UnreadableWalletException {
+        bip44chain.maybeLookAhead();
+        DeterministicKey key1 = bip44chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
+        DeterministicKey key2 = bip44chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
+        DeterministicKey key3 = bip44chain.getKey(KeyChain.KeyPurpose.CHANGE);
+        List<Protos.Key> keys = bip44chain.serializeToProtobuf();
+        // 1 mnemonic/seed, 1 master key, 1 account key, 2 internal keys, 3 derived, 20 lookahead and 5 lookahead
+        // threshold.
+        int numItems = 3 // mnemonic/seed
+                + 1 // master key
+                + 1 // account key
+                + 2 // ext/int parent keys
+                + (bip44chain.getLookaheadSize() + bip44chain.getLookaheadThreshold()) * 2 // lookahead zone on each chain
+        ;
+        assertEquals(numItems, keys.size());
+
+        // Get another key that will be lost during round-tripping, to ensure we can derive it again.
+        DeterministicKey key4 = bip44chain.getKey(KeyChain.KeyPurpose.CHANGE);
+
+        final String EXPECTED_SERIALIZATION = checkSerialization(keys, "deterministic-wallet-bip44-serialization.txt");
+
+        // Round trip the data back and forth to check it is preserved.
+        int oldLookaheadSize = bip44chain.getLookaheadSize();
+        bip44chain = DeterministicKeyChain.fromProtobuf(keys, null).get(0);
+        assertEquals(BIP44_ACCOUNT_ONE_PATH, bip44chain.getAccountPath());
+        assertEquals(EXPECTED_SERIALIZATION, protoToString(bip44chain.serializeToProtobuf()));
+        assertEquals(key1, bip44chain.findKeyFromPubHash(key1.getPubKeyHash()));
+        assertEquals(key2, bip44chain.findKeyFromPubHash(key2.getPubKeyHash()));
+        assertEquals(key3, bip44chain.findKeyFromPubHash(key3.getPubKeyHash()));
+        assertEquals(key4, bip44chain.getKey(KeyChain.KeyPurpose.CHANGE));
+        key1.sign(Sha256Hash.ZERO_HASH);
+        key2.sign(Sha256Hash.ZERO_HASH);
+        key3.sign(Sha256Hash.ZERO_HASH);
+        key4.sign(Sha256Hash.ZERO_HASH);
+        assertEquals(oldLookaheadSize, bip44chain.getLookaheadSize());
+    }
+
     @Test(expected = IllegalStateException.class)
     public void notEncrypted() {
         chain.toDecrypted("fail");
@@ -316,13 +397,13 @@ public void watchingChain() throws UnreadableWalletException {
         DeterministicKey key3 = chain.getKey(KeyChain.KeyPurpose.CHANGE);
         DeterministicKey key4 = chain.getKey(KeyChain.KeyPurpose.CHANGE);
 
-        NetworkParameters params = MainNetParams.get();
         DeterministicKey watchingKey = chain.getWatchingKey();
-        final String pub58 = watchingKey.serializePubB58(params);
+        final String pub58 = watchingKey.serializePubB58(MAINNET);
         assertEquals("xpub69KR9epSNBM59KLuasxMU5CyKytMJjBP5HEZ5p8YoGUCpM6cM9hqxB9DDPCpUUtqmw5duTckvPfwpoWGQUFPmRLpxs5jYiTf2u6xRMcdhDf", pub58);
-        watchingKey = DeterministicKey.deserializeB58(null, pub58, params);
+        watchingKey = DeterministicKey.deserializeB58(null, pub58, MAINNET);
         watchingKey.setCreationTimeSeconds(100000);
-        chain = DeterministicKeyChain.watch(watchingKey);
+        chain = DeterministicKeyChain.builder().watch(watchingKey).outputScriptType(chain.getOutputScriptType())
+                .build();
         assertEquals(100000, chain.getEarliestKeyCreationTime());
         chain.setLookaheadSize(10);
         chain.maybeLookAhead();
@@ -342,14 +423,287 @@ public void watchingChain() throws UnreadableWalletException {
         List<Protos.Key> serialization = chain.serializeToProtobuf();
         checkSerialization(serialization, "watching-wallet-serialization.txt");
         chain = DeterministicKeyChain.fromProtobuf(serialization, null).get(0);
+        assertEquals(DeterministicKeyChain.ACCOUNT_ZERO_PATH, chain.getAccountPath());
+        final DeterministicKey rekey4 = chain.getKey(KeyChain.KeyPurpose.CHANGE);
+        assertEquals(key4.getPubKeyPoint(), rekey4.getPubKeyPoint());
+    }
+
+    @Test
+    public void watchingChainArbitraryPath() throws UnreadableWalletException {
+        Utils.setMockClock();
+        DeterministicKey key1 = bip44chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
+        DeterministicKey key2 = bip44chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
+        DeterministicKey key3 = bip44chain.getKey(KeyChain.KeyPurpose.CHANGE);
+        DeterministicKey key4 = bip44chain.getKey(KeyChain.KeyPurpose.CHANGE);
+
+        DeterministicKey watchingKey = bip44chain.getWatchingKey();
+        watchingKey = watchingKey.dropPrivateBytes().dropParent();
+        watchingKey.setCreationTimeSeconds(100000);
+        chain = DeterministicKeyChain.builder().watch(watchingKey).outputScriptType(bip44chain.getOutputScriptType())
+                .build();
+        assertEquals(100000, chain.getEarliestKeyCreationTime());
+        chain.setLookaheadSize(10);
+        chain.maybeLookAhead();
+
+        assertEquals(key1.getPubKeyPoint(), chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS).getPubKeyPoint());
+        assertEquals(key2.getPubKeyPoint(), chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS).getPubKeyPoint());
+        final DeterministicKey key = chain.getKey(KeyChain.KeyPurpose.CHANGE);
+        assertEquals(key3.getPubKeyPoint(), key.getPubKeyPoint());
+        try {
+            // Can't sign with a key from a watching chain.
+            key.sign(Sha256Hash.ZERO_HASH);
+            fail();
+        } catch (ECKey.MissingPrivateKeyException e) {
+            // Ignored.
+        }
+        // Test we can serialize and deserialize a watching chain OK.
+        List<Protos.Key> serialization = chain.serializeToProtobuf();
+        checkSerialization(serialization, "watching-wallet-arbitrary-path-serialization.txt");
+        chain = DeterministicKeyChain.fromProtobuf(serialization, null).get(0);
+        assertEquals(BIP44_ACCOUNT_ONE_PATH, chain.getAccountPath());
+        final DeterministicKey rekey4 = chain.getKey(KeyChain.KeyPurpose.CHANGE);
+        assertEquals(key4.getPubKeyPoint(), rekey4.getPubKeyPoint());
+    }
+
+    @Test
+    public void watchingChainAccountOne() throws UnreadableWalletException {
+        Utils.setMockClock();
+        final ImmutableList<ChildNumber> accountOne = ImmutableList.of(ChildNumber.ONE);
+        DeterministicKeyChain chain1 = DeterministicKeyChain.builder().accountPath(accountOne)
+                .seed(chain.getSeed()).build();
+        DeterministicKey key1 = chain1.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
+        DeterministicKey key2 = chain1.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
+        DeterministicKey key3 = chain1.getKey(KeyChain.KeyPurpose.CHANGE);
+        DeterministicKey key4 = chain1.getKey(KeyChain.KeyPurpose.CHANGE);
+
+        DeterministicKey watchingKey = chain1.getWatchingKey();
+        final String pub58 = watchingKey.serializePubB58(MAINNET);
+        assertEquals("xpub69KR9epJ2Wp6ywiv4Xu5WfBUpX4GLu6D5NUMd4oUkCFoZoRNyk3ZCxfKPDkkGvCPa16dPgEdY63qoyLqEa5TQQy1nmfSmgWcagRzimyV7uA", pub58);
+        watchingKey = DeterministicKey.deserializeB58(null, pub58, MAINNET);
+        watchingKey.setCreationTimeSeconds(100000);
+        chain = DeterministicKeyChain.builder().watch(watchingKey).outputScriptType(chain1.getOutputScriptType())
+                .build();
+        assertEquals(accountOne, chain.getAccountPath());
+        assertEquals(100000, chain.getEarliestKeyCreationTime());
+        chain.setLookaheadSize(10);
+        chain.maybeLookAhead();
+
+        assertEquals(key1.getPubKeyPoint(), chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS).getPubKeyPoint());
+        assertEquals(key2.getPubKeyPoint(), chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS).getPubKeyPoint());
+        final DeterministicKey key = chain.getKey(KeyChain.KeyPurpose.CHANGE);
+        assertEquals(key3.getPubKeyPoint(), key.getPubKeyPoint());
+        try {
+            // Can't sign with a key from a watching chain.
+            key.sign(Sha256Hash.ZERO_HASH);
+            fail();
+        } catch (ECKey.MissingPrivateKeyException e) {
+            // Ignored.
+        }
+        // Test we can serialize and deserialize a watching chain OK.
+        List<Protos.Key> serialization = chain.serializeToProtobuf();
+        checkSerialization(serialization, "watching-wallet-serialization-account-one.txt");
+        chain = DeterministicKeyChain.fromProtobuf(serialization, null).get(0);
+        assertEquals(accountOne, chain.getAccountPath());
+        final DeterministicKey rekey4 = chain.getKey(KeyChain.KeyPurpose.CHANGE);
+        assertEquals(key4.getPubKeyPoint(), rekey4.getPubKeyPoint());
+    }
+
+    @Test
+    public void watchingSegwitChain() throws UnreadableWalletException {
+        Utils.setMockClock();
+        DeterministicKey key1 = segwitChain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
+        DeterministicKey key2 = segwitChain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
+        DeterministicKey key3 = segwitChain.getKey(KeyChain.KeyPurpose.CHANGE);
+        DeterministicKey key4 = segwitChain.getKey(KeyChain.KeyPurpose.CHANGE);
+
+        DeterministicKey watchingKey = segwitChain.getWatchingKey();
+        final String pub58 = watchingKey.serializePubB58(MAINNET, segwitChain.getOutputScriptType());
+        assertEquals("zpub6nywkzAGfYS2siEfJtm9mo3hwDk8eUtL8EJ31XeWSd7C7x7esnfMMWmWiSs8od5jRt11arTjKLLbxCXuWNSXcxpi9PMSAphMt2ZE2gLnXGE", pub58);
+        watchingKey = DeterministicKey.deserializeB58(null, pub58, MAINNET);
+        watchingKey.setCreationTimeSeconds(100000);
+        segwitChain = DeterministicKeyChain.builder().watch(watchingKey)
+                .outputScriptType(segwitChain.getOutputScriptType()).build();
+        assertEquals(100000, segwitChain.getEarliestKeyCreationTime());
+        segwitChain.setLookaheadSize(10);
+        segwitChain.maybeLookAhead();
+
+        assertEquals(key1.getPubKeyPoint(), segwitChain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS).getPubKeyPoint());
+        assertEquals(key2.getPubKeyPoint(), segwitChain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS).getPubKeyPoint());
+        final DeterministicKey key = segwitChain.getKey(KeyChain.KeyPurpose.CHANGE);
+        assertEquals(key3.getPubKeyPoint(), key.getPubKeyPoint());
+        try {
+            // Can't sign with a key from a watching chain.
+            key.sign(Sha256Hash.ZERO_HASH);
+            fail();
+        } catch (ECKey.MissingPrivateKeyException e) {
+            // Ignored.
+        }
+        // Test we can serialize and deserialize a watching chain OK.
+        List<Protos.Key> serialization = segwitChain.serializeToProtobuf();
+        checkSerialization(serialization, "watching-wallet-p2wpkh-serialization.txt");
+        final DeterministicKeyChain chain = DeterministicKeyChain.fromProtobuf(serialization, null).get(0);
+        assertEquals(DeterministicKeyChain.ACCOUNT_ONE_PATH, chain.getAccountPath());
+        assertEquals(Script.ScriptType.P2WPKH, chain.getOutputScriptType());
+        final DeterministicKey rekey4 = segwitChain.getKey(KeyChain.KeyPurpose.CHANGE);
+        assertEquals(key4.getPubKeyPoint(), rekey4.getPubKeyPoint());
+    }
+
+    @Test
+    public void spendingChain() throws UnreadableWalletException {
+        Utils.setMockClock();
+        DeterministicKey key1 = chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
+        DeterministicKey key2 = chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
+        DeterministicKey key3 = chain.getKey(KeyChain.KeyPurpose.CHANGE);
+        DeterministicKey key4 = chain.getKey(KeyChain.KeyPurpose.CHANGE);
+
+        NetworkParameters params = MainNetParams.get();
+        DeterministicKey watchingKey = chain.getWatchingKey();
+        final String prv58 = watchingKey.serializePrivB58(params);
+        assertEquals("xprv9vL4k9HYXonmvqGSUrRM6wGEmx3ruGTXi4JxHRiwEvwDwYmTocPbQNpjN89gpqPrFofmfvALwgnNFBCH2grse1YDf8ERAwgdvbjRtoMfsbV", prv58);
+        watchingKey = DeterministicKey.deserializeB58(null, prv58, params);
+        watchingKey.setCreationTimeSeconds(100000);
+        chain = DeterministicKeyChain.builder().spend(watchingKey).outputScriptType(chain.getOutputScriptType())
+                .build();
+        assertEquals(100000, chain.getEarliestKeyCreationTime());
+        chain.setLookaheadSize(10);
+        chain.maybeLookAhead();
+
+        assertEquals(key1.getPubKeyPoint(), chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS).getPubKeyPoint());
+        assertEquals(key2.getPubKeyPoint(), chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS).getPubKeyPoint());
+        final DeterministicKey key = chain.getKey(KeyChain.KeyPurpose.CHANGE);
+        assertEquals(key3.getPubKeyPoint(), key.getPubKeyPoint());
+        try {
+            // We can sign with a key from a spending chain.
+            key.sign(Sha256Hash.ZERO_HASH);
+        } catch (ECKey.MissingPrivateKeyException e) {
+            fail();
+        }
+        // Test we can serialize and deserialize a watching chain OK.
+        List<Protos.Key> serialization = chain.serializeToProtobuf();
+        checkSerialization(serialization, "spending-wallet-serialization.txt");
+        chain = DeterministicKeyChain.fromProtobuf(serialization, null).get(0);
+        assertEquals(DeterministicKeyChain.ACCOUNT_ZERO_PATH, chain.getAccountPath());
         final DeterministicKey rekey4 = chain.getKey(KeyChain.KeyPurpose.CHANGE);
         assertEquals(key4.getPubKeyPoint(), rekey4.getPubKeyPoint());
     }
 
+    @Test
+    public void spendingChainAccountTwo() throws UnreadableWalletException {
+        Utils.setMockClock();
+        final long secs = 1389353062L;
+        final ImmutableList<ChildNumber> accountTwo = ImmutableList.of(new ChildNumber(2, true));
+        chain = DeterministicKeyChain.builder().accountPath(accountTwo).entropy(ENTROPY, secs).build();
+        DeterministicKey firstReceiveKey = chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
+        DeterministicKey secondReceiveKey = chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
+        DeterministicKey firstChangeKey = chain.getKey(KeyChain.KeyPurpose.CHANGE);
+        DeterministicKey secondChangeKey = chain.getKey(KeyChain.KeyPurpose.CHANGE);
+
+        NetworkParameters params = MainNetParams.get();
+        DeterministicKey watchingKey = chain.getWatchingKey();
+
+        final String prv58 = watchingKey.serializePrivB58(params);
+        assertEquals("xprv9vL4k9HYXonmzR7UC1ngJ3hTjxkmjLLUo3RexSfUGSWcACHzghWBLJAwW6xzs59XeFizQxFQWtscoTfrF9PSXrUgAtBgr13Nuojax8xTBRz", prv58);
+        watchingKey = DeterministicKey.deserializeB58(null, prv58, params);
+        watchingKey.setCreationTimeSeconds(secs);
+        chain = DeterministicKeyChain.builder().spend(watchingKey).outputScriptType(chain.getOutputScriptType())
+                .build();
+        assertEquals(accountTwo, chain.getAccountPath());
+        assertEquals(secs, chain.getEarliestKeyCreationTime());
+        chain.setLookaheadSize(10);
+        chain.maybeLookAhead();
+
+        verifySpendableKeyChain(firstReceiveKey, secondReceiveKey, firstChangeKey, secondChangeKey, chain, "spending-wallet-account-two-serialization.txt");
+    }
+
+    @Test
+    public void masterKeyAccount() throws UnreadableWalletException {
+        Utils.setMockClock();
+        long secs = 1389353062L;
+        DeterministicKey firstReceiveKey = bip44chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
+        DeterministicKey secondReceiveKey = bip44chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
+        DeterministicKey firstChangeKey = bip44chain.getKey(KeyChain.KeyPurpose.CHANGE);
+        DeterministicKey secondChangeKey = bip44chain.getKey(KeyChain.KeyPurpose.CHANGE);
+
+        NetworkParameters params = MainNetParams.get();
+        DeterministicKey watchingKey = bip44chain.getWatchingKey(); //m/44'/1'/0'
+        DeterministicKey coinLevelKey = bip44chain.getWatchingKey().getParent(); //m/44'/1'
+
+        //Simulate Wallet.fromSpendingKeyB58(PARAMS, prv58, secs)
+        final String prv58 = watchingKey.serializePrivB58(params);
+        assertEquals("xprv9yYQhynAmWWuz62PScx5Q2frBET2F1raaXna5A2E9Lj8XWgmKBL7S98Yand8F736j9UCTNWQeiB4yL5pLZP7JDY2tY8eszGQkiKDwBkezeS", prv58);
+        watchingKey = DeterministicKey.deserializeB58(null, prv58, params);
+        watchingKey.setCreationTimeSeconds(secs);
+        DeterministicKeyChain fromPrivBase58Chain = DeterministicKeyChain.builder().spend(watchingKey)
+                .outputScriptType(bip44chain.getOutputScriptType()).build();
+        assertEquals(secs, fromPrivBase58Chain.getEarliestKeyCreationTime());
+        fromPrivBase58Chain.setLookaheadSize(10);
+        fromPrivBase58Chain.maybeLookAhead();
+
+        verifySpendableKeyChain(firstReceiveKey, secondReceiveKey, firstChangeKey, secondChangeKey, fromPrivBase58Chain, "spending-wallet-from-bip44-serialization.txt");
+
+        //Simulate Wallet.fromMasterKey(params, coinLevelKey, 0)
+        DeterministicKey accountKey = HDKeyDerivation.deriveChildKey(coinLevelKey, new ChildNumber(0, true));
+        accountKey = accountKey.dropParent();
+        accountKey.setCreationTimeSeconds(watchingKey.getCreationTimeSeconds());
+        KeyChainGroup group = KeyChainGroup.builder(params).addChain(DeterministicKeyChain.builder().spend(accountKey)
+                .outputScriptType(bip44chain.getOutputScriptType()).build()).build();
+        DeterministicKeyChain fromMasterKeyChain = group.getActiveKeyChain();
+        assertEquals(BIP44_ACCOUNT_ONE_PATH, fromMasterKeyChain.getAccountPath());
+        assertEquals(secs, fromMasterKeyChain.getEarliestKeyCreationTime());
+        fromMasterKeyChain.setLookaheadSize(10);
+        fromMasterKeyChain.maybeLookAhead();
+
+        verifySpendableKeyChain(firstReceiveKey, secondReceiveKey, firstChangeKey, secondChangeKey, fromMasterKeyChain, "spending-wallet-from-bip44-serialization-two.txt");
+    }
+
+    /**
+     * verifySpendableKeyChain
+     *
+     * firstReceiveKey and secondReceiveKey are the first two keys of the external chain of a known key chain
+     * firstChangeKey and secondChangeKey are the first two keys of the internal chain of a known key chain
+     * keyChain is a DeterministicKeyChain loaded from a serialized format or derived in some other way from
+     * the known key chain
+     *
+     * This method verifies that known keys match a newly created keyChain and that keyChain's protobuf
+     * matches the serializationFile.
+     */
+    private void verifySpendableKeyChain(DeterministicKey firstReceiveKey, DeterministicKey secondReceiveKey,
+                                         DeterministicKey firstChangeKey, DeterministicKey secondChangeKey,
+                                         DeterministicKeyChain keyChain, String serializationFile) throws UnreadableWalletException {
+
+        //verify that the keys are the same as the keyChain
+        assertEquals(firstReceiveKey.getPubKeyPoint(), keyChain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS).getPubKeyPoint());
+        assertEquals(secondReceiveKey.getPubKeyPoint(), keyChain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS).getPubKeyPoint());
+        final DeterministicKey key = keyChain.getKey(KeyChain.KeyPurpose.CHANGE);
+        assertEquals(firstChangeKey.getPubKeyPoint(), key.getPubKeyPoint());
+
+        try {
+            key.sign(Sha256Hash.ZERO_HASH);
+        } catch (ECKey.MissingPrivateKeyException e) {
+            // We can sign with a key from a spending chain.
+            fail();
+        }
+
+        // Test we can serialize and deserialize the chain OK
+        List<Protos.Key> serialization = keyChain.serializeToProtobuf();
+        checkSerialization(serialization, serializationFile);
+
+        // Check that the second change key matches after loading from the serialization, serializing and deserializing
+        long secs = keyChain.getEarliestKeyCreationTime();
+        keyChain = DeterministicKeyChain.fromProtobuf(serialization, null).get(0);
+        serialization = keyChain.serializeToProtobuf();
+        checkSerialization(serialization, serializationFile);
+        assertEquals(secs, keyChain.getEarliestKeyCreationTime());
+        final DeterministicKey nextChangeKey = keyChain.getKey(KeyChain.KeyPurpose.CHANGE);
+        assertEquals(secondChangeKey.getPubKeyPoint(), nextChangeKey.getPubKeyPoint());
+    }
+
     @Test(expected = IllegalStateException.class)
     public void watchingCannotEncrypt() throws Exception {
         final DeterministicKey accountKey = chain.getKeyByPath(DeterministicKeyChain.ACCOUNT_ZERO_PATH);
-        chain = DeterministicKeyChain.watch(accountKey.dropPrivateBytes().dropParent());
+        chain = DeterministicKeyChain.builder().watch(accountKey.dropPrivateBytes().dropParent())
+                .outputScriptType(chain.getOutputScriptType()).build();
+        assertEquals(DeterministicKeyChain.ACCOUNT_ZERO_PATH, chain.getAccountPath());
         chain = chain.toEncrypted("this doesn't make any sense");
     }
 
@@ -379,7 +733,8 @@ public void bloom2() throws Exception {
         DeterministicKey[] keys = new DeterministicKey[100];
         for (int i = 0; i < keys.length; i++)
             keys[i] = chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
-        chain = DeterministicKeyChain.watch(chain.getWatchingKey().dropPrivateBytes().dropParent());
+        chain = DeterministicKeyChain.builder().watch(chain.getWatchingKey().dropPrivateBytes().dropParent())
+                .outputScriptType(chain.getOutputScriptType()).build();
         int e = chain.numBloomFilterEntries();
         BloomFilter filter = chain.getFilter(e, 0.001, 1);
         for (DeterministicKey key : keys)
@@ -398,7 +753,8 @@ private String protoToString(List<Protos.Key> keys) {
     private String checkSerialization(List<Protos.Key> keys, String filename) {
         try {
             String sb = protoToString(keys);
-            String expected = Utils.getResourceAsString(getClass().getResource(filename));
+            List<String> lines = Resources.readLines(getClass().getResource(filename), StandardCharsets.UTF_8);
+            String expected = Joiner.on('\n').join(lines);
             assertEquals(expected, sb);
             return expected;
         } catch (IOException e) {
diff --git a/core/src/test/java/org/bitcoinj/wallet/KeyChainGroupTest.java b/core/src/test/java/org/bitcoinj/wallet/KeyChainGroupTest.java
index f1b06dab33a..0c08533b35e 100644
--- a/core/src/test/java/org/bitcoinj/wallet/KeyChainGroupTest.java
+++ b/core/src/test/java/org/bitcoinj/wallet/KeyChainGroupTest.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2014 Mike Hearn
+ * Copyright 2019 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,20 +17,28 @@
 
 package org.bitcoinj.wallet;
 
-import org.bitcoinj.core.*;
+import org.bitcoinj.core.Address;
+import org.bitcoinj.core.BloomFilter;
+import org.bitcoinj.core.ECKey;
+import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.core.Sha256Hash;
+import org.bitcoinj.core.Utils;
 import org.bitcoinj.crypto.*;
 import org.bitcoinj.params.MainNetParams;
+import org.bitcoinj.script.Script;
+import org.bitcoinj.script.Script.ScriptType;
 import org.bitcoinj.utils.BriefLogFormatter;
 import org.bitcoinj.utils.Threading;
+import org.bitcoinj.wallet.KeyChain.KeyPurpose;
 import org.bitcoinj.wallet.listeners.KeyChainEventListener;
 
 import com.google.common.collect.ImmutableList;
 import org.junit.Before;
 import org.junit.Test;
-import org.spongycastle.crypto.params.KeyParameter;
-import org.spongycastle.util.Arrays;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import java.math.BigInteger;
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -40,8 +49,11 @@ public class KeyChainGroupTest {
     // Number of initial keys in this tests HD wallet, including interior keys.
     private static final int INITIAL_KEYS = 4;
     private static final int LOOKAHEAD_SIZE = 5;
-    private static final NetworkParameters PARAMS = MainNetParams.get();
+    private static final NetworkParameters MAINNET = MainNetParams.get();
     private static final String XPUB = "xpub68KFnj3bqUx1s7mHejLDBPywCAKdJEu1b49uniEEn2WSbHmZ7xbLqFTjJbtx1LUcAt1DwhoqWHmo2s5WMJp6wi38CiF2hYD49qVViKVvAoi";
+    private static final byte[] ENTROPY = Sha256Hash.hash("don't use a string seed like this in real life".getBytes());
+    private static final KeyCrypterScrypt KEY_CRYPTER = new KeyCrypterScrypt(2);
+    private static final KeyParameter AES_KEY = KEY_CRYPTER.deriveKey("password");
     private KeyChainGroup group;
     private DeterministicKey watchingAccountKey;
 
@@ -49,18 +61,35 @@ public class KeyChainGroupTest {
     public void setup() {
         BriefLogFormatter.init();
         Utils.setMockClock();
-        group = new KeyChainGroup(PARAMS);
-        group.setLookaheadSize(LOOKAHEAD_SIZE);   // Don't want slow tests.
+        group = KeyChainGroup.builder(MAINNET).lookaheadSize(LOOKAHEAD_SIZE).fromRandom(Script.ScriptType.P2PKH)
+                .build();
         group.getActiveKeyChain();  // Force create a chain.
 
-        watchingAccountKey = DeterministicKey.deserializeB58(null, XPUB, PARAMS);
+        watchingAccountKey = DeterministicKey.deserializeB58(null, XPUB, MAINNET);
+    }
+
+    @Test
+    public void createDeterministic_P2PKH() {
+        KeyChainGroup kcg = KeyChainGroup.builder(MAINNET).fromRandom(Script.ScriptType.P2PKH).build();
+        // check default
+        Address address = kcg.currentAddress(KeyPurpose.RECEIVE_FUNDS);
+        assertEquals(Script.ScriptType.P2PKH, address.getOutputScriptType());
+    }
+
+    @Test
+    public void createDeterministic_P2WPKH() {
+        KeyChainGroup kcg = KeyChainGroup.builder(MAINNET).fromRandom(Script.ScriptType.P2WPKH).build();
+        // check default
+        Address address = kcg.currentAddress(KeyPurpose.RECEIVE_FUNDS);
+        assertEquals(Script.ScriptType.P2WPKH, address.getOutputScriptType());
+        // check fallback (this will go away at some point)
+        address = kcg.freshAddress(KeyPurpose.RECEIVE_FUNDS, Script.ScriptType.P2PKH, 0);
+        assertEquals(Script.ScriptType.P2PKH, address.getOutputScriptType());
     }
 
     private KeyChainGroup createMarriedKeyChainGroup() {
-        KeyChainGroup group = new KeyChainGroup(PARAMS);
         DeterministicKeyChain chain = createMarriedKeyChain();
-        group.addAndActivateHDChain(chain);
-        group.setLookaheadSize(LOOKAHEAD_SIZE);
+        KeyChainGroup group = KeyChainGroup.builder(MAINNET).lookaheadSize(LOOKAHEAD_SIZE).addChain(chain).build();
         group.getActiveKeyChain();
         return group;
     }
@@ -154,23 +183,23 @@ public void findKey() throws Exception {
         assertEquals(a, result);
         result = group.findKeyFromPubKey(b.getPubKey());
         assertEquals(b, result);
-        result = group.findKeyFromPubHash(a.getPubKeyHash());
+        result = group.findKeyFromPubKeyHash(a.getPubKeyHash(), null);
         assertEquals(a, result);
-        result = group.findKeyFromPubHash(b.getPubKeyHash());
+        result = group.findKeyFromPubKeyHash(b.getPubKeyHash(), null);
         assertEquals(b, result);
         result = group.findKeyFromPubKey(c.getPubKey());
         assertEquals(c, result);
-        result = group.findKeyFromPubHash(c.getPubKeyHash());
+        result = group.findKeyFromPubKeyHash(c.getPubKeyHash(), null);
         assertEquals(c, result);
         assertNull(group.findKeyFromPubKey(d.getPubKey()));
-        assertNull(group.findKeyFromPubHash(d.getPubKeyHash()));
+        assertNull(group.findKeyFromPubKeyHash(d.getPubKeyHash(), null));
     }
 
     @Test
     public void currentP2SHAddress() throws Exception {
         group = createMarriedKeyChainGroup();
         Address a1 = group.currentAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS);
-        assertTrue(a1.isP2SHAddress());
+        assertEquals(ScriptType.P2SH, a1.getOutputScriptType());
         Address a2 = group.currentAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS);
         assertEquals(a1, a2);
         Address a3 = group.currentAddress(KeyChain.KeyPurpose.CHANGE);
@@ -182,7 +211,7 @@ public void freshAddress() throws Exception {
         group = createMarriedKeyChainGroup();
         Address a1 = group.freshAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS);
         Address a2 = group.freshAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS);
-        assertTrue(a1.isP2SHAddress());
+        assertEquals(ScriptType.P2SH, a1.getOutputScriptType());
         assertNotEquals(a1, a2);
         group.getBloomFilterElementCount();
         assertEquals(((group.getLookaheadSize() + group.getLookaheadThreshold()) * 2)   // * 2 because of internal/external
@@ -202,7 +231,7 @@ public void findRedeemData() throws Exception {
 
         // test our script hash
         Address address = group.currentAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS);
-        RedeemData redeemData = group.findRedeemDataFromScriptHash(address.getHash160());
+        RedeemData redeemData = group.findRedeemDataFromScriptHash(address.getHash());
         assertNotNull(redeemData);
         assertNotNull(redeemData.redeemScript);
         assertEquals(2, redeemData.keys.size());
@@ -240,9 +269,7 @@ public void encryption(boolean withImported) throws Exception {
             group.importKeys(b);
             assertEquals(yesterday, group.getEarliestKeyCreationTime());
         }
-        KeyCrypterScrypt scrypt = new KeyCrypterScrypt(2);
-        final KeyParameter aesKey = scrypt.deriveKey("password");
-        group.encrypt(scrypt, aesKey);
+        group.encrypt(KEY_CRYPTER, AES_KEY);
         assertTrue(group.isEncrypted());
         assertTrue(group.checkPassword("password"));
         assertFalse(group.checkPassword("wrong password"));
@@ -267,22 +294,22 @@ public void encryption(boolean withImported) throws Exception {
                 fail();
             } catch (KeyCrypterException e) {
             }
-            group.importKeysAndEncrypt(ImmutableList.of(c), aesKey);
+            group.importKeysAndEncrypt(ImmutableList.of(c), AES_KEY);
             ECKey ec = group.findKeyFromPubKey(c.getPubKey());
             try {
-                group.importKeysAndEncrypt(ImmutableList.of(ec), aesKey);
+                group.importKeysAndEncrypt(ImmutableList.of(ec), AES_KEY);
                 fail();
             } catch (IllegalArgumentException e) {
             }
         }
 
         try {
-            group.decrypt(scrypt.deriveKey("WRONG PASSWORD"));
+            group.decrypt(KEY_CRYPTER.deriveKey("WRONG PASSWORD"));
             fail();
         } catch (KeyCrypterException e) {
         }
 
-        group.decrypt(aesKey);
+        group.decrypt(AES_KEY);
         assertFalse(group.isEncrypted());
         assertFalse(checkNotNull(group.findKeyFromPubKey(a.getPubKey())).isEncrypted());
         if (withImported) {
@@ -295,14 +322,11 @@ public void encryption(boolean withImported) throws Exception {
 
     @Test
     public void encryptionWhilstEmpty() throws Exception {
-        group = new KeyChainGroup(PARAMS);
-        group.setLookaheadSize(5);
-        KeyCrypterScrypt scrypt = new KeyCrypterScrypt(2);
-        final KeyParameter aesKey = scrypt.deriveKey("password");
-        group.encrypt(scrypt, aesKey);
+        group = KeyChainGroup.builder(MAINNET).lookaheadSize(5).fromRandom(Script.ScriptType.P2PKH).build();
+        group.encrypt(KEY_CRYPTER, AES_KEY);
         assertTrue(group.freshKey(KeyChain.KeyPurpose.RECEIVE_FUNDS).isEncrypted());
         final ECKey key = group.currentKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
-        group.decrypt(aesKey);
+        group.decrypt(AES_KEY);
         assertFalse(checkNotNull(group.findKeyFromPubKey(key.getPubKey())).isEncrypted());
     }
 
@@ -332,7 +356,7 @@ public void bloom() throws Exception {
     public void findRedeemScriptFromPubHash() throws Exception {
         group = createMarriedKeyChainGroup();
         Address address = group.freshAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS);
-        assertTrue(group.findRedeemDataFromScriptHash(address.getHash160()) != null);
+        assertTrue(group.findRedeemDataFromScriptHash(address.getHash()) != null);
         group.getBloomFilterElementCount();
         KeyChainGroup group2 = createMarriedKeyChainGroup();
         group2.freshAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS);
@@ -340,9 +364,9 @@ public void findRedeemScriptFromPubHash() throws Exception {
         // test address from lookahead zone and lookahead threshold zone
         for (int i = 0; i < group.getLookaheadSize() + group.getLookaheadThreshold(); i++) {
             address = group.freshAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS);
-            assertTrue(group2.findRedeemDataFromScriptHash(address.getHash160()) != null);
+            assertTrue(group2.findRedeemDataFromScriptHash(address.getHash()) != null);
         }
-        assertFalse(group2.findRedeemDataFromScriptHash(group.freshAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS).getHash160()) != null);
+        assertFalse(group2.findRedeemDataFromScriptHash(group.freshAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS).getHash()) != null);
     }
 
     @Test
@@ -354,18 +378,18 @@ public void bloomFilterForMarriedChains() throws Exception {
         Address address1 = group.freshAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS);
         assertEquals(expected, group.getBloomFilterElementCount());
         BloomFilter filter = group.getBloomFilter(expected + 2, 0.001, (long)(Math.random() * Long.MAX_VALUE));
-        assertTrue(filter.contains(address1.getHash160()));
+        assertTrue(filter.contains(address1.getHash()));
 
         Address address2 = group.freshAddress(KeyChain.KeyPurpose.CHANGE);
-        assertTrue(filter.contains(address2.getHash160()));
+        assertTrue(filter.contains(address2.getHash()));
 
         // Check that the filter contains the lookahead buffer.
         for (int i = 0; i < bufferSize - 1 /* issued address */; i++) {
             Address address = group.freshAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS);
-            assertTrue("key " + i, filter.contains(address.getHash160()));
+            assertTrue("key " + i, filter.contains(address.getHash()));
         }
         // We ran ahead of the lookahead buffer.
-        assertFalse(filter.contains(group.freshAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS).getHash160()));
+        assertFalse(filter.contains(group.freshAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS).getHash()));
     }
 
     @Test
@@ -389,7 +413,7 @@ public void earliestKeyTime() throws Exception {
     public void events() throws Exception {
         // Check that events are registered with the right chains and that if a chain is added, it gets the event
         // listeners attached properly even post-hoc.
-        final AtomicReference<ECKey> ran = new AtomicReference<ECKey>(null);
+        final AtomicReference<ECKey> ran = new AtomicReference<>(null);
         final KeyChainEventListener listener = new KeyChainEventListener() {
             @Override
             public void onKeysAdded(List<ECKey> keys) {
@@ -412,7 +436,7 @@ public void onKeysAdded(List<ECKey> keys) {
     public void serialization() throws Exception {
         int initialKeys = INITIAL_KEYS + group.getActiveKeyChain().getAccountPath().size() - 1;
         assertEquals(initialKeys + 1 /* for the seed */, group.serializeToProtobuf().size());
-        group = KeyChainGroup.fromProtobufUnencrypted(PARAMS, group.serializeToProtobuf());
+        group = KeyChainGroup.fromProtobufUnencrypted(MAINNET, group.serializeToProtobuf());
         group.freshKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
         DeterministicKey key1 = group.freshKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
         DeterministicKey key2 = group.freshKey(KeyChain.KeyPurpose.CHANGE);
@@ -423,39 +447,37 @@ public void serialization() throws Exception {
         List<Protos.Key> protoKeys2 = group.serializeToProtobuf();
         assertEquals(initialKeys + ((LOOKAHEAD_SIZE + 1) * 2) + 1 /* for the seed */ + 2, protoKeys2.size());
 
-        group = KeyChainGroup.fromProtobufUnencrypted(PARAMS, protoKeys1);
+        group = KeyChainGroup.fromProtobufUnencrypted(MAINNET, protoKeys1);
         assertEquals(initialKeys + ((LOOKAHEAD_SIZE + 1)  * 2)  + 1 /* for the seed */ + 1, protoKeys1.size());
         assertTrue(group.hasKey(key1));
         assertTrue(group.hasKey(key2));
         assertEquals(key2, group.currentKey(KeyChain.KeyPurpose.CHANGE));
         assertEquals(key1, group.currentKey(KeyChain.KeyPurpose.RECEIVE_FUNDS));
-        group = KeyChainGroup.fromProtobufUnencrypted(PARAMS, protoKeys2);
+        group = KeyChainGroup.fromProtobufUnencrypted(MAINNET, protoKeys2);
         assertEquals(initialKeys + ((LOOKAHEAD_SIZE + 1) * 2) + 1 /* for the seed */ + 2, protoKeys2.size());
         assertTrue(group.hasKey(key1));
         assertTrue(group.hasKey(key2));
 
-        KeyCrypterScrypt scrypt = new KeyCrypterScrypt(2);
-        final KeyParameter aesKey = scrypt.deriveKey("password");
-        group.encrypt(scrypt, aesKey);
+        group.encrypt(KEY_CRYPTER, AES_KEY);
         List<Protos.Key> protoKeys3 = group.serializeToProtobuf();
-        group = KeyChainGroup.fromProtobufEncrypted(PARAMS, protoKeys3, scrypt);
+        group = KeyChainGroup.fromProtobufEncrypted(MAINNET, protoKeys3, KEY_CRYPTER);
         assertTrue(group.isEncrypted());
         assertTrue(group.checkPassword("password"));
-        group.decrypt(aesKey);
+        group.decrypt(AES_KEY);
 
         // No need for extensive contents testing here, as that's done in the keychain class tests.
     }
 
     @Test
     public void serializeWatching() throws Exception {
-        group = new KeyChainGroup(PARAMS, watchingAccountKey);
-        group.setLookaheadSize(LOOKAHEAD_SIZE);
+        group = KeyChainGroup.builder(MAINNET).lookaheadSize(LOOKAHEAD_SIZE).addChain(DeterministicKeyChain.builder()
+                .watch(watchingAccountKey).outputScriptType(Script.ScriptType.P2PKH).build()).build();
         group.freshKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
         group.freshKey(KeyChain.KeyPurpose.CHANGE);
         group.getBloomFilterElementCount();  // Force lookahead.
         List<Protos.Key> protoKeys1 = group.serializeToProtobuf();
         assertEquals(3 + (group.getLookaheadSize() + group.getLookaheadThreshold() + 1) * 2, protoKeys1.size());
-        group = KeyChainGroup.fromProtobufUnencrypted(PARAMS, protoKeys1);
+        group = KeyChainGroup.fromProtobufUnencrypted(MAINNET, protoKeys1);
         assertEquals(3 + (group.getLookaheadSize() + group.getLookaheadThreshold() + 1) * 2, group.serializeToProtobuf().size());
     }
 
@@ -467,7 +489,7 @@ public void serializeMarried() throws Exception {
         assertEquals(2, group.getActiveKeyChain().getSigsRequiredToSpend());
 
         List<Protos.Key> protoKeys = group.serializeToProtobuf();
-        KeyChainGroup group2 = KeyChainGroup.fromProtobufUnencrypted(PARAMS, protoKeys);
+        KeyChainGroup group2 = KeyChainGroup.fromProtobufUnencrypted(MAINNET, protoKeys);
         assertTrue(group2.isMarried());
         assertEquals(2, group.getActiveKeyChain().getSigsRequiredToSpend());
         Address address2 = group2.currentAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS);
@@ -485,18 +507,41 @@ public void addFollowingAccounts() throws Exception {
     public void constructFromSeed() throws Exception {
         ECKey key1 = group.freshKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
         final DeterministicSeed seed = checkNotNull(group.getActiveKeyChain().getSeed());
-        KeyChainGroup group2 = new KeyChainGroup(PARAMS, seed);
-        group2.setLookaheadSize(5);
+        KeyChainGroup group2 = KeyChainGroup.builder(MAINNET).lookaheadSize(5)
+                .addChain(DeterministicKeyChain.builder().seed(seed).outputScriptType(Script.ScriptType.P2PKH).build())
+                .build();
         ECKey key2 = group2.freshKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
         assertEquals(key1, key2);
     }
 
+    @Test
+    public void addAndActivateHDChain_freshCurrentAddress() {
+        DeterministicSeed seed = new DeterministicSeed(ENTROPY, "", 0);
+        DeterministicKeyChain chain1 = DeterministicKeyChain.builder().seed(seed)
+                .accountPath(DeterministicKeyChain.ACCOUNT_ZERO_PATH).outputScriptType(Script.ScriptType.P2PKH).build();
+        group = KeyChainGroup.builder(MAINNET).addChain(chain1).build();
+        assertEquals("1M5T5k9yKtGWRtWYMjQtGx3K2sshrABzCT", group.currentAddress(KeyPurpose.RECEIVE_FUNDS).toString());
+
+        final DeterministicKeyChain chain2 = DeterministicKeyChain.builder().seed(seed)
+                .accountPath(DeterministicKeyChain.ACCOUNT_ONE_PATH).outputScriptType(Script.ScriptType.P2PKH).build();
+        group.addAndActivateHDChain(chain2);
+        assertEquals("1JLnjJEXcyByAaW6sqSxNvGiiSEWRhdvPb", group.currentAddress(KeyPurpose.RECEIVE_FUNDS).toString());
+
+        final DeterministicKeyChain chain3 = DeterministicKeyChain.builder().seed(seed)
+                .accountPath(DeterministicKeyChain.BIP44_ACCOUNT_ZERO_PATH).outputScriptType(Script.ScriptType.P2WPKH)
+                .build();
+        group.addAndActivateHDChain(chain3);
+        assertEquals("bc1q5fa84aghxd6uzk5g2ywkppmzlut5d77vg8cd20",
+                group.currentAddress(KeyPurpose.RECEIVE_FUNDS).toString());
+    }
+
     @Test(expected = DeterministicUpgradeRequiredException.class)
     public void deterministicUpgradeRequired() throws Exception {
         // Check that if we try to use HD features in a KCG that only has random keys, we get an exception.
-        group = new KeyChainGroup(PARAMS);
+        group = KeyChainGroup.builder(MAINNET).build();
         group.importKeys(new ECKey(), new ECKey());
-        assertTrue(group.isDeterministicUpgradeRequired());
+        assertTrue(group.isDeterministicUpgradeRequired(Script.ScriptType.P2PKH, 0));
+        assertTrue(group.isDeterministicUpgradeRequired(Script.ScriptType.P2WPKH, 0));
         group.freshKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);   // throws
     }
 
@@ -504,22 +549,26 @@ public void deterministicUpgradeRequired() throws Exception {
     public void deterministicUpgradeUnencrypted() throws Exception {
         // Check that a group that contains only random keys has its HD chain created using the private key bytes of
         // the oldest random key, so upgrading the same wallet twice gives the same outcome.
-        group = new KeyChainGroup(PARAMS);
-        group.setLookaheadSize(LOOKAHEAD_SIZE);   // Don't want slow tests.
+        group = KeyChainGroup.builder(MAINNET).lookaheadSize(LOOKAHEAD_SIZE).build();
         ECKey key1 = new ECKey();
         Utils.rollMockClock(86400);
         ECKey key2 = new ECKey();
         group.importKeys(key2, key1);
 
         List<Protos.Key> protobufs = group.serializeToProtobuf();
-        group.upgradeToDeterministic(0, null);
-        assertFalse(group.isDeterministicUpgradeRequired());
+        group.upgradeToDeterministic(Script.ScriptType.P2PKH, KeyChainGroupStructure.DEFAULT, 0, null);
+        assertFalse(group.isEncrypted());
+        assertFalse(group.isDeterministicUpgradeRequired(Script.ScriptType.P2PKH, 0));
+        assertTrue(group.isDeterministicUpgradeRequired(Script.ScriptType.P2WPKH, 0));
         DeterministicKey dkey1 = group.freshKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
         DeterministicSeed seed1 = group.getActiveKeyChain().getSeed();
         assertNotNull(seed1);
 
-        group = KeyChainGroup.fromProtobufUnencrypted(PARAMS, protobufs);
-        group.upgradeToDeterministic(0, null);  // Should give same result as last time.
+        group = KeyChainGroup.fromProtobufUnencrypted(MAINNET, protobufs);
+        group.upgradeToDeterministic(Script.ScriptType.P2PKH, KeyChainGroupStructure.DEFAULT, 0, null);  // Should give same result as last time.
+        assertFalse(group.isEncrypted());
+        assertFalse(group.isDeterministicUpgradeRequired(Script.ScriptType.P2PKH, 0));
+        assertTrue(group.isDeterministicUpgradeRequired(Script.ScriptType.P2WPKH, 0));
         DeterministicKey dkey2 = group.freshKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
         DeterministicSeed seed2 = group.getActiveKeyChain().getSeed();
         assertEquals(seed1, seed2);
@@ -532,8 +581,7 @@ public void deterministicUpgradeUnencrypted() throws Exception {
 
     @Test
     public void deterministicUpgradeRotating() throws Exception {
-        group = new KeyChainGroup(PARAMS);
-        group.setLookaheadSize(LOOKAHEAD_SIZE);   // Don't want slow tests.
+        group = KeyChainGroup.builder(MAINNET).lookaheadSize(LOOKAHEAD_SIZE).build();
         long now = Utils.currentTimeSeconds();
         ECKey key1 = new ECKey();
         Utils.rollMockClock(86400);
@@ -541,7 +589,7 @@ public void deterministicUpgradeRotating() throws Exception {
         Utils.rollMockClock(86400);
         ECKey key3 = new ECKey();
         group.importKeys(key2, key1, key3);
-        group.upgradeToDeterministic(now + 10, null);
+        group.upgradeToDeterministic(Script.ScriptType.P2PKH, KeyChainGroupStructure.DEFAULT, now + 10, null);
         DeterministicSeed seed = group.getActiveKeyChain().getSeed();
         assertNotNull(seed);
         // Check we used the right key: oldest non rotating.
@@ -551,26 +599,26 @@ public void deterministicUpgradeRotating() throws Exception {
 
     @Test
     public void deterministicUpgradeEncrypted() throws Exception {
-        group = new KeyChainGroup(PARAMS);
+        group = KeyChainGroup.builder(MAINNET).build();
         final ECKey key = new ECKey();
         group.importKeys(key);
-        final KeyCrypterScrypt crypter = new KeyCrypterScrypt();
-        final KeyParameter aesKey = crypter.deriveKey("abc");
-        assertTrue(group.isDeterministicUpgradeRequired());
-        group.encrypt(crypter, aesKey);
-        assertTrue(group.isDeterministicUpgradeRequired());
+        assertTrue(group.isDeterministicUpgradeRequired(Script.ScriptType.P2PKH, 0));
+        group.encrypt(KEY_CRYPTER, AES_KEY);
+        assertTrue(group.isDeterministicUpgradeRequired(Script.ScriptType.P2PKH, 0));
         try {
-            group.upgradeToDeterministic(0, null);
+            group.upgradeToDeterministic(Script.ScriptType.P2PKH, KeyChainGroupStructure.DEFAULT, 0, null);
             fail();
         } catch (DeterministicUpgradeRequiresPassword e) {
             // Expected.
         }
-        group.upgradeToDeterministic(0, aesKey);
-        assertFalse(group.isDeterministicUpgradeRequired());
+        group.upgradeToDeterministic(Script.ScriptType.P2PKH, KeyChainGroupStructure.DEFAULT, 0, AES_KEY);
+        assertTrue(group.isEncrypted());
+        assertFalse(group.isDeterministicUpgradeRequired(Script.ScriptType.P2PKH, 0));
+        assertTrue(group.isDeterministicUpgradeRequired(Script.ScriptType.P2WPKH, 0));
         final DeterministicSeed deterministicSeed = group.getActiveKeyChain().getSeed();
         assertNotNull(deterministicSeed);
         assertTrue(deterministicSeed.isEncrypted());
-        byte[] entropy = checkNotNull(group.getActiveKeyChain().toDecrypted(aesKey).getSeed()).getEntropyBytes();
+        byte[] entropy = checkNotNull(group.getActiveKeyChain().toDecrypted(AES_KEY).getSeed()).getEntropyBytes();
         // Check we used the right key: oldest non rotating.
         byte[] truncatedBytes = Arrays.copyOfRange(key.getSecretBytes(), 0, 16);
         assertArrayEquals(entropy, truncatedBytes);
@@ -581,14 +629,14 @@ public void markAsUsed() throws Exception {
         Address addr1 = group.currentAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS);
         Address addr2 = group.currentAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS);
         assertEquals(addr1, addr2);
-        group.markPubKeyHashAsUsed(addr1.getHash160());
+        group.markPubKeyHashAsUsed(addr1.getHash());
         Address addr3 = group.currentAddress(KeyChain.KeyPurpose.RECEIVE_FUNDS);
         assertNotEquals(addr2, addr3);
     }
 
     @Test
     public void isNotWatching() {
-        group = new KeyChainGroup(PARAMS);
+        group = KeyChainGroup.builder(MAINNET).fromRandom(Script.ScriptType.P2PKH).build();
         final ECKey key = ECKey.fromPrivate(BigInteger.TEN);
         group.importKeys(key);
         assertFalse(group.isWatching());
@@ -596,12 +644,11 @@ public void isNotWatching() {
 
     @Test
     public void isWatching() {
-        group = new KeyChainGroup(
-                PARAMS,
-                DeterministicKey
-                        .deserializeB58(
-                                "xpub69bjfJ91ikC5ghsqsVDHNq2dRGaV2HHVx7Y9LXi27LN9BWWAXPTQr4u8U3wAtap8bLdHdkqPpAcZmhMS5SnrMQC4ccaoBccFhh315P4UYzo",
-                                PARAMS));
+        group = KeyChainGroup.builder(MAINNET)
+                .addChain(DeterministicKeyChain.builder().watch(DeterministicKey.deserializeB58(
+                        "xpub69bjfJ91ikC5ghsqsVDHNq2dRGaV2HHVx7Y9LXi27LN9BWWAXPTQr4u8U3wAtap8bLdHdkqPpAcZmhMS5SnrMQC4ccaoBccFhh315P4UYzo",
+                        MAINNET)).outputScriptType(Script.ScriptType.P2PKH).build())
+                .build();
         final ECKey watchingKey = ECKey.fromPublicOnly(new ECKey().getPubKeyPoint());
         group.importKeys(watchingKey);
         assertTrue(group.isWatching());
@@ -609,20 +656,62 @@ public void isWatching() {
 
     @Test(expected = IllegalStateException.class)
     public void isWatchingNoKeys() {
-        group = new KeyChainGroup(PARAMS);
+        group = KeyChainGroup.builder(MAINNET).build();
         group.isWatching();
     }
 
     @Test(expected = IllegalStateException.class)
     public void isWatchingMixedKeys() {
-        group = new KeyChainGroup(
-                PARAMS,
-                DeterministicKey
-                        .deserializeB58(
-                                "xpub69bjfJ91ikC5ghsqsVDHNq2dRGaV2HHVx7Y9LXi27LN9BWWAXPTQr4u8U3wAtap8bLdHdkqPpAcZmhMS5SnrMQC4ccaoBccFhh315P4UYzo",
-                                PARAMS));
+        group = KeyChainGroup.builder(MAINNET)
+                .addChain(DeterministicKeyChain.builder().watch(DeterministicKey.deserializeB58(
+                        "xpub69bjfJ91ikC5ghsqsVDHNq2dRGaV2HHVx7Y9LXi27LN9BWWAXPTQr4u8U3wAtap8bLdHdkqPpAcZmhMS5SnrMQC4ccaoBccFhh315P4UYzo",
+                        MAINNET)).outputScriptType(Script.ScriptType.P2PKH).build())
+                .build();
         final ECKey key = ECKey.fromPrivate(BigInteger.TEN);
         group.importKeys(key);
         group.isWatching();
     }
+
+    @Test
+    public void segwitKeyChainGroup() throws Exception {
+        group = KeyChainGroup.builder(MAINNET).lookaheadSize(LOOKAHEAD_SIZE)
+                .addChain(DeterministicKeyChain.builder().entropy(ENTROPY, 0).outputScriptType(Script.ScriptType.P2WPKH)
+                        .accountPath(DeterministicKeyChain.ACCOUNT_ONE_PATH).build())
+                .build();
+        assertEquals(Script.ScriptType.P2WPKH, group.getActiveKeyChain().getOutputScriptType());
+        assertEquals("bc1qhcurdec849thpjjp3e27atvya43gy2snrechd9",
+                group.currentAddress(KeyPurpose.RECEIVE_FUNDS).toString());
+        assertEquals("bc1qw8sf3mwuwn74qnhj83gjg0cwkk78fun2pxl9t2", group.currentAddress(KeyPurpose.CHANGE).toString());
+
+        // round-trip through protobuf
+        group = KeyChainGroup.fromProtobufUnencrypted(MAINNET, group.serializeToProtobuf());
+        assertEquals(Script.ScriptType.P2WPKH, group.getActiveKeyChain().getOutputScriptType());
+        assertEquals("bc1qhcurdec849thpjjp3e27atvya43gy2snrechd9",
+                group.currentAddress(KeyPurpose.RECEIVE_FUNDS).toString());
+        assertEquals("bc1qw8sf3mwuwn74qnhj83gjg0cwkk78fun2pxl9t2", group.currentAddress(KeyPurpose.CHANGE).toString());
+
+        // encryption
+        group.encrypt(KEY_CRYPTER, AES_KEY);
+        assertEquals(Script.ScriptType.P2WPKH, group.getActiveKeyChain().getOutputScriptType());
+        assertEquals("bc1qhcurdec849thpjjp3e27atvya43gy2snrechd9",
+                group.currentAddress(KeyPurpose.RECEIVE_FUNDS).toString());
+        assertEquals("bc1qw8sf3mwuwn74qnhj83gjg0cwkk78fun2pxl9t2", group.currentAddress(KeyPurpose.CHANGE).toString());
+
+        // round-trip encrypted again, then dectypt
+        group = KeyChainGroup.fromProtobufEncrypted(MAINNET, group.serializeToProtobuf(), KEY_CRYPTER);
+        group.decrypt(AES_KEY);
+        assertEquals(Script.ScriptType.P2WPKH, group.getActiveKeyChain().getOutputScriptType());
+        assertEquals("bc1qhcurdec849thpjjp3e27atvya43gy2snrechd9",
+                group.currentAddress(KeyPurpose.RECEIVE_FUNDS).toString());
+        assertEquals("bc1qw8sf3mwuwn74qnhj83gjg0cwkk78fun2pxl9t2", group.currentAddress(KeyPurpose.CHANGE).toString());
+    }
+
+    @Test
+    public void onlyBasicKeyEncryptionAndDecryption() {
+        group = KeyChainGroup.createBasic(MAINNET);
+        final ECKey key = ECKey.fromPrivate(BigInteger.TEN);
+        group.importKeys(key);
+        group.encrypt(KEY_CRYPTER, AES_KEY);
+        group.decrypt(AES_KEY);
+    }
 }
diff --git a/core/src/test/java/org/bitcoinj/wallet/WalletExtensionsTest.java b/core/src/test/java/org/bitcoinj/wallet/WalletExtensionsTest.java
index 0bca6aec3bd..cc32fbc289b 100644
--- a/core/src/test/java/org/bitcoinj/wallet/WalletExtensionsTest.java
+++ b/core/src/test/java/org/bitcoinj/wallet/WalletExtensionsTest.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/core/src/test/java/org/bitcoinj/wallet/WalletTest.java b/core/src/test/java/org/bitcoinj/wallet/WalletTest.java
index e164f62294a..cce87006781 100644
--- a/core/src/test/java/org/bitcoinj/wallet/WalletTest.java
+++ b/core/src/test/java/org/bitcoinj/wallet/WalletTest.java
@@ -25,7 +25,9 @@
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.ECKey;
 import org.bitcoinj.core.InsufficientMoneyException;
+import org.bitcoinj.core.LegacyAddress;
 import org.bitcoinj.core.PeerAddress;
+import org.bitcoinj.core.SegwitAddress;
 import org.bitcoinj.core.Sha256Hash;
 import org.bitcoinj.core.StoredBlock;
 import org.bitcoinj.core.Transaction;
@@ -39,7 +41,8 @@
 import org.bitcoinj.crypto.*;
 import org.bitcoinj.script.Script;
 import org.bitcoinj.script.ScriptBuilder;
-import org.bitcoinj.signers.StatelessTransactionSigner;
+import org.bitcoinj.script.ScriptChunk;
+import org.bitcoinj.script.ScriptPattern;
 import org.bitcoinj.signers.TransactionSigner;
 import org.bitcoinj.store.BlockStoreException;
 import org.bitcoinj.store.MemoryBlockStore;
@@ -59,14 +62,15 @@
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.protobuf.ByteString;
+
+import org.bitcoinj.wallet.KeyChain.KeyPurpose;
 import org.bitcoinj.wallet.Protos.Wallet.EncryptionType;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import java.io.File;
 import java.math.BigInteger;
@@ -77,7 +81,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
 
 import static org.bitcoinj.core.Coin.*;
 import static org.bitcoinj.core.Utils.HEX;
@@ -93,9 +96,8 @@ public class WalletTest extends TestWithWallet {
     private static final CharSequence PASSWORD1 = "my helicopter contains eels";
     private static final CharSequence WRONG_PASSWORD = "nothing noone nobody nowhere";
 
-    private SecureRandom secureRandom = new SecureRandom();
-
-    private final Address OTHER_ADDRESS = new ECKey().toAddress(PARAMS);
+    private final Address OTHER_ADDRESS = LegacyAddress.fromKey(UNITTEST, new ECKey());
+    private final Address OTHER_SEGWIT_ADDRESS = SegwitAddress.fromKey(UNITTEST, new ECKey());
 
     @Before
     @Override
@@ -114,14 +116,14 @@ private void createMarriedWallet(int threshold, int numKeys) throws BlockStoreEx
     }
 
     private void createMarriedWallet(int threshold, int numKeys, boolean addSigners) throws BlockStoreException {
-        wallet = new Wallet(PARAMS);
-        blockStore = new MemoryBlockStore(PARAMS);
-        chain = new BlockChain(PARAMS, wallet, blockStore);
+        wallet = new Wallet(UNITTEST);
+        blockStore = new MemoryBlockStore(UNITTEST);
+        chain = new BlockChain(UNITTEST, wallet, blockStore);
 
         List<DeterministicKey> followingKeys = Lists.newArrayList();
         for (int i = 0; i < numKeys - 1; i++) {
-            final DeterministicKeyChain keyChain = new DeterministicKeyChain(new SecureRandom());
-            DeterministicKey partnerKey = DeterministicKey.deserializeB58(null, keyChain.getWatchingKey().serializePubB58(PARAMS), PARAMS);
+            final DeterministicKeyChain keyChain = DeterministicKeyChain.builder().random(new SecureRandom()).build();
+            DeterministicKey partnerKey = DeterministicKey.deserializeB58(null, keyChain.getWatchingKey().serializePubB58(UNITTEST), UNITTEST);
             followingKeys.add(partnerKey);
             if (addSigners && i < threshold - 1)
                 wallet.addTransactionSigner(new KeyChainTransactionSigner(keyChain));
@@ -134,6 +136,20 @@ private void createMarriedWallet(int threshold, int numKeys, boolean addSigners)
         wallet.addAndActivateHDChain(chain);
     }
 
+    @Test
+    public void createBasic() {
+        Wallet wallet = Wallet.createBasic(UNITTEST);
+        assertEquals(0, wallet.getKeyChainGroupSize());
+        wallet.importKey(new ECKey());
+        assertEquals(1, wallet.getKeyChainGroupSize());
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void createBasic_noDerivation() {
+        Wallet wallet = Wallet.createBasic(UNITTEST);
+        wallet.currentReceiveAddress();
+    }
+
     @Test
     public void getSeedAsWords1() {
         // Can't verify much here as the wallet is random each time. We could fix the RNG for the unit tests and solve.
@@ -152,18 +168,31 @@ public void basicSpending() throws Exception {
 
     @Test
     public void basicSpendingToP2SH() throws Exception {
-        Address destination = new Address(PARAMS, PARAMS.getP2SHHeader(), HEX.decode("4a22c3c4cbb31e4d03b15550636762bda0baf85a"));
+        Address destination = LegacyAddress.fromScriptHash(UNITTEST, HEX.decode("4a22c3c4cbb31e4d03b15550636762bda0baf85a"));
         basicSpendingCommon(wallet, myAddress, destination, null);
     }
 
     @Test
     public void basicSpendingWithEncryptedWallet() throws Exception {
-        Wallet encryptedWallet = new Wallet(PARAMS);
+        Wallet encryptedWallet = new Wallet(UNITTEST);
         encryptedWallet.encrypt(PASSWORD1);
-        Address myEncryptedAddress = encryptedWallet.freshReceiveKey().toAddress(PARAMS);
+        Address myEncryptedAddress = LegacyAddress.fromKey(UNITTEST, encryptedWallet.freshReceiveKey());
         basicSpendingCommon(encryptedWallet, myEncryptedAddress, OTHER_ADDRESS, encryptedWallet);
     }
 
+    @Test
+    public void encryptDecryptWalletWithArbitraryPathAndScriptType() throws Exception {
+        final byte[] ENTROPY = Sha256Hash.hash("don't use a string seed like this in real life".getBytes());
+        KeyChainGroup keyChainGroup = KeyChainGroup.builder(UNITTEST)
+                .addChain(DeterministicKeyChain.builder().seed(new DeterministicSeed(ENTROPY, "", 1389353062L))
+                        .outputScriptType(Script.ScriptType.P2WPKH)
+                        .accountPath(DeterministicKeyChain.BIP44_ACCOUNT_ZERO_PATH).build())
+                .build();
+        Wallet encryptedWallet = new Wallet(UNITTEST, keyChainGroup);
+        encryptedWallet.encrypt(PASSWORD1);
+        encryptedWallet.decrypt(PASSWORD1);
+    }
+
     @Test
     public void basicSpendingFromP2SH() throws Exception {
         createMarriedWallet(2, 2);
@@ -339,8 +368,10 @@ private void basicSpendingCommon(Wallet wallet, Address toAddress, Address desti
             try {
                 wallet.completeTx(req);
                 fail("No exception was thrown trying to sign an encrypted key with the wrong password supplied.");
-            } catch (KeyCrypterException kce) {
-                assertEquals("Could not decrypt bytes", kce.getMessage());
+            } catch (KeyCrypterException.InvalidCipherText e) {
+                // Expected, either this...
+            } catch (KeyCrypterException.PublicPrivateMismatch e) {
+                // ...or this.
             }
 
             assertEquals("Wrong number of UNSPENT", 1, wallet.getPoolSize(WalletTransaction.Pool.UNSPENT));
@@ -413,8 +444,8 @@ private void receiveATransactionAmount(Wallet wallet, Address toAddress, Coin am
     private void basicSanityChecks(Wallet wallet, Transaction t, Address destination) throws VerificationException {
         assertEquals("Wrong number of tx inputs", 1, t.getInputs().size());
         assertEquals("Wrong number of tx outputs",2, t.getOutputs().size());
-        assertEquals(destination, t.getOutput(0).getScriptPubKey().getToAddress(PARAMS));
-        assertEquals(wallet.currentChangeAddress(), t.getOutputs().get(1).getScriptPubKey().getToAddress(PARAMS));
+        assertEquals(destination, t.getOutput(0).getScriptPubKey().getToAddress(UNITTEST));
+        assertEquals(wallet.currentChangeAddress(), t.getOutputs().get(1).getScriptPubKey().getToAddress(UNITTEST));
         assertEquals(valueOf(0, 50), t.getOutputs().get(1).getValue());
         // Check the script runs and signatures verify.
         t.getInputs().get(0).verify();
@@ -429,8 +460,8 @@ public void onCoinsSent(Wallet wallet, Transaction tx, Coin prevBalance, Coin ne
             }
         });
 
-        t.getConfidence().markBroadcastBy(new PeerAddress(PARAMS, InetAddress.getByAddress(new byte[]{1,2,3,4})));
-        t.getConfidence().markBroadcastBy(new PeerAddress(PARAMS, InetAddress.getByAddress(new byte[]{10,2,3,4})));
+        t.getConfidence().markBroadcastBy(new PeerAddress(UNITTEST, InetAddress.getByAddress(new byte[]{1,2,3,4})));
+        t.getConfidence().markBroadcastBy(new PeerAddress(UNITTEST, InetAddress.getByAddress(new byte[]{10,2,3,4})));
         wallet.commitTx(t);
         Threading.waitForUserCode();
         assertEquals(1, wallet.getPoolSize(WalletTransaction.Pool.PENDING));
@@ -450,8 +481,8 @@ private Wallet spendUnconfirmedChange(Wallet wallet, Transaction t2, KeyParamete
         req.shuffleOutputs = false;
         wallet.completeTx(req);
         Transaction t3 = req.tx;
-        assertNotEquals(t2.getOutput(1).getScriptPubKey().getToAddress(PARAMS),
-                        t3.getOutput(1).getScriptPubKey().getToAddress(PARAMS));
+        assertNotEquals(t2.getOutput(1).getScriptPubKey().getToAddress(UNITTEST),
+                        t3.getOutput(1).getScriptPubKey().getToAddress(UNITTEST));
         assertNotNull(t3);
         wallet.commitTx(t3);
         assertTrue(wallet.isConsistent());
@@ -462,8 +493,6 @@ private Wallet spendUnconfirmedChange(Wallet wallet, Transaction t2, KeyParamete
     }
 
     @Test
-    @SuppressWarnings("deprecation")
-    // Having a test for deprecated method getFromAddress() is no evil so we suppress the warning here.
     public void customTransactionSpending() throws Exception {
         // We'll set up a wallet that receives a coin, then sends a coin of lesser value and keeps the change.
         Coin v1 = valueOf(3, 0);
@@ -476,7 +505,7 @@ public void customTransactionSpending() throws Exception {
         Coin v3 = valueOf(0, 75);
         Coin v4 = valueOf(1, 25);
 
-        Transaction t2 = new Transaction(PARAMS);
+        Transaction t2 = new Transaction(UNITTEST);
         t2.addOutput(v2, OTHER_ADDRESS);
         t2.addOutput(v3, OTHER_ADDRESS);
         t2.addOutput(v4, OTHER_ADDRESS);
@@ -485,7 +514,10 @@ public void customTransactionSpending() throws Exception {
 
         // Do some basic sanity checks.
         assertEquals(1, t2.getInputs().size());
-        assertEquals(myAddress, t2.getInput(0).getScriptSig().getFromAddress(PARAMS));
+        List<ScriptChunk> scriptSigChunks = t2.getInput(0).getScriptSig().getChunks();
+        // check 'from address' -- in a unit test this is fine
+        assertEquals(2, scriptSigChunks.size());
+        assertEquals(myAddress, LegacyAddress.fromPubKeyHash(UNITTEST, Utils.sha256hash160(scriptSigChunks.get(1).data)));
         assertEquals(TransactionConfidence.ConfidenceType.UNKNOWN, t2.getConfidence().getConfidenceType());
 
         // We have NOT proven that the signature is correct!
@@ -497,7 +529,7 @@ public void customTransactionSpending() throws Exception {
 
     @Test
     public void sideChain() throws Exception {
-        // The wallet receives a coin on the main chain, then on a side chain. Balance is equal to both added together
+        // The wallet receives a coin on the best chain, then on a side chain. Balance is equal to both added together
         // as we assume the side chain tx is pending and will be included shortly.
         Coin v1 = COIN;
         sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, v1);
@@ -545,6 +577,16 @@ public void balance() throws Exception {
         assertEquals(v4, wallet.getBalance(Wallet.BalanceType.AVAILABLE));
     }
 
+    @Test
+    public void balanceWithIdenticalOutputs() {
+        assertEquals(Coin.ZERO, wallet.getBalance(BalanceType.ESTIMATED));
+        Transaction tx = new Transaction(UNITTEST);
+        tx.addOutput(Coin.COIN, myAddress);
+        tx.addOutput(Coin.COIN, myAddress); // identical to the above
+        wallet.addWalletTransaction(new WalletTransaction(Pool.UNSPENT, tx));
+        assertEquals(Coin.COIN.plus(Coin.COIN), wallet.getBalance(BalanceType.ESTIMATED));
+    }
+
     // Intuitively you'd expect to be able to create a transaction with identical inputs and outputs and get an
     // identical result to Bitcoin Core. However the signatures are not deterministic - signing the same data
     // with the same key twice gives two different outputs. So we cannot prove bit-for-bit compatibility in this test
@@ -555,7 +597,7 @@ public void blockChainCatchup() throws Exception {
         // Test that we correctly process transactions arriving from the chain, with callbacks for inbound and outbound.
         final Coin[] bigints = new Coin[4];
         final Transaction[] txn = new Transaction[2];
-        final LinkedList<Transaction> confTxns = new LinkedList<Transaction>();
+        final LinkedList<Transaction> confTxns = new LinkedList<>();
         wallet.addCoinsReceivedEventListener(new WalletCoinsReceivedEventListener() {
             @Override
             public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coin newBalance) {
@@ -587,7 +629,7 @@ public void onTransactionConfidenceChanged(Wallet wallet, Transaction tx) {
         Threading.waitForUserCode();
         assertEquals(null, txn[1]);  // onCoinsSent not called.
         assertEquals(tx1, confTxns.getFirst());   // onTransactionConfidenceChanged called
-        assertEquals(txn[0].getHash(), tx1.getHash());
+        assertEquals(txn[0].getTxId(), tx1.getTxId());
         assertEquals(ZERO, bigints[0]);
         assertEquals(oneCoin, bigints[1]);
         assertEquals(TransactionConfidence.ConfidenceType.BUILDING, tx1.getConfidence().getConfidenceType());
@@ -604,7 +646,7 @@ public void onTransactionConfidenceChanged(Wallet wallet, Transaction tx) {
         assertEquals(Coin.valueOf(0, 90), wallet.getBalance());
         assertEquals(null, txn[0]);
         assertEquals(2, confTxns.size());
-        assertEquals(txn[1].getHash(), send1.getHash());
+        assertEquals(txn[1].getTxId(), send1.getTxId());
         assertEquals(Coin.COIN, bigints[2]);
         assertEquals(Coin.valueOf(0, 90), bigints[3]);
         // And we do it again after the catchup.
@@ -630,7 +672,7 @@ public void balances() throws Exception {
         // Send 0.10 to somebody else.
         Transaction send1 = wallet.createSend(OTHER_ADDRESS, valueOf(0, 10));
         // Reserialize.
-        Transaction send2 = PARAMS.getDefaultSerializer().makeTransaction(send1.bitcoinSerialize());
+        Transaction send2 = UNITTEST.getDefaultSerializer().makeTransaction(send1.bitcoinSerialize());
         assertEquals(nanos, send2.getValueSentFromMe(wallet));
         assertEquals(ZERO.subtract(valueOf(0, 10)), send2.getValue(wallet));
     }
@@ -639,14 +681,14 @@ public void balances() throws Exception {
     public void isConsistent_duplicates() throws Exception {
         // This test ensures that isConsistent catches duplicate transactions, eg, because we submitted the same block
         // twice (this is not allowed).
-        Transaction tx = createFakeTx(PARAMS, COIN, myAddress);
-        TransactionOutput output = new TransactionOutput(PARAMS, tx, valueOf(0, 5), OTHER_ADDRESS);
+        Transaction tx = createFakeTx(UNITTEST, COIN, myAddress);
+        TransactionOutput output = new TransactionOutput(UNITTEST, tx, valueOf(0, 5), OTHER_ADDRESS);
         tx.addOutput(output);
         wallet.receiveFromBlock(tx, null, BlockChain.NewBlockType.BEST_CHAIN, 0);
 
         assertTrue(wallet.isConsistent());
 
-        Transaction txClone = PARAMS.getDefaultSerializer().makeTransaction(tx.bitcoinSerialize());
+        Transaction txClone = UNITTEST.getDefaultSerializer().makeTransaction(tx.bitcoinSerialize());
         try {
             wallet.receiveFromBlock(txClone, null, BlockChain.NewBlockType.BEST_CHAIN, 0);
             fail("Illegal argument not thrown when it should have been.");
@@ -658,8 +700,8 @@ public void isConsistent_duplicates() throws Exception {
     @Test
     public void isConsistent_pools() throws Exception {
         // This test ensures that isConsistent catches transactions that are in incompatible pools.
-        Transaction tx = createFakeTx(PARAMS, COIN, myAddress);
-        TransactionOutput output = new TransactionOutput(PARAMS, tx, valueOf(0, 5), OTHER_ADDRESS);
+        Transaction tx = createFakeTx(UNITTEST, COIN, myAddress);
+        TransactionOutput output = new TransactionOutput(UNITTEST, tx, valueOf(0, 5), OTHER_ADDRESS);
         tx.addOutput(output);
         wallet.receiveFromBlock(tx, null, BlockChain.NewBlockType.BEST_CHAIN, 0);
 
@@ -673,8 +715,8 @@ public void isConsistent_pools() throws Exception {
     public void isConsistent_spent() throws Exception {
         // This test ensures that isConsistent catches transactions that are marked spent when
         // they aren't.
-        Transaction tx = createFakeTx(PARAMS, COIN, myAddress);
-        TransactionOutput output = new TransactionOutput(PARAMS, tx, valueOf(0, 5), OTHER_ADDRESS);
+        Transaction tx = createFakeTx(UNITTEST, COIN, myAddress);
+        TransactionOutput output = new TransactionOutput(UNITTEST, tx, valueOf(0, 5), OTHER_ADDRESS);
         tx.addOutput(output);
         assertTrue(wallet.isConsistent());
 
@@ -684,13 +726,13 @@ public void isConsistent_spent() throws Exception {
 
     @Test
     public void isTxConsistentReturnsFalseAsExpected() {
-        Wallet wallet = new Wallet(PARAMS);
+        Wallet wallet = new Wallet(UNITTEST);
         TransactionOutput to = createMock(TransactionOutput.class);
         EasyMock.expect(to.isAvailableForSpending()).andReturn(true);
         EasyMock.expect(to.isMineOrWatched(wallet)).andReturn(true);
-        EasyMock.expect(to.getSpentBy()).andReturn(new TransactionInput(PARAMS, null, new byte[0]));
+        EasyMock.expect(to.getSpentBy()).andReturn(new TransactionInput(UNITTEST, null, new byte[0]));
 
-        Transaction tx = FakeTxBuilder.createFakeTxWithoutChange(PARAMS, to);
+        Transaction tx = FakeTxBuilder.createFakeTxWithoutChange(UNITTEST, to);
 
         replay(to);
 
@@ -700,12 +742,12 @@ public void isTxConsistentReturnsFalseAsExpected() {
 
     @Test
     public void isTxConsistentReturnsFalseAsExpected_WhenAvailableForSpendingEqualsFalse() {
-        Wallet wallet = new Wallet(PARAMS);
+        Wallet wallet = new Wallet(UNITTEST);
         TransactionOutput to = createMock(TransactionOutput.class);
         EasyMock.expect(to.isAvailableForSpending()).andReturn(false);
         EasyMock.expect(to.getSpentBy()).andReturn(null);
 
-        Transaction tx = FakeTxBuilder.createFakeTxWithoutChange(PARAMS, to);
+        Transaction tx = FakeTxBuilder.createFakeTxWithoutChange(UNITTEST, to);
 
         replay(to);
 
@@ -716,18 +758,18 @@ public void isTxConsistentReturnsFalseAsExpected_WhenAvailableForSpendingEqualsF
     @Test
     public void transactions() throws Exception {
         // This test covers a bug in which Transaction.getValueSentFromMe was calculating incorrectly.
-        Transaction tx = createFakeTx(PARAMS, COIN, myAddress);
+        Transaction tx = createFakeTx(UNITTEST, COIN, myAddress);
         // Now add another output (ie, change) that goes to some other address.
-        TransactionOutput output = new TransactionOutput(PARAMS, tx, valueOf(0, 5), OTHER_ADDRESS);
+        TransactionOutput output = new TransactionOutput(UNITTEST, tx, valueOf(0, 5), OTHER_ADDRESS);
         tx.addOutput(output);
         // Note that tx is no longer valid: it spends more than it imports. However checking transactions balance
         // correctly isn't possible in SPV mode because value is a property of outputs not inputs. Without all
         // transactions you can't check they add up.
         sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, tx);
         // Now the other guy creates a transaction which spends that change.
-        Transaction tx2 = new Transaction(PARAMS);
+        Transaction tx2 = new Transaction(UNITTEST);
         tx2.addInput(output);
-        tx2.addOutput(new TransactionOutput(PARAMS, tx2, valueOf(0, 5), myAddress));
+        tx2.addOutput(new TransactionOutput(UNITTEST, tx2, valueOf(0, 5), myAddress));
         // tx2 doesn't send any coins from us, even though the output is in the wallet.
         assertEquals(ZERO, tx2.getValueSentFromMe(wallet));
     }
@@ -748,8 +790,8 @@ public void bounce() throws Exception {
         sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, outbound1);
         assertTrue(outbound1.getWalletOutputs(wallet).size() <= 1); //the change address at most
         // That other guy gives us the coins right back.
-        Transaction inbound2 = new Transaction(PARAMS);
-        inbound2.addOutput(new TransactionOutput(PARAMS, inbound2, coinHalf, myAddress));
+        Transaction inbound2 = new Transaction(UNITTEST);
+        inbound2.addOutput(new TransactionOutput(UNITTEST, inbound2, coinHalf, myAddress));
         assertTrue(outbound1.getWalletOutputs(wallet).size() >= 1);
         inbound2.addInput(outbound1.getOutputs().get(0));
         sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, inbound2);
@@ -768,9 +810,9 @@ public void doubleSpendUnspendsOtherInputs() throws Exception {
         // Create a send to a merchant of all our coins.
         Transaction send1 = wallet.createSend(OTHER_ADDRESS, valueOf(2, 90));
         // Create a double spend of just the first one.
-        Address BAD_GUY = new ECKey().toAddress(PARAMS);
+        Address BAD_GUY = LegacyAddress.fromKey(UNITTEST, new ECKey());
         Transaction send2 = wallet.createSend(BAD_GUY, COIN);
-        send2 = PARAMS.getDefaultSerializer().makeTransaction(send2.bitcoinSerialize());
+        send2 = UNITTEST.getDefaultSerializer().makeTransaction(send2.bitcoinSerialize());
         // Broadcast send1, it's now pending.
         wallet.commitTx(send1);
         assertEquals(ZERO, wallet.getBalance()); // change of 10 cents is not yet mined so not included in the balance.
@@ -797,7 +839,7 @@ public void doubleSpends() throws Exception {
         Transaction send2 = checkNotNull(wallet.createSend(OTHER_ADDRESS, value2));
         byte[] buf = send1.bitcoinSerialize();
         buf[43] = 0;  // Break the signature: bitcoinj won't check in SPV mode and this is easier than other mutations.
-        send1 = PARAMS.getDefaultSerializer().makeTransaction(buf);
+        send1 = UNITTEST.getDefaultSerializer().makeTransaction(buf);
         wallet.commitTx(send2);
         wallet.allowSpendingUnconfirmedTransactions();
         assertEquals(value, wallet.getBalance(Wallet.BalanceType.ESTIMATED));
@@ -805,7 +847,7 @@ public void doubleSpends() throws Exception {
         Transaction send3 = checkNotNull(wallet.createSend(OTHER_ADDRESS, value));
         wallet.commitTx(send3);
         assertEquals(ZERO, wallet.getBalance());
-        final LinkedList<TransactionConfidence> dead = new LinkedList<TransactionConfidence>();
+        final LinkedList<TransactionConfidence> dead = new LinkedList<>();
         final TransactionConfidence.Listener listener = new TransactionConfidence.Listener() {
             @Override
             public void onConfidenceChanged(TransactionConfidence confidence, ChangeReason reason) {
@@ -820,8 +862,8 @@ public void onConfidenceChanged(TransactionConfidence confidence, ChangeReason r
         sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, send1);
         // Back to having one coin.
         assertEquals(value, wallet.getBalance());
-        assertEquals(send2.getHash(), dead.poll().getTransactionHash());
-        assertEquals(send3.getHash(), dead.poll().getTransactionHash());
+        assertEquals(send2.getTxId(), dead.poll().getTransactionHash());
+        assertEquals(send3.getTxId(), dead.poll().getTransactionHash());
     }
 
     @Test
@@ -862,9 +904,9 @@ public void onWalletChanged(Wallet wallet) {
         // Create a send to a merchant.
         Transaction send1 = wallet.createSend(OTHER_ADDRESS, valueOf(0, 50));
         // Create a double spend.
-        Address BAD_GUY = new ECKey().toAddress(PARAMS);
+        Address BAD_GUY = LegacyAddress.fromKey(UNITTEST, new ECKey());
         Transaction send2 = wallet.createSend(BAD_GUY, valueOf(0, 50));
-        send2 = PARAMS.getDefaultSerializer().makeTransaction(send2.bitcoinSerialize());
+        send2 = UNITTEST.getDefaultSerializer().makeTransaction(send2.bitcoinSerialize());
         // Broadcast send1.
         wallet.commitTx(send1);
         assertEquals(send1, received.getOutput(0).getSpentBy().getParentTransaction());
@@ -877,7 +919,7 @@ public void onWalletChanged(Wallet wallet) {
                 send1.getConfidence().getConfidenceType());
         assertEquals(send2, received.getOutput(0).getSpentBy().getParentTransaction());
 
-        FakeTxBuilder.DoubleSpends doubleSpends = FakeTxBuilder.createFakeDoubleSpendTxns(PARAMS, myAddress);
+        FakeTxBuilder.DoubleSpends doubleSpends = FakeTxBuilder.createFakeDoubleSpendTxns(UNITTEST, myAddress);
         // t1 spends to our wallet. t2 double spends somewhere else.
         wallet.receivePending(doubleSpends.t1, null);
         assertEquals(TransactionConfidence.ConfidenceType.PENDING,
@@ -1086,11 +1128,11 @@ public void doubleSpendWeCreate() throws Exception {
 
     @Test
     public void doubleSpendWeReceive() throws Exception {
-        FakeTxBuilder.DoubleSpends doubleSpends = FakeTxBuilder.createFakeDoubleSpendTxns(PARAMS, myAddress);
+        FakeTxBuilder.DoubleSpends doubleSpends = FakeTxBuilder.createFakeDoubleSpendTxns(UNITTEST, myAddress);
         // doubleSpends.t1 spends to our wallet. doubleSpends.t2 double spends somewhere else.
 
-        Transaction t1b = new Transaction(PARAMS);
-        TransactionOutput t1bo = new TransactionOutput(PARAMS, t1b, valueOf(0, 50), OTHER_ADDRESS);
+        Transaction t1b = new Transaction(UNITTEST);
+        TransactionOutput t1bo = new TransactionOutput(UNITTEST, t1b, valueOf(0, 50), OTHER_ADDRESS);
         t1b.addOutput(t1bo);
         t1b.addInput(doubleSpends.t1.getOutput(0));
 
@@ -1173,27 +1215,27 @@ public void txSpendingDeadTx() throws Exception {
 
     private void assertInConflict(Transaction tx) {
         assertEquals(ConfidenceType.IN_CONFLICT, tx.getConfidence().getConfidenceType());
-        assertTrue(wallet.poolContainsTxHash(WalletTransaction.Pool.PENDING, tx.getHash()));
+        assertTrue(wallet.poolContainsTxHash(WalletTransaction.Pool.PENDING, tx.getTxId()));
     }
 
     private void assertPending(Transaction tx) {
         assertEquals(ConfidenceType.PENDING, tx.getConfidence().getConfidenceType());
-        assertTrue(wallet.poolContainsTxHash(WalletTransaction.Pool.PENDING, tx.getHash()));
+        assertTrue(wallet.poolContainsTxHash(WalletTransaction.Pool.PENDING, tx.getTxId()));
     }
 
     private void assertSpent(Transaction tx) {
         assertEquals(ConfidenceType.BUILDING, tx.getConfidence().getConfidenceType());
-        assertTrue(wallet.poolContainsTxHash(WalletTransaction.Pool.SPENT, tx.getHash()));
+        assertTrue(wallet.poolContainsTxHash(WalletTransaction.Pool.SPENT, tx.getTxId()));
     }
 
     private void assertUnspent(Transaction tx) {
         assertEquals(ConfidenceType.BUILDING, tx.getConfidence().getConfidenceType());
-        assertTrue(wallet.poolContainsTxHash(WalletTransaction.Pool.UNSPENT, tx.getHash()));
+        assertTrue(wallet.poolContainsTxHash(WalletTransaction.Pool.UNSPENT, tx.getTxId()));
     }
 
     private void assertDead(Transaction tx) {
         assertEquals(ConfidenceType.DEAD, tx.getConfidence().getConfidenceType());
-        assertTrue(wallet.poolContainsTxHash(WalletTransaction.Pool.DEAD, tx.getHash()));
+        assertTrue(wallet.poolContainsTxHash(WalletTransaction.Pool.DEAD, tx.getTxId()));
     }
 
     @Test
@@ -1210,7 +1252,7 @@ public void testAddTransactionsDependingOn() throws Exception {
             Transaction send1c = checkNotNull(wallet.createSend(OTHER_ADDRESS, valueOf(0, 25)));
             wallet.commitTx(send1c);
             wallet.commitTx(send2);
-            Set<Transaction> txns = new HashSet<Transaction>();
+            Set<Transaction> txns = new HashSet<>();
             txns.add(send1);
             wallet.addTransactionsDependingOn(txns, wallet.getTransactions(true));
             assertEquals(3, txns.size());
@@ -1259,7 +1301,7 @@ public void sortTxnsByDependency() throws Exception {
             wallet.completeTx(req2c);
             Transaction send2c = req2c.tx;
 
-            Set<Transaction> unsortedTxns = new HashSet<Transaction>();
+            Set<Transaction> unsortedTxns = new HashSet<>();
             unsortedTxns.add(send1a);
             unsortedTxns.add(send1b);
             unsortedTxns.add(send1c);
@@ -1286,7 +1328,7 @@ public void sortTxnsByDependency() throws Exception {
     public void pending1() throws Exception {
         // Check that if we receive a pending transaction that is then confirmed, we are notified as appropriate.
         final Coin nanos = COIN;
-        final Transaction t1 = createFakeTx(PARAMS, nanos, myAddress);
+        final Transaction t1 = createFakeTx(UNITTEST, nanos, myAddress);
 
         // First one is "called" second is "pending".
         final boolean[] flags = new boolean[2];
@@ -1340,7 +1382,7 @@ public void onConfidenceChanged(TransactionConfidence confidence, TransactionCon
         sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN);
         Threading.waitForUserCode();
         assertNull(reasons[0]);
-        final Transaction t1Copy = PARAMS.getDefaultSerializer().makeTransaction(t1.bitcoinSerialize());
+        final Transaction t1Copy = UNITTEST.getDefaultSerializer().makeTransaction(t1.bitcoinSerialize());
         sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, t1Copy);
         Threading.waitForUserCode();
         assertFalse(flags[0]);
@@ -1349,7 +1391,7 @@ public void onConfidenceChanged(TransactionConfidence confidence, TransactionCon
         // Check we don't get notified about an irrelevant transaction.
         flags[0] = false;
         flags[1] = false;
-        Transaction irrelevant = createFakeTx(PARAMS, nanos, OTHER_ADDRESS);
+        Transaction irrelevant = createFakeTx(UNITTEST, nanos, OTHER_ADDRESS);
         if (wallet.isPendingTransactionRelevant(irrelevant))
             wallet.receivePending(irrelevant, null);
         Threading.waitForUserCode();
@@ -1391,22 +1433,22 @@ public void onCoinsSent(Wallet wallet, Transaction tx, Coin prevBalance, Coin ne
 
     @Test
     public void pending3() throws Exception {
-        // Check that if we receive a pending tx, and it's overridden by a double spend from the main chain, we
+        // Check that if we receive a pending tx, and it's overridden by a double spend from the best chain, we
         // are notified that it's dead. This should work even if the pending tx inputs are NOT ours, ie, they don't
         // connect to anything.
         Coin nanos = COIN;
 
         // Create two transactions that share the same input tx.
-        Address badGuy = new ECKey().toAddress(PARAMS);
-        Transaction doubleSpentTx = new Transaction(PARAMS);
-        TransactionOutput doubleSpentOut = new TransactionOutput(PARAMS, doubleSpentTx, nanos, badGuy);
+        Address badGuy = LegacyAddress.fromKey(UNITTEST, new ECKey());
+        Transaction doubleSpentTx = new Transaction(UNITTEST);
+        TransactionOutput doubleSpentOut = new TransactionOutput(UNITTEST, doubleSpentTx, nanos, badGuy);
         doubleSpentTx.addOutput(doubleSpentOut);
-        Transaction t1 = new Transaction(PARAMS);
-        TransactionOutput o1 = new TransactionOutput(PARAMS, t1, nanos, myAddress);
+        Transaction t1 = new Transaction(UNITTEST);
+        TransactionOutput o1 = new TransactionOutput(UNITTEST, t1, nanos, myAddress);
         t1.addOutput(o1);
         t1.addInput(doubleSpentOut);
-        Transaction t2 = new Transaction(PARAMS);
-        TransactionOutput o2 = new TransactionOutput(PARAMS, t2, nanos, badGuy);
+        Transaction t2 = new Transaction(UNITTEST);
+        TransactionOutput o2 = new TransactionOutput(UNITTEST, t2, nanos, badGuy);
         t2.addOutput(o2);
         t2.addInput(doubleSpentOut);
 
@@ -1435,7 +1477,7 @@ public void onTransactionConfidenceChanged(Wallet wallet, Transaction tx) {
         Threading.waitForUserCode();
         assertEquals(t1, called[0]);
         assertEquals(nanos, wallet.getBalance(Wallet.BalanceType.ESTIMATED));
-        // Now receive a double spend on the main chain.
+        // Now receive a double spend on the best chain.
         called[0] = called[1] = null;
         sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, t2);
         Threading.waitForUserCode();
@@ -1456,7 +1498,7 @@ public void transactionsList() throws Exception {
         assertEquals(tx2, transactions.get(0));
         assertEquals(tx1, transactions.get(1));
         assertEquals(2, transactions.size());
-        // Check we get only the last transaction if we request a subrage.
+        // Check we get only the last transaction if we request a subrange.
         transactions = wallet.getRecentTransactions(1, false);
         assertEquals(1, transactions.size());
         assertEquals(tx2,  transactions.get(0));
@@ -1486,7 +1528,7 @@ public void transactionsList() throws Exception {
     public void keyCreationTime() throws Exception {
         Utils.setMockClock();
         long now = Utils.currentTimeSeconds();
-        wallet = new Wallet(PARAMS);
+        wallet = new Wallet(UNITTEST);
         assertEquals(now, wallet.getEarliestKeyCreationTime());
         Utils.rollMockClock(60);
         wallet.freshReceiveKey();
@@ -1497,7 +1539,7 @@ public void keyCreationTime() throws Exception {
     public void scriptCreationTime() throws Exception {
         Utils.setMockClock();
         long now = Utils.currentTimeSeconds();
-        wallet = new Wallet(PARAMS);
+        wallet = new Wallet(UNITTEST);
         assertEquals(now, wallet.getEarliestKeyCreationTime());
         Utils.rollMockClock(-120);
         wallet.addWatchedAddress(OTHER_ADDRESS);
@@ -1531,9 +1573,9 @@ public void lastBlockSeen() throws Exception {
         Coin v1 = valueOf(5, 0);
         Coin v2 = valueOf(0, 50);
         Coin v3 = valueOf(0, 25);
-        Transaction t1 = createFakeTx(PARAMS, v1, myAddress);
-        Transaction t2 = createFakeTx(PARAMS, v2, myAddress);
-        Transaction t3 = createFakeTx(PARAMS, v3, myAddress);
+        Transaction t1 = createFakeTx(UNITTEST, v1, myAddress);
+        Transaction t2 = createFakeTx(UNITTEST, v2, myAddress);
+        Transaction t3 = createFakeTx(UNITTEST, v3, myAddress);
 
         Block genesis = blockStore.getChainHead().getHeader();
         Block b10 = makeSolvedTestBlock(genesis, t1);
@@ -1562,7 +1604,7 @@ public void pubkeyOnlyScripts() throws Exception {
         // Verify that we support outputs like OP_PUBKEY and the corresponding inputs.
         ECKey key1 = wallet.freshReceiveKey();
         Coin value = valueOf(5, 0);
-        Transaction t1 = createFakeTx(PARAMS, value, key1);
+        Transaction t1 = createFakeTx(UNITTEST, value, key1);
         if (wallet.isPendingTransactionRelevant(t1))
             wallet.receivePending(t1, null);
         // TX should have been seen as relevant.
@@ -1577,13 +1619,13 @@ public void pubkeyOnlyScripts() throws Exception {
         // TODO: This code is messy, improve the Script class and fixinate!
         assertEquals(t2.toString(), 1, t2.getInputs().get(0).getScriptSig().getChunks().size());
         assertTrue(t2.getInputs().get(0).getScriptSig().getChunks().get(0).data.length > 50);
-        log.info(t2.toString(chain));
     }
 
     @Test
     public void isWatching() {
         assertFalse(wallet.isWatching());
-        Wallet watchingWallet = Wallet.fromWatchingKey(PARAMS, wallet.getWatchingKey().dropPrivateBytes().dropParent());
+        Wallet watchingWallet = Wallet.fromWatchingKey(UNITTEST,
+                wallet.getWatchingKey().dropPrivateBytes().dropParent(), Script.ScriptType.P2PKH);
         assertTrue(watchingWallet.isWatching());
         wallet.encrypt(PASSWORD1);
         assertFalse(wallet.isWatching());
@@ -1592,10 +1634,11 @@ public void isWatching() {
     @Test
     public void watchingWallet() throws Exception {
         DeterministicKey watchKey = wallet.getWatchingKey();
-        String serialized = watchKey.serializePubB58(PARAMS);
+        String serialized = watchKey.serializePubB58(UNITTEST);
 
         // Construct watching wallet.
-        Wallet watchingWallet = Wallet.fromWatchingKey(PARAMS, DeterministicKey.deserializeB58(null, serialized, PARAMS));
+        Wallet watchingWallet = Wallet.fromWatchingKey(UNITTEST,
+                DeterministicKey.deserializeB58(null, serialized, UNITTEST), Script.ScriptType.P2PKH);
         DeterministicKey key2 = watchingWallet.freshReceiveKey();
         assertEquals(myKey, key2);
 
@@ -1610,7 +1653,7 @@ public void watchingWallet() throws Exception {
             // Expected
         }
 
-        receiveATransaction(watchingWallet, myKey.toAddress(PARAMS));
+        receiveATransaction(watchingWallet, LegacyAddress.fromKey(UNITTEST, myKey));
         assertEquals(COIN, watchingWallet.getBalance());
         assertEquals(COIN, watchingWallet.getBalance(Wallet.BalanceType.AVAILABLE));
         assertEquals(ZERO, watchingWallet.getBalance(Wallet.BalanceType.AVAILABLE_SPENDABLE));
@@ -1619,8 +1662,8 @@ public void watchingWallet() throws Exception {
     @Test(expected = ECKey.MissingPrivateKeyException.class)
     public void watchingWalletWithCreationTime() throws Exception {
         DeterministicKey watchKey = wallet.getWatchingKey();
-        String serialized = watchKey.serializePubB58(PARAMS);
-        Wallet watchingWallet = Wallet.fromWatchingKeyB58(PARAMS, serialized, 1415282801);
+        String serialized = watchKey.serializePubB58(UNITTEST);
+        Wallet watchingWallet = Wallet.fromWatchingKeyB58(UNITTEST, serialized, 1415282801);
         DeterministicKey key2 = watchingWallet.freshReceiveKey();
         assertEquals(myKey, key2);
 
@@ -1634,17 +1677,17 @@ public void watchingWalletWithCreationTime() throws Exception {
     @Test
     public void watchingScripts() throws Exception {
         // Verify that pending transactions to watched addresses are relevant
-        Address watchedAddress = new ECKey().toAddress(PARAMS);
+        Address watchedAddress = LegacyAddress.fromKey(UNITTEST, new ECKey());
         wallet.addWatchedAddress(watchedAddress);
         Coin value = valueOf(5, 0);
-        Transaction t1 = createFakeTx(PARAMS, value, watchedAddress);
+        Transaction t1 = createFakeTx(UNITTEST, value, watchedAddress);
         assertTrue(t1.getWalletOutputs(wallet).size() >= 1);
         assertTrue(wallet.isPendingTransactionRelevant(t1));
     }
 
     @Test(expected = InsufficientMoneyException.class)
     public void watchingScriptsConfirmed() throws Exception {
-        Address watchedAddress = new ECKey().toAddress(PARAMS);
+        Address watchedAddress = LegacyAddress.fromKey(UNITTEST, new ECKey());
         wallet.addWatchedAddress(watchedAddress);
         sendMoneyToWallet(BlockChain.NewBlockType.BEST_CHAIN, CENT, watchedAddress);
         assertEquals(CENT, wallet.getBalance());
@@ -1657,15 +1700,15 @@ public void watchingScriptsConfirmed() throws Exception {
     public void watchingScriptsSentFrom() throws Exception {
         int baseElements = wallet.getBloomFilterElementCount();
 
-        Address watchedAddress = new ECKey().toAddress(PARAMS);
+        Address watchedAddress = LegacyAddress.fromKey(UNITTEST, new ECKey());
         wallet.addWatchedAddress(watchedAddress);
         assertEquals(baseElements + 1, wallet.getBloomFilterElementCount());
 
-        Transaction t1 = createFakeTx(PARAMS, CENT, watchedAddress);
-        Transaction t2 = createFakeTx(PARAMS, COIN, OTHER_ADDRESS);
+        Transaction t1 = createFakeTx(UNITTEST, CENT, watchedAddress);
+        Transaction t2 = createFakeTx(UNITTEST, COIN, OTHER_ADDRESS);
         sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, t1);
         assertEquals(baseElements + 2, wallet.getBloomFilterElementCount());
-        Transaction st2 = new Transaction(PARAMS);
+        Transaction st2 = new Transaction(UNITTEST);
         st2.addOutput(CENT, OTHER_ADDRESS);
         st2.addOutput(COIN, OTHER_ADDRESS);
         st2.addInput(t1.getOutput(0));
@@ -1679,9 +1722,9 @@ public void watchingScriptsSentFrom() throws Exception {
     public void watchingScriptsBloomFilter() throws Exception {
         assertFalse(wallet.isRequiringUpdateAllBloomFilter());
 
-        Address watchedAddress = new ECKey().toAddress(PARAMS);
-        Transaction t1 = createFakeTx(PARAMS, CENT, watchedAddress);
-        TransactionOutPoint outPoint = new TransactionOutPoint(PARAMS, 0, t1);
+        Address watchedAddress = LegacyAddress.fromKey(UNITTEST, new ECKey());
+        Transaction t1 = createFakeTx(UNITTEST, CENT, watchedAddress);
+        TransactionOutPoint outPoint = new TransactionOutPoint(UNITTEST, 0, t1);
         wallet.addWatchedAddress(watchedAddress);
 
         assertTrue(wallet.isRequiringUpdateAllBloomFilter());
@@ -1694,7 +1737,7 @@ public void watchingScriptsBloomFilter() throws Exception {
 
     @Test
     public void getWatchedAddresses() throws Exception {
-        Address watchedAddress = new ECKey().toAddress(PARAMS);
+        Address watchedAddress = LegacyAddress.fromKey(UNITTEST, new ECKey());
         wallet.addWatchedAddress(watchedAddress);
         List<Address> watchedAddresses = wallet.getWatchedAddresses();
         assertEquals(1, watchedAddresses.size());
@@ -1703,9 +1746,9 @@ public void getWatchedAddresses() throws Exception {
 
     @Test
     public void removeWatchedAddresses() {
-        List<Address> addressesForRemoval = new ArrayList<Address>();
+        List<Address> addressesForRemoval = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
-            Address watchedAddress = new ECKey().toAddress(PARAMS);
+            Address watchedAddress = LegacyAddress.fromKey(UNITTEST, new ECKey());
             addressesForRemoval.add(watchedAddress);
             wallet.addWatchedAddress(watchedAddress);
         }
@@ -1719,7 +1762,7 @@ public void removeWatchedAddresses() {
 
     @Test
     public void removeWatchedAddress() {
-        Address watchedAddress = new ECKey().toAddress(PARAMS);
+        Address watchedAddress = LegacyAddress.fromKey(UNITTEST, new ECKey());
         wallet.addWatchedAddress(watchedAddress);
         wallet.removeWatchedAddress(watchedAddress);
         assertFalse(wallet.isAddressWatched(watchedAddress));
@@ -1728,9 +1771,9 @@ public void removeWatchedAddress() {
 
     @Test
     public void removeScriptsBloomFilter() throws Exception {
-        List<Address> addressesForRemoval = new ArrayList<Address>();
+        List<Address> addressesForRemoval = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
-            Address watchedAddress = new ECKey().toAddress(PARAMS);
+            Address watchedAddress = LegacyAddress.fromKey(UNITTEST, new ECKey());
             addressesForRemoval.add(watchedAddress);
             wallet.addWatchedAddress(watchedAddress);
         }
@@ -1738,8 +1781,8 @@ public void removeScriptsBloomFilter() throws Exception {
         wallet.removeWatchedAddresses(addressesForRemoval);
 
         for (Address addr : addressesForRemoval) {
-            Transaction t1 = createFakeTx(PARAMS, CENT, addr);
-            TransactionOutPoint outPoint = new TransactionOutPoint(PARAMS, 0, t1);
+            Transaction t1 = createFakeTx(UNITTEST, CENT, addr);
+            TransactionOutPoint outPoint = new TransactionOutPoint(UNITTEST, 0, t1);
 
             // Note that this has a 1e-12 chance of failing this unit test due to a false positive
             assertFalse(wallet.getBloomFilter(1e-12).contains(outPoint.unsafeBitcoinSerialize()));
@@ -1754,10 +1797,10 @@ public void marriedKeychainBloomFilter() throws Exception {
         createMarriedWallet(2, 2);
         Address address = wallet.currentReceiveAddress();
 
-        assertTrue(wallet.getBloomFilter(0.001).contains(address.getHash160()));
+        assertTrue(wallet.getBloomFilter(0.001).contains(address.getHash()));
 
-        Transaction t1 = createFakeTx(PARAMS, CENT, address);
-        TransactionOutPoint outPoint = new TransactionOutPoint(PARAMS, 0, t1);
+        Transaction t1 = createFakeTx(UNITTEST, CENT, address);
+        TransactionOutPoint outPoint = new TransactionOutPoint(UNITTEST, 0, t1);
 
         assertFalse(wallet.getBloomFilter(0.001).contains(outPoint.unsafeBitcoinSerialize()));
 
@@ -1776,7 +1819,7 @@ public void autosaveImmediate() throws Exception {
         Sha256Hash hash2 = Sha256Hash.of(f);
         assertFalse("Wallet not saved after generating fresh key", hash1.equals(hash2));  // File has changed.
 
-        Transaction t1 = createFakeTx(PARAMS, valueOf(5, 0), key);
+        Transaction t1 = createFakeTx(UNITTEST, valueOf(5, 0), key);
         if (wallet.isPendingTransactionRelevant(t1))
             wallet.receivePending(t1, null);
         Sha256Hash hash3 = Sha256Hash.of(f);
@@ -1858,8 +1901,8 @@ public void spendOutputFromPendingTransaction() throws Exception {
         // First create our current transaction
         ECKey k2 = wallet.freshReceiveKey();
         Coin v2 = valueOf(0, 50);
-        Transaction t2 = new Transaction(PARAMS);
-        TransactionOutput o2 = new TransactionOutput(PARAMS, t2, v2, k2.toAddress(PARAMS));
+        Transaction t2 = new Transaction(UNITTEST);
+        TransactionOutput o2 = new TransactionOutput(UNITTEST, t2, v2, LegacyAddress.fromKey(UNITTEST, k2));
         t2.addOutput(o2);
         SendRequest req = SendRequest.forTx(t2);
         wallet.completeTx(req);
@@ -1873,8 +1916,8 @@ public void spendOutputFromPendingTransaction() throws Exception {
         // Now try to the spend the output.
         ECKey k3 = new ECKey();
         Coin v3 = valueOf(0, 25);
-        Transaction t3 = new Transaction(PARAMS);
-        t3.addOutput(v3, k3.toAddress(PARAMS));
+        Transaction t3 = new Transaction(UNITTEST);
+        t3.addOutput(v3, LegacyAddress.fromKey(UNITTEST, k3));
         t3.addInput(o2);
         wallet.signTransaction(SendRequest.forTx(t3));
 
@@ -1894,8 +1937,8 @@ public void replayWhilstPending() throws Exception {
         // See bug 345. This can happen if there is a pending transaction floating around and then you replay the
         // chain without emptying the memory pool (or refilling it from a peer).
         Coin value = COIN;
-        Transaction tx1 = createFakeTx(PARAMS, value, myAddress);
-        Transaction tx2 = new Transaction(PARAMS);
+        Transaction tx1 = createFakeTx(UNITTEST, value, myAddress);
+        Transaction tx2 = new Transaction(UNITTEST);
         tx2.addInput(tx1.getOutput(0));
         tx2.addOutput(valueOf(0, 9), OTHER_ADDRESS);
         // Add a change address to ensure this tx is relevant.
@@ -1914,14 +1957,14 @@ public void outOfOrderPendingTxns() throws Exception {
         // correctly. For instance, we are watching a wallet, someone pays us (A) and we then pay someone else (B)
         // with a change address but the network delivers the transactions to us in order B then A.
         Coin value = COIN;
-        Transaction a = createFakeTx(PARAMS, value, myAddress);
-        Transaction b = new Transaction(PARAMS);
+        Transaction a = createFakeTx(UNITTEST, value, myAddress);
+        Transaction b = new Transaction(UNITTEST);
         b.addInput(a.getOutput(0));
         b.addOutput(CENT, OTHER_ADDRESS);
         Coin v = COIN.subtract(CENT);
         b.addOutput(v, wallet.currentChangeAddress());
-        a = roundTripTransaction(PARAMS, a);
-        b = roundTripTransaction(PARAMS, b);
+        a = roundTripTransaction(UNITTEST, a);
+        b = roundTripTransaction(UNITTEST, b);
         wallet.receivePending(b, null);
         assertEquals(v, wallet.getBalance(Wallet.BalanceType.ESTIMATED));
         wallet.receivePending(a, null);
@@ -1930,7 +1973,7 @@ public void outOfOrderPendingTxns() throws Exception {
 
     @Test
     public void encryptionDecryptionAESBasic() throws Exception {
-        Wallet encryptedWallet = new Wallet(PARAMS);
+        Wallet encryptedWallet = new Wallet(UNITTEST);
         encryptedWallet.encrypt(PASSWORD1);
         KeyCrypter keyCrypter = encryptedWallet.getKeyCrypter();
         KeyParameter aesKey = keyCrypter.deriveKey(PASSWORD1);
@@ -1953,7 +1996,7 @@ public void encryptionDecryptionAESBasic() throws Exception {
 
     @Test
     public void encryptionDecryptionPasswordBasic() throws Exception {
-        Wallet encryptedWallet = new Wallet(PARAMS);
+        Wallet encryptedWallet = new Wallet(UNITTEST);
         encryptedWallet.encrypt(PASSWORD1);
 
         assertTrue(encryptedWallet.isEncrypted());
@@ -1971,7 +2014,7 @@ public void encryptionDecryptionPasswordBasic() throws Exception {
 
     @Test
     public void encryptionDecryptionBadPassword() throws Exception {
-        Wallet encryptedWallet = new Wallet(PARAMS);
+        Wallet encryptedWallet = new Wallet(UNITTEST);
         encryptedWallet.encrypt(PASSWORD1);
         KeyCrypter keyCrypter = encryptedWallet.getKeyCrypter();
         KeyParameter wrongAesKey = keyCrypter.deriveKey(WRONG_PASSWORD);
@@ -1984,14 +2027,16 @@ public void encryptionDecryptionBadPassword() throws Exception {
         try {
             encryptedWallet.decrypt(wrongAesKey);
             fail("Incorrectly decoded wallet with wrong password");
-        } catch (KeyCrypterException ede) {
-            // Expected.
+        } catch (KeyCrypterException.InvalidCipherText e) {
+            // Expected, either this...
+        } catch (KeyCrypterException.PublicPrivateMismatch e) {
+            // ...or this.
         }
     }
 
     @Test
     public void changePasswordTest() {
-        Wallet encryptedWallet = new Wallet(PARAMS);
+        Wallet encryptedWallet = new Wallet(UNITTEST);
         encryptedWallet.encrypt(PASSWORD1);
         CharSequence newPassword = "My name is Tom";
         encryptedWallet.changeEncryptionPassword(PASSWORD1, newPassword);
@@ -2001,7 +2046,7 @@ public void changePasswordTest() {
 
     @Test
     public void changeAesKeyTest() {
-        Wallet encryptedWallet = new Wallet(PARAMS);
+        Wallet encryptedWallet = new Wallet(UNITTEST);
         encryptedWallet.encrypt(PASSWORD1);
 
         KeyCrypter keyCrypter = encryptedWallet.getKeyCrypter();
@@ -2018,7 +2063,7 @@ public void changeAesKeyTest() {
 
     @Test
     public void encryptionDecryptionCheckExceptions() throws Exception {
-        Wallet encryptedWallet = new Wallet(PARAMS);
+        Wallet encryptedWallet = new Wallet(UNITTEST);
         encryptedWallet.encrypt(PASSWORD1);
         KeyCrypter keyCrypter = encryptedWallet.getKeyCrypter();
         KeyParameter aesKey = keyCrypter.deriveKey(PASSWORD1);
@@ -2057,7 +2102,7 @@ public void encryptionDecryptionCheckExceptions() throws Exception {
 
     @Test(expected = KeyCrypterException.class)
     public void addUnencryptedKeyToEncryptedWallet() throws Exception {
-        Wallet encryptedWallet = new Wallet(PARAMS);
+        Wallet encryptedWallet = new Wallet(UNITTEST);
         encryptedWallet.encrypt(PASSWORD1);
 
         ECKey key1 = new ECKey();
@@ -2066,7 +2111,7 @@ public void addUnencryptedKeyToEncryptedWallet() throws Exception {
 
     @Test(expected = KeyCrypterException.class)
     public void addEncryptedKeyToUnencryptedWallet() throws Exception {
-        Wallet encryptedWallet = new Wallet(PARAMS);
+        Wallet encryptedWallet = new Wallet(UNITTEST);
         encryptedWallet.encrypt(PASSWORD1);
         KeyCrypter keyCrypter = encryptedWallet.getKeyCrypter();
 
@@ -2077,16 +2122,15 @@ public void addEncryptedKeyToUnencryptedWallet() throws Exception {
 
     @Test(expected = KeyCrypterException.class)
     public void mismatchedCrypter() throws Exception {
-        Wallet encryptedWallet = new Wallet(PARAMS);
+        Wallet encryptedWallet = new Wallet(UNITTEST);
         encryptedWallet.encrypt(PASSWORD1);
         KeyCrypter keyCrypter = encryptedWallet.getKeyCrypter();
         KeyParameter aesKey = keyCrypter.deriveKey(PASSWORD1);
 
         // Try added an ECKey that was encrypted with a differenct ScryptParameters (i.e. a non-homogenous key).
         // This is not allowed as the ScryptParameters is stored at the Wallet level.
-        byte[] salt = new byte[KeyCrypterScrypt.SALT_LENGTH];
-        secureRandom.nextBytes(salt);
-        Protos.ScryptParameters.Builder scryptParametersBuilder = Protos.ScryptParameters.newBuilder().setSalt(ByteString.copyFrom(salt));
+        Protos.ScryptParameters.Builder scryptParametersBuilder = Protos.ScryptParameters.newBuilder()
+                .setSalt(ByteString.copyFrom(KeyCrypterScrypt.randomSalt()));
         Protos.ScryptParameters scryptParameters = scryptParametersBuilder.build();
         KeyCrypter keyCrypterDifferent = new KeyCrypterScrypt(scryptParameters);
         ECKey ecKeyDifferent = new ECKey();
@@ -2096,14 +2140,14 @@ public void mismatchedCrypter() throws Exception {
 
     @Test
     public void importAndEncrypt() throws InsufficientMoneyException {
-        Wallet encryptedWallet = new Wallet(PARAMS);
+        Wallet encryptedWallet = new Wallet(UNITTEST);
         encryptedWallet.encrypt(PASSWORD1);
 
         final ECKey key = new ECKey();
         encryptedWallet.importKeysAndEncrypt(ImmutableList.of(key), PASSWORD1);
         assertEquals(1, encryptedWallet.getImportedKeys().size());
         assertEquals(key.getPubKeyPoint(), encryptedWallet.getImportedKeys().get(0).getPubKeyPoint());
-        sendMoneyToWallet(encryptedWallet, AbstractBlockChain.NewBlockType.BEST_CHAIN, Coin.COIN, key.toAddress(PARAMS));
+        sendMoneyToWallet(encryptedWallet, AbstractBlockChain.NewBlockType.BEST_CHAIN, Coin.COIN, LegacyAddress.fromKey(UNITTEST, key));
         assertEquals(Coin.COIN, encryptedWallet.getBalance());
         SendRequest req = SendRequest.emptyWallet(OTHER_ADDRESS);
         req.aesKey = checkNotNull(encryptedWallet.getKeyCrypter()).deriveKey(PASSWORD1);
@@ -2123,7 +2167,7 @@ public void ageMattersDuringSelection() throws Exception {
         for (int i = 0; i < ITERATIONS; i++) {
             Transaction spend = wallet.createSend(OTHER_ADDRESS, COIN);
             assertEquals(spend.getInputs().size(), 1);
-            assertEquals("Failed on iteration " + i, spend.getInput(0).getOutpoint().getHash(), txns[i].getHash());
+            assertEquals("Failed on iteration " + i, spend.getInput(0).getOutpoint().getHash(), txns[i].getTxId());
             wallet.commitTx(spend);
         }
     }
@@ -2132,13 +2176,13 @@ public void ageMattersDuringSelection() throws Exception {
     public void respectMaxStandardSize() throws Exception {
         // Check that we won't create txns > 100kb. Average tx size is ~220 bytes so this would have to be enormous.
         sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, valueOf(100, 0));
-        Transaction tx = new Transaction(PARAMS);
+        Transaction tx = new Transaction(UNITTEST);
         byte[] bits = new byte[20];
         new Random().nextBytes(bits);
         Coin v = CENT;
         // 3100 outputs to a random address.
         for (int i = 0; i < 3100; i++) {
-            tx.addOutput(v, new Address(PARAMS, bits));
+            tx.addOutput(v, LegacyAddress.fromPubKeyHash(UNITTEST, bits));
         }
         SendRequest req = SendRequest.forTx(tx);
         wallet.completeTx(req);
@@ -2148,7 +2192,7 @@ public void respectMaxStandardSize() throws Exception {
     public void opReturnOneOutputTest() throws Exception {
         // Tests basic send of transaction with one output that doesn't transfer any value but just writes OP_RETURN.
         receiveATransaction(wallet, myAddress);
-        Transaction tx = new Transaction(PARAMS);
+        Transaction tx = new Transaction(UNITTEST);
         Coin messagePrice = Coin.ZERO;
         Script script = ScriptBuilder.createOpReturnScript("hello world!".getBytes());
         tx.addOutput(messagePrice, script);
@@ -2157,11 +2201,22 @@ public void opReturnOneOutputTest() throws Exception {
         wallet.completeTx(request);
     }
 
+    @Test
+    public void opReturnMaxBytes() throws Exception {
+        receiveATransaction(wallet, myAddress);
+        Transaction tx = new Transaction(UNITTEST);
+        Script script = ScriptBuilder.createOpReturnScript(new byte[80]);
+        tx.addOutput(Coin.ZERO, script);
+        SendRequest request = SendRequest.forTx(tx);
+        request.ensureMinRequiredFee = true;
+        wallet.completeTx(request);
+    }
+
     @Test
     public void opReturnOneOutputWithValueTest() throws Exception {
         // Tests basic send of transaction with one output that destroys coins and has an OP_RETURN.
         receiveATransaction(wallet, myAddress);
-        Transaction tx = new Transaction(PARAMS);
+        Transaction tx = new Transaction(UNITTEST);
         Coin messagePrice = CENT;
         Script script = ScriptBuilder.createOpReturnScript("hello world!".getBytes());
         tx.addOutput(messagePrice, script);
@@ -2173,7 +2228,7 @@ public void opReturnOneOutputWithValueTest() throws Exception {
     public void opReturnTwoOutputsTest() throws Exception {
         // Tests sending transaction where one output transfers BTC, the other one writes OP_RETURN.
         receiveATransaction(wallet, myAddress);
-        Transaction tx = new Transaction(PARAMS);
+        Transaction tx = new Transaction(UNITTEST);
         Coin messagePrice = Coin.ZERO;
         Script script = ScriptBuilder.createOpReturnScript("hello world!".getBytes());
         tx.addOutput(CENT, OTHER_ADDRESS);
@@ -2186,7 +2241,7 @@ public void opReturnTwoOutputsTest() throws Exception {
     public void twoOpReturnsPerTransactionTest() throws Exception {
         // Tests sending transaction where there are 2 attempts to write OP_RETURN scripts - this should fail and throw MultipleOpReturnRequested.
         receiveATransaction(wallet, myAddress);
-        Transaction tx = new Transaction(PARAMS);
+        Transaction tx = new Transaction(UNITTEST);
         Coin messagePrice = Coin.ZERO;
         Script script1 = ScriptBuilder.createOpReturnScript("hello world 1!".getBytes());
         Script script2 = ScriptBuilder.createOpReturnScript("hello world 2!".getBytes());
@@ -2200,7 +2255,7 @@ public void twoOpReturnsPerTransactionTest() throws Exception {
     @Test(expected = Wallet.DustySendRequested.class)
     public void sendDustTest() throws InsufficientMoneyException {
         // Tests sending dust, should throw DustySendRequested.
-        Transaction tx = new Transaction(PARAMS);
+        Transaction tx = new Transaction(UNITTEST);
         tx.addOutput(Transaction.MIN_NONDUST_OUTPUT.subtract(SATOSHI), OTHER_ADDRESS);
         SendRequest request = SendRequest.forTx(tx);
         request.ensureMinRequiredFee = true;
@@ -2210,7 +2265,7 @@ public void sendDustTest() throws InsufficientMoneyException {
     @Test
     public void sendMultipleCentsTest() throws Exception {
         receiveATransactionAmount(wallet, myAddress, Coin.COIN);
-        Transaction tx = new Transaction(PARAMS);
+        Transaction tx = new Transaction(UNITTEST);
         Coin c = CENT.subtract(SATOSHI);
         tx.addOutput(c, OTHER_ADDRESS);
         tx.addOutput(c, OTHER_ADDRESS);
@@ -2224,7 +2279,7 @@ public void sendMultipleCentsTest() throws Exception {
     public void sendDustAndOpReturnWithoutValueTest() throws Exception {
         // Tests sending dust and OP_RETURN without value, should throw DustySendRequested because sending sending dust is not allowed in any case.
         receiveATransactionAmount(wallet, myAddress, Coin.COIN);
-        Transaction tx = new Transaction(PARAMS);
+        Transaction tx = new Transaction(UNITTEST);
         tx.addOutput(Coin.ZERO, ScriptBuilder.createOpReturnScript("hello world!".getBytes()));
         tx.addOutput(Coin.SATOSHI, OTHER_ADDRESS);
         SendRequest request = SendRequest.forTx(tx);
@@ -2236,7 +2291,7 @@ public void sendDustAndOpReturnWithoutValueTest() throws Exception {
     public void sendDustAndMessageWithValueTest() throws Exception {
         // Tests sending dust and OP_RETURN with value, should throw DustySendRequested
         receiveATransaction(wallet, myAddress);
-        Transaction tx = new Transaction(PARAMS);
+        Transaction tx = new Transaction(UNITTEST);
         tx.addOutput(Coin.CENT, ScriptBuilder.createOpReturnScript("hello world!".getBytes()));
         tx.addOutput(Transaction.MIN_NONDUST_OUTPUT.subtract(SATOSHI), OTHER_ADDRESS);
         SendRequest request = SendRequest.forTx(tx);
@@ -2247,23 +2302,24 @@ public void sendDustAndMessageWithValueTest() throws Exception {
     @Test
     public void sendRequestP2PKTest() {
         ECKey key = new ECKey();
-        SendRequest req = SendRequest.to(PARAMS, key, SATOSHI.multiply(12));
-        assertArrayEquals(key.getPubKey(), req.tx.getOutputs().get(0).getScriptPubKey().getPubKey());
+        SendRequest req = SendRequest.to(UNITTEST, key, SATOSHI.multiply(12));
+        assertArrayEquals(key.getPubKey(),
+                ScriptPattern.extractKeyFromP2PK(req.tx.getOutputs().get(0).getScriptPubKey()));
     }
 
     @Test
     public void sendRequestP2PKHTest() {
         SendRequest req = SendRequest.to(OTHER_ADDRESS, SATOSHI.multiply(12));
-        assertEquals(OTHER_ADDRESS, req.tx.getOutputs().get(0).getScriptPubKey().getToAddress(PARAMS));
+        assertEquals(OTHER_ADDRESS, req.tx.getOutputs().get(0).getScriptPubKey().getToAddress(UNITTEST));
     }
 
     @Test
     public void feeSolverAndCoinSelectionTest_dustySendRequested() throws Exception {
         // Generate a few outputs to us that are far too small to spend reasonably
-        Transaction tx1 = createFakeTx(PARAMS, SATOSHI, myAddress);
-        Transaction tx2 = createFakeTx(PARAMS, SATOSHI, myAddress);
-        assertNotEquals(tx1.getHash(), tx2.getHash());
-        Transaction tx3 = createFakeTx(PARAMS, SATOSHI.multiply(10), myAddress);
+        Transaction tx1 = createFakeTx(UNITTEST, SATOSHI, myAddress);
+        Transaction tx2 = createFakeTx(UNITTEST, SATOSHI, myAddress);
+        assertNotEquals(tx1.getTxId(), tx2.getTxId());
+        Transaction tx3 = createFakeTx(UNITTEST, SATOSHI.multiply(10), myAddress);
         sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, tx1, tx2, tx3);
 
         // Not allowed to send dust.
@@ -2281,82 +2337,6 @@ public void feeSolverAndCoinSelectionTest_dustySendRequested() throws Exception
         assertEquals(ZERO, wallet.getBalance());
     }
 
-    @Test
-    public void basicFeeSolverTests() throws Exception {
-        sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, Coin.COIN);
-
-        // Simple test to make sure if we have an ouput < 0.01 we get a fee
-        SendRequest request1 = SendRequest.to(OTHER_ADDRESS, CENT.subtract(SATOSHI));
-        request1.ensureMinRequiredFee = true;
-        wallet.completeTx(request1);
-        Transaction spend1 = request1.tx;
-        assertEquals(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE, request1.tx.getFee());
-        assertEquals(2, spend1.getOutputs().size());
-
-        // ...but not more fee than what we request
-        SendRequest request3 = SendRequest.to(OTHER_ADDRESS, CENT.subtract(SATOSHI));
-        request3.feePerKb = Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.add(SATOSHI);
-        request3.ensureMinRequiredFee = true;
-        wallet.completeTx(request3);
-        assertEquals(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE, request3.tx.getFee());
-        assertEquals(2, request3.tx.getOutputs().size());
-
-        // ...unless we need it
-        SendRequest request4 = SendRequest.to(OTHER_ADDRESS, CENT.subtract(SATOSHI));
-        request4.feePerKb = Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.subtract(SATOSHI);
-        request4.ensureMinRequiredFee = true;
-        wallet.completeTx(request4);
-        assertEquals(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE, request4.tx.getFee());
-        assertEquals(2, request4.tx.getOutputs().size());
-
-        // If we would have a change output < 0.01, it should add the fee
-        SendRequest request5 = SendRequest.to(OTHER_ADDRESS, Coin.COIN.subtract(CENT.subtract(SATOSHI)));
-        request5.ensureMinRequiredFee = true;
-        wallet.completeTx(request5);
-        assertEquals(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE, request5.tx.getFee());
-        assertEquals(2, request5.tx.getOutputs().size());
-
-        // If change is 0.1-satoshi and we already have a 0.1-satoshi output, fee should be reference fee
-        SendRequest request7 = SendRequest.to(OTHER_ADDRESS, Coin.COIN.subtract(CENT.subtract(SATOSHI.multiply(2)).multiply(2)));
-        request7.ensureMinRequiredFee = true;
-        request7.tx.addOutput(CENT.subtract(SATOSHI), OTHER_ADDRESS);
-        wallet.completeTx(request7);
-        assertEquals(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE, request7.tx.getFee());
-        assertEquals(3, request7.tx.getOutputs().size());
-
-        // If we would have a change output == REFERENCE_DEFAULT_MIN_TX_FEE that would cause a fee, throw it away and make it fee
-        SendRequest request8 = SendRequest.to(OTHER_ADDRESS, COIN.subtract(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE));
-        request8.ensureMinRequiredFee = true;
-        wallet.completeTx(request8);
-        assertEquals(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE, request8.tx.getFee());
-        assertEquals(1, request8.tx.getOutputs().size());
-
-        // ...in fact, also add fee if we would get back less than MIN_NONDUST_OUTPUT
-        SendRequest request9 = SendRequest.to(OTHER_ADDRESS, COIN.subtract(
-                Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.add(Transaction.MIN_NONDUST_OUTPUT).subtract(SATOSHI)));
-        request9.ensureMinRequiredFee = true;
-        wallet.completeTx(request9);
-        assertEquals(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.add(Transaction.MIN_NONDUST_OUTPUT).subtract(SATOSHI), request9.tx.getFee());
-        assertEquals(1, request9.tx.getOutputs().size());
-
-        // ...but if we get back any more than that, we should get a refund (but still pay fee)
-        SendRequest request10 = SendRequest.to(OTHER_ADDRESS, COIN.subtract(
-                Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.add(Transaction.MIN_NONDUST_OUTPUT)));
-        request10.ensureMinRequiredFee = true;
-        wallet.completeTx(request10);
-        assertEquals(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE, request10.tx.getFee());
-        assertEquals(2, request10.tx.getOutputs().size());
-
-        // ...of course fee should be min(request.fee, MIN_TX_FEE) so we should get MIN_TX_FEE.add(SATOSHI) here
-        SendRequest request11 = SendRequest.to(OTHER_ADDRESS, COIN.subtract(
-                Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.add(Transaction.MIN_NONDUST_OUTPUT).add(SATOSHI.multiply(2))));
-        request11.feePerKb = Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.add(SATOSHI);
-        request11.ensureMinRequiredFee = true;
-        wallet.completeTx(request11);
-        assertEquals(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE, request11.tx.getFee());
-        assertEquals(2, request11.tx.getOutputs().size());
-    }
-
     @Test
     public void coinSelection_coinTimesDepth() throws Exception {
         Transaction txCent = sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, CENT);
@@ -2423,9 +2403,8 @@ public void feeSolverAndCoinSelectionTests2() throws Exception {
         request15.feePerKb = Transaction.DEFAULT_TX_FEE;
         request15.ensureMinRequiredFee = true;
         wallet.completeTx(request15);
-        assertEquals(Coin.valueOf(60650), request15.tx.getFee());
+        assertEquals(Coin.valueOf(121300), request15.tx.getFee());
         Transaction spend15 = request15.tx;
-        // If a transaction is over 1kb, 2 satoshis should be added.
         assertEquals(31, spend15.getOutputs().size());
         // We optimize for priority, so the output selected should be the largest one
         assertEquals(1, spend15.getInputs().size());
@@ -2440,7 +2419,8 @@ public void feeSolverAndCoinSelectionTests2() throws Exception {
         assertTrue(request16.tx.unsafeBitcoinSerialize().length > 1000);
         wallet.completeTx(request16);
         // Just the reference fee should be added if feePerKb == 0
-        assertEquals(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE, request16.tx.getFee());
+        // Hardcoded tx length because actual length may vary depending on actual signature length
+        assertEquals(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.multiply(1213).divide(1000), request16.tx.getFee());
         Transaction spend16 = request16.tx;
         assertEquals(31, spend16.getOutputs().size());
         // We optimize for priority, so the output selected should be the largest one
@@ -2451,11 +2431,11 @@ public void feeSolverAndCoinSelectionTests2() throws Exception {
         SendRequest request17 = SendRequest.to(OTHER_ADDRESS, CENT);
         for (int i = 0; i < 22; i++)
             request17.tx.addOutput(CENT, OTHER_ADDRESS);
-        request17.tx.addOutput(new TransactionOutput(PARAMS, request17.tx, CENT, new byte[15]));
+        request17.tx.addOutput(new TransactionOutput(UNITTEST, request17.tx, CENT, new byte[15]));
         request17.feePerKb = Transaction.DEFAULT_TX_FEE;
         request17.ensureMinRequiredFee = true;
         wallet.completeTx(request17);
-        assertEquals(Coin.valueOf(49950), request17.tx.getFee());
+        assertEquals(Coin.valueOf(99900), request17.tx.getFee());
         assertEquals(1, request17.tx.getInputs().size());
         // Calculate its max length to make sure it is indeed 999
         int theoreticalMaxLength17 = request17.tx.unsafeBitcoinSerialize().length + myKey.getPubKey().length + 75;
@@ -2478,11 +2458,11 @@ public void feeSolverAndCoinSelectionTests2() throws Exception {
         SendRequest request18 = SendRequest.to(OTHER_ADDRESS, CENT);
         for (int i = 0; i < 22; i++)
             request18.tx.addOutput(CENT, OTHER_ADDRESS);
-        request18.tx.addOutput(new TransactionOutput(PARAMS, request18.tx, CENT, new byte[17]));
+        request18.tx.addOutput(new TransactionOutput(UNITTEST, request18.tx, CENT, new byte[17]));
         request18.feePerKb = Transaction.DEFAULT_TX_FEE;
         request18.ensureMinRequiredFee = true;
         wallet.completeTx(request18);
-        assertEquals(Coin.valueOf(50050), request18.tx.getFee());
+        assertEquals(Coin.valueOf(100100), request18.tx.getFee());
         assertEquals(1, request18.tx.getInputs().size());
         // Calculate its max length to make sure it is indeed 1001
         Transaction spend18 = request18.tx;
@@ -2516,7 +2496,7 @@ public void feeSolverAndCoinSelectionTests2() throws Exception {
         request19.feePerKb = Transaction.DEFAULT_TX_FEE;
         request19.shuffleOutputs = false;
         wallet.completeTx(request19);
-        assertEquals(Coin.valueOf(187100), request19.tx.getFee());
+        assertEquals(Coin.valueOf(374200), request19.tx.getFee());
         assertEquals(2, request19.tx.getInputs().size());
         assertEquals(COIN, request19.tx.getInput(0).getValue());
         assertEquals(CENT, request19.tx.getInput(1).getValue());
@@ -2537,22 +2517,24 @@ public void feeSolverAndCoinSelectionTests2() throws Exception {
         request20.feePerKb = Transaction.DEFAULT_TX_FEE;
         wallet.completeTx(request20);
         // 4kb tx.
-        assertEquals(Coin.valueOf(187100), request20.tx.getFee());
+        assertEquals(Coin.valueOf(374200), request20.tx.getFee());
         assertEquals(2, request20.tx.getInputs().size());
         assertEquals(COIN, request20.tx.getInput(0).getValue());
         assertEquals(CENT, request20.tx.getInput(1).getValue());
 
-        // Same as request 19, but make the change 0 (so it doesnt force fee) and make us require min fee as a
-        // result of an output < CENT.
+        // Same as request 19, but make the change 0 (so it doesn't force fee) and make us require min fee
         SendRequest request21 = SendRequest.to(OTHER_ADDRESS, CENT);
         request21.feePerKb = ZERO;
         request21.ensureMinRequiredFee = true;
         for (int i = 0; i < 99; i++)
             request21.tx.addOutput(CENT, OTHER_ADDRESS);
-        request21.tx.addOutput(CENT.subtract(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE), OTHER_ADDRESS);
+        //request21.tx.addOutput(CENT.subtract(Coin.valueOf(18880-10)), OTHER_ADDRESS); //fails because tx size is calculated with a change output
+        request21.tx.addOutput(CENT.subtract(Coin.valueOf(18880)), OTHER_ADDRESS); //3739 bytes, fee 5048 sat/kb
+        //request21.tx.addOutput(CENT.subtract(Coin.valueOf(500000)), OTHER_ADDRESS); //3774 bytes, fee 5003 sat/kb
         // If we send without a feePerKb, we should still require REFERENCE_DEFAULT_MIN_TX_FEE because we have an output < 0.01
         wallet.completeTx(request21);
-        assertEquals(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE, request21.tx.getFee());
+        // Hardcoded tx length because actual length may vary depending on actual signature length
+        assertEquals(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.multiply(3776).divide(1000), request21.tx.getFee());
         assertEquals(2, request21.tx.getInputs().size());
         assertEquals(COIN, request21.tx.getInput(0).getValue());
         assertEquals(CENT, request21.tx.getInput(1).getValue());
@@ -2573,13 +2555,13 @@ public void feeSolverAndCoinSelectionTests2() throws Exception {
         request25.feePerKb = Transaction.DEFAULT_TX_FEE;
         request25.shuffleOutputs = false;
         wallet.completeTx(request25);
-        assertEquals(Coin.valueOf(139500), request25.tx.getFee());
+        assertEquals(Coin.valueOf(279000), request25.tx.getFee());
         assertEquals(2, request25.tx.getInputs().size());
         assertEquals(COIN, request25.tx.getInput(0).getValue());
         assertEquals(CENT, request25.tx.getInput(1).getValue());
 
         // Spend our CENT output.
-        Transaction spendTx5 = new Transaction(PARAMS);
+        Transaction spendTx5 = new Transaction(UNITTEST);
         spendTx5.addOutput(CENT, OTHER_ADDRESS);
         spendTx5.addInput(tx5.getOutput(0));
         wallet.signTransaction(SendRequest.forTx(spendTx5));
@@ -2587,21 +2569,21 @@ public void feeSolverAndCoinSelectionTests2() throws Exception {
         sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, spendTx5);
         assertEquals(COIN, wallet.getBalance());
 
-        // Ensure change is discarded if it results in a fee larger than the chain (same as 8 and 9 but with feePerKb)
+        // Ensure change is discarded if it is dust
         SendRequest request26 = SendRequest.to(OTHER_ADDRESS, CENT);
         for (int i = 0; i < 98; i++)
             request26.tx.addOutput(CENT, OTHER_ADDRESS);
-        request26.tx.addOutput(CENT.subtract(
-                Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.add(Transaction.MIN_NONDUST_OUTPUT).subtract(SATOSHI)),
+        // Hardcoded tx length because actual length may vary depending on actual signature length
+        Coin fee = Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.multiply(3560).divide(1000);
+        Coin dustMinusOne = Transaction.MIN_NONDUST_OUTPUT.subtract(SATOSHI);
+        request26.tx.addOutput(CENT.subtract(fee.add(dustMinusOne)),
                 OTHER_ADDRESS);
         assertTrue(request26.tx.unsafeBitcoinSerialize().length > 1000);
         request26.feePerKb = SATOSHI;
         request26.ensureMinRequiredFee = true;
         wallet.completeTx(request26);
-        assertEquals(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.add(Transaction.MIN_NONDUST_OUTPUT).subtract(SATOSHI),
-                request26.tx.getFee());
+        assertEquals(fee.add(dustMinusOne), request26.tx.getFee());
         Transaction spend26 = request26.tx;
-        // If a transaction is over 1kb, the set fee should be added
         assertEquals(100, spend26.getOutputs().size());
         // We optimize for priority, so the output selected should be the largest one
         assertEquals(1, spend26.getInputs().size());
@@ -2609,133 +2591,166 @@ public void feeSolverAndCoinSelectionTests2() throws Exception {
     }
 
     @Test
-    @Ignore("disabled for now as this test is not maintainable")
-    public void basicCategoryStepTest() throws Exception {
-        // Creates spends that step through the possible fee solver categories
-
-        // Generate a ton of small outputs
-        StoredBlock block = new StoredBlock(makeSolvedTestBlock(blockStore, OTHER_ADDRESS), BigInteger.ONE, 1);
-        int i = 0;
-        Coin tenThousand = Coin.valueOf(10000);
-        while (i <= 100) {
-            Transaction tx = createFakeTxWithChangeAddress(PARAMS, tenThousand, myAddress, OTHER_ADDRESS);
-            tx.getInput(0).setSequenceNumber(i++); // Keep every transaction unique
-            wallet.receiveFromBlock(tx, block, AbstractBlockChain.NewBlockType.BEST_CHAIN, i);
-        }
-        Coin balance = wallet.getBalance();
-
-        // Create a spend that will throw away change (category 3 type 2 in which the change causes fee which is worth more than change)
-        SendRequest request1 = SendRequest.to(OTHER_ADDRESS, balance.subtract(SATOSHI));
-        request1.ensureMinRequiredFee = true;
-        wallet.completeTx(request1);
-        assertEquals(SATOSHI, request1.tx.getFee());
-        assertEquals(request1.tx.getInputs().size(), i); // We should have spent all inputs
-
-        // Give us one more input...
-        Transaction tx1 = createFakeTxWithChangeAddress(PARAMS, tenThousand, myAddress, OTHER_ADDRESS);
-        tx1.getInput(0).setSequenceNumber(i++); // Keep every transaction unique
-        wallet.receiveFromBlock(tx1, block, AbstractBlockChain.NewBlockType.BEST_CHAIN, i);
+    public void recipientPaysFees() throws Exception {
+        sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, COIN);
 
-        // ... and create a spend that will throw away change (category 3 type 1 in which the change causes dust output)
-        SendRequest request2 = SendRequest.to(OTHER_ADDRESS, balance.subtract(SATOSHI));
+        // Simplest recipientPaysFees use case
+        Coin valueToSend = CENT.divide(2);
+        SendRequest request = SendRequest.to(OTHER_ADDRESS, valueToSend);
+        request.feePerKb = Transaction.DEFAULT_TX_FEE;
+        request.ensureMinRequiredFee = true;
+        request.recipientsPayFees = true;
+        request.shuffleOutputs = false;
+        wallet.completeTx(request);
+        // Hardcoded tx length because actual length may vary depending on actual signature length
+        Coin fee = request.feePerKb.multiply(227).divide(1000);
+        assertEquals(fee, request.tx.getFee());
+        Transaction spend = request.tx;
+        assertEquals(2, spend.getOutputs().size());
+        assertEquals(valueToSend.subtract(fee), spend.getOutput(0).getValue());
+        assertEquals(COIN.subtract(valueToSend), spend.getOutput(1).getValue());
+        assertEquals(1, spend.getInputs().size());
+        assertEquals(COIN, spend.getInput(0).getValue());
+
+        // Fee is split between the 2 outputs
+        SendRequest request2 = SendRequest.to(OTHER_ADDRESS, valueToSend);
+        request2.tx.addOutput(valueToSend, OTHER_ADDRESS);
+        request2.feePerKb = Transaction.DEFAULT_TX_FEE;
         request2.ensureMinRequiredFee = true;
+        request2.recipientsPayFees = true;
+        request2.shuffleOutputs = false;
         wallet.completeTx(request2);
-        assertEquals(SATOSHI, request2.tx.getFee());
-        assertEquals(request2.tx.getInputs().size(), i - 1); // We should have spent all inputs - 1
-
-        // Give us one more input...
-        Transaction tx2 = createFakeTxWithChangeAddress(PARAMS, tenThousand, myAddress, OTHER_ADDRESS);
-        tx2.getInput(0).setSequenceNumber(i++); // Keep every transaction unique
-        wallet.receiveFromBlock(tx2, block, AbstractBlockChain.NewBlockType.BEST_CHAIN, i);
+        // Hardcoded tx length because actual length may vary depending on actual signature length
+        Coin fee2 = request2.feePerKb.multiply(261).divide(1000);
+        assertEquals(fee2, request2.tx.getFee());
+        Transaction spend2 = request2.tx;
+        assertEquals(3, spend2.getOutputs().size());
+        assertEquals(valueToSend.subtract(fee2.divide(2)), spend2.getOutput(0).getValue());
+        assertEquals(valueToSend.subtract(fee2.divide(2)), spend2.getOutput(1).getValue());
+        assertEquals(COIN.subtract(valueToSend.multiply(2)), spend2.getOutput(2).getValue());
+        assertEquals(1, spend2.getInputs().size());
+        assertEquals(COIN, spend2.getInput(0).getValue());
 
-        // ... and create a spend that will throw away change (category 3 type 1 in which the change causes dust output)
-        // but that also could have been category 2 if it wanted
-        SendRequest request3 = SendRequest.to(OTHER_ADDRESS, CENT.add(tenThousand).subtract(SATOSHI));
+        // Fee is split between the 3 outputs. Division has a remainder which is taken from the first output
+        SendRequest request3 = SendRequest.to(OTHER_ADDRESS, valueToSend);
+        request3.tx.addOutput(valueToSend, OTHER_ADDRESS);
+        request3.tx.addOutput(valueToSend, OTHER_ADDRESS);
+        request3.feePerKb = Transaction.DEFAULT_TX_FEE;
         request3.ensureMinRequiredFee = true;
+        request3.recipientsPayFees = true;
+        request3.shuffleOutputs = false;
         wallet.completeTx(request3);
-        assertEquals(SATOSHI, request3.tx.getFee());
-        assertEquals(request3.tx.getInputs().size(), i - 2); // We should have spent all inputs - 2
+        // Hardcoded tx length because actual length may vary depending on actual signature length
+        Coin fee3 = request3.feePerKb.multiply(295).divide(1000);
+        assertEquals(fee3, request3.tx.getFee());
+        Transaction spend3 = request3.tx;
+        assertEquals(4, spend3.getOutputs().size());
+        // 1st output pays the fee division remainder
+        assertEquals(valueToSend.subtract(fee3.divideAndRemainder(3)[0]).subtract(fee3.divideAndRemainder(3)[1]),
+                spend3.getOutput(0).getValue());
+        assertEquals(valueToSend.subtract(fee3.divide(3)), spend3.getOutput(1).getValue());
+        assertEquals(valueToSend.subtract(fee3.divide(3)), spend3.getOutput(2).getValue());
+        assertEquals(COIN.subtract(valueToSend.multiply(3)), spend3.getOutput(3).getValue());
+        assertEquals(1, spend3.getInputs().size());
+        assertEquals(COIN, spend3.getInput(0).getValue());
 
-        //
-        SendRequest request4 = SendRequest.to(OTHER_ADDRESS, balance.subtract(SATOSHI));
-        request4.feePerKb = Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.divide(request3.tx.unsafeBitcoinSerialize().length);
+        // Output when subtracted fee is dust
+        // Hardcoded tx length because actual length may vary depending on actual signature length
+        Coin fee4 = Transaction.DEFAULT_TX_FEE.multiply(227).divide(1000);
+        valueToSend = fee4.add(Transaction.MIN_NONDUST_OUTPUT).subtract(SATOSHI);
+        SendRequest request4 = SendRequest.to(OTHER_ADDRESS, valueToSend);
+        request4.feePerKb = Transaction.DEFAULT_TX_FEE;
         request4.ensureMinRequiredFee = true;
-        wallet.completeTx(request4);
-        assertEquals(SATOSHI, request4.tx.getFee());
-        assertEquals(request4.tx.getInputs().size(), i - 2); // We should have spent all inputs - 2
-
-        // Give us a few more inputs...
-        while (wallet.getBalance().compareTo(CENT.multiply(2)) < 0) {
-            Transaction tx3 = createFakeTxWithChangeAddress(PARAMS, tenThousand, myAddress, OTHER_ADDRESS);
-            tx3.getInput(0).setSequenceNumber(i++); // Keep every transaction unique
-            wallet.receiveFromBlock(tx3, block, AbstractBlockChain.NewBlockType.BEST_CHAIN, i);
+        request4.recipientsPayFees = true;
+        request4.shuffleOutputs = false;
+        try {
+            wallet.completeTx(request4);
+            fail("Expected CouldNotAdjustDownwards exception");
+        } catch (Wallet.CouldNotAdjustDownwards e) {
         }
 
-        // ...that is just slightly less than is needed for category 1
-        SendRequest request5 = SendRequest.to(OTHER_ADDRESS, CENT.add(tenThousand).subtract(SATOSHI));
+        // Change is dust, so it is incremented to min non dust value. First output value is reduced to compensate.
+        // Hardcoded tx length because actual length may vary depending on actual signature length
+        Coin fee5 = Transaction.DEFAULT_TX_FEE.multiply(261).divide(1000);
+        valueToSend = COIN.divide(2).subtract(Coin.MICROCOIN);
+        SendRequest request5 = SendRequest.to(OTHER_ADDRESS, valueToSend);
+        request5.tx.addOutput(valueToSend, OTHER_ADDRESS);
+        request5.feePerKb = Transaction.DEFAULT_TX_FEE;
         request5.ensureMinRequiredFee = true;
+        request5.recipientsPayFees = true;
+        request5.shuffleOutputs = false;
         wallet.completeTx(request5);
-        assertEquals(SATOSHI, request5.tx.getFee());
-        assertEquals(1, request5.tx.getOutputs().size()); // We should have no change output
-
-        // Give us one more input...
-        Transaction tx4 = createFakeTxWithChangeAddress(PARAMS, tenThousand, myAddress, OTHER_ADDRESS);
-        tx4.getInput(0).setSequenceNumber(i); // Keep every transaction unique
-        wallet.receiveFromBlock(tx4, block, AbstractBlockChain.NewBlockType.BEST_CHAIN, i);
-
-        // ... that puts us in category 1 (no fee!)
-        SendRequest request6 = SendRequest.to(OTHER_ADDRESS, CENT.add(tenThousand).subtract(SATOSHI));
+        assertEquals(fee5, request5.tx.getFee());
+        Transaction spend5 = request5.tx;
+        assertEquals(3, spend5.getOutputs().size());
+        Coin valueSubtractedFromFirstOutput = Transaction.MIN_NONDUST_OUTPUT
+                .subtract(COIN.subtract(valueToSend.multiply(2)));
+        assertEquals(valueToSend.subtract(fee5.divide(2)).subtract(valueSubtractedFromFirstOutput),
+                spend5.getOutput(0).getValue());
+        assertEquals(valueToSend.subtract(fee5.divide(2)), spend5.getOutput(1).getValue());
+        assertEquals(Transaction.MIN_NONDUST_OUTPUT, spend5.getOutput(2).getValue());
+        assertEquals(1, spend5.getInputs().size());
+        assertEquals(COIN, spend5.getInput(0).getValue());
+
+        // Change is dust, so it is incremented to min non dust value. First output value is about to be reduced to
+        // compensate, but after subtracting some satoshis, first output is dust.
+        // Hardcoded tx length because actual length may vary depending on actual signature length
+        Coin fee6 = Transaction.DEFAULT_TX_FEE.multiply(261).divide(1000);
+        Coin valueToSend1 = fee6.divide(2).add(Transaction.MIN_NONDUST_OUTPUT).add(Coin.MICROCOIN);
+        Coin valueToSend2 = COIN.subtract(valueToSend1).subtract(Coin.MICROCOIN.multiply(2));
+        SendRequest request6 = SendRequest.to(OTHER_ADDRESS, valueToSend1);
+        request6.tx.addOutput(valueToSend2, OTHER_ADDRESS);
+        request6.feePerKb = Transaction.DEFAULT_TX_FEE;
         request6.ensureMinRequiredFee = true;
-        wallet.completeTx(request6);
-        assertEquals(ZERO, request6.tx.getFee());
-        assertEquals(2, request6.tx.getOutputs().size()); // We should have a change output
-    }
-
-    @Test
-    public void testCategory2WithChange() throws Exception {
-        // Specifically target case 2 with significant change
-
-        // Generate a ton of small outputs
-        StoredBlock block = new StoredBlock(makeSolvedTestBlock(blockStore, OTHER_ADDRESS), BigInteger.ONE, 1);
-        int i = 0;
-        while (i <= CENT.divide(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.multiply(10))) {
-            Transaction tx = createFakeTxWithChangeAddress(PARAMS, Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.multiply(10), myAddress, OTHER_ADDRESS);
-            tx.getInput(0).setSequenceNumber(i++); // Keep every transaction unique
-            wallet.receiveFromBlock(tx, block, AbstractBlockChain.NewBlockType.BEST_CHAIN, i);
+        request6.recipientsPayFees = true;
+        request6.shuffleOutputs = false;
+        try {
+            wallet.completeTx(request6);
+            fail("Expected CouldNotAdjustDownwards exception");
+        } catch (Wallet.CouldNotAdjustDownwards e) {
         }
-
-        // The selector will choose 2 with MIN_TX_FEE fee
-        SendRequest request1 = SendRequest.to(OTHER_ADDRESS, CENT.add(SATOSHI));
-        request1.ensureMinRequiredFee = true;
-        wallet.completeTx(request1);
-        assertEquals(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE, request1.tx.getFee());
-        assertEquals(request1.tx.getInputs().size(), i); // We should have spent all inputs
-        assertEquals(2, request1.tx.getOutputs().size()); // and gotten change back
     }
 
     @Test
     public void transactionGetFeeTest() throws Exception {
         // Prepare wallet to spend
         StoredBlock block = new StoredBlock(makeSolvedTestBlock(blockStore, OTHER_ADDRESS), BigInteger.ONE, 1);
-        Transaction tx = createFakeTx(PARAMS, COIN, myAddress);
+        Transaction tx = createFakeTx(UNITTEST, COIN, myAddress);
         wallet.receiveFromBlock(tx, block, AbstractBlockChain.NewBlockType.BEST_CHAIN, 0);
 
         // Create a transaction
         SendRequest request = SendRequest.to(OTHER_ADDRESS, CENT);
         request.feePerKb = Transaction.DEFAULT_TX_FEE;
         wallet.completeTx(request);
-        assertEquals(Coin.valueOf(11350), request.tx.getFee());
+        assertEquals(Coin.valueOf(22700), request.tx.getFee());
+    }
+
+    @Test
+    public void witnessTransactionGetFeeTest() throws Exception {
+        Wallet mySegwitWallet = Wallet.createDeterministic(UNITTEST, Script.ScriptType.P2WPKH);
+        Address mySegwitAddress = mySegwitWallet.freshReceiveAddress(Script.ScriptType.P2WPKH);
+
+        // Prepare wallet to spend
+        StoredBlock block = new StoredBlock(makeSolvedTestBlock(blockStore, OTHER_SEGWIT_ADDRESS), BigInteger.ONE, 1);
+        Transaction tx = createFakeTx(UNITTEST, COIN, mySegwitAddress);
+        mySegwitWallet.receiveFromBlock(tx, block, AbstractBlockChain.NewBlockType.BEST_CHAIN, 0);
+
+        // Create a transaction
+        SendRequest request = SendRequest.to(OTHER_SEGWIT_ADDRESS, CENT);
+        request.feePerKb = Transaction.DEFAULT_TX_FEE;
+        mySegwitWallet.completeTx(request);
+        assertEquals(Coin.valueOf(14000), request.tx.getFee());
     }
 
     @Test
     public void lowerThanDefaultFee() throws InsufficientMoneyException {
-        int feeFactor = 10;
+        int feeFactor = 50;
         Coin fee = Transaction.DEFAULT_TX_FEE.divide(feeFactor);
         receiveATransactionAmount(wallet, myAddress, Coin.COIN);
         SendRequest req = SendRequest.to(myAddress, Coin.CENT);
         req.feePerKb = fee;
         wallet.completeTx(req);
-        assertEquals(Coin.valueOf(11350).divide(feeFactor), req.tx.getFee());
+        assertEquals(Coin.valueOf(22700).divide(feeFactor), req.tx.getFee());
         wallet.commitTx(req.tx);
         SendRequest emptyReq = SendRequest.emptyWallet(myAddress);
         emptyReq.feePerKb = fee;
@@ -2755,14 +2770,14 @@ public void higherThanDefaultFee() throws InsufficientMoneyException {
         SendRequest req = SendRequest.to(myAddress, Coin.CENT);
         req.feePerKb = fee;
         wallet.completeTx(req);
-        assertEquals(Coin.valueOf(11350).multiply(feeFactor), req.tx.getFee());
+        assertEquals(Coin.valueOf(22700).multiply(feeFactor), req.tx.getFee());
         wallet.commitTx(req.tx);
         SendRequest emptyReq = SendRequest.emptyWallet(myAddress);
         emptyReq.feePerKb = fee;
         emptyReq.emptyWallet = true;
         emptyReq.coinSelector = AllowUnconfirmedCoinSelector.get();
         wallet.completeTx(emptyReq);
-        assertEquals(Coin.valueOf(171000), emptyReq.tx.getFee());
+        assertEquals(Coin.valueOf(342000), emptyReq.tx.getFee());
         wallet.commitTx(emptyReq.tx);
     }
 
@@ -2772,12 +2787,12 @@ public void testCompleteTxWithExistingInputs() throws Exception {
 
         // Generate a few outputs to us
         StoredBlock block = new StoredBlock(makeSolvedTestBlock(blockStore, OTHER_ADDRESS), BigInteger.ONE, 1);
-        Transaction tx1 = createFakeTx(PARAMS, COIN, myAddress);
+        Transaction tx1 = createFakeTx(UNITTEST, COIN, myAddress);
         wallet.receiveFromBlock(tx1, block, AbstractBlockChain.NewBlockType.BEST_CHAIN, 0);
-        Transaction tx2 = createFakeTx(PARAMS, COIN, myAddress);
-        assertNotEquals(tx1.getHash(), tx2.getHash());
+        Transaction tx2 = createFakeTx(UNITTEST, COIN, myAddress);
+        assertNotEquals(tx1.getTxId(), tx2.getTxId());
         wallet.receiveFromBlock(tx2, block, AbstractBlockChain.NewBlockType.BEST_CHAIN, 1);
-        Transaction tx3 = createFakeTx(PARAMS, CENT, myAddress);
+        Transaction tx3 = createFakeTx(UNITTEST, CENT, myAddress);
         wallet.receiveFromBlock(tx3, block, AbstractBlockChain.NewBlockType.BEST_CHAIN, 2);
 
         SendRequest request1 = SendRequest.to(OTHER_ADDRESS, CENT);
@@ -2803,7 +2818,7 @@ public void testCompleteTxWithExistingInputs() throws Exception {
 
         // However, if there is no connected output, we will grab a COIN output anyway and add the CENT to fee
         SendRequest request3 = SendRequest.to(OTHER_ADDRESS, CENT);
-        request3.tx.addInput(new TransactionInput(PARAMS, request3.tx, new byte[]{}, new TransactionOutPoint(PARAMS, 0, tx3.getHash())));
+        request3.tx.addInput(new TransactionInput(UNITTEST, request3.tx, new byte[]{}, new TransactionOutPoint(UNITTEST, 0, tx3.getTxId())));
         // Now completeTx will result in two inputs, two outputs and a fee of a CENT
         // Note that it is simply assumed that the inputs are correctly signed, though in fact the first is not
         request3.shuffleOutputs = false;
@@ -2861,7 +2876,7 @@ public void testEmptyRandomWallet() throws Exception {
         StoredBlock block = new StoredBlock(makeSolvedTestBlock(blockStore, OTHER_ADDRESS), BigInteger.ONE, 1);
         Random rng = new Random();
         for (int i = 0; i < rng.nextInt(100) + 1; i++) {
-            Transaction tx = createFakeTx(PARAMS, Coin.valueOf(rng.nextInt((int) COIN.value)), myAddress);
+            Transaction tx = createFakeTx(UNITTEST, Coin.valueOf(rng.nextInt((int) COIN.value)), myAddress);
             wallet.receiveFromBlock(tx, block, AbstractBlockChain.NewBlockType.BEST_CHAIN, i);
         }
         SendRequest request = SendRequest.emptyWallet(OTHER_ADDRESS);
@@ -2874,7 +2889,7 @@ public void testEmptyRandomWallet() throws Exception {
     public void testEmptyWallet() throws Exception {
         // Add exactly 0.01
         StoredBlock block = new StoredBlock(makeSolvedTestBlock(blockStore, OTHER_ADDRESS), BigInteger.ONE, 1);
-        Transaction tx = createFakeTx(PARAMS, CENT, myAddress);
+        Transaction tx = createFakeTx(UNITTEST, CENT, myAddress);
         wallet.receiveFromBlock(tx, block, AbstractBlockChain.NewBlockType.BEST_CHAIN, 0);
         SendRequest request = SendRequest.emptyWallet(OTHER_ADDRESS);
         wallet.completeTx(request);
@@ -2886,9 +2901,9 @@ public void testEmptyWallet() throws Exception {
         // Add 1 confirmed cent and 1 unconfirmed cent. Verify only one cent is emptied because of the coin selection
         // policies that are in use by default.
         block = new StoredBlock(makeSolvedTestBlock(blockStore, OTHER_ADDRESS), BigInteger.ONE, 2);
-        tx = createFakeTx(PARAMS, CENT, myAddress);
+        tx = createFakeTx(UNITTEST, CENT, myAddress);
         wallet.receiveFromBlock(tx, block, AbstractBlockChain.NewBlockType.BEST_CHAIN, 0);
-        tx = createFakeTx(PARAMS, CENT, myAddress);
+        tx = createFakeTx(UNITTEST, CENT, myAddress);
         wallet.receivePending(tx, null);
         request = SendRequest.emptyWallet(OTHER_ADDRESS);
         wallet.completeTx(request);
@@ -2900,12 +2915,12 @@ public void testEmptyWallet() throws Exception {
         // Add an unsendable value
         block = new StoredBlock(block.getHeader().createNextBlock(OTHER_ADDRESS), BigInteger.ONE, 3);
         Coin outputValue = Transaction.MIN_NONDUST_OUTPUT.subtract(SATOSHI);
-        tx = createFakeTx(PARAMS, outputValue, myAddress);
+        tx = createFakeTx(UNITTEST, outputValue, myAddress);
         wallet.receiveFromBlock(tx, block, AbstractBlockChain.NewBlockType.BEST_CHAIN, 0);
         try {
             request = SendRequest.emptyWallet(OTHER_ADDRESS);
-            assertEquals(ZERO, request.tx.getFee());
             wallet.completeTx(request);
+            assertEquals(ZERO, request.tx.getFee());
             fail();
         } catch (Wallet.CouldNotAdjustDownwards e) {}
     }
@@ -2913,12 +2928,12 @@ public void testEmptyWallet() throws Exception {
     @Test
     public void childPaysForParent() throws Exception {
         // Receive confirmed balance to play with.
-        Transaction toMe = createFakeTxWithoutChangeAddress(PARAMS, COIN, myAddress);
+        Transaction toMe = createFakeTxWithoutChangeAddress(UNITTEST, COIN, myAddress);
         sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, toMe);
         assertEquals(Coin.COIN, wallet.getBalance(BalanceType.ESTIMATED_SPENDABLE));
         assertEquals(Coin.COIN, wallet.getBalance(BalanceType.AVAILABLE_SPENDABLE));
         // Receive unconfirmed coin without fee.
-        Transaction toMeWithoutFee = createFakeTxWithoutChangeAddress(PARAMS, COIN, myAddress);
+        Transaction toMeWithoutFee = createFakeTxWithoutChangeAddress(UNITTEST, COIN, myAddress);
         wallet.receivePending(toMeWithoutFee, null);
         assertEquals(Coin.COIN.multiply(2), wallet.getBalance(BalanceType.ESTIMATED_SPENDABLE));
         assertEquals(Coin.COIN, wallet.getBalance(BalanceType.AVAILABLE_SPENDABLE));
@@ -2936,7 +2951,7 @@ public void childPaysForParent() throws Exception {
     public void keyRotationRandom() throws Exception {
         Utils.setMockClock();
         // Start with an empty wallet (no HD chain).
-        wallet = new Wallet(PARAMS);
+        wallet = new Wallet(UNITTEST);
         // Watch out for wallet-initiated broadcasts.
         MockTransactionBroadcaster broadcaster = new MockTransactionBroadcaster(wallet);
         // Send three cents to two different random keys, then add a key and mark the initial keys as compromised.
@@ -2946,9 +2961,9 @@ public void keyRotationRandom() throws Exception {
         key2.setCreationTimeSeconds(Utils.currentTimeSeconds() - 86400);
         wallet.importKey(key1);
         wallet.importKey(key2);
-        sendMoneyToWallet(wallet, AbstractBlockChain.NewBlockType.BEST_CHAIN, CENT, key1.toAddress(PARAMS));
-        sendMoneyToWallet(wallet, AbstractBlockChain.NewBlockType.BEST_CHAIN, CENT, key2.toAddress(PARAMS));
-        sendMoneyToWallet(wallet, AbstractBlockChain.NewBlockType.BEST_CHAIN, CENT, key2.toAddress(PARAMS));
+        sendMoneyToWallet(wallet, AbstractBlockChain.NewBlockType.BEST_CHAIN, CENT, LegacyAddress.fromKey(UNITTEST, key1));
+        sendMoneyToWallet(wallet, AbstractBlockChain.NewBlockType.BEST_CHAIN, CENT, LegacyAddress.fromKey(UNITTEST, key2));
+        sendMoneyToWallet(wallet, AbstractBlockChain.NewBlockType.BEST_CHAIN, CENT, LegacyAddress.fromKey(UNITTEST, key2));
         Date compromiseTime = Utils.now();
         assertEquals(0, broadcaster.size());
         assertFalse(wallet.isKeyRotating(key1));
@@ -2961,12 +2976,12 @@ public void keyRotationRandom() throws Exception {
 
         Transaction tx = broadcaster.waitForTransactionAndSucceed();
         final Coin THREE_CENTS = CENT.add(CENT).add(CENT);
-        assertEquals(Coin.valueOf(24550), tx.getFee());
+        assertEquals(Coin.valueOf(49100), tx.getFee());
         assertEquals(THREE_CENTS, tx.getValueSentFromMe(wallet));
         assertEquals(THREE_CENTS.subtract(tx.getFee()), tx.getValueSentToMe(wallet));
         // TX sends to one of our addresses (for now we ignore married wallets).
-        final Address toAddress = tx.getOutput(0).getScriptPubKey().getToAddress(PARAMS);
-        final ECKey rotatingToKey = wallet.findKeyFromPubHash(toAddress.getHash160());
+        final Address toAddress = tx.getOutput(0).getScriptPubKey().getToAddress(UNITTEST);
+        final ECKey rotatingToKey = wallet.findKeyFromPubKeyHash(toAddress.getHash(), toAddress.getOutputScriptType());
         assertNotNull(rotatingToKey);
         assertFalse(wallet.isKeyRotating(rotatingToKey));
         assertEquals(3, tx.getInputs().size());
@@ -2979,12 +2994,13 @@ public void keyRotationRandom() throws Exception {
         assertEquals(0, broadcaster.size());
 
         // Receive money via a new block on key1 and ensure it shows up as a maintenance task.
-        sendMoneyToWallet(wallet, AbstractBlockChain.NewBlockType.BEST_CHAIN, CENT, key1.toAddress(PARAMS));
+        sendMoneyToWallet(wallet, AbstractBlockChain.NewBlockType.BEST_CHAIN, CENT, LegacyAddress.fromKey(UNITTEST, key1));
         wallet.doMaintenance(null, true);
         tx = broadcaster.waitForTransactionAndSucceed();
-        assertNotNull(wallet.findKeyFromPubHash(tx.getOutput(0).getScriptPubKey().getPubKeyHash()));
+        assertNotNull(wallet.findKeyFromPubKeyHash(tx.getOutput(0).getScriptPubKey().getPubKeyHash(),
+                toAddress.getOutputScriptType()));
         log.info("Unexpected thing: {}", tx);
-        assertEquals(Coin.valueOf(9650), tx.getFee());
+        assertEquals(Coin.valueOf(19300), tx.getFee());
         assertEquals(1, tx.getInputs().size());
         assertEquals(1, tx.getOutputs().size());
         assertEquals(CENT, tx.getValueSentFromMe(wallet));
@@ -2997,7 +3013,7 @@ public void keyRotationRandom() throws Exception {
         // Now round-trip the wallet and check the protobufs are storing the data correctly.
         wallet = roundTrip(wallet);
 
-        tx = wallet.getTransaction(tx.getHash());
+        tx = wallet.getTransaction(tx.getTxId());
         checkNotNull(tx);
         assertEquals(Transaction.Purpose.KEY_ROTATION, tx.getPurpose());
         // Have to divide here to avoid mismatch due to second-level precision in serialisation.
@@ -3006,23 +3022,23 @@ public void keyRotationRandom() throws Exception {
         // Make a normal spend and check it's all ok.
         wallet.sendCoins(broadcaster, OTHER_ADDRESS, wallet.getBalance());
         tx = broadcaster.waitForTransaction();
-        assertArrayEquals(OTHER_ADDRESS.getHash160(), tx.getOutput(0).getScriptPubKey().getPubKeyHash());
+        assertArrayEquals(OTHER_ADDRESS.getHash(), tx.getOutput(0).getScriptPubKey().getPubKeyHash());
     }
 
     private Wallet roundTrip(Wallet wallet) throws UnreadableWalletException {
         Protos.Wallet protos = new WalletProtobufSerializer().walletToProto(wallet);
-        return new WalletProtobufSerializer().readWallet(PARAMS, null, protos);
+        return new WalletProtobufSerializer().readWallet(UNITTEST, null, protos);
     }
 
     @Test
     public void keyRotationHD() throws Exception {
         // Test that if we rotate an HD chain, a new one is created and all arrivals on the old keys are moved.
         Utils.setMockClock();
-        wallet = new Wallet(PARAMS);
+        wallet = new Wallet(UNITTEST);
         ECKey key1 = wallet.freshReceiveKey();
         ECKey key2 = wallet.freshReceiveKey();
-        sendMoneyToWallet(wallet, AbstractBlockChain.NewBlockType.BEST_CHAIN, CENT, key1.toAddress(PARAMS));
-        sendMoneyToWallet(wallet, AbstractBlockChain.NewBlockType.BEST_CHAIN, CENT, key2.toAddress(PARAMS));
+        sendMoneyToWallet(wallet, AbstractBlockChain.NewBlockType.BEST_CHAIN, CENT, LegacyAddress.fromKey(UNITTEST, key1));
+        sendMoneyToWallet(wallet, AbstractBlockChain.NewBlockType.BEST_CHAIN, CENT, LegacyAddress.fromKey(UNITTEST, key2));
         DeterministicKey watchKey1 = wallet.getWatchingKey();
 
         // A day later, we get compromised.
@@ -3052,42 +3068,36 @@ public void keyRotationHD2() throws Exception {
         goodKey.setCreationTimeSeconds(Utils.currentTimeSeconds());
 
         // Do an upgrade based on the bad key.
-        final AtomicReference<List<DeterministicKeyChain>> fChains = new AtomicReference<List<DeterministicKeyChain>>();
-        KeyChainGroup kcg = new KeyChainGroup(PARAMS) {
-
-            {
-                fChains.set(chains);
-            }
-        };
+        KeyChainGroup kcg = KeyChainGroup.builder(UNITTEST).build();
         kcg.importKeys(badKey, goodKey);
         Utils.rollMockClock(86400);
-        wallet = new Wallet(PARAMS, kcg);   // This avoids the automatic HD initialisation
-        assertTrue(fChains.get().isEmpty());
-        wallet.upgradeToDeterministic(null);
+        wallet = new Wallet(UNITTEST, kcg);   // This avoids the automatic HD initialisation
+        assertTrue(kcg.getDeterministicKeyChains().isEmpty());
+        wallet.upgradeToDeterministic(Script.ScriptType.P2PKH, null);
         DeterministicKey badWatchingKey = wallet.getWatchingKey();
         assertEquals(badKey.getCreationTimeSeconds(), badWatchingKey.getCreationTimeSeconds());
-        sendMoneyToWallet(wallet, AbstractBlockChain.NewBlockType.BEST_CHAIN, CENT, badWatchingKey.toAddress(PARAMS));
+        sendMoneyToWallet(wallet, AbstractBlockChain.NewBlockType.BEST_CHAIN, CENT, LegacyAddress.fromKey(UNITTEST, badWatchingKey));
 
         // Now we set the rotation time to the time we started making good keys. This should create a new HD chain.
         wallet.setKeyRotationTime(goodKey.getCreationTimeSeconds());
         List<Transaction> txns = wallet.doMaintenance(null, false).get();
         assertEquals(1, txns.size());
-        Address output = txns.get(0).getOutput(0).getAddressFromP2PKHScript(PARAMS);
-        ECKey usedKey = wallet.findKeyFromPubHash(output.getHash160());
+        Address output = txns.get(0).getOutput(0).getScriptPubKey().getToAddress(UNITTEST);
+        ECKey usedKey = wallet.findKeyFromPubKeyHash(output.getHash(), output.getOutputScriptType());
         assertEquals(goodKey.getCreationTimeSeconds(), usedKey.getCreationTimeSeconds());
         assertEquals(goodKey.getCreationTimeSeconds(), wallet.freshReceiveKey().getCreationTimeSeconds());
-        assertEquals("mrM3TpCnav5YQuVA1xLercCGJH4DXujMtv", usedKey.toAddress(PARAMS).toString());
-        DeterministicKeyChain c = fChains.get().get(1);
+        assertEquals("mrM3TpCnav5YQuVA1xLercCGJH4DXujMtv", LegacyAddress.fromKey(UNITTEST, usedKey).toString());
+        DeterministicKeyChain c = kcg.getDeterministicKeyChains().get(1);
         assertEquals(c.getEarliestKeyCreationTime(), goodKey.getCreationTimeSeconds());
-        assertEquals(2, fChains.get().size());
+        assertEquals(2, kcg.getDeterministicKeyChains().size());
 
         // Commit the maint txns.
         wallet.commitTx(txns.get(0));
 
         // Check next maintenance does nothing.
         assertTrue(wallet.doMaintenance(null, false).get().isEmpty());
-        assertEquals(c, fChains.get().get(1));
-        assertEquals(2, fChains.get().size());
+        assertEquals(c, kcg.getDeterministicKeyChains().get(1));
+        assertEquals(2, kcg.getDeterministicKeyChains().size());
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -3099,7 +3109,7 @@ public void importOfHDKeyForbidden() throws Exception {
     public void fragmentedReKeying() throws Exception {
         // Send lots of small coins and check the fee is correct.
         ECKey key = wallet.freshReceiveKey();
-        Address address = key.toAddress(PARAMS);
+        Address address = LegacyAddress.fromKey(UNITTEST, key);
         Utils.setMockClock();
         Utils.rollMockClock(86400);
         for (int i = 0; i < 800; i++) {
@@ -3126,6 +3136,8 @@ public void fragmentedReKeying() throws Exception {
         assertEquals(200, tx.getInputs().size());
     }
 
+    private static final byte[] EMPTY_SIG = {};
+
     @Test
     public void completeTxPartiallySignedWithDummySigs() throws Exception {
         byte[] dummySig = TransactionSignature.dummy().encodeToBitcoin();
@@ -3134,19 +3146,20 @@ public void completeTxPartiallySignedWithDummySigs() throws Exception {
 
     @Test
     public void completeTxPartiallySignedWithEmptySig() throws Exception {
-        byte[] emptySig = {};
-        completeTxPartiallySigned(Wallet.MissingSigsMode.USE_OP_ZERO, emptySig);
+        completeTxPartiallySigned(Wallet.MissingSigsMode.USE_OP_ZERO, EMPTY_SIG);
     }
 
     @Test (expected = ECKey.MissingPrivateKeyException.class)
     public void completeTxPartiallySignedThrows() throws Exception {
-        sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, CENT, wallet.freshReceiveKey());
+        sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, CENT, wallet.currentReceiveKey());
         SendRequest req = SendRequest.emptyWallet(OTHER_ADDRESS);
         wallet.completeTx(req);
         // Delete the sigs
         for (TransactionInput input : req.tx.getInputs())
             input.clearScriptBytes();
-        Wallet watching = Wallet.fromWatchingKey(PARAMS, wallet.getWatchingKey().dropParent().dropPrivateBytes());
+        Wallet watching = Wallet.fromWatchingKey(UNITTEST, wallet.getWatchingKey().dropParent().dropPrivateBytes(),
+                Script.ScriptType.P2PKH);
+        watching.currentReceiveKey();
         watching.completeTx(SendRequest.forTx(req.tx));
     }
 
@@ -3158,14 +3171,12 @@ public void completeTxPartiallySignedMarriedWithDummySigs() throws Exception {
 
     @Test
     public void completeTxPartiallySignedMarriedWithEmptySig() throws Exception {
-        byte[] emptySig = {};
-        completeTxPartiallySignedMarried(Wallet.MissingSigsMode.USE_OP_ZERO, emptySig);
+        completeTxPartiallySignedMarried(Wallet.MissingSigsMode.USE_OP_ZERO, EMPTY_SIG);
     }
 
     @Test (expected = TransactionSigner.MissingSignatureException.class)
     public void completeTxPartiallySignedMarriedThrows() throws Exception {
-        byte[] emptySig = {};
-        completeTxPartiallySignedMarried(Wallet.MissingSigsMode.THROW, emptySig);
+        completeTxPartiallySignedMarried(Wallet.MissingSigsMode.THROW, EMPTY_SIG);
     }
 
     @Test (expected = TransactionSigner.MissingSignatureException.class)
@@ -3209,7 +3220,7 @@ public void completeTxPartiallySigned(Wallet.MissingSigsMode missSigMode, byte[]
         // Send three transactions, with one being an address type and the other being a raw CHECKSIG type pubkey only,
         // and the final one being a key we do have. We expect the first two inputs to be dummy values and the last
         // to be signed correctly.
-        Transaction t1 = sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, CENT, pub.toAddress(PARAMS));
+        Transaction t1 = sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, CENT, LegacyAddress.fromKey(UNITTEST, pub));
         Transaction t2 = sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, CENT, pub);
         Transaction t3 = sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, CENT, priv2);
 
@@ -3234,13 +3245,13 @@ public void completeTxPartiallySigned(Wallet.MissingSigsMode missSigMode, byte[]
     @Test
     public void riskAnalysis() throws Exception {
         // Send a tx that is considered risky to the wallet, verify it doesn't show up in the balances.
-        final Transaction tx = createFakeTx(PARAMS, COIN, myAddress);
+        final Transaction tx = createFakeTx(UNITTEST, COIN, myAddress);
         final AtomicBoolean bool = new AtomicBoolean();
         wallet.setRiskAnalyzer(new RiskAnalysis.Analyzer() {
             @Override
             public RiskAnalysis create(Wallet wallet, Transaction wtx, List<Transaction> dependencies) {
                 RiskAnalysis.Result result = RiskAnalysis.Result.OK;
-                if (wtx.getHash().equals(tx.getHash()))
+                if (wtx.getTxId().equals(tx.getTxId()))
                     result = RiskAnalysis.Result.NON_STANDARD;
                 final RiskAnalysis.Result finalResult = result;
                 return new RiskAnalysis() {
@@ -3266,22 +3277,22 @@ public Result analyze() {
 
     @Test
     public void transactionInBlockNotification() {
-        final Transaction tx = createFakeTx(PARAMS, COIN, myAddress);
+        final Transaction tx = createFakeTx(UNITTEST, COIN, myAddress);
         StoredBlock block = createFakeBlock(blockStore, Block.BLOCK_HEIGHT_GENESIS, tx).storedBlock;
         wallet.receivePending(tx, null);
-        boolean notification = wallet.notifyTransactionIsInBlock(tx.getHash(), block, AbstractBlockChain.NewBlockType.BEST_CHAIN, 1);
+        boolean notification = wallet.notifyTransactionIsInBlock(tx.getTxId(), block, AbstractBlockChain.NewBlockType.BEST_CHAIN, 1);
         assertTrue(notification);
 
-        final Transaction tx2 = createFakeTx(PARAMS, COIN, OTHER_ADDRESS);
+        final Transaction tx2 = createFakeTx(UNITTEST, COIN, OTHER_ADDRESS);
         wallet.receivePending(tx2, null);
         StoredBlock block2 = createFakeBlock(blockStore, Block.BLOCK_HEIGHT_GENESIS + 1, tx2).storedBlock;
-        boolean notification2 = wallet.notifyTransactionIsInBlock(tx2.getHash(), block2, AbstractBlockChain.NewBlockType.BEST_CHAIN, 1);
+        boolean notification2 = wallet.notifyTransactionIsInBlock(tx2.getTxId(), block2, AbstractBlockChain.NewBlockType.BEST_CHAIN, 1);
         assertFalse(notification2);
     }
 
     @Test
     public void duplicatedBlock() {
-        final Transaction tx = createFakeTx(PARAMS, COIN, myAddress);
+        final Transaction tx = createFakeTx(UNITTEST, COIN, myAddress);
         StoredBlock block = createFakeBlock(blockStore, Block.BLOCK_HEIGHT_GENESIS, tx).storedBlock;
         wallet.notifyNewBestBlock(block);
         wallet.notifyNewBestBlock(block);
@@ -3290,7 +3301,7 @@ public void duplicatedBlock() {
     @Test
     public void keyEvents() throws Exception {
         // Check that we can register an event listener, generate some keys and the callbacks are invoked properly.
-        wallet = new Wallet(PARAMS);
+        wallet = new Wallet(UNITTEST, KeyChainGroup.builder(UNITTEST).fromRandom(Script.ScriptType.P2PKH).build());
         final List<ECKey> keys = Lists.newLinkedList();
         wallet.addKeyChainEventListener(Threading.SAME_THREAD, new KeyChainEventListener() {
             @Override
@@ -3303,70 +3314,185 @@ public void onKeysAdded(List<ECKey> k) {
     }
 
     @Test
-    public void upgradeToHDUnencrypted() throws Exception {
-        // This isn't very deep because most of it is tested in KeyChainGroupTest and Wallet just forwards most logic
-        // there. We're mostly concerned with the slightly different auto upgrade logic: KeyChainGroup won't do an
-        // on-demand auto upgrade of the wallet to HD even in the unencrypted case, because the key rotation time is
-        // a property of the Wallet, not the KeyChainGroup (it should perhaps be moved at some point - it doesn't matter
-        // much where it goes). Wallet on the other hand will try to auto-upgrade you when possible.
+    public void upgradeToDeterministic_basic_to_P2PKH_unencrypted() throws Exception {
+        wallet = new Wallet(UNITTEST, KeyChainGroup.builder(UNITTEST).build());
+        wallet.importKeys(Arrays.asList(new ECKey(), new ECKey()));
+        assertFalse(wallet.isEncrypted());
+        assertTrue(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2PKH));
+        assertTrue(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2WPKH));
+        try {
+            wallet.freshReceiveKey();
+            fail();
+        } catch (DeterministicUpgradeRequiredException e) {
+            // Expected.
+        }
 
-        // Create an old-style random wallet.
-        KeyChainGroup group = new KeyChainGroup(PARAMS);
-        group.importKeys(new ECKey(), new ECKey());
-        wallet = new Wallet(PARAMS, group);
-        assertTrue(wallet.isDeterministicUpgradeRequired());
-        // Use an HD feature.
-        wallet.freshReceiveKey();
-        assertFalse(wallet.isDeterministicUpgradeRequired());
+        wallet.upgradeToDeterministic(Script.ScriptType.P2PKH, null);
+        assertFalse(wallet.isEncrypted());
+        assertFalse(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2PKH));
+        assertTrue(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2WPKH));
+        assertEquals(Script.ScriptType.P2PKH, wallet.currentReceiveAddress().getOutputScriptType());
+        assertEquals(Script.ScriptType.P2PKH, wallet.freshReceiveAddress().getOutputScriptType());
     }
 
     @Test
-    public void upgradeToHDEncrypted() throws Exception {
-        // Create an old-style random wallet.
-        KeyChainGroup group = new KeyChainGroup(PARAMS);
-        group.importKeys(new ECKey(), new ECKey());
-        wallet = new Wallet(PARAMS, group);
-        assertTrue(wallet.isDeterministicUpgradeRequired());
-        KeyCrypter crypter = new KeyCrypterScrypt();
-        KeyParameter aesKey = crypter.deriveKey("abc");
-        wallet.encrypt(crypter, aesKey);
+    public void upgradeToDeterministic_basic_to_P2PKH_encrypted() throws Exception {
+        wallet = new Wallet(UNITTEST, KeyChainGroup.builder(UNITTEST).build());
+        wallet.importKeys(Arrays.asList(new ECKey(), new ECKey()));
+        assertFalse(wallet.isEncrypted());
+        assertTrue(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2PKH));
+        assertTrue(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2WPKH));
+
+        KeyParameter aesKey = new KeyCrypterScrypt().deriveKey("abc");
+        wallet.encrypt(new KeyCrypterScrypt(), aesKey);
+        assertTrue(wallet.isEncrypted());
         try {
             wallet.freshReceiveKey();
+            fail();
+        } catch (DeterministicUpgradeRequiredException e) {
+            // Expected.
+        }
+        try {
+            wallet.upgradeToDeterministic(Script.ScriptType.P2PKH, null);
+            fail();
         } catch (DeterministicUpgradeRequiresPassword e) {
             // Expected.
         }
-        wallet.upgradeToDeterministic(aesKey);
-        assertFalse(wallet.isDeterministicUpgradeRequired());
-        wallet.freshReceiveKey();  // works.
+
+        wallet.upgradeToDeterministic(Script.ScriptType.P2PKH, aesKey);
+        assertTrue(wallet.isEncrypted());
+        assertFalse(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2PKH));
+        assertTrue(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2WPKH));
+        assertEquals(Script.ScriptType.P2PKH, wallet.currentReceiveAddress().getOutputScriptType());
+        assertEquals(Script.ScriptType.P2PKH, wallet.freshReceiveAddress().getOutputScriptType());
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void shouldNotAddTransactionSignerThatIsNotReady() throws Exception {
-        wallet.addTransactionSigner(new NopTransactionSigner(false));
+    @Test
+    public void upgradeToDeterministic_basic_to_P2WPKH_unencrypted() throws Exception {
+        wallet = new Wallet(UNITTEST, KeyChainGroup.builder(UNITTEST).build());
+        wallet.importKeys(Arrays.asList(new ECKey(), new ECKey()));
+        assertFalse(wallet.isEncrypted());
+        assertTrue(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2PKH));
+        assertTrue(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2WPKH));
+        try {
+            wallet.freshReceiveKey();
+            fail();
+        } catch (DeterministicUpgradeRequiredException e) {
+            // Expected.
+        }
+
+        wallet.upgradeToDeterministic(Script.ScriptType.P2WPKH, null);
+        assertFalse(wallet.isEncrypted());
+        assertFalse(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2PKH));
+        assertFalse(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2WPKH));
+        assertEquals(Script.ScriptType.P2WPKH, wallet.currentReceiveAddress().getOutputScriptType());
+        assertEquals(Script.ScriptType.P2WPKH, wallet.freshReceiveAddress().getOutputScriptType());
     }
 
     @Test
-    public void transactionSignersShouldBeSerializedAlongWithWallet() throws Exception {
-        TransactionSigner signer = new NopTransactionSigner(true);
-        wallet.addTransactionSigner(signer);
-        assertEquals(2, wallet.getTransactionSigners().size());
-        wallet = roundTrip(wallet);
-        assertEquals(2, wallet.getTransactionSigners().size());
-        assertTrue(wallet.getTransactionSigners().get(1).isReady());
+    public void upgradeToDeterministic_basic_to_P2WPKH_encrypted() throws Exception {
+        wallet = new Wallet(UNITTEST, KeyChainGroup.builder(UNITTEST).build());
+        wallet.importKeys(Arrays.asList(new ECKey(), new ECKey()));
+        assertFalse(wallet.isEncrypted());
+        assertTrue(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2PKH));
+        assertTrue(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2WPKH));
+
+        KeyParameter aesKey = new KeyCrypterScrypt().deriveKey("abc");
+        wallet.encrypt(new KeyCrypterScrypt(), aesKey);
+        assertTrue(wallet.isEncrypted());
+        try {
+            wallet.upgradeToDeterministic(Script.ScriptType.P2WPKH, null);
+            fail();
+        } catch (DeterministicUpgradeRequiresPassword e) {
+            // Expected.
+        }
+
+        wallet.upgradeToDeterministic(Script.ScriptType.P2WPKH, aesKey);
+        assertTrue(wallet.isEncrypted());
+        assertFalse(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2PKH));
+        assertFalse(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2WPKH));
+        assertEquals(Script.ScriptType.P2WPKH, wallet.currentReceiveAddress().getOutputScriptType());
+        assertEquals(Script.ScriptType.P2WPKH, wallet.freshReceiveAddress().getOutputScriptType());
+    }
+
+    @Test
+    public void upgradeToDeterministic_P2PKH_to_P2WPKH_unencrypted() throws Exception {
+        wallet = Wallet.createDeterministic(UNITTEST, Script.ScriptType.P2PKH);
+        assertFalse(wallet.isEncrypted());
+        assertFalse(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2PKH));
+        assertTrue(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2WPKH));
+        assertEquals(Script.ScriptType.P2PKH, wallet.currentReceiveAddress().getOutputScriptType());
+        assertEquals(Script.ScriptType.P2PKH, wallet.freshReceiveAddress().getOutputScriptType());
+
+        wallet.upgradeToDeterministic(Script.ScriptType.P2WPKH, null);
+        assertFalse(wallet.isEncrypted());
+        assertFalse(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2PKH));
+        assertFalse(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2WPKH));
+        assertEquals(Script.ScriptType.P2WPKH, wallet.currentReceiveAddress().getOutputScriptType());
+        assertEquals(Script.ScriptType.P2WPKH, wallet.freshReceiveAddress().getOutputScriptType());
+    }
+
+    @Test
+    public void upgradeToDeterministic_P2PKH_to_P2WPKH_encrypted() throws Exception {
+        wallet = Wallet.createDeterministic(UNITTEST, Script.ScriptType.P2PKH);
+        assertFalse(wallet.isEncrypted());
+        assertFalse(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2PKH));
+        assertTrue(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2WPKH));
+
+        KeyParameter aesKey = new KeyCrypterScrypt().deriveKey("abc");
+        wallet.encrypt(new KeyCrypterScrypt(), aesKey);
+        assertTrue(wallet.isEncrypted());
+        assertEquals(Script.ScriptType.P2PKH, wallet.currentReceiveAddress().getOutputScriptType());
+        assertEquals(Script.ScriptType.P2PKH, wallet.freshReceiveAddress().getOutputScriptType());
+        try {
+            wallet.upgradeToDeterministic(Script.ScriptType.P2WPKH, null);
+            fail();
+        } catch (DeterministicUpgradeRequiresPassword e) {
+            // Expected.
+        }
+
+        wallet.upgradeToDeterministic(Script.ScriptType.P2WPKH, aesKey);
+        assertTrue(wallet.isEncrypted());
+        assertFalse(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2PKH));
+        assertFalse(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2WPKH));
+        assertEquals(Script.ScriptType.P2WPKH, wallet.currentReceiveAddress().getOutputScriptType());
+        assertEquals(Script.ScriptType.P2WPKH, wallet.freshReceiveAddress().getOutputScriptType());
+    }
+
+    @Test
+    public void upgradeToDeterministic_noDowngrade_unencrypted() throws Exception {
+        wallet = Wallet.createDeterministic(UNITTEST, Script.ScriptType.P2WPKH);
+        assertFalse(wallet.isEncrypted());
+        assertFalse(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2PKH));
+        assertFalse(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2WPKH));
+        assertEquals(Script.ScriptType.P2WPKH, wallet.currentReceiveAddress().getOutputScriptType());
+        assertEquals(Script.ScriptType.P2WPKH, wallet.freshReceiveAddress().getOutputScriptType());
+
+        wallet.upgradeToDeterministic(Script.ScriptType.P2PKH, null);
+        assertFalse(wallet.isEncrypted());
+        assertFalse(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2PKH));
+        assertFalse(wallet.isDeterministicUpgradeRequired(Script.ScriptType.P2WPKH));
+        assertEquals(Script.ScriptType.P2WPKH, wallet.currentReceiveAddress().getOutputScriptType());
+        assertEquals(Script.ScriptType.P2WPKH, wallet.freshReceiveAddress().getOutputScriptType());
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void shouldNotAddTransactionSignerThatIsNotReady() throws Exception {
+        wallet.addTransactionSigner(new NopTransactionSigner(false));
     }
 
     @Test
     public void watchingMarriedWallet() throws Exception {
         DeterministicKey watchKey = wallet.getWatchingKey();
-        String serialized = watchKey.serializePubB58(PARAMS);
-        Wallet wallet = Wallet.fromWatchingKeyB58(PARAMS, serialized, 0);
-        blockStore = new MemoryBlockStore(PARAMS);
-        chain = new BlockChain(PARAMS, wallet, blockStore);
+        String serialized = watchKey.serializePubB58(UNITTEST);
+        Wallet wallet = Wallet.fromWatchingKeyB58(UNITTEST, serialized, 0);
+        blockStore = new MemoryBlockStore(UNITTEST);
+        chain = new BlockChain(UNITTEST, wallet, blockStore);
 
-        final DeterministicKeyChain keyChain = new DeterministicKeyChain(new SecureRandom());
-        DeterministicKey partnerKey = DeterministicKey.deserializeB58(null, keyChain.getWatchingKey().serializePubB58(PARAMS), PARAMS);
+        final DeterministicKeyChain keyChain = DeterministicKeyChain.builder().random(new SecureRandom()).build();
+        DeterministicKey partnerKey = DeterministicKey.deserializeB58(null, keyChain.getWatchingKey().serializePubB58(UNITTEST), UNITTEST);
 
-        TransactionSigner signer = new StatelessTransactionSigner() {
+        TransactionSigner signer = new TransactionSigner() {
             @Override
             public boolean isReady() {
                 return true;
@@ -3439,10 +3565,10 @@ public void sendCoinsWithBroadcasterTest() throws InsufficientMoneyException {
     @Test
     public void fromKeys() {
         ECKey key = ECKey.fromPrivate(Utils.HEX.decode("00905b93f990267f4104f316261fc10f9f983551f9ef160854f40102eb71cffdcc"));
-        Wallet wallet = Wallet.fromKeys(PARAMS, Arrays.asList(key));
+        Wallet wallet = Wallet.fromKeys(UNITTEST, Arrays.asList(key));
         assertEquals(1, wallet.getImportedKeys().size());
         assertEquals(key, wallet.getImportedKeys().get(0));
-        wallet.upgradeToDeterministic(null);
+        wallet.upgradeToDeterministic(Script.ScriptType.P2PKH, null);
         String seed = wallet.getKeyChainSeed().toHexString();
         assertEquals("5ca8cd6c01aa004d3c5396c628b78a4a89462f412f460a845b594ac42eceaa264b0e14dcd4fe73d4ed08ce06f4c28facfa85042d26d784ab2798a870bb7af556", seed);
     }
@@ -3462,8 +3588,8 @@ public void reset() {
     @Test
     public void totalReceivedSent() throws Exception {
         // Receive 4 BTC in 2 separate transactions
-        Transaction toMe1 = createFakeTxWithoutChangeAddress(PARAMS, COIN.multiply(2), myAddress);
-        Transaction toMe2 = createFakeTxWithoutChangeAddress(PARAMS, COIN.multiply(2), myAddress);
+        Transaction toMe1 = createFakeTxWithoutChangeAddress(UNITTEST, COIN.multiply(2), myAddress);
+        Transaction toMe2 = createFakeTxWithoutChangeAddress(UNITTEST, COIN.multiply(2), myAddress);
         sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, toMe1, toMe2);
 
         // Check we calculate the total received correctly
@@ -3480,4 +3606,131 @@ public void totalReceivedSent() throws Exception {
 
         // TODO: test shared wallet calculation here
     }
+
+    @Test
+    public void testIrrelevantDoubleSpend() throws Exception {
+        Transaction tx0 = createFakeTx(UNITTEST);
+        Transaction tx1 = createFakeTx(UNITTEST);
+
+        Transaction tx2 = new Transaction(UNITTEST);
+        tx2.addInput(tx0.getOutput(0));
+        tx2.addOutput(COIN, myAddress);
+        tx2.addOutput(COIN, OTHER_ADDRESS);
+
+        sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, tx2, tx1, tx0);
+
+        // tx3 and tx4 double spend each other
+        Transaction tx3 = new Transaction(UNITTEST);
+        tx3.addInput(tx1.getOutput(0));
+        tx3.addOutput(COIN, myAddress);
+        tx3.addOutput(COIN, OTHER_ADDRESS);
+        wallet.receivePending(tx3, null);
+
+        // tx4 also spends irrelevant output from tx2
+        Transaction tx4 = new Transaction(UNITTEST);
+        tx4.addInput(tx1.getOutput(0)); // spends same output
+        tx4.addInput(tx2.getOutput(1));
+        tx4.addOutput(COIN, OTHER_ADDRESS);
+
+        // tx4 does not actually get added to wallet here since it by itself is irrelevant
+        sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, tx4);
+
+        // since tx4 is not saved, tx2 output 1 will have bad spentBy
+        wallet = roundTrip(wallet);
+
+        assertTrue(wallet.isConsistent());
+    }
+
+    @Test
+    public void overridingDeadTxTest() throws Exception {
+        Transaction tx0 = createFakeTx(UNITTEST);
+
+        Transaction tx1 = new Transaction(UNITTEST);
+        tx1.addInput(tx0.getOutput(0));
+        tx1.addOutput(COIN, OTHER_ADDRESS);
+        tx1.addOutput(COIN, OTHER_ADDRESS);
+        tx1.addOutput(COIN, myAddress); // to save this in wallet
+
+        sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, tx0, tx1);
+
+        // tx2, tx3 and tx4 double spend each other
+        Transaction tx2 = new Transaction(UNITTEST);
+        tx2.addInput(tx1.getOutput(0));
+        tx2.addInput(tx1.getOutput(1));
+        tx2.addOutput(COIN, myAddress);
+        tx2.addOutput(COIN, OTHER_ADDRESS);
+        wallet.receivePending(tx2, null);
+
+        // irrelevant to the wallet
+        Transaction tx3 = new Transaction(UNITTEST);
+        tx3.addInput(tx1.getOutput(0)); // spends same output as tx2
+        tx3.addOutput(COIN, OTHER_ADDRESS);
+
+        // irrelevant to the wallet
+        Transaction tx4 = new Transaction(UNITTEST);
+        tx4.addInput(tx1.getOutput(1)); // spends different output, but also in tx2
+        tx4.addOutput(COIN, OTHER_ADDRESS);
+
+        assertUnspent(tx1);
+        assertPending(tx2);
+        sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, tx3);
+        assertUnspent(tx1);
+        assertDead(tx2);
+        assertEquals(2, wallet.transactions.size()); // tx3 not saved
+        sendMoneyToWallet(AbstractBlockChain.NewBlockType.BEST_CHAIN, tx4);
+        assertUnspent(tx1);
+        assertDead(tx2);
+        assertEquals(2, wallet.transactions.size()); // tx4 not saved
+
+        // this will fail if tx4 does not get disconnected from tx1
+        wallet = roundTrip(wallet);
+        assertTrue(wallet.isConsistent());
+    }
+
+    @Test
+    public void scriptTypeKeyChainRestrictions() {
+        // Set up chains: basic chain, P2PKH deterministric chain, P2WPKH deterministic chain.
+        DeterministicKeyChain p2pkhChain = DeterministicKeyChain.builder().random(new SecureRandom())
+                .outputScriptType(Script.ScriptType.P2PKH).build();
+        DeterministicKeyChain p2wpkhChain = DeterministicKeyChain.builder().random(new SecureRandom())
+                .outputScriptType(Script.ScriptType.P2WPKH).build();
+        KeyChainGroup kcg = KeyChainGroup.builder(UNITTEST).addChain(p2pkhChain).addChain(p2wpkhChain).build();
+        Wallet wallet = new Wallet(UNITTEST, kcg);
+
+        // Set up one key from each chain.
+        ECKey importedKey = new ECKey();
+        wallet.importKey(importedKey);
+        ECKey p2pkhKey = p2pkhChain.getKey(KeyPurpose.RECEIVE_FUNDS);
+        ECKey p2wpkhKey = p2wpkhChain.getKey(KeyPurpose.RECEIVE_FUNDS);
+
+        // Test imported key: it's not limited to script type.
+        assertTrue(wallet.isAddressMine(LegacyAddress.fromKey(UNITTEST, importedKey)));
+        assertTrue(wallet.isAddressMine(SegwitAddress.fromKey(UNITTEST, importedKey)));
+        assertEquals(importedKey, wallet.findKeyFromAddress(LegacyAddress.fromKey(UNITTEST, importedKey)));
+        assertEquals(importedKey, wallet.findKeyFromAddress(SegwitAddress.fromKey(UNITTEST, importedKey)));
+
+        // Test key from P2PKH chain: it's limited to P2PKH addresses
+        assertTrue(wallet.isAddressMine(LegacyAddress.fromKey(UNITTEST, p2pkhKey)));
+        assertFalse(wallet.isAddressMine(SegwitAddress.fromKey(UNITTEST, p2pkhKey)));
+        assertEquals(p2pkhKey, wallet.findKeyFromAddress(LegacyAddress.fromKey(UNITTEST, p2pkhKey)));
+        assertNull(wallet.findKeyFromAddress(SegwitAddress.fromKey(UNITTEST, p2pkhKey)));
+
+        // Test key from P2WPKH chain: it's limited to P2WPKH addresses
+        assertFalse(wallet.isAddressMine(LegacyAddress.fromKey(UNITTEST, p2wpkhKey)));
+        assertTrue(wallet.isAddressMine(SegwitAddress.fromKey(UNITTEST, p2wpkhKey)));
+        assertNull(wallet.findKeyFromAddress(LegacyAddress.fromKey(UNITTEST, p2wpkhKey)));
+        assertEquals(p2wpkhKey, wallet.findKeyFromAddress(SegwitAddress.fromKey(UNITTEST, p2wpkhKey)));
+    }
+
+    @Test
+    public void roundtripViaMnemonicCode() {
+        Wallet wallet = Wallet.createDeterministic(UNITTEST, Script.ScriptType.P2WPKH);
+        List<String> mnemonicCode = wallet.getKeyChainSeed().getMnemonicCode();
+        final DeterministicSeed clonedSeed = new DeterministicSeed(mnemonicCode, null, "",
+                wallet.getEarliestKeyCreationTime());
+        Wallet clone = Wallet.fromSeed(UNITTEST, clonedSeed, Script.ScriptType.P2WPKH);
+        assertEquals(wallet.currentReceiveKey(), clone.currentReceiveKey());
+        assertEquals(wallet.freshReceiveAddress(Script.ScriptType.P2PKH),
+                clone.freshReceiveAddress(Script.ScriptType.P2PKH));
+    }
 }
diff --git a/core/src/test/resources/org/bitcoinj/core/LegacyAddressTestDataset.txt b/core/src/test/resources/org/bitcoinj/core/LegacyAddressTestDataset.txt
new file mode 100644
index 00000000000..bbd92efb5bb
--- /dev/null
+++ b/core/src/test/resources/org/bitcoinj/core/LegacyAddressTestDataset.txt
@@ -0,0 +1,32 @@
+1Dorian4RoXcnBv9hnQ4Y2C1an6NJ4UrjX,1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P
+12prgkB2jumVVh1iSQaSLqroe81RyaqkyR,1ArPkmHt15fYrNJ8br7GYVduZiugtSfAC8
+13G22VU8uXCsmh2PZ8Vh8CnWUtkz1mpDnY,1QJ3i7HhMX9ymKNJU8szirD57VyCUop8rv
+1CK6KHY6MHgYvmRQ4PAafKYDrg1ejbH1cE,1DWsmHpyELq51pYUxCjBjwBpt4yyXfEjif
+1CTC2u5B6DhBe8LkaSnZvxNeScrBByYiFv,1H1hGnwaQed7JPPqYgfYR2HqLyGfMnMZ92
+1GFpf1cAgCneQrLHn1AWL95FXZ3196gLbi,1L59Gh2FUk6bsG7t7LzGuti3PwMT6vKDta
+12vnBzWDDuftQYqjSbiYMuT66KmAGsXYYE,1PLtsSnkabRETVYRvyFUSAKTHbtL7FZvgY
+19pH85mQvmLn45xFj3K3or3EaijUjMy4xj,1PsqoEpNo9Yb2PNpc4PbfhQuHzxz1JCK34
+1BPuMoYqgE3kYL76qAF6SrL2nJMtyKCbcM,1KpJZ9Q6tj2yegQAzLUmmov72d1pATE9Uu
+1C1mCxRukix1KfegAY5zQQJV7samAciZpv,1Cudf98s16kW7152TwVsidYPhrPiYwLmJR
+1J962fubMgq1YNGdT7EVMY91A1ULh9s9Ji,1QA74FEhzhLi23pVZjGQ2yWSGaep2Go5pq
+12i7xva6bNNovaXW9a869w4Chze9VnvZjN,1PuoxiYCmsady21q6DSCNpwdNDQs1yujcG
+16fFb8vPAQ4RPjtAfkQdHMpoTognrnTzs7,1KMVb5vJqD1ceQSHqUczFHHTVmm1v9rCEH
+19frvQBjDhYnv9qjsC6YQs9nxfPCuFRsFe,1MTxMFJtCPuLHmnG7Ecef28su5DPxbaep5
+17XrM9u3Edkh1PR8GpX5kfNZLn1JmrxGH7,1LfzzJ5EGpR81sxcbHVkcNvVsSDt6ZFJsz
+1Ke11ARCEN6ynFtPdrTdFPGs1LQ4ukugDi,1Nv9scQTGdijZhHsWbbJf3kY1dZZ6sFJ1u
+14xLHSd2vLMSSe7RLjUw6xtyLQCVSq8Mpa,1NKLb68QACKUqtGiwSN5W9znW5RZFCnbYV
+1BjmkScvLX8kFn9FqtRDn79vfjhxjnW2ap,1EWyYmfyv7PvLz4DsCyWZf1zhavskfJqGG
+16vi5dxVZXMRzF9Pt2EHDSMipYeePmQCyJ,1LvCnrgKryx7QEbsaPT9NJb1S8xMi8nWDi
+13TdqLm25WgZw5NwjmYfdrRLRfob26GsM5,13apxjFiTBvqQxyFxPk7MCFTzAKgjaX6R4
+1EK7ZHeh13wQG4b3z8wF423xbxT6HydR5i,1JK8voQbxSbGqJ2mShaVVepRKZ6xMvkJk8
+13w8xV2XK5BX3rVLm5avvoAEf1JvBmwF2r,15xgB2X1hj7F2Ek2V3YfajvCrp2PbuSmMC
+1K6PRbv68NBzcmMx3PSTms2DNvWjvX5yNg,1KHn81uJcVxcEeFTG5w78i2Pz4dtkeD78c
+1AerGGVb9byLp1WK4r88f9wwGeM5YFQyfz,1Fn9WHnLe2CdA1aZCZbTAYnjzkD7mTL4LT
+1ELt4mSqm5hHnQ5k8WQRG75aEdEWCJ1oyc,1F3tWDBPqjPbbCVDJEN3cv3x7hDrbkuXze
+144Za3x1HSN4UtAqCP2Ym8xRsXkt95A8AL,1NURJdpmh15ostB6kweuummHRxgyMHWhi6
+1K6PRbv68NBzcmMx3PSTms2DNvWjvX5yNg,1KHn81uJcVxcEeFTG5w78i2Pz4dtkeD78c
+1AerGGVb9byLp1WK4r88f9wwGeM5YFQyfz,1Fn9WHnLe2CdA1aZCZbTAYnjzkD7mTL4LT
+1ELt4mSqm5hHnQ5k8WQRG75aEdEWCJ1oyc,1F3tWDBPqjPbbCVDJEN3cv3x7hDrbkuXze
+144Za3x1HSN4UtAqCP2Ym8xRsXkt95A8AL,1NURJdpmh15ostB6kweuummHRxgyMHWhi6
+14NGL5LYhwkWREpeo2AMWU6HgbDfdqAuZC,1GMyyYHKC3RKqmjixxxoHnsDJ46hBsQbfS
+17kuSgebpmoA8kbKQaiaokCBbWnteDtL27,19PUE9SnfhxoCp42eQCmDbWtqrLXat8sh2
diff --git a/core/src/test/resources/org/bitcoinj/core/block481815.dat b/core/src/test/resources/org/bitcoinj/core/block481815.dat
new file mode 100644
index 00000000000..ed358c20166
Binary files /dev/null and b/core/src/test/resources/org/bitcoinj/core/block481815.dat differ
diff --git a/core/src/test/resources/org/bitcoinj/core/block481829.dat b/core/src/test/resources/org/bitcoinj/core/block481829.dat
new file mode 100644
index 00000000000..6f1b1c3e580
Binary files /dev/null and b/core/src/test/resources/org/bitcoinj/core/block481829.dat differ
diff --git a/core/src/test/resources/org/bitcoinj/core/block_testnet700000.dat b/core/src/test/resources/org/bitcoinj/core/block_testnet700000.dat
new file mode 100644
index 00000000000..e1a248d2d97
Binary files /dev/null and b/core/src/test/resources/org/bitcoinj/core/block_testnet700000.dat differ
diff --git a/core/src/test/resources/org/bitcoinj/core/checkpointmanagertest/noCheckpoints.checkpoints.txt b/core/src/test/resources/org/bitcoinj/core/checkpointmanagertest/noCheckpoints.checkpoints.txt
new file mode 100644
index 00000000000..e72a93bfac3
--- /dev/null
+++ b/core/src/test/resources/org/bitcoinj/core/checkpointmanagertest/noCheckpoints.checkpoints.txt
@@ -0,0 +1,3 @@
+TXT CHECKPOINTS 1
+0
+0
\ No newline at end of file
diff --git a/orchid/README b/core/src/test/resources/org/bitcoinj/core/checkpointmanagertest/unsupportedFormat.checkpoints.txt
similarity index 100%
rename from orchid/README
rename to core/src/test/resources/org/bitcoinj/core/checkpointmanagertest/unsupportedFormat.checkpoints.txt
diff --git a/core/src/test/resources/org/bitcoinj/core/checkpointmanagertest/validTextualFormat.checkpoints.txt b/core/src/test/resources/org/bitcoinj/core/checkpointmanagertest/validTextualFormat.checkpoints.txt
new file mode 100644
index 00000000000..be997738eef
--- /dev/null
+++ b/core/src/test/resources/org/bitcoinj/core/checkpointmanagertest/validTextualFormat.checkpoints.txt
@@ -0,0 +1,4 @@
+TXT CHECKPOINTS 1
+0
+1
+AAAAAAAAB+EH4QfhAAAH4AEAAAApmwX6UCEnJcYIKTa7HO3pFkqqNhAzJVBMdEuGAAAAAPSAvVCBUypCbBW/OqU0oIF7ISF84h2spOqHrFCWN9Zw6r6/T///AB0E5oOO
\ No newline at end of file
diff --git a/core/src/test/resources/org/bitcoinj/script/script_invalid.json b/core/src/test/resources/org/bitcoinj/script/script_invalid.json
deleted file mode 100644
index 75de4716f85..00000000000
--- a/core/src/test/resources/org/bitcoinj/script/script_invalid.json
+++ /dev/null
@@ -1,377 +0,0 @@
-[
-["", "DEPTH", "P2SH,STRICTENC",   "Test the test: we should have an empty stack after scriptSig evaluation"],
-["  ", "DEPTH", "P2SH,STRICTENC", "and multiple spaces should not change that."],
-["   ", "DEPTH", "P2SH,STRICTENC"],
-["    ", "DEPTH", "P2SH,STRICTENC"],
-
-["", "", "P2SH,STRICTENC"],
-["", "NOP", "P2SH,STRICTENC"],
-["", "NOP DEPTH", "P2SH,STRICTENC"],
-["NOP", "", "P2SH,STRICTENC"],
-["NOP", "DEPTH", "P2SH,STRICTENC"],
-["NOP","NOP", "P2SH,STRICTENC"],
-["NOP","NOP DEPTH", "P2SH,STRICTENC"],
-
-["DEPTH", "", "P2SH,STRICTENC"],
-
-["0x4c01","0x01 NOP", "P2SH,STRICTENC", "PUSHDATA1 with not enough bytes"],
-["0x4d0200ff","0x01 NOP", "P2SH,STRICTENC", "PUSHDATA2 with not enough bytes"],
-["0x4e03000000ffff","0x01 NOP", "P2SH,STRICTENC", "PUSHDATA4 with not enough bytes"],
-
-["1", "IF 0x50 ENDIF 1", "P2SH,STRICTENC", "0x50 is reserved"],
-["0x52", "0x5f ADD 0x60 EQUAL", "P2SH,STRICTENC", "0x51 through 0x60 push 1 through 16 onto stack"],
-["0","NOP", "P2SH,STRICTENC"],
-["1", "IF VER ELSE 1 ENDIF", "P2SH,STRICTENC", "VER non-functional"],
-["0", "IF VERIF ELSE 1 ENDIF", "P2SH,STRICTENC", "VERIF illegal everywhere"],
-["0", "IF ELSE 1 ELSE VERIF ENDIF", "P2SH,STRICTENC", "VERIF illegal everywhere"],
-["0", "IF VERNOTIF ELSE 1 ENDIF", "P2SH,STRICTENC", "VERNOTIF illegal everywhere"],
-["0", "IF ELSE 1 ELSE VERNOTIF ENDIF", "P2SH,STRICTENC", "VERNOTIF illegal everywhere"],
-
-["1 IF", "1 ENDIF", "P2SH,STRICTENC", "IF/ENDIF can't span scriptSig/scriptPubKey"],
-["1 IF 0 ENDIF", "1 ENDIF", "P2SH,STRICTENC"],
-["1 ELSE 0 ENDIF", "1", "P2SH,STRICTENC"],
-["0 NOTIF", "123", "P2SH,STRICTENC"],
-
-["0", "DUP IF ENDIF", "P2SH,STRICTENC"],
-["0", "IF 1 ENDIF", "P2SH,STRICTENC"],
-["0", "DUP IF ELSE ENDIF", "P2SH,STRICTENC"],
-["0", "IF 1 ELSE ENDIF", "P2SH,STRICTENC"],
-["0", "NOTIF ELSE 1 ENDIF", "P2SH,STRICTENC"],
-
-["0 1", "IF IF 1 ELSE 0 ENDIF ENDIF", "P2SH,STRICTENC"],
-["0 0", "IF IF 1 ELSE 0 ENDIF ENDIF", "P2SH,STRICTENC"],
-["1 0", "IF IF 1 ELSE 0 ENDIF ELSE IF 0 ELSE 1 ENDIF ENDIF", "P2SH,STRICTENC"],
-["0 1", "IF IF 1 ELSE 0 ENDIF ELSE IF 0 ELSE 1 ENDIF ENDIF", "P2SH,STRICTENC"],
-
-["0 0", "NOTIF IF 1 ELSE 0 ENDIF ENDIF", "P2SH,STRICTENC"],
-["0 1", "NOTIF IF 1 ELSE 0 ENDIF ENDIF", "P2SH,STRICTENC"],
-["1 1", "NOTIF IF 1 ELSE 0 ENDIF ELSE IF 0 ELSE 1 ENDIF ENDIF", "P2SH,STRICTENC"],
-["0 0", "NOTIF IF 1 ELSE 0 ENDIF ELSE IF 0 ELSE 1 ENDIF ENDIF", "P2SH,STRICTENC"],
-
-["1", "IF RETURN ELSE ELSE 1 ENDIF", "P2SH,STRICTENC", "Multiple ELSEs"],
-["1", "IF 1 ELSE ELSE RETURN ENDIF", "P2SH,STRICTENC"],
-
-["1", "ENDIF", "P2SH,STRICTENC", "Malformed IF/ELSE/ENDIF sequence"],
-["1", "ELSE ENDIF", "P2SH,STRICTENC"],
-["1", "ENDIF ELSE", "P2SH,STRICTENC"],
-["1", "ENDIF ELSE IF", "P2SH,STRICTENC"],
-["1", "IF ELSE ENDIF ELSE", "P2SH,STRICTENC"],
-["1", "IF ELSE ENDIF ELSE ENDIF", "P2SH,STRICTENC"],
-["1", "IF ENDIF ENDIF", "P2SH,STRICTENC"],
-["1", "IF ELSE ELSE ENDIF ENDIF", "P2SH,STRICTENC"],
-
-["1", "RETURN", "P2SH,STRICTENC"],
-["1", "DUP IF RETURN ENDIF", "P2SH,STRICTENC"],
-
-["1", "RETURN 'data'", "P2SH,STRICTENC", "canonical prunable txout format"],
-["0 IF", "RETURN ENDIF 1", "P2SH,STRICTENC", "still prunable because IF/ENDIF can't span scriptSig/scriptPubKey"],
-
-["0", "VERIFY 1", "P2SH,STRICTENC"],
-["1", "VERIFY", "P2SH,STRICTENC"],
-["1", "VERIFY 0", "P2SH,STRICTENC"],
-
-["1 TOALTSTACK", "FROMALTSTACK 1", "P2SH,STRICTENC", "alt stack not shared between sig/pubkey"],
-
-["IFDUP", "DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["DROP", "DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["DUP", "DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["1", "DUP 1 ADD 2 EQUALVERIFY 0 EQUAL", "P2SH,STRICTENC"],
-["NOP", "NIP", "P2SH,STRICTENC"],
-["NOP", "1 NIP", "P2SH,STRICTENC"],
-["NOP", "1 0 NIP", "P2SH,STRICTENC"],
-["NOP", "OVER 1", "P2SH,STRICTENC"],
-["1", "OVER", "P2SH,STRICTENC"],
-["0 1", "OVER DEPTH 3 EQUALVERIFY", "P2SH,STRICTENC"],
-["19 20 21", "PICK 19 EQUALVERIFY DEPTH 2 EQUAL", "P2SH,STRICTENC"],
-["NOP", "0 PICK", "P2SH,STRICTENC"],
-["1", "-1 PICK", "P2SH,STRICTENC"],
-["19 20 21", "0 PICK 20 EQUALVERIFY DEPTH 3 EQUAL", "P2SH,STRICTENC"],
-["19 20 21", "1 PICK 21 EQUALVERIFY DEPTH 3 EQUAL", "P2SH,STRICTENC"],
-["19 20 21", "2 PICK 22 EQUALVERIFY DEPTH 3 EQUAL", "P2SH,STRICTENC"],
-["NOP", "0 ROLL", "P2SH,STRICTENC"],
-["1", "-1 ROLL", "P2SH,STRICTENC"],
-["19 20 21", "0 ROLL 20 EQUALVERIFY DEPTH 2 EQUAL", "P2SH,STRICTENC"],
-["19 20 21", "1 ROLL 21 EQUALVERIFY DEPTH 2 EQUAL", "P2SH,STRICTENC"],
-["19 20 21", "2 ROLL 22 EQUALVERIFY DEPTH 2 EQUAL", "P2SH,STRICTENC"],
-["NOP", "ROT 1", "P2SH,STRICTENC"],
-["NOP", "1 ROT 1", "P2SH,STRICTENC"],
-["NOP", "1 2 ROT 1", "P2SH,STRICTENC"],
-["NOP", "0 1 2 ROT", "P2SH,STRICTENC"],
-["NOP", "SWAP 1", "P2SH,STRICTENC"],
-["1", "SWAP 1", "P2SH,STRICTENC"],
-["0 1", "SWAP 1 EQUALVERIFY", "P2SH,STRICTENC"],
-["NOP", "TUCK 1", "P2SH,STRICTENC"],
-["1", "TUCK 1", "P2SH,STRICTENC"],
-["1 0", "TUCK DEPTH 3 EQUALVERIFY SWAP 2DROP", "P2SH,STRICTENC"],
-["NOP", "2DUP 1", "P2SH,STRICTENC"],
-["1", "2DUP 1", "P2SH,STRICTENC"],
-["NOP", "3DUP 1", "P2SH,STRICTENC"],
-["1", "3DUP 1", "P2SH,STRICTENC"],
-["1 2", "3DUP 1", "P2SH,STRICTENC"],
-["NOP", "2OVER 1", "P2SH,STRICTENC"],
-["1", "2 3 2OVER 1", "P2SH,STRICTENC"],
-["NOP", "2SWAP 1", "P2SH,STRICTENC"],
-["1", "2 3 2SWAP 1", "P2SH,STRICTENC"],
-
-["'a' 'b'", "CAT", "P2SH,STRICTENC", "CAT disabled"],
-["'a' 'b' 0", "IF CAT ELSE 1 ENDIF", "P2SH,STRICTENC", "CAT disabled"],
-["'abc' 1 1", "SUBSTR", "P2SH,STRICTENC", "SUBSTR disabled"],
-["'abc' 1 1 0", "IF SUBSTR ELSE 1 ENDIF", "P2SH,STRICTENC", "SUBSTR disabled"],
-["'abc' 2 0", "IF LEFT ELSE 1 ENDIF", "P2SH,STRICTENC", "LEFT disabled"],
-["'abc' 2 0", "IF RIGHT ELSE 1 ENDIF", "P2SH,STRICTENC", "RIGHT disabled"],
-
-["NOP", "SIZE 1", "P2SH,STRICTENC"],
-
-["'abc'", "IF INVERT ELSE 1 ENDIF", "P2SH,STRICTENC", "INVERT disabled"],
-["1 2 0 IF AND ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "AND disabled"],
-["1 2 0 IF OR ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "OR disabled"],
-["1 2 0 IF XOR ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "XOR disabled"],
-["2 0 IF 2MUL ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "2MUL disabled"],
-["2 0 IF 2DIV ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "2DIV disabled"],
-["2 2 0 IF MUL ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "MUL disabled"],
-["2 2 0 IF DIV ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "DIV disabled"],
-["2 2 0 IF MOD ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "MOD disabled"],
-["2 2 0 IF LSHIFT ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "LSHIFT disabled"],
-["2 2 0 IF RSHIFT ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "RSHIFT disabled"],
-
-["0 1","EQUAL", "P2SH,STRICTENC"],
-["1 1 ADD", "0 EQUAL", "P2SH,STRICTENC"],
-["11 1 ADD 12 SUB", "11 EQUAL", "P2SH,STRICTENC"],
-
-["2147483648 0 ADD", "NOP", "P2SH,STRICTENC", "arithmetic operands must be in range [-2^31...2^31] "],
-["-2147483648 0 ADD", "NOP", "P2SH,STRICTENC", "arithmetic operands must be in range [-2^31...2^31] "],
-["2147483647 DUP ADD", "4294967294 NUMEQUAL", "P2SH,STRICTENC", "NUMEQUAL must be in numeric range"],
-["'abcdef' NOT", "0 EQUAL", "P2SH,STRICTENC", "NOT is an arithmetic operand"],
-
-["2 DUP MUL", "4 EQUAL", "P2SH,STRICTENC", "disabled"],
-["2 DUP DIV", "1 EQUAL", "P2SH,STRICTENC", "disabled"],
-["2 2MUL", "4 EQUAL", "P2SH,STRICTENC", "disabled"],
-["2 2DIV", "1 EQUAL", "P2SH,STRICTENC", "disabled"],
-["7 3 MOD", "1 EQUAL", "P2SH,STRICTENC", "disabled"],
-["2 2 LSHIFT", "8 EQUAL", "P2SH,STRICTENC", "disabled"],
-["2 1 RSHIFT", "1 EQUAL", "P2SH,STRICTENC", "disabled"],
-
-["1","NOP1 NOP2 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 2 EQUAL", "P2SH,STRICTENC"],
-["'NOP_1_to_10' NOP1 NOP2 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_11' EQUAL", "P2SH,STRICTENC"],
-
-["0x50","1", "P2SH,STRICTENC", "opcode 0x50 is reserved"],
-["1", "IF 0xba ELSE 1 ENDIF", "P2SH,STRICTENC", "opcodes above NOP10 invalid if executed"],
-["1", "IF 0xbb ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xbc ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xbd ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xbe ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xbf ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xc0 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xc1 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xc2 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xc3 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xc4 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xc5 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xc6 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xc7 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xc8 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xc9 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xca ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xcb ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xcc ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xcd ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xce ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xcf ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xd0 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xd1 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xd2 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xd3 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xd4 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xd5 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xd6 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xd7 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xd8 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xd9 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xda ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xdb ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xdc ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xdd ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xde ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xdf ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xe0 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xe1 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xe2 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xe3 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xe4 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xe5 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xe6 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xe7 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xe8 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xe9 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xea ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xeb ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xec ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xed ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xee ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xef ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xf0 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xf1 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xf2 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xf3 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xf4 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xf5 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xf6 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xf7 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xf8 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xf9 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xfa ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xfb ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xfc ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xfd ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xfe ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 0xff ELSE 1 ENDIF", "P2SH,STRICTENC"],
-
-["1 IF 1 ELSE", "0xff ENDIF", "P2SH,STRICTENC", "invalid because scriptSig and scriptPubKey are processed separately"],
-
-["NOP", "RIPEMD160", "P2SH,STRICTENC"],
-["NOP", "SHA1", "P2SH,STRICTENC"],
-["NOP", "SHA256", "P2SH,STRICTENC"],
-["NOP", "HASH160", "P2SH,STRICTENC"],
-["NOP", "HASH256", "P2SH,STRICTENC"],
-
-["NOP",
-"'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'",
-"P2SH,STRICTENC",
-">520 byte push"],
-["0",
-"IF 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' ENDIF 1",
-"P2SH,STRICTENC",
-">520 byte push in non-executed IF branch"],
-["1",
-"0x61616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161",
-"P2SH,STRICTENC",
-">201 opcodes executed. 0x61 is NOP"],
-["0",
-"IF 0x6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 ENDIF 1",
-"P2SH,STRICTENC",
-">201 opcodes including non-executed IF branch. 0x61 is NOP"],
-["1 2 3 4 5 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f",
-"1 2 3 4 5 6 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f",
-"P2SH,STRICTENC",
-">1,000 stack size (0x6f is 3DUP)"],
-["1 2 3 4 5 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f",
-"1 TOALTSTACK 2 TOALTSTACK 3 4 5 6 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f",
-"P2SH,STRICTENC",
-">1,000 stack+altstack size"],
-["NOP",
-"0 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f 2DUP 0x616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161",
-"P2SH,STRICTENC",
-"10,001-byte scriptPubKey"],
-
-["NOP1","NOP10", "P2SH,STRICTENC"],
-
-["1","VER", "P2SH,STRICTENC", "OP_VER is reserved"],
-["1","VERIF", "P2SH,STRICTENC", "OP_VERIF is reserved"],
-["1","VERNOTIF", "P2SH,STRICTENC", "OP_VERNOTIF is reserved"],
-["1","RESERVED", "P2SH,STRICTENC", "OP_RESERVED is reserved"],
-["1","RESERVED1", "P2SH,STRICTENC", "OP_RESERVED1 is reserved"],
-["1","RESERVED2", "P2SH,STRICTENC", "OP_RESERVED2 is reserved"],
-["1","0xba", "P2SH,STRICTENC", "0xba == OP_NOP10 + 1"],
-
-["2147483648", "1ADD 1", "P2SH,STRICTENC", "We cannot do math on 5-byte integers"],
-["2147483648", "NEGATE 1", "P2SH,STRICTENC", "We cannot do math on 5-byte integers"],
-["-2147483648", "1ADD 1", "P2SH,STRICTENC", "Because we use a sign bit, -2147483648 is also 5 bytes"],
-["2147483647", "1ADD 1SUB 1", "P2SH,STRICTENC", "We cannot do math on 5-byte integers, even if the result is 4-bytes"],
-["2147483648", "1SUB 1", "P2SH,STRICTENC", "We cannot do math on 5-byte integers, even if the result is 4-bytes"],
-
-["2147483648 1", "BOOLOR 1", "P2SH,STRICTENC", "We cannot do BOOLOR on 5-byte integers (but we can still do IF etc)"],
-["2147483648 1", "BOOLAND 1", "P2SH,STRICTENC", "We cannot do BOOLAND on 5-byte integers"],
-
-["1", "1 ENDIF", "P2SH,STRICTENC", "ENDIF without IF"],
-["1", "IF 1", "P2SH,STRICTENC", "IF without ENDIF"],
-["1 IF 1", "ENDIF", "P2SH,STRICTENC", "IFs don't carry over"],
-
-["NOP", "IF 1 ENDIF", "P2SH,STRICTENC", "The following tests check the if(stack.size() < N) tests in each opcode"],
-["NOP", "NOTIF 1 ENDIF", "P2SH,STRICTENC", "They are here to catch copy-and-paste errors"],
-["NOP", "VERIFY 1", "P2SH,STRICTENC", "Most of them are duplicated elsewhere,"],
-
-["NOP", "TOALTSTACK 1", "P2SH,STRICTENC", "but, hey, more is always better, right?"],
-["1", "FROMALTSTACK", "P2SH,STRICTENC"],
-["1", "2DROP 1", "P2SH,STRICTENC"],
-["1", "2DUP", "P2SH,STRICTENC"],
-["1 1", "3DUP", "P2SH,STRICTENC"],
-["1 1 1", "2OVER", "P2SH,STRICTENC"],
-["1 1 1 1 1", "2ROT", "P2SH,STRICTENC"],
-["1 1 1", "2SWAP", "P2SH,STRICTENC"],
-["NOP", "IFDUP 1", "P2SH,STRICTENC"],
-["NOP", "DROP 1", "P2SH,STRICTENC"],
-["NOP", "DUP 1", "P2SH,STRICTENC"],
-["1", "NIP", "P2SH,STRICTENC"],
-["1", "OVER", "P2SH,STRICTENC"],
-["1 1 1 3", "PICK", "P2SH,STRICTENC"],
-["0", "PICK 1", "P2SH,STRICTENC"],
-["1 1 1 3", "ROLL", "P2SH,STRICTENC"],
-["0", "ROLL 1", "P2SH,STRICTENC"],
-["1 1", "ROT", "P2SH,STRICTENC"],
-["1", "SWAP", "P2SH,STRICTENC"],
-["1", "TUCK", "P2SH,STRICTENC"],
-
-["NOP", "SIZE 1", "P2SH,STRICTENC"],
-
-["1", "EQUAL 1", "P2SH,STRICTENC"],
-["1", "EQUALVERIFY 1", "P2SH,STRICTENC"],
-
-["NOP", "1ADD 1", "P2SH,STRICTENC"],
-["NOP", "1SUB 1", "P2SH,STRICTENC"],
-["NOP", "NEGATE 1", "P2SH,STRICTENC"],
-["NOP", "ABS 1", "P2SH,STRICTENC"],
-["NOP", "NOT 1", "P2SH,STRICTENC"],
-["NOP", "0NOTEQUAL 1", "P2SH,STRICTENC"],
-
-["1", "ADD", "P2SH,STRICTENC"],
-["1", "SUB", "P2SH,STRICTENC"],
-["1", "BOOLAND", "P2SH,STRICTENC"],
-["1", "BOOLOR", "P2SH,STRICTENC"],
-["1", "NUMEQUAL", "P2SH,STRICTENC"],
-["1", "NUMEQUALVERIFY 1", "P2SH,STRICTENC"],
-["1", "NUMNOTEQUAL", "P2SH,STRICTENC"],
-["1", "LESSTHAN", "P2SH,STRICTENC"],
-["1", "GREATERTHAN", "P2SH,STRICTENC"],
-["1", "LESSTHANOREQUAL", "P2SH,STRICTENC"],
-["1", "GREATERTHANOREQUAL", "P2SH,STRICTENC"],
-["1", "MIN", "P2SH,STRICTENC"],
-["1", "MAX", "P2SH,STRICTENC"],
-["1 1", "WITHIN", "P2SH,STRICTENC"],
-
-["NOP", "RIPEMD160 1", "P2SH,STRICTENC"],
-["NOP", "SHA1 1", "P2SH,STRICTENC"],
-["NOP", "SHA256 1", "P2SH,STRICTENC"],
-["NOP", "HASH160 1", "P2SH,STRICTENC"],
-["NOP", "HASH256 1", "P2SH,STRICTENC"],
-
-["",
-"0 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG",
-"P2SH,STRICTENC",
-"202 CHECKMULTISIGS, fails due to 201 op limit"],
-
-["1",
-"0 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY",
-"P2SH,STRICTENC"],
-
-["",
-"NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG",
-"P2SH,STRICTENC",
-"Fails due to 201 sig op limit"],
-
-["1",
-"NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY",
-"P2SH,STRICTENC"],
-
-
-["0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21", "21 CHECKMULTISIG 1", "P2SH,STRICTENC", "nPubKeys > 20"],
-["0 'sig' 1 0", "CHECKMULTISIG 1", "P2SH,STRICTENC", "nSigs > nPubKeys"],
-
-
-["NOP 0x01 1", "HASH160 0x14 0xda1745e9b549bd0bfa1a569971c77eba30cd5a4b EQUAL", "P2SH,STRICTENC", "Tests for Script.IsPushOnly()"],
-["NOP1 0x01 1", "HASH160 0x14 0xda1745e9b549bd0bfa1a569971c77eba30cd5a4b EQUAL", "P2SH,STRICTENC"],
-
-["0 0x01 0x50", "HASH160 0x14 0xece424a6bb6ddf4db592c0faed60685047a361b1 EQUAL", "P2SH,STRICTENC", "OP_RESERVED in P2SH should fail"],
-["0 0x01 VER", "HASH160 0x14 0x0f4d7845db968f2a81b530b6f3c1d6246d4c7e01 EQUAL", "P2SH,STRICTENC", "OP_VER in P2SH should fail"],
-
-["0x00", "'00' EQUAL", "P2SH,STRICTENC", "Basic OP_0 execution"]
-]
diff --git a/core/src/test/resources/org/bitcoinj/script/script_tests.json b/core/src/test/resources/org/bitcoinj/script/script_tests.json
new file mode 100644
index 00000000000..1c2ea60c533
--- /dev/null
+++ b/core/src/test/resources/org/bitcoinj/script/script_tests.json
@@ -0,0 +1,1230 @@
+[
+["Format is: [scriptSig, scriptPubKey, flags, expected_scripterror, ... comments]"],
+["It is evaluated as if there was a crediting coinbase transaction with two 0"],
+["pushes as scriptSig, and one output of 0 satoshi and given scriptPubKey,"],
+["followed by a spending transaction which spends this output as only input (and"],
+["correct prevout hash), using the given scriptSig. All nLockTimes are 0, all"],
+["nSequences are max."],
+
+["", "DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK", "Test the test: we should have an empty stack after scriptSig evaluation"],
+["  ", "DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK", "and multiple spaces should not change that."],
+["   ", "DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["    ", "DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["1 2", "2 EQUALVERIFY 1 EQUAL", "P2SH,STRICTENC", "OK", "Similarly whitespace around and between symbols"],
+["1  2", "2 EQUALVERIFY 1 EQUAL", "P2SH,STRICTENC", "OK"],
+["  1  2", "2 EQUALVERIFY 1 EQUAL", "P2SH,STRICTENC", "OK"],
+["1  2  ", "2 EQUALVERIFY 1 EQUAL", "P2SH,STRICTENC", "OK"],
+["  1  2  ", "2 EQUALVERIFY 1 EQUAL", "P2SH,STRICTENC", "OK"],
+
+["1", "", "P2SH,STRICTENC", "OK"],
+["0x02 0x01 0x00", "", "P2SH,STRICTENC", "OK", "all bytes are significant, not only the last one"],
+["0x09 0x00000000 0x00000000 0x10", "", "P2SH,STRICTENC", "OK", "equals zero when cast to Int64"],
+
+["0x01 0x0b", "11 EQUAL", "P2SH,STRICTENC", "OK", "push 1 byte"],
+["0x02 0x417a", "'Az' EQUAL", "P2SH,STRICTENC", "OK"],
+["0x4b 0x417a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a",
+ "'Azzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz' EQUAL", "P2SH,STRICTENC", "OK", "push 75 bytes"],
+
+["0x4c 0x01 0x07","7 EQUAL", "P2SH,STRICTENC", "OK", "0x4c is OP_PUSHDATA1"],
+["0x4d 0x0100 0x08","8 EQUAL", "P2SH,STRICTENC", "OK", "0x4d is OP_PUSHDATA2"],
+["0x4e 0x01000000 0x09","9 EQUAL", "P2SH,STRICTENC", "OK", "0x4e is OP_PUSHDATA4"],
+
+["0x4c 0x00","0 EQUAL", "P2SH,STRICTENC", "OK"],
+["0x4d 0x0000","0 EQUAL", "P2SH,STRICTENC", "OK"],
+["0x4e 0x00000000","0 EQUAL", "P2SH,STRICTENC", "OK"],
+["0x4f 1000 ADD","999 EQUAL", "P2SH,STRICTENC", "OK"],
+["0", "IF 0x50 ENDIF 1", "P2SH,STRICTENC", "OK", "0x50 is reserved (ok if not executed)"],
+["0x51", "0x5f ADD 0x60 EQUAL", "P2SH,STRICTENC", "OK", "0x51 through 0x60 push 1 through 16 onto stack"],
+["1","NOP", "P2SH,STRICTENC", "OK"],
+["0", "IF VER ELSE 1 ENDIF", "P2SH,STRICTENC", "OK", "VER non-functional (ok if not executed)"],
+["0", "IF RESERVED RESERVED1 RESERVED2 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK", "RESERVED ok in un-executed IF"],
+
+["1", "DUP IF ENDIF", "P2SH,STRICTENC", "OK"],
+["1", "IF 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["1", "DUP IF ELSE ENDIF", "P2SH,STRICTENC", "OK"],
+["1", "IF 1 ELSE ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+
+["1 1", "IF IF 1 ELSE 0 ENDIF ENDIF", "P2SH,STRICTENC", "OK"],
+["1 0", "IF IF 1 ELSE 0 ENDIF ENDIF", "P2SH,STRICTENC", "OK"],
+["1 1", "IF IF 1 ELSE 0 ENDIF ELSE IF 0 ELSE 1 ENDIF ENDIF", "P2SH,STRICTENC", "OK"],
+["0 0", "IF IF 1 ELSE 0 ENDIF ELSE IF 0 ELSE 1 ENDIF ENDIF", "P2SH,STRICTENC", "OK"],
+
+["1 0", "NOTIF IF 1 ELSE 0 ENDIF ENDIF", "P2SH,STRICTENC", "OK"],
+["1 1", "NOTIF IF 1 ELSE 0 ENDIF ENDIF", "P2SH,STRICTENC", "OK"],
+["1 0", "NOTIF IF 1 ELSE 0 ENDIF ELSE IF 0 ELSE 1 ENDIF ENDIF", "P2SH,STRICTENC", "OK"],
+["0 1", "NOTIF IF 1 ELSE 0 ENDIF ELSE IF 0 ELSE 1 ENDIF ENDIF", "P2SH,STRICTENC", "OK"],
+
+["0", "IF 0 ELSE 1 ELSE 0 ENDIF", "P2SH,STRICTENC", "OK", "Multiple ELSE's are valid and executed inverts on each ELSE encountered"],
+["1", "IF 1 ELSE 0 ELSE ENDIF", "P2SH,STRICTENC", "OK"],
+["1", "IF ELSE 0 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["1", "IF 1 ELSE 0 ELSE 1 ENDIF ADD 2 EQUAL", "P2SH,STRICTENC", "OK"],
+["'' 1", "IF SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ENDIF 0x14 0x68ca4fec736264c13b859bac43d5173df6871682 EQUAL", "P2SH,STRICTENC", "OK"],
+
+["1", "NOTIF 0 ELSE 1 ELSE 0 ENDIF", "P2SH,STRICTENC", "OK", "Multiple ELSE's are valid and execution inverts on each ELSE encountered"],
+["0", "NOTIF 1 ELSE 0 ELSE ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "NOTIF ELSE 0 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "NOTIF 1 ELSE 0 ELSE 1 ENDIF ADD 2 EQUAL", "P2SH,STRICTENC", "OK"],
+["'' 0", "NOTIF SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ENDIF 0x14 0x68ca4fec736264c13b859bac43d5173df6871682 EQUAL", "P2SH,STRICTENC", "OK"],
+
+["0", "IF 1 IF RETURN ELSE RETURN ELSE RETURN ENDIF ELSE 1 IF 1 ELSE RETURN ELSE 1 ENDIF ELSE RETURN ENDIF ADD 2 EQUAL", "P2SH,STRICTENC", "OK", "Nested ELSE ELSE"],
+["1", "NOTIF 0 NOTIF RETURN ELSE RETURN ELSE RETURN ENDIF ELSE 0 NOTIF 1 ELSE RETURN ELSE 1 ENDIF ELSE RETURN ENDIF ADD 2 EQUAL", "P2SH,STRICTENC", "OK"],
+
+["0", "IF RETURN ENDIF 1", "P2SH,STRICTENC", "OK", "RETURN only works if executed"],
+
+["1 1", "VERIFY", "P2SH,STRICTENC", "OK"],
+["1 0x05 0x01 0x00 0x00 0x00 0x00", "VERIFY", "P2SH,STRICTENC", "OK", "values >4 bytes can be cast to boolean"],
+["1 0x01 0x80", "IF 0 ENDIF", "P2SH,STRICTENC", "OK", "negative 0 is false"],
+
+["10 0 11 TOALTSTACK DROP FROMALTSTACK", "ADD 21 EQUAL", "P2SH,STRICTENC", "OK"],
+["'gavin_was_here' TOALTSTACK 11 FROMALTSTACK", "'gavin_was_here' EQUALVERIFY 11 EQUAL", "P2SH,STRICTENC", "OK"],
+
+["0 IFDUP", "DEPTH 1 EQUALVERIFY 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["1 IFDUP", "DEPTH 2 EQUALVERIFY 1 EQUALVERIFY 1 EQUAL", "P2SH,STRICTENC", "OK"],
+["0x05 0x0100000000 IFDUP", "DEPTH 2 EQUALVERIFY 0x05 0x0100000000 EQUAL", "P2SH,STRICTENC", "OK", "IFDUP dups non ints"],
+["0 DROP", "DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["0", "DUP 1 ADD 1 EQUALVERIFY 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["0 1", "NIP", "P2SH,STRICTENC", "OK"],
+["1 0", "OVER DEPTH 3 EQUALVERIFY", "P2SH,STRICTENC", "OK"],
+["22 21 20", "0 PICK 20 EQUALVERIFY DEPTH 3 EQUAL", "P2SH,STRICTENC", "OK"],
+["22 21 20", "1 PICK 21 EQUALVERIFY DEPTH 3 EQUAL", "P2SH,STRICTENC", "OK"],
+["22 21 20", "2 PICK 22 EQUALVERIFY DEPTH 3 EQUAL", "P2SH,STRICTENC", "OK"],
+["22 21 20", "0 ROLL 20 EQUALVERIFY DEPTH 2 EQUAL", "P2SH,STRICTENC", "OK"],
+["22 21 20", "1 ROLL 21 EQUALVERIFY DEPTH 2 EQUAL", "P2SH,STRICTENC", "OK"],
+["22 21 20", "2 ROLL 22 EQUALVERIFY DEPTH 2 EQUAL", "P2SH,STRICTENC", "OK"],
+["22 21 20", "ROT 22 EQUAL", "P2SH,STRICTENC", "OK"],
+["22 21 20", "ROT DROP 20 EQUAL", "P2SH,STRICTENC", "OK"],
+["22 21 20", "ROT DROP DROP 21 EQUAL", "P2SH,STRICTENC", "OK"],
+["22 21 20", "ROT ROT 21 EQUAL", "P2SH,STRICTENC", "OK"],
+["22 21 20", "ROT ROT ROT 20 EQUAL", "P2SH,STRICTENC", "OK"],
+["25 24 23 22 21 20", "2ROT 24 EQUAL", "P2SH,STRICTENC", "OK"],
+["25 24 23 22 21 20", "2ROT DROP 25 EQUAL", "P2SH,STRICTENC", "OK"],
+["25 24 23 22 21 20", "2ROT 2DROP 20 EQUAL", "P2SH,STRICTENC", "OK"],
+["25 24 23 22 21 20", "2ROT 2DROP DROP 21 EQUAL", "P2SH,STRICTENC", "OK"],
+["25 24 23 22 21 20", "2ROT 2DROP 2DROP 22 EQUAL", "P2SH,STRICTENC", "OK"],
+["25 24 23 22 21 20", "2ROT 2DROP 2DROP DROP 23 EQUAL", "P2SH,STRICTENC", "OK"],
+["25 24 23 22 21 20", "2ROT 2ROT 22 EQUAL", "P2SH,STRICTENC", "OK"],
+["25 24 23 22 21 20", "2ROT 2ROT 2ROT 20 EQUAL", "P2SH,STRICTENC", "OK"],
+["1 0", "SWAP 1 EQUALVERIFY 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["0 1", "TUCK DEPTH 3 EQUALVERIFY SWAP 2DROP", "P2SH,STRICTENC", "OK"],
+["13 14", "2DUP ROT EQUALVERIFY EQUAL", "P2SH,STRICTENC", "OK"],
+["-1 0 1 2", "3DUP DEPTH 7 EQUALVERIFY ADD ADD 3 EQUALVERIFY 2DROP 0 EQUALVERIFY", "P2SH,STRICTENC", "OK"],
+["1 2 3 5", "2OVER ADD ADD 8 EQUALVERIFY ADD ADD 6 EQUAL", "P2SH,STRICTENC", "OK"],
+["1 3 5 7", "2SWAP ADD 4 EQUALVERIFY ADD 12 EQUAL", "P2SH,STRICTENC", "OK"],
+["0", "SIZE 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["1", "SIZE 1 EQUAL", "P2SH,STRICTENC", "OK"],
+["127", "SIZE 1 EQUAL", "P2SH,STRICTENC", "OK"],
+["128", "SIZE 2 EQUAL", "P2SH,STRICTENC", "OK"],
+["32767", "SIZE 2 EQUAL", "P2SH,STRICTENC", "OK"],
+["32768", "SIZE 3 EQUAL", "P2SH,STRICTENC", "OK"],
+["8388607", "SIZE 3 EQUAL", "P2SH,STRICTENC", "OK"],
+["8388608", "SIZE 4 EQUAL", "P2SH,STRICTENC", "OK"],
+["2147483647", "SIZE 4 EQUAL", "P2SH,STRICTENC", "OK"],
+["2147483648", "SIZE 5 EQUAL", "P2SH,STRICTENC", "OK"],
+["549755813887", "SIZE 5 EQUAL", "P2SH,STRICTENC", "OK"],
+["549755813888", "SIZE 6 EQUAL", "P2SH,STRICTENC", "OK"],
+["9223372036854775807", "SIZE 8 EQUAL", "P2SH,STRICTENC", "OK"],
+["-1", "SIZE 1 EQUAL", "P2SH,STRICTENC", "OK"],
+["-127", "SIZE 1 EQUAL", "P2SH,STRICTENC", "OK"],
+["-128", "SIZE 2 EQUAL", "P2SH,STRICTENC", "OK"],
+["-32767", "SIZE 2 EQUAL", "P2SH,STRICTENC", "OK"],
+["-32768", "SIZE 3 EQUAL", "P2SH,STRICTENC", "OK"],
+["-8388607", "SIZE 3 EQUAL", "P2SH,STRICTENC", "OK"],
+["-8388608", "SIZE 4 EQUAL", "P2SH,STRICTENC", "OK"],
+["-2147483647", "SIZE 4 EQUAL", "P2SH,STRICTENC", "OK"],
+["-2147483648", "SIZE 5 EQUAL", "P2SH,STRICTENC", "OK"],
+["-549755813887", "SIZE 5 EQUAL", "P2SH,STRICTENC", "OK"],
+["-549755813888", "SIZE 6 EQUAL", "P2SH,STRICTENC", "OK"],
+["-9223372036854775807", "SIZE 8 EQUAL", "P2SH,STRICTENC", "OK"],
+["'abcdefghijklmnopqrstuvwxyz'", "SIZE 26 EQUAL", "P2SH,STRICTENC", "OK"],
+
+["42", "SIZE 1 EQUALVERIFY 42 EQUAL", "P2SH,STRICTENC", "OK", "SIZE does not consume argument"],
+
+["2 -2 ADD", "0 EQUAL", "P2SH,STRICTENC", "OK"],
+["2147483647 -2147483647 ADD", "0 EQUAL", "P2SH,STRICTENC", "OK"],
+["-1 -1 ADD", "-2 EQUAL", "P2SH,STRICTENC", "OK"],
+
+["0 0","EQUAL", "P2SH,STRICTENC", "OK"],
+["1 1 ADD", "2 EQUAL", "P2SH,STRICTENC", "OK"],
+["1 1ADD", "2 EQUAL", "P2SH,STRICTENC", "OK"],
+["111 1SUB", "110 EQUAL", "P2SH,STRICTENC", "OK"],
+["111 1 ADD 12 SUB", "100 EQUAL", "P2SH,STRICTENC", "OK"],
+["0 ABS", "0 EQUAL", "P2SH,STRICTENC", "OK"],
+["16 ABS", "16 EQUAL", "P2SH,STRICTENC", "OK"],
+["-16 ABS", "-16 NEGATE EQUAL", "P2SH,STRICTENC", "OK"],
+["0 NOT", "NOP", "P2SH,STRICTENC", "OK"],
+["1 NOT", "0 EQUAL", "P2SH,STRICTENC", "OK"],
+["11 NOT", "0 EQUAL", "P2SH,STRICTENC", "OK"],
+["0 0NOTEQUAL", "0 EQUAL", "P2SH,STRICTENC", "OK"],
+["1 0NOTEQUAL", "1 EQUAL", "P2SH,STRICTENC", "OK"],
+["111 0NOTEQUAL", "1 EQUAL", "P2SH,STRICTENC", "OK"],
+["-111 0NOTEQUAL", "1 EQUAL", "P2SH,STRICTENC", "OK"],
+["1 1 BOOLAND", "NOP", "P2SH,STRICTENC", "OK"],
+["1 0 BOOLAND", "NOT", "P2SH,STRICTENC", "OK"],
+["0 1 BOOLAND", "NOT", "P2SH,STRICTENC", "OK"],
+["0 0 BOOLAND", "NOT", "P2SH,STRICTENC", "OK"],
+["16 17 BOOLAND", "NOP", "P2SH,STRICTENC", "OK"],
+["1 1 BOOLOR", "NOP", "P2SH,STRICTENC", "OK"],
+["1 0 BOOLOR", "NOP", "P2SH,STRICTENC", "OK"],
+["0 1 BOOLOR", "NOP", "P2SH,STRICTENC", "OK"],
+["0 0 BOOLOR", "NOT", "P2SH,STRICTENC", "OK"],
+["16 17 BOOLOR", "NOP", "P2SH,STRICTENC", "OK"],
+["11 10 1 ADD", "NUMEQUAL", "P2SH,STRICTENC", "OK"],
+["11 10 1 ADD", "NUMEQUALVERIFY 1", "P2SH,STRICTENC", "OK"],
+["11 10 1 ADD", "NUMNOTEQUAL NOT", "P2SH,STRICTENC", "OK"],
+["111 10 1 ADD", "NUMNOTEQUAL", "P2SH,STRICTENC", "OK"],
+["11 10", "LESSTHAN NOT", "P2SH,STRICTENC", "OK"],
+["4 4", "LESSTHAN NOT", "P2SH,STRICTENC", "OK"],
+["10 11", "LESSTHAN", "P2SH,STRICTENC", "OK"],
+["-11 11", "LESSTHAN", "P2SH,STRICTENC", "OK"],
+["-11 -10", "LESSTHAN", "P2SH,STRICTENC", "OK"],
+["11 10", "GREATERTHAN", "P2SH,STRICTENC", "OK"],
+["4 4", "GREATERTHAN NOT", "P2SH,STRICTENC", "OK"],
+["10 11", "GREATERTHAN NOT", "P2SH,STRICTENC", "OK"],
+["-11 11", "GREATERTHAN NOT", "P2SH,STRICTENC", "OK"],
+["-11 -10", "GREATERTHAN NOT", "P2SH,STRICTENC", "OK"],
+["11 10", "LESSTHANOREQUAL NOT", "P2SH,STRICTENC", "OK"],
+["4 4", "LESSTHANOREQUAL", "P2SH,STRICTENC", "OK"],
+["10 11", "LESSTHANOREQUAL", "P2SH,STRICTENC", "OK"],
+["-11 11", "LESSTHANOREQUAL", "P2SH,STRICTENC", "OK"],
+["-11 -10", "LESSTHANOREQUAL", "P2SH,STRICTENC", "OK"],
+["11 10", "GREATERTHANOREQUAL", "P2SH,STRICTENC", "OK"],
+["4 4", "GREATERTHANOREQUAL", "P2SH,STRICTENC", "OK"],
+["10 11", "GREATERTHANOREQUAL NOT", "P2SH,STRICTENC", "OK"],
+["-11 11", "GREATERTHANOREQUAL NOT", "P2SH,STRICTENC", "OK"],
+["-11 -10", "GREATERTHANOREQUAL NOT", "P2SH,STRICTENC", "OK"],
+["1 0 MIN", "0 NUMEQUAL", "P2SH,STRICTENC", "OK"],
+["0 1 MIN", "0 NUMEQUAL", "P2SH,STRICTENC", "OK"],
+["-1 0 MIN", "-1 NUMEQUAL", "P2SH,STRICTENC", "OK"],
+["0 -2147483647 MIN", "-2147483647 NUMEQUAL", "P2SH,STRICTENC", "OK"],
+["2147483647 0 MAX", "2147483647 NUMEQUAL", "P2SH,STRICTENC", "OK"],
+["0 100 MAX", "100 NUMEQUAL", "P2SH,STRICTENC", "OK"],
+["-100 0 MAX", "0 NUMEQUAL", "P2SH,STRICTENC", "OK"],
+["0 -2147483647 MAX", "0 NUMEQUAL", "P2SH,STRICTENC", "OK"],
+["0 0 1", "WITHIN", "P2SH,STRICTENC", "OK"],
+["1 0 1", "WITHIN NOT", "P2SH,STRICTENC", "OK"],
+["0 -2147483647 2147483647", "WITHIN", "P2SH,STRICTENC", "OK"],
+["-1 -100 100", "WITHIN", "P2SH,STRICTENC", "OK"],
+["11 -100 100", "WITHIN", "P2SH,STRICTENC", "OK"],
+["-2147483647 -100 100", "WITHIN NOT", "P2SH,STRICTENC", "OK"],
+["2147483647 -100 100", "WITHIN NOT", "P2SH,STRICTENC", "OK"],
+
+["2147483647 2147483647 SUB", "0 EQUAL", "P2SH,STRICTENC", "OK"],
+["2147483647 DUP ADD", "4294967294 EQUAL", "P2SH,STRICTENC", "OK", ">32 bit EQUAL is valid"],
+["2147483647 NEGATE DUP ADD", "-4294967294 EQUAL", "P2SH,STRICTENC", "OK"],
+
+["''", "RIPEMD160 0x14 0x9c1185a5c5e9fc54612808977ee8f548b2258d31 EQUAL", "P2SH,STRICTENC", "OK"],
+["'a'", "RIPEMD160 0x14 0x0bdc9d2d256b3ee9daae347be6f4dc835a467ffe EQUAL", "P2SH,STRICTENC", "OK"],
+["'abcdefghijklmnopqrstuvwxyz'", "RIPEMD160 0x14 0xf71c27109c692c1b56bbdceb5b9d2865b3708dbc EQUAL", "P2SH,STRICTENC", "OK"],
+["''", "SHA1 0x14 0xda39a3ee5e6b4b0d3255bfef95601890afd80709 EQUAL", "P2SH,STRICTENC", "OK"],
+["'a'", "SHA1 0x14 0x86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 EQUAL", "P2SH,STRICTENC", "OK"],
+["'abcdefghijklmnopqrstuvwxyz'", "SHA1 0x14 0x32d10c7b8cf96570ca04ce37f2a19d84240d3a89 EQUAL", "P2SH,STRICTENC", "OK"],
+["''", "SHA256 0x20 0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 EQUAL", "P2SH,STRICTENC", "OK"],
+["'a'", "SHA256 0x20 0xca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb EQUAL", "P2SH,STRICTENC", "OK"],
+["'abcdefghijklmnopqrstuvwxyz'", "SHA256 0x20 0x71c480df93d6ae2f1efad1447c66c9525e316218cf51fc8d9ed832f2daf18b73 EQUAL", "P2SH,STRICTENC", "OK"],
+["''", "DUP HASH160 SWAP SHA256 RIPEMD160 EQUAL", "P2SH,STRICTENC", "OK"],
+["''", "DUP HASH256 SWAP SHA256 SHA256 EQUAL", "P2SH,STRICTENC", "OK"],
+["''", "NOP HASH160 0x14 0xb472a266d0bd89c13706a4132ccfb16f7c3b9fcb EQUAL", "P2SH,STRICTENC", "OK"],
+["'a'", "HASH160 NOP 0x14 0x994355199e516ff76c4fa4aab39337b9d84cf12b EQUAL", "P2SH,STRICTENC", "OK"],
+["'abcdefghijklmnopqrstuvwxyz'", "HASH160 0x4c 0x14 0xc286a1af0947f58d1ad787385b1c2c4a976f9e71 EQUAL", "P2SH,STRICTENC", "OK"],
+["''", "HASH256 0x20 0x5df6e0e2761359d30a8275058e299fcc0381534545f55cf43e41983f5d4c9456 EQUAL", "P2SH,STRICTENC", "OK"],
+["'a'", "HASH256 0x20 0xbf5d3affb73efd2ec6c36ad3112dd933efed63c4e1cbffcfa88e2759c144f2d8 EQUAL", "P2SH,STRICTENC", "OK"],
+["'abcdefghijklmnopqrstuvwxyz'", "HASH256 0x4c 0x20 0xca139bc10c2f660da42666f72e89a225936fc60f193c161124a672050c434671 EQUAL", "P2SH,STRICTENC", "OK"],
+
+
+["1","NOP1 CHECKLOCKTIMEVERIFY CHECKSEQUENCEVERIFY NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 1 EQUAL", "P2SH,STRICTENC", "OK"],
+["'NOP_1_to_10' NOP1 CHECKLOCKTIMEVERIFY CHECKSEQUENCEVERIFY NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_10' EQUAL", "P2SH,STRICTENC", "OK"],
+
+["1", "NOP", "P2SH,STRICTENC,DISCOURAGE_UPGRADABLE_NOPS", "OK", "Discourage NOPx flag allows OP_NOP"],
+
+["0", "IF NOP10 ENDIF 1", "P2SH,STRICTENC,DISCOURAGE_UPGRADABLE_NOPS", "OK",
+ "Discouraged NOPs are allowed if not executed"],
+
+["0", "IF 0xba ELSE 1 ENDIF", "P2SH,STRICTENC", "OK", "opcodes above NOP10 invalid if executed"],
+["0", "IF 0xbb ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xbc ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xbd ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xbe ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xbf ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xc0 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xc1 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xc2 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xc3 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xc4 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xc5 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xc6 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xc7 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xc8 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xc9 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xca ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xcb ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xcc ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xcd ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xce ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xcf ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xd0 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xd1 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xd2 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xd3 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xd4 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xd5 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xd6 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xd7 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xd8 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xd9 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xda ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xdb ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xdc ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xdd ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xde ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xdf ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xe0 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xe1 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xe2 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xe3 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xe4 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xe5 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xe6 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xe7 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xe8 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xe9 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xea ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xeb ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xec ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xed ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xee ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xef ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xf0 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xf1 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xf2 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xf3 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xf4 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xf5 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xf6 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xf7 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xf8 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xf9 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xfa ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xfb ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xfc ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xfd ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xfe ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+["0", "IF 0xff ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
+
+["NOP",
+"'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'",
+"P2SH,STRICTENC", "OK",
+"520 byte push"],
+["1",
+"0x616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161",
+"P2SH,STRICTENC", "OK",
+"201 opcodes executed. 0x61 is NOP"],
+["1 2 3 4 5 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f",
+"1 2 3 4 5 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f",
+"P2SH,STRICTENC", "OK",
+"1,000 stack size (0x6f is 3DUP)"],
+["1 TOALTSTACK 2 TOALTSTACK 3 4 5 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f",
+"1 2 3 4 5 6 7 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f",
+"P2SH,STRICTENC", "OK",
+"1,000 stack size (altstack cleared between scriptSig/scriptPubKey)"],
+["'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f",
+"'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f 2DUP 0x616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161",
+"P2SH,STRICTENC", "OK",
+"Max-size (10,000-byte), max-push(520 bytes), max-opcodes(201), max stack size(1,000 items). 0x6f is 3DUP, 0x61 is NOP"],
+
+["0",
+"IF 0x5050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050 ENDIF 1",
+"P2SH,STRICTENC", "OK",
+">201 opcodes, but RESERVED (0x50) doesn't count towards opcode limit."],
+
+["NOP","1", "P2SH,STRICTENC", "OK"],
+
+["1", "0x01 0x01 EQUAL", "P2SH,STRICTENC", "OK", "The following is useful for checking implementations of BN_bn2mpi"],
+["127", "0x01 0x7F EQUAL", "P2SH,STRICTENC", "OK"],
+["128", "0x02 0x8000 EQUAL", "P2SH,STRICTENC", "OK", "Leave room for the sign bit"],
+["32767", "0x02 0xFF7F EQUAL", "P2SH,STRICTENC", "OK"],
+["32768", "0x03 0x008000 EQUAL", "P2SH,STRICTENC", "OK"],
+["8388607", "0x03 0xFFFF7F EQUAL", "P2SH,STRICTENC", "OK"],
+["8388608", "0x04 0x00008000 EQUAL", "P2SH,STRICTENC", "OK"],
+["2147483647", "0x04 0xFFFFFF7F EQUAL", "P2SH,STRICTENC", "OK"],
+["2147483648", "0x05 0x0000008000 EQUAL", "P2SH,STRICTENC", "OK"],
+["549755813887", "0x05 0xFFFFFFFF7F EQUAL", "P2SH,STRICTENC", "OK"],
+["549755813888", "0x06 0x000000008000 EQUAL", "P2SH,STRICTENC", "OK"],
+["9223372036854775807", "0x08 0xFFFFFFFFFFFFFF7F EQUAL", "P2SH,STRICTENC", "OK"],
+["-1", "0x01 0x81 EQUAL", "P2SH,STRICTENC", "OK", "Numbers are little-endian with the MSB being a sign bit"],
+["-127", "0x01 0xFF EQUAL", "P2SH,STRICTENC", "OK"],
+["-128", "0x02 0x8080 EQUAL", "P2SH,STRICTENC", "OK"],
+["-32767", "0x02 0xFFFF EQUAL", "P2SH,STRICTENC", "OK"],
+["-32768", "0x03 0x008080 EQUAL", "P2SH,STRICTENC", "OK"],
+["-8388607", "0x03 0xFFFFFF EQUAL", "P2SH,STRICTENC", "OK"],
+["-8388608", "0x04 0x00008080 EQUAL", "P2SH,STRICTENC", "OK"],
+["-2147483647", "0x04 0xFFFFFFFF EQUAL", "P2SH,STRICTENC", "OK"],
+["-2147483648", "0x05 0x0000008080 EQUAL", "P2SH,STRICTENC", "OK"],
+["-4294967295", "0x05 0xFFFFFFFF80 EQUAL", "P2SH,STRICTENC", "OK"],
+["-549755813887", "0x05 0xFFFFFFFFFF EQUAL", "P2SH,STRICTENC", "OK"],
+["-549755813888", "0x06 0x000000008080 EQUAL", "P2SH,STRICTENC", "OK"],
+["-9223372036854775807", "0x08 0xFFFFFFFFFFFFFFFF EQUAL", "P2SH,STRICTENC", "OK"],
+
+["2147483647", "1ADD 2147483648 EQUAL", "P2SH,STRICTENC", "OK", "We can do math on 4-byte integers, and compare 5-byte ones"],
+["2147483647", "1ADD 1", "P2SH,STRICTENC", "OK"],
+["-2147483647", "1ADD 1", "P2SH,STRICTENC", "OK"],
+
+["1", "0x02 0x0100 EQUAL NOT", "P2SH,STRICTENC", "OK", "Not the same byte array..."],
+["1", "0x02 0x0100 NUMEQUAL", "P2SH,STRICTENC", "OK", "... but they are numerically equal"],
+["11", "0x4c 0x03 0x0b0000 NUMEQUAL", "P2SH,STRICTENC", "OK"],
+["0", "0x01 0x80 EQUAL NOT", "P2SH,STRICTENC", "OK"],
+["0", "0x01 0x80 NUMEQUAL", "P2SH,STRICTENC", "OK", "Zero numerically equals negative zero"],
+["0", "0x02 0x0080 NUMEQUAL", "P2SH,STRICTENC", "OK"],
+["0x03 0x000080", "0x04 0x00000080 NUMEQUAL", "P2SH,STRICTENC", "OK"],
+["0x03 0x100080", "0x04 0x10000080 NUMEQUAL", "P2SH,STRICTENC", "OK"],
+["0x03 0x100000", "0x04 0x10000000 NUMEQUAL", "P2SH,STRICTENC", "OK"],
+
+["NOP", "NOP 1", "P2SH,STRICTENC", "OK", "The following tests check the if(stack.size() < N) tests in each opcode"],
+["1", "IF 1 ENDIF", "P2SH,STRICTENC", "OK", "They are here to catch copy-and-paste errors"],
+["0", "NOTIF 1 ENDIF", "P2SH,STRICTENC", "OK", "Most of them are duplicated elsewhere,"],
+["1", "VERIFY 1", "P2SH,STRICTENC", "OK", "but, hey, more is always better, right?"],
+
+["0", "TOALTSTACK 1", "P2SH,STRICTENC", "OK"],
+["1", "TOALTSTACK FROMALTSTACK", "P2SH,STRICTENC", "OK"],
+["0 0", "2DROP 1", "P2SH,STRICTENC", "OK"],
+["0 1", "2DUP", "P2SH,STRICTENC", "OK"],
+["0 0 1", "3DUP", "P2SH,STRICTENC", "OK"],
+["0 1 0 0", "2OVER", "P2SH,STRICTENC", "OK"],
+["0 1 0 0 0 0", "2ROT", "P2SH,STRICTENC", "OK"],
+["0 1 0 0", "2SWAP", "P2SH,STRICTENC", "OK"],
+["1", "IFDUP", "P2SH,STRICTENC", "OK"],
+["NOP", "DEPTH 1", "P2SH,STRICTENC", "OK"],
+["0", "DROP 1", "P2SH,STRICTENC", "OK"],
+["1", "DUP", "P2SH,STRICTENC", "OK"],
+["0 1", "NIP", "P2SH,STRICTENC", "OK"],
+["1 0", "OVER", "P2SH,STRICTENC", "OK"],
+["1 0 0 0 3", "PICK", "P2SH,STRICTENC", "OK"],
+["1 0", "PICK", "P2SH,STRICTENC", "OK"],
+["1 0 0 0 3", "ROLL", "P2SH,STRICTENC", "OK"],
+["1 0", "ROLL", "P2SH,STRICTENC", "OK"],
+["1 0 0", "ROT", "P2SH,STRICTENC", "OK"],
+["1 0", "SWAP", "P2SH,STRICTENC", "OK"],
+["0 1", "TUCK", "P2SH,STRICTENC", "OK"],
+
+["1", "SIZE", "P2SH,STRICTENC", "OK"],
+
+["0 0", "EQUAL", "P2SH,STRICTENC", "OK"],
+["0 0", "EQUALVERIFY 1", "P2SH,STRICTENC", "OK"],
+["0 0 1", "EQUAL EQUAL", "P2SH,STRICTENC", "OK", "OP_0 and bools must have identical byte representations"],
+
+["0", "1ADD", "P2SH,STRICTENC", "OK"],
+["2", "1SUB", "P2SH,STRICTENC", "OK"],
+["-1", "NEGATE", "P2SH,STRICTENC", "OK"],
+["-1", "ABS", "P2SH,STRICTENC", "OK"],
+["0", "NOT", "P2SH,STRICTENC", "OK"],
+["-1", "0NOTEQUAL", "P2SH,STRICTENC", "OK"],
+
+["1 0", "ADD", "P2SH,STRICTENC", "OK"],
+["1 0", "SUB", "P2SH,STRICTENC", "OK"],
+["-1 -1", "BOOLAND", "P2SH,STRICTENC", "OK"],
+["-1 0", "BOOLOR", "P2SH,STRICTENC", "OK"],
+["0 0", "NUMEQUAL", "P2SH,STRICTENC", "OK"],
+["0 0", "NUMEQUALVERIFY 1", "P2SH,STRICTENC", "OK"],
+["-1 0", "NUMNOTEQUAL", "P2SH,STRICTENC", "OK"],
+["-1 0", "LESSTHAN", "P2SH,STRICTENC", "OK"],
+["1 0", "GREATERTHAN", "P2SH,STRICTENC", "OK"],
+["0 0", "LESSTHANOREQUAL", "P2SH,STRICTENC", "OK"],
+["0 0", "GREATERTHANOREQUAL", "P2SH,STRICTENC", "OK"],
+["-1 0", "MIN", "P2SH,STRICTENC", "OK"],
+["1 0", "MAX", "P2SH,STRICTENC", "OK"],
+["-1 -1 0", "WITHIN", "P2SH,STRICTENC", "OK"],
+
+["0", "RIPEMD160", "P2SH,STRICTENC", "OK"],
+["0", "SHA1", "P2SH,STRICTENC", "OK"],
+["0", "SHA256", "P2SH,STRICTENC", "OK"],
+["0", "HASH160", "P2SH,STRICTENC", "OK"],
+["0", "HASH256", "P2SH,STRICTENC", "OK"],
+["NOP", "CODESEPARATOR 1", "P2SH,STRICTENC", "OK"],
+
+["NOP", "NOP1 1", "P2SH,STRICTENC", "OK"],
+["NOP", "CHECKLOCKTIMEVERIFY 1", "P2SH,STRICTENC", "OK"],
+["NOP", "CHECKSEQUENCEVERIFY 1", "P2SH,STRICTENC", "OK"],
+["NOP", "NOP4 1", "P2SH,STRICTENC", "OK"],
+["NOP", "NOP5 1", "P2SH,STRICTENC", "OK"],
+["NOP", "NOP6 1", "P2SH,STRICTENC", "OK"],
+["NOP", "NOP7 1", "P2SH,STRICTENC", "OK"],
+["NOP", "NOP8 1", "P2SH,STRICTENC", "OK"],
+["NOP", "NOP9 1", "P2SH,STRICTENC", "OK"],
+["NOP", "NOP10 1", "P2SH,STRICTENC", "OK"],
+
+["", "0 0 0 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK", "CHECKMULTISIG is allowed to have zero keys and/or sigs"],
+["", "0 0 0 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 0 1 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK", "Zero sigs means no sigs are checked"],
+["", "0 0 0 1 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+
+["", "0 0 0 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK", "CHECKMULTISIG is allowed to have zero keys and/or sigs"],
+["", "0 0 0 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 0 1 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK", "Zero sigs means no sigs are checked"],
+["", "0 0 0 1 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+
+["", "0 0 'a' 'b' 2 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK", "Test from up to 20 pubkeys, all not checked"],
+["", "0 0 'a' 'b' 'c' 3 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 4 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 5 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 6 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 7 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 8 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 9 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 10 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 11 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 12 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 13 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 14 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 15 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 16 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 17 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 18 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 19 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 1 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 2 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 3 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 4 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 5 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 6 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 7 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 8 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 9 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 10 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 11 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 12 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 13 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 14 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 15 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 16 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 17 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 18 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 19 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "OK"],
+
+["",
+"0 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG",
+"P2SH,STRICTENC", "OK",
+"nOpCount is incremented by the number of keys evaluated in addition to the usual one op per op. In this case we have zero keys, so we can execute 201 CHECKMULTISIGS"],
+
+["1",
+"0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY",
+"P2SH,STRICTENC", "OK"],
+
+["",
+"NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG",
+"P2SH,STRICTENC", "OK",
+"Even though there are no signatures being checked nOpCount is incremented by the number of keys."],
+
+["1",
+"NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY",
+"P2SH,STRICTENC", "OK"],
+
+["0 0x01 1", "HASH160 0x14 0xda1745e9b549bd0bfa1a569971c77eba30cd5a4b EQUAL", "P2SH,STRICTENC", "OK", "Very basic P2SH"],
+["0x4c 0 0x01 1", "HASH160 0x14 0xda1745e9b549bd0bfa1a569971c77eba30cd5a4b EQUAL", "P2SH,STRICTENC", "OK"],
+
+["0x40 0x42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242",
+"0x4d 0x4000 0x42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242 EQUAL",
+"P2SH,STRICTENC", "OK",
+"Basic PUSH signedness check"],
+
+["0x4c 0x40 0x42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242",
+"0x4d 0x4000 0x42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242 EQUAL",
+"P2SH,STRICTENC", "OK",
+"Basic PUSHDATA1 signedness check"],
+
+["all PUSHDATA forms are equivalent"],
+
+["0x4c 0x4b 0x111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111", "0x4b 0x111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 EQUAL", "", "OK", "PUSHDATA1 of 75 bytes equals direct push of it"],
+["0x4d 0xFF00 0x111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111", "0x4c 0xFF 0x111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 EQUAL", "", "OK", "PUSHDATA2 of 255 bytes equals PUSHDATA1 of it"],
+
+["0x00", "SIZE 0 EQUAL", "P2SH,STRICTENC", "OK", "Basic OP_0 execution"],
+
+["Numeric pushes"],
+
+["0x01 0x81", "0x4f EQUAL", "", "OK", "OP1_NEGATE pushes 0x81"],
+["0x01 0x01", "0x51 EQUAL", "", "OK", "OP_1  pushes 0x01"],
+["0x01 0x02", "0x52 EQUAL", "", "OK", "OP_2  pushes 0x02"],
+["0x01 0x03", "0x53 EQUAL", "", "OK", "OP_3  pushes 0x03"],
+["0x01 0x04", "0x54 EQUAL", "", "OK", "OP_4  pushes 0x04"],
+["0x01 0x05", "0x55 EQUAL", "", "OK", "OP_5  pushes 0x05"],
+["0x01 0x06", "0x56 EQUAL", "", "OK", "OP_6  pushes 0x06"],
+["0x01 0x07", "0x57 EQUAL", "", "OK", "OP_7  pushes 0x07"],
+["0x01 0x08", "0x58 EQUAL", "", "OK", "OP_8  pushes 0x08"],
+["0x01 0x09", "0x59 EQUAL", "", "OK", "OP_9  pushes 0x09"],
+["0x01 0x0a", "0x5a EQUAL", "", "OK", "OP_10 pushes 0x0a"],
+["0x01 0x0b", "0x5b EQUAL", "", "OK", "OP_11 pushes 0x0b"],
+["0x01 0x0c", "0x5c EQUAL", "", "OK", "OP_12 pushes 0x0c"],
+["0x01 0x0d", "0x5d EQUAL", "", "OK", "OP_13 pushes 0x0d"],
+["0x01 0x0e", "0x5e EQUAL", "", "OK", "OP_14 pushes 0x0e"],
+["0x01 0x0f", "0x5f EQUAL", "", "OK", "OP_15 pushes 0x0f"],
+["0x01 0x10", "0x60 EQUAL", "", "OK", "OP_16 pushes 0x10"],
+
+["Equivalency of different numeric encodings"],
+
+["0x02 0x8000", "128 NUMEQUAL", "", "OK", "0x8000 equals 128"],
+["0x01 0x00", "0 NUMEQUAL", "", "OK", "0x00 numequals 0"],
+["0x01 0x80", "0 NUMEQUAL", "", "OK", "0x80 (negative zero) numequals 0"],
+["0x02 0x0080", "0 NUMEQUAL", "", "OK", "0x0080 numequals 0"],
+["0x02 0x0500", "5 NUMEQUAL", "", "OK", "0x0500 numequals 5"],
+["0x03 0xff7f80", "0x02 0xffff NUMEQUAL", "", "OK", ""],
+["0x03 0xff7f00", "0x02 0xff7f NUMEQUAL", "", "OK", ""],
+["0x04 0xffff7f80", "0x03 0xffffff NUMEQUAL", "", "OK", ""],
+["0x04 0xffff7f00", "0x03 0xffff7f NUMEQUAL", "", "OK", ""],
+
+["Unevaluated non-minimal pushes are ignored"],
+
+["0 IF 0x4c 0x00 ENDIF 1", "", "MINIMALDATA", "OK", "non-minimal PUSHDATA1 ignored"],
+["0 IF 0x4d 0x0000 ENDIF 1", "", "MINIMALDATA", "OK", "non-minimal PUSHDATA2 ignored"],
+["0 IF 0x4c 0x00000000 ENDIF 1", "", "MINIMALDATA", "OK", "non-minimal PUSHDATA4 ignored"],
+["0 IF 0x01 0x81 ENDIF 1", "", "MINIMALDATA", "OK", "1NEGATE equiv"],
+["0 IF 0x01 0x01 ENDIF 1", "", "MINIMALDATA", "OK", "OP_1  equiv"],
+["0 IF 0x01 0x02 ENDIF 1", "", "MINIMALDATA", "OK", "OP_2  equiv"],
+["0 IF 0x01 0x03 ENDIF 1", "", "MINIMALDATA", "OK", "OP_3  equiv"],
+["0 IF 0x01 0x04 ENDIF 1", "", "MINIMALDATA", "OK", "OP_4  equiv"],
+["0 IF 0x01 0x05 ENDIF 1", "", "MINIMALDATA", "OK", "OP_5  equiv"],
+["0 IF 0x01 0x06 ENDIF 1", "", "MINIMALDATA", "OK", "OP_6  equiv"],
+["0 IF 0x01 0x07 ENDIF 1", "", "MINIMALDATA", "OK", "OP_7  equiv"],
+["0 IF 0x01 0x08 ENDIF 1", "", "MINIMALDATA", "OK", "OP_8  equiv"],
+["0 IF 0x01 0x09 ENDIF 1", "", "MINIMALDATA", "OK", "OP_9  equiv"],
+["0 IF 0x01 0x0a ENDIF 1", "", "MINIMALDATA", "OK", "OP_10 equiv"],
+["0 IF 0x01 0x0b ENDIF 1", "", "MINIMALDATA", "OK", "OP_11 equiv"],
+["0 IF 0x01 0x0c ENDIF 1", "", "MINIMALDATA", "OK", "OP_12 equiv"],
+["0 IF 0x01 0x0d ENDIF 1", "", "MINIMALDATA", "OK", "OP_13 equiv"],
+["0 IF 0x01 0x0e ENDIF 1", "", "MINIMALDATA", "OK", "OP_14 equiv"],
+["0 IF 0x01 0x0f ENDIF 1", "", "MINIMALDATA", "OK", "OP_15 equiv"],
+["0 IF 0x01 0x10 ENDIF 1", "", "MINIMALDATA", "OK", "OP_16 equiv"],
+
+["Numeric minimaldata rules are only applied when a stack item is numerically evaluated; the push itself is allowed"],
+
+["0x01 0x00", "1", "MINIMALDATA", "OK"],
+["0x01 0x80", "1", "MINIMALDATA", "OK"],
+["0x02 0x0180", "1", "MINIMALDATA", "OK"],
+["0x02 0x0100", "1", "MINIMALDATA", "OK"],
+["0x02 0x0200", "1", "MINIMALDATA", "OK"],
+["0x02 0x0300", "1", "MINIMALDATA", "OK"],
+["0x02 0x0400", "1", "MINIMALDATA", "OK"],
+["0x02 0x0500", "1", "MINIMALDATA", "OK"],
+["0x02 0x0600", "1", "MINIMALDATA", "OK"],
+["0x02 0x0700", "1", "MINIMALDATA", "OK"],
+["0x02 0x0800", "1", "MINIMALDATA", "OK"],
+["0x02 0x0900", "1", "MINIMALDATA", "OK"],
+["0x02 0x0a00", "1", "MINIMALDATA", "OK"],
+["0x02 0x0b00", "1", "MINIMALDATA", "OK"],
+["0x02 0x0c00", "1", "MINIMALDATA", "OK"],
+["0x02 0x0d00", "1", "MINIMALDATA", "OK"],
+["0x02 0x0e00", "1", "MINIMALDATA", "OK"],
+["0x02 0x0f00", "1", "MINIMALDATA", "OK"],
+["0x02 0x1000", "1", "MINIMALDATA", "OK"],
+
+["Valid version of the 'Test every numeric-accepting opcode for correct handling of the numeric minimal encoding rule' script_invalid test"],
+
+["1 0x02 0x0000", "PICK DROP", "", "OK"],
+["1 0x02 0x0000", "ROLL DROP 1", "", "OK"],
+["0x02 0x0000", "1ADD DROP 1", "", "OK"],
+["0x02 0x0000", "1SUB DROP 1", "", "OK"],
+["0x02 0x0000", "NEGATE DROP 1", "", "OK"],
+["0x02 0x0000", "ABS DROP 1", "", "OK"],
+["0x02 0x0000", "NOT DROP 1", "", "OK"],
+["0x02 0x0000", "0NOTEQUAL DROP 1", "", "OK"],
+
+["0 0x02 0x0000", "ADD DROP 1", "", "OK"],
+["0x02 0x0000 0", "ADD DROP 1", "", "OK"],
+["0 0x02 0x0000", "SUB DROP 1", "", "OK"],
+["0x02 0x0000 0", "SUB DROP 1", "", "OK"],
+["0 0x02 0x0000", "BOOLAND DROP 1", "", "OK"],
+["0x02 0x0000 0", "BOOLAND DROP 1", "", "OK"],
+["0 0x02 0x0000", "BOOLOR DROP 1", "", "OK"],
+["0x02 0x0000 0", "BOOLOR DROP 1", "", "OK"],
+["0 0x02 0x0000", "NUMEQUAL DROP 1", "", "OK"],
+["0x02 0x0000 1", "NUMEQUAL DROP 1", "", "OK"],
+["0 0x02 0x0000", "NUMEQUALVERIFY 1", "", "OK"],
+["0x02 0x0000 0", "NUMEQUALVERIFY 1", "", "OK"],
+["0 0x02 0x0000", "NUMNOTEQUAL DROP 1", "", "OK"],
+["0x02 0x0000 0", "NUMNOTEQUAL DROP 1", "", "OK"],
+["0 0x02 0x0000", "LESSTHAN DROP 1", "", "OK"],
+["0x02 0x0000 0", "LESSTHAN DROP 1", "", "OK"],
+["0 0x02 0x0000", "GREATERTHAN DROP 1", "", "OK"],
+["0x02 0x0000 0", "GREATERTHAN DROP 1", "", "OK"],
+["0 0x02 0x0000", "LESSTHANOREQUAL DROP 1", "", "OK"],
+["0x02 0x0000 0", "LESSTHANOREQUAL DROP 1", "", "OK"],
+["0 0x02 0x0000", "GREATERTHANOREQUAL DROP 1", "", "OK"],
+["0x02 0x0000 0", "GREATERTHANOREQUAL DROP 1", "", "OK"],
+["0 0x02 0x0000", "MIN DROP 1", "", "OK"],
+["0x02 0x0000 0", "MIN DROP 1", "", "OK"],
+["0 0x02 0x0000", "MAX DROP 1", "", "OK"],
+["0x02 0x0000 0", "MAX DROP 1", "", "OK"],
+
+["0x02 0x0000 0 0", "WITHIN DROP 1", "", "OK"],
+["0 0x02 0x0000 0", "WITHIN DROP 1", "", "OK"],
+["0 0 0x02 0x0000", "WITHIN DROP 1", "", "OK"],
+
+["0 0 0x02 0x0000", "CHECKMULTISIG DROP 1", "", "OK"],
+["0 0x02 0x0000 0", "CHECKMULTISIG DROP 1", "", "OK"],
+["0 0x02 0x0000 0 1", "CHECKMULTISIG DROP 1", "", "OK"],
+["0 0 0x02 0x0000", "CHECKMULTISIGVERIFY 1", "", "OK"],
+["0 0x02 0x0000 0", "CHECKMULTISIGVERIFY 1", "", "OK"],
+
+["While not really correctly DER encoded, the empty signature is allowed by"],
+["STRICTENC to provide a compact way to provide a delibrately invalid signature."],
+["0", "0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 CHECKSIG NOT", "STRICTENC", "OK"],
+["0 0", "1 0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 1 CHECKMULTISIG NOT", "STRICTENC", "OK"],
+
+["CHECKMULTISIG evaluation order tests. CHECKMULTISIG evaluates signatures and"],
+["pubkeys in a specific order, and will exit early if the number of signatures"],
+["left to check is greater than the number of keys left. As STRICTENC fails the"],
+["script when it reaches an invalidly encoded signature or pubkey, we can use it"],
+["to test the exact order in which signatures and pubkeys are evaluated by"],
+["distinguishing CHECKMULTISIG returning false on the stack and the script as a"],
+["whole failing."],
+["See also the corresponding inverted versions of these tests in script_invalid.json"],
+[
+    "0 0x47 0x3044022044dc17b0887c161bb67ba9635bf758735bdde503e4b0a0987f587f14a4e1143d022009a215772d49a85dae40d8ca03955af26ad3978a0ff965faa12915e9586249a501 0x47 0x3044022044dc17b0887c161bb67ba9635bf758735bdde503e4b0a0987f587f14a4e1143d022009a215772d49a85dae40d8ca03955af26ad3978a0ff965faa12915e9586249a501",
+    "2 0 0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 2 CHECKMULTISIG NOT",
+    "STRICTENC", "OK",
+    "2-of-2 CHECKMULTISIG NOT with the second pubkey invalid, and both signatures validly encoded. Valid pubkey fails, and CHECKMULTISIG exits early, prior to evaluation of second invalid pubkey."
+],
+[
+    "0 0 0x47 0x3044022044dc17b0887c161bb67ba9635bf758735bdde503e4b0a0987f587f14a4e1143d022009a215772d49a85dae40d8ca03955af26ad3978a0ff965faa12915e9586249a501",
+    "2 0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 0x21 0x02865c40293a680cb9c020e7b1e106d8c1916d3cef99aa431a56d253e69256dac0 2 CHECKMULTISIG NOT",
+    "STRICTENC", "OK",
+    "2-of-2 CHECKMULTISIG NOT with both pubkeys valid, but second signature invalid. Valid pubkey fails, and CHECKMULTISIG exits early, prior to evaluation of second invalid signature."
+],
+
+["Increase test coverage for DERSIG"],
+["0x4a 0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "0 CHECKSIG NOT", "", "OK", "Overly long signature is correctly encoded"],
+["0x25 0x30220220000000000000000000000000000000000000000000000000000000000000000000", "0 CHECKSIG NOT", "", "OK", "Missing S is correctly encoded"],
+["0x27 0x3024021077777777777777777777777777777777020a7777777777777777777777777777777701", "0 CHECKSIG NOT", "", "OK", "S with invalid S length is correctly encoded"],
+["0x27 0x302403107777777777777777777777777777777702107777777777777777777777777777777701", "0 CHECKSIG NOT", "", "OK", "Non-integer R is correctly encoded"],
+["0x27 0x302402107777777777777777777777777777777703107777777777777777777777777777777701", "0 CHECKSIG NOT", "", "OK", "Non-integer S is correctly encoded"],
+["0x17 0x3014020002107777777777777777777777777777777701", "0 CHECKSIG NOT", "", "OK", "Zero-length R is correctly encoded"],
+["0x17 0x3014021077777777777777777777777777777777020001", "0 CHECKSIG NOT", "", "OK", "Zero-length S is correctly encoded for DERSIG"],
+["0x27 0x302402107777777777777777777777777777777702108777777777777777777777777777777701", "0 CHECKSIG NOT", "", "OK", "Negative S is correctly encoded"],
+ 
+["2147483648", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY", "OK", "CSV passes if stack top bit 1 << 31 is set"],
+
+["", "DEPTH", "P2SH,STRICTENC",   "EVAL_FALSE", "Test the test: we should have an empty stack after scriptSig evaluation"],
+["  ", "DEPTH", "P2SH,STRICTENC", "EVAL_FALSE", "and multiple spaces should not change that."],
+["   ", "DEPTH", "P2SH,STRICTENC", "EVAL_FALSE"],
+["    ", "DEPTH", "P2SH,STRICTENC", "EVAL_FALSE"],
+
+["", "", "P2SH,STRICTENC","EVAL_FALSE"],
+["", "NOP", "P2SH,STRICTENC","EVAL_FALSE"],
+["", "NOP DEPTH", "P2SH,STRICTENC", "EVAL_FALSE"],
+["NOP", "", "P2SH,STRICTENC", "EVAL_FALSE"],
+["NOP", "DEPTH", "P2SH,STRICTENC", "EVAL_FALSE"],
+["NOP","NOP", "P2SH,STRICTENC", "EVAL_FALSE"],
+["NOP","NOP DEPTH", "P2SH,STRICTENC", "EVAL_FALSE"],
+
+["DEPTH", "", "P2SH,STRICTENC", "EVAL_FALSE"],
+
+["0x4c01","0x01 NOP", "P2SH,STRICTENC","BAD_OPCODE", "PUSHDATA1 with not enough bytes"],
+["0x4d0200ff","0x01 NOP", "P2SH,STRICTENC","BAD_OPCODE", "PUSHDATA2 with not enough bytes"],
+["0x4e03000000ffff","0x01 NOP", "P2SH,STRICTENC","BAD_OPCODE", "PUSHDATA4 with not enough bytes"],
+
+["1", "IF 0x50 ENDIF 1", "P2SH,STRICTENC","BAD_OPCODE", "0x50 is reserved"],
+["0x52", "0x5f ADD 0x60 EQUAL", "P2SH,STRICTENC","EVAL_FALSE", "0x51 through 0x60 push 1 through 16 onto stack"],
+["0","NOP", "P2SH,STRICTENC","EVAL_FALSE",""],
+["1", "IF VER ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE", "VER non-functional"],
+["0", "IF VERIF ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE", "VERIF illegal everywhere"],
+["0", "IF ELSE 1 ELSE VERIF ENDIF", "P2SH,STRICTENC", "BAD_OPCODE", "VERIF illegal everywhere"],
+["0", "IF VERNOTIF ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE", "VERNOTIF illegal everywhere"],
+["0", "IF ELSE 1 ELSE VERNOTIF ENDIF", "P2SH,STRICTENC", "BAD_OPCODE", "VERNOTIF illegal everywhere"],
+
+["1 IF", "1 ENDIF", "P2SH,STRICTENC", "UNBALANCED_CONDITIONAL", "IF/ENDIF can't span scriptSig/scriptPubKey"],
+["1 IF 0 ENDIF", "1 ENDIF", "P2SH,STRICTENC", "UNBALANCED_CONDITIONAL"],
+["1 ELSE 0 ENDIF", "1", "P2SH,STRICTENC", "UNBALANCED_CONDITIONAL"],
+["0 NOTIF", "123", "P2SH,STRICTENC", "UNBALANCED_CONDITIONAL"],
+
+["0", "DUP IF ENDIF", "P2SH,STRICTENC", "EVAL_FALSE"],
+["0", "IF 1 ENDIF", "P2SH,STRICTENC", "EVAL_FALSE"],
+["0", "DUP IF ELSE ENDIF", "P2SH,STRICTENC", "EVAL_FALSE"],
+["0", "IF 1 ELSE ENDIF", "P2SH,STRICTENC", "EVAL_FALSE"],
+["0", "NOTIF ELSE 1 ENDIF", "P2SH,STRICTENC", "EVAL_FALSE"],
+
+["0 1", "IF IF 1 ELSE 0 ENDIF ENDIF", "P2SH,STRICTENC", "EVAL_FALSE"],
+["0 0", "IF IF 1 ELSE 0 ENDIF ENDIF", "P2SH,STRICTENC", "EVAL_FALSE"],
+["1 0", "IF IF 1 ELSE 0 ENDIF ELSE IF 0 ELSE 1 ENDIF ENDIF", "P2SH,STRICTENC", "EVAL_FALSE"],
+["0 1", "IF IF 1 ELSE 0 ENDIF ELSE IF 0 ELSE 1 ENDIF ENDIF", "P2SH,STRICTENC", "EVAL_FALSE"],
+
+["0 0", "NOTIF IF 1 ELSE 0 ENDIF ENDIF", "P2SH,STRICTENC", "EVAL_FALSE"],
+["0 1", "NOTIF IF 1 ELSE 0 ENDIF ENDIF", "P2SH,STRICTENC", "EVAL_FALSE"],
+["1 1", "NOTIF IF 1 ELSE 0 ENDIF ELSE IF 0 ELSE 1 ENDIF ENDIF", "P2SH,STRICTENC", "EVAL_FALSE"],
+["0 0", "NOTIF IF 1 ELSE 0 ENDIF ELSE IF 0 ELSE 1 ENDIF ENDIF", "P2SH,STRICTENC", "EVAL_FALSE"],
+
+["1", "IF RETURN ELSE ELSE 1 ENDIF", "P2SH,STRICTENC", "OP_RETURN", "Multiple ELSEs"],
+["1", "IF 1 ELSE ELSE RETURN ENDIF", "P2SH,STRICTENC", "OP_RETURN"],
+
+["1", "ENDIF", "P2SH,STRICTENC", "UNBALANCED_CONDITIONAL", "Malformed IF/ELSE/ENDIF sequence"],
+["1", "ELSE ENDIF", "P2SH,STRICTENC", "UNBALANCED_CONDITIONAL"],
+["1", "ENDIF ELSE", "P2SH,STRICTENC", "UNBALANCED_CONDITIONAL"],
+["1", "ENDIF ELSE IF", "P2SH,STRICTENC", "UNBALANCED_CONDITIONAL"],
+["1", "IF ELSE ENDIF ELSE", "P2SH,STRICTENC", "UNBALANCED_CONDITIONAL"],
+["1", "IF ELSE ENDIF ELSE ENDIF", "P2SH,STRICTENC", "UNBALANCED_CONDITIONAL"],
+["1", "IF ENDIF ENDIF", "P2SH,STRICTENC", "UNBALANCED_CONDITIONAL"],
+["1", "IF ELSE ELSE ENDIF ENDIF", "P2SH,STRICTENC", "UNBALANCED_CONDITIONAL"],
+
+["1", "RETURN", "P2SH,STRICTENC", "OP_RETURN"],
+["1", "DUP IF RETURN ENDIF", "P2SH,STRICTENC", "OP_RETURN"],
+
+["1", "RETURN 'data'", "P2SH,STRICTENC", "OP_RETURN", "canonical prunable txout format"],
+["0 IF", "RETURN ENDIF 1", "P2SH,STRICTENC", "UNBALANCED_CONDITIONAL", "still prunable because IF/ENDIF can't span scriptSig/scriptPubKey"],
+
+["0", "VERIFY 1", "P2SH,STRICTENC", "VERIFY"],
+["1", "VERIFY", "P2SH,STRICTENC", "EVAL_FALSE"],
+["1", "VERIFY 0", "P2SH,STRICTENC", "EVAL_FALSE"],
+
+["1 TOALTSTACK", "FROMALTSTACK 1", "P2SH,STRICTENC", "INVALID_ALTSTACK_OPERATION", "alt stack not shared between sig/pubkey"],
+
+["IFDUP", "DEPTH 0 EQUAL", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["DROP", "DEPTH 0 EQUAL", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["DUP", "DEPTH 0 EQUAL", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "DUP 1 ADD 2 EQUALVERIFY 0 EQUAL", "P2SH,STRICTENC", "EVAL_FALSE"],
+["NOP", "NIP", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "1 NIP", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "1 0 NIP", "P2SH,STRICTENC", "EVAL_FALSE"],
+["NOP", "OVER 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "OVER", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["0 1", "OVER DEPTH 3 EQUALVERIFY", "P2SH,STRICTENC", "EVAL_FALSE"],
+["19 20 21", "PICK 19 EQUALVERIFY DEPTH 2 EQUAL", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "0 PICK", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "-1 PICK", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["19 20 21", "0 PICK 20 EQUALVERIFY DEPTH 3 EQUAL", "P2SH,STRICTENC", "EQUALVERIFY"],
+["19 20 21", "1 PICK 21 EQUALVERIFY DEPTH 3 EQUAL", "P2SH,STRICTENC", "EQUALVERIFY"],
+["19 20 21", "2 PICK 22 EQUALVERIFY DEPTH 3 EQUAL", "P2SH,STRICTENC", "EQUALVERIFY"],
+["NOP", "0 ROLL", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "-1 ROLL", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["19 20 21", "0 ROLL 20 EQUALVERIFY DEPTH 2 EQUAL", "P2SH,STRICTENC", "EQUALVERIFY"],
+["19 20 21", "1 ROLL 21 EQUALVERIFY DEPTH 2 EQUAL", "P2SH,STRICTENC", "EQUALVERIFY"],
+["19 20 21", "2 ROLL 22 EQUALVERIFY DEPTH 2 EQUAL", "P2SH,STRICTENC", "EQUALVERIFY"],
+["NOP", "ROT 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "1 ROT 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "1 2 ROT 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "0 1 2 ROT", "P2SH,STRICTENC", "EVAL_FALSE"],
+["NOP", "SWAP 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "SWAP 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["0 1", "SWAP 1 EQUALVERIFY", "P2SH,STRICTENC", "EQUALVERIFY"],
+["NOP", "TUCK 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "TUCK 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1 0", "TUCK DEPTH 3 EQUALVERIFY SWAP 2DROP", "P2SH,STRICTENC", "EVAL_FALSE"],
+["NOP", "2DUP 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "2DUP 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "3DUP 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "3DUP 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1 2", "3DUP 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "2OVER 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "2 3 2OVER 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "2SWAP 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "2 3 2SWAP 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+
+["'a' 'b'", "CAT", "P2SH,STRICTENC", "DISABLED_OPCODE", "CAT disabled"],
+["'a' 'b' 0", "IF CAT ELSE 1 ENDIF", "P2SH,STRICTENC", "DISABLED_OPCODE", "CAT disabled"],
+["'abc' 1 1", "SUBSTR", "P2SH,STRICTENC", "DISABLED_OPCODE", "SUBSTR disabled"],
+["'abc' 1 1 0", "IF SUBSTR ELSE 1 ENDIF", "P2SH,STRICTENC", "DISABLED_OPCODE", "SUBSTR disabled"],
+["'abc' 2 0", "IF LEFT ELSE 1 ENDIF", "P2SH,STRICTENC", "DISABLED_OPCODE", "LEFT disabled"],
+["'abc' 2 0", "IF RIGHT ELSE 1 ENDIF", "P2SH,STRICTENC", "DISABLED_OPCODE", "RIGHT disabled"],
+
+["NOP", "SIZE 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+
+["'abc'", "IF INVERT ELSE 1 ENDIF", "P2SH,STRICTENC", "DISABLED_OPCODE", "INVERT disabled"],
+["1 2 0 IF AND ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "DISABLED_OPCODE", "AND disabled"],
+["1 2 0 IF OR ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "DISABLED_OPCODE", "OR disabled"],
+["1 2 0 IF XOR ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "DISABLED_OPCODE", "XOR disabled"],
+["2 0 IF 2MUL ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "DISABLED_OPCODE", "2MUL disabled"],
+["2 0 IF 2DIV ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "DISABLED_OPCODE", "2DIV disabled"],
+["2 2 0 IF MUL ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "DISABLED_OPCODE", "MUL disabled"],
+["2 2 0 IF DIV ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "DISABLED_OPCODE", "DIV disabled"],
+["2 2 0 IF MOD ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "DISABLED_OPCODE", "MOD disabled"],
+["2 2 0 IF LSHIFT ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "DISABLED_OPCODE", "LSHIFT disabled"],
+["2 2 0 IF RSHIFT ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "DISABLED_OPCODE", "RSHIFT disabled"],
+
+["", "EQUAL NOT", "P2SH,STRICTENC", "INVALID_STACK_OPERATION", "EQUAL must error when there are no stack items"],
+["0", "EQUAL NOT", "P2SH,STRICTENC", "INVALID_STACK_OPERATION", "EQUAL must error when there are not 2 stack items"],
+["0 1","EQUAL", "P2SH,STRICTENC", "EVAL_FALSE"],
+["1 1 ADD", "0 EQUAL", "P2SH,STRICTENC", "EVAL_FALSE"],
+["11 1 ADD 12 SUB", "11 EQUAL", "P2SH,STRICTENC", "EVAL_FALSE"],
+
+["2147483648 0 ADD", "NOP", "P2SH,STRICTENC", "UNKNOWN_ERROR", "arithmetic operands must be in range [-2^31...2^31] "],
+["-2147483648 0 ADD", "NOP", "P2SH,STRICTENC", "UNKNOWN_ERROR", "arithmetic operands must be in range [-2^31...2^31] "],
+["2147483647 DUP ADD", "4294967294 NUMEQUAL", "P2SH,STRICTENC", "UNKNOWN_ERROR", "NUMEQUAL must be in numeric range"],
+["'abcdef' NOT", "0 EQUAL", "P2SH,STRICTENC", "UNKNOWN_ERROR", "NOT is an arithmetic operand"],
+
+["2 DUP MUL", "4 EQUAL", "P2SH,STRICTENC", "DISABLED_OPCODE", "disabled"],
+["2 DUP DIV", "1 EQUAL", "P2SH,STRICTENC", "DISABLED_OPCODE", "disabled"],
+["2 2MUL", "4 EQUAL", "P2SH,STRICTENC", "DISABLED_OPCODE", "disabled"],
+["2 2DIV", "1 EQUAL", "P2SH,STRICTENC", "DISABLED_OPCODE", "disabled"],
+["7 3 MOD", "1 EQUAL", "P2SH,STRICTENC", "DISABLED_OPCODE", "disabled"],
+["2 2 LSHIFT", "8 EQUAL", "P2SH,STRICTENC", "DISABLED_OPCODE", "disabled"],
+["2 1 RSHIFT", "1 EQUAL", "P2SH,STRICTENC", "DISABLED_OPCODE", "disabled"],
+
+["1", "NOP1 CHECKLOCKTIMEVERIFY CHECKSEQUENCEVERIFY NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 2 EQUAL", "P2SH,STRICTENC", "EVAL_FALSE"],
+["'NOP_1_to_10' NOP1 CHECKLOCKTIMEVERIFY CHECKSEQUENCEVERIFY NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_11' EQUAL", "P2SH,STRICTENC", "EVAL_FALSE"],
+
+["Ensure 100% coverage of discouraged NOPS"],
+["1", "NOP1",  "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS"],
+["1", "CHECKLOCKTIMEVERIFY",  "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS"],
+["1", "CHECKSEQUENCEVERIFY",  "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS"],
+["1", "NOP4",  "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS"],
+["1", "NOP5",  "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS"],
+["1", "NOP6",  "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS"],
+["1", "NOP7",  "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS"],
+["1", "NOP8",  "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS"],
+["1", "NOP9",  "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS"],
+["1", "NOP10", "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS"],
+
+["NOP10", "1", "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS", "Discouraged NOP10 in scriptSig"],
+
+["1 0x01 0xb9", "HASH160 0x14 0x15727299b05b45fdaf9ac9ecf7565cfe27c3e567 EQUAL",
+ "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS", "Discouraged NOP10 in redeemScript"],
+
+["0x50","1", "P2SH,STRICTENC", "BAD_OPCODE", "opcode 0x50 is reserved"],
+["1", "IF 0xba ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE", "opcodes above NOP10 invalid if executed"],
+["1", "IF 0xbb ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xbc ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xbd ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xbe ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xbf ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xc0 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xc1 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xc2 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xc3 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xc4 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xc5 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xc6 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xc7 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xc8 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xc9 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xca ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xcb ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xcc ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xcd ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xce ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xcf ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xd0 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xd1 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xd2 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xd3 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xd4 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xd5 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xd6 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xd7 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xd8 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xd9 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xda ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xdb ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xdc ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xdd ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xde ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xdf ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xe0 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xe1 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xe2 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xe3 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xe4 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xe5 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xe6 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xe7 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xe8 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xe9 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xea ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xeb ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xec ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xed ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xee ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xef ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xf0 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xf1 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xf2 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xf3 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xf4 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xf5 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xf6 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xf7 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xf8 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xf9 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xfa ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xfb ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xfc ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xfd ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xfe ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+["1", "IF 0xff ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
+
+["1 IF 1 ELSE", "0xff ENDIF", "P2SH,STRICTENC", "UNBALANCED_CONDITIONAL", "invalid because scriptSig and scriptPubKey are processed separately"],
+
+["NOP", "RIPEMD160", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "SHA1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "SHA256", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "HASH160", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "HASH256", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+
+["NOP",
+"'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'",
+"P2SH,STRICTENC",
+"PUSH_SIZE",
+">520 byte push"],
+["0",
+"IF 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' ENDIF 1",
+"P2SH,STRICTENC",
+"PUSH_SIZE",
+">520 byte push in non-executed IF branch"],
+["1",
+"0x61616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161",
+"P2SH,STRICTENC",
+"OP_COUNT",
+">201 opcodes executed. 0x61 is NOP"],
+["0",
+"IF 0x6161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161 ENDIF 1",
+"P2SH,STRICTENC",
+"OP_COUNT",
+">201 opcodes including non-executed IF branch. 0x61 is NOP"],
+["1 2 3 4 5 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f",
+"1 2 3 4 5 6 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f",
+"P2SH,STRICTENC",
+"STACK_SIZE",
+">1,000 stack size (0x6f is 3DUP)"],
+["1 2 3 4 5 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f",
+"1 TOALTSTACK 2 TOALTSTACK 3 4 5 6 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f",
+"P2SH,STRICTENC",
+"STACK_SIZE",
+">1,000 stack+altstack size"],
+["NOP",
+"0 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f 2DUP 0x616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161",
+"P2SH,STRICTENC",
+"SCRIPT_SIZE",
+"10,001-byte scriptPubKey"],
+
+["NOP1","NOP10", "P2SH,STRICTENC", "EVAL_FALSE"],
+
+["1","VER", "P2SH,STRICTENC", "BAD_OPCODE", "OP_VER is reserved"],
+["1","VERIF", "P2SH,STRICTENC", "BAD_OPCODE", "OP_VERIF is reserved"],
+["1","VERNOTIF", "P2SH,STRICTENC", "BAD_OPCODE", "OP_VERNOTIF is reserved"],
+["1","RESERVED", "P2SH,STRICTENC", "BAD_OPCODE", "OP_RESERVED is reserved"],
+["1","RESERVED1", "P2SH,STRICTENC", "BAD_OPCODE", "OP_RESERVED1 is reserved"],
+["1","RESERVED2", "P2SH,STRICTENC", "BAD_OPCODE", "OP_RESERVED2 is reserved"],
+["1","0xba", "P2SH,STRICTENC", "BAD_OPCODE", "0xba == OP_NOP10 + 1"],
+
+["2147483648", "1ADD 1", "P2SH,STRICTENC", "UNKNOWN_ERROR", "We cannot do math on 5-byte integers"],
+["2147483648", "NEGATE 1", "P2SH,STRICTENC", "UNKNOWN_ERROR", "We cannot do math on 5-byte integers"],
+["-2147483648", "1ADD 1", "P2SH,STRICTENC", "UNKNOWN_ERROR", "Because we use a sign bit, -2147483648 is also 5 bytes"],
+["2147483647", "1ADD 1SUB 1", "P2SH,STRICTENC", "UNKNOWN_ERROR", "We cannot do math on 5-byte integers, even if the result is 4-bytes"],
+["2147483648", "1SUB 1", "P2SH,STRICTENC", "UNKNOWN_ERROR", "We cannot do math on 5-byte integers, even if the result is 4-bytes"],
+
+["2147483648 1", "BOOLOR 1", "P2SH,STRICTENC", "UNKNOWN_ERROR", "We cannot do BOOLOR on 5-byte integers (but we can still do IF etc)"],
+["2147483648 1", "BOOLAND 1", "P2SH,STRICTENC", "UNKNOWN_ERROR", "We cannot do BOOLAND on 5-byte integers"],
+
+["1", "1 ENDIF", "P2SH,STRICTENC", "UNBALANCED_CONDITIONAL", "ENDIF without IF"],
+["1", "IF 1", "P2SH,STRICTENC", "UNBALANCED_CONDITIONAL", "IF without ENDIF"],
+["1 IF 1", "ENDIF", "P2SH,STRICTENC", "UNBALANCED_CONDITIONAL", "IFs don't carry over"],
+
+["NOP", "IF 1 ENDIF", "P2SH,STRICTENC", "UNBALANCED_CONDITIONAL", "The following tests check the if(stack.size() < N) tests in each opcode"],
+["NOP", "NOTIF 1 ENDIF", "P2SH,STRICTENC", "UNBALANCED_CONDITIONAL", "They are here to catch copy-and-paste errors"],
+["NOP", "VERIFY 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION", "Most of them are duplicated elsewhere,"],
+
+["NOP", "TOALTSTACK 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION", "but, hey, more is always better, right?"],
+["1", "FROMALTSTACK", "P2SH,STRICTENC", "INVALID_ALTSTACK_OPERATION"],
+["1", "2DROP 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "2DUP", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1 1", "3DUP", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1 1 1", "2OVER", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1 1 1 1 1", "2ROT", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1 1 1", "2SWAP", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "IFDUP 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "DROP 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "DUP 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "NIP", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "OVER", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1 1 1 3", "PICK", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["0", "PICK 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1 1 1 3", "ROLL", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["0", "ROLL 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1 1", "ROT", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "SWAP", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "TUCK", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+
+["NOP", "SIZE 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+
+["1", "EQUAL 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "EQUALVERIFY 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+
+["NOP", "1ADD 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "1SUB 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "NEGATE 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "ABS 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "NOT 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "0NOTEQUAL 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+
+["1", "ADD", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "SUB", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "BOOLAND", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "BOOLOR", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "NUMEQUAL", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "NUMEQUALVERIFY 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "NUMNOTEQUAL", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "LESSTHAN", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "GREATERTHAN", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "LESSTHANOREQUAL", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "GREATERTHANOREQUAL", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "MIN", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1", "MAX", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["1 1", "WITHIN", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+
+["NOP", "RIPEMD160 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "SHA1 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "SHA256 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "HASH160 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+["NOP", "HASH256 1", "P2SH,STRICTENC", "INVALID_STACK_OPERATION"],
+
+["Increase CHECKSIG and CHECKMULTISIG negative test coverage"],
+["", "CHECKSIG NOT", "STRICTENC", "INVALID_STACK_OPERATION", "CHECKSIG must error when there are no stack items"],
+["0", "CHECKSIG NOT", "STRICTENC", "INVALID_STACK_OPERATION", "CHECKSIG must error when there are not 2 stack items"],
+["", "CHECKMULTISIG NOT", "STRICTENC", "INVALID_STACK_OPERATION", "CHECKMULTISIG must error when there are no stack items"],
+["", "-1 CHECKMULTISIG NOT", "STRICTENC", "PUBKEY_COUNT", "CHECKMULTISIG must error when the specified number of pubkeys is negative"],
+["", "1 CHECKMULTISIG NOT", "STRICTENC", "INVALID_STACK_OPERATION", "CHECKMULTISIG must error when there are not enough pubkeys on the stack"],
+["", "-1 0 CHECKMULTISIG NOT", "STRICTENC", "SIG_COUNT", "CHECKMULTISIG must error when the specified number of signatures is negative"],
+["", "1 'pk1' 1 CHECKMULTISIG NOT", "STRICTENC", "INVALID_STACK_OPERATION", "CHECKMULTISIG must error when there are not enough signatures on the stack"],
+["", "'dummy' 'sig1' 1 'pk1' 1 CHECKMULTISIG IF 1 ENDIF", "", "EVAL_FALSE", "CHECKMULTISIG must push false to stack when signature is invalid when NOT in strict enc mode"],
+
+["",
+"0 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG",
+"P2SH,STRICTENC",
+"OP_COUNT",
+"202 CHECKMULTISIGS, fails due to 201 op limit"],
+
+["1",
+"0 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY 0 0 CHECKMULTISIGVERIFY",
+"P2SH,STRICTENC",
+"INVALID_STACK_OPERATION",
+""],
+
+["",
+"NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG",
+"P2SH,STRICTENC",
+"OP_COUNT",
+"Fails due to 201 script operation limit"],
+
+["1",
+"NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY",
+"P2SH,STRICTENC",
+"OP_COUNT",
+""],
+
+
+["0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21", "21 CHECKMULTISIG 1", "P2SH,STRICTENC", "PUBKEY_COUNT", "nPubKeys > 20"],
+["0 'sig' 1 0", "CHECKMULTISIG 1", "P2SH,STRICTENC", "SIG_COUNT", "nSigs > nPubKeys"],
+
+
+["NOP 0x01 1", "HASH160 0x14 0xda1745e9b549bd0bfa1a569971c77eba30cd5a4b EQUAL", "P2SH,STRICTENC", "SIG_PUSHONLY", "Tests for Script.IsPushOnly()"],
+["NOP1 0x01 1", "HASH160 0x14 0xda1745e9b549bd0bfa1a569971c77eba30cd5a4b EQUAL", "P2SH,STRICTENC", "SIG_PUSHONLY"],
+
+["0 0x01 0x50", "HASH160 0x14 0xece424a6bb6ddf4db592c0faed60685047a361b1 EQUAL", "P2SH,STRICTENC", "BAD_OPCODE", "OP_RESERVED in P2SH should fail"],
+["0 0x01 VER", "HASH160 0x14 0x0f4d7845db968f2a81b530b6f3c1d6246d4c7e01 EQUAL", "P2SH,STRICTENC", "BAD_OPCODE", "OP_VER in P2SH should fail"],
+
+["0x00", "'00' EQUAL", "P2SH,STRICTENC", "EVAL_FALSE", "Basic OP_0 execution"],
+
+["MINIMALDATA enforcement for PUSHDATAs"],
+
+["0x4c 0x00", "DROP 1", "MINIMALDATA", "MINIMALDATA", "Empty vector minimally represented by OP_0"],
+["0x01 0x81", "DROP 1", "MINIMALDATA", "MINIMALDATA", "-1 minimally represented by OP_1NEGATE"],
+["0x01 0x01", "DROP 1", "MINIMALDATA", "MINIMALDATA", "1 to 16 minimally represented by OP_1 to OP_16"],
+["0x01 0x02", "DROP 1", "MINIMALDATA", "MINIMALDATA"],
+["0x01 0x03", "DROP 1", "MINIMALDATA", "MINIMALDATA"],
+["0x01 0x04", "DROP 1", "MINIMALDATA", "MINIMALDATA"],
+["0x01 0x05", "DROP 1", "MINIMALDATA", "MINIMALDATA"],
+["0x01 0x06", "DROP 1", "MINIMALDATA", "MINIMALDATA"],
+["0x01 0x07", "DROP 1", "MINIMALDATA", "MINIMALDATA"],
+["0x01 0x08", "DROP 1", "MINIMALDATA", "MINIMALDATA"],
+["0x01 0x09", "DROP 1", "MINIMALDATA", "MINIMALDATA"],
+["0x01 0x0a", "DROP 1", "MINIMALDATA", "MINIMALDATA"],
+["0x01 0x0b", "DROP 1", "MINIMALDATA", "MINIMALDATA"],
+["0x01 0x0c", "DROP 1", "MINIMALDATA", "MINIMALDATA"],
+["0x01 0x0d", "DROP 1", "MINIMALDATA", "MINIMALDATA"],
+["0x01 0x0e", "DROP 1", "MINIMALDATA", "MINIMALDATA"],
+["0x01 0x0f", "DROP 1", "MINIMALDATA", "MINIMALDATA"],
+["0x01 0x10", "DROP 1", "MINIMALDATA", "MINIMALDATA"],
+
+["0x4c 0x48 0x111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111", "DROP 1", "MINIMALDATA",
+ "MINIMALDATA",
+ "PUSHDATA1 of 72 bytes minimally represented by direct push"],
+
+["0x4d 0xFF00 0x111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111", "DROP 1", "MINIMALDATA",
+ "MINIMALDATA",
+ "PUSHDATA2 of 255 bytes minimally represented by PUSHDATA1"],
+
+["0x4e 0x00010000 0x11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111", "DROP 1", "MINIMALDATA",
+ "MINIMALDATA",
+ "PUSHDATA4 of 256 bytes minimally represented by PUSHDATA2"],
+
+["MINIMALDATA enforcement for numeric arguments"],
+["0x0000", "DROP 0 EQUAL", "MINIMALDATA,CLEANSTACK", "OK", "numequals 0"],
+
+["0x01 0x00", "NOT DROP 1", "MINIMALDATA", "UNKNOWN_ERROR", "numequals 0"],
+["0x02 0x0000", "NOT DROP 1", "MINIMALDATA", "UNKNOWN_ERROR", "numequals 0"],
+["0x01 0x80", "NOT DROP 1", "MINIMALDATA", "UNKNOWN_ERROR", "0x80 (negative zero) numequals 0"],
+["0x02 0x0080", "NOT DROP 1", "MINIMALDATA", "UNKNOWN_ERROR", "numequals 0"],
+["0x02 0x0500", "NOT DROP 1", "MINIMALDATA", "UNKNOWN_ERROR", "numequals 5"],
+["0x03 0x050000", "NOT DROP 1", "MINIMALDATA", "UNKNOWN_ERROR", "numequals 5"],
+["0x02 0x0580", "NOT DROP 1", "MINIMALDATA", "UNKNOWN_ERROR", "numequals -5"],
+["0x03 0x050080", "NOT DROP 1", "MINIMALDATA", "UNKNOWN_ERROR", "numequals -5"],
+["0x03 0xff7f80", "NOT DROP 1", "MINIMALDATA", "UNKNOWN_ERROR", "Minimal encoding is 0xffff"],
+["0x03 0xff7f00", "NOT DROP 1", "MINIMALDATA", "UNKNOWN_ERROR", "Minimal encoding is 0xff7f"],
+["0x04 0xffff7f80", "NOT DROP 1", "MINIMALDATA", "UNKNOWN_ERROR", "Minimal encoding is 0xffffff"],
+["0x04 0xffff7f00", "NOT DROP 1", "MINIMALDATA", "UNKNOWN_ERROR", "Minimal encoding is 0xffff7f"],
+
+["Test every numeric-accepting opcode for correct handling of the numeric minimal encoding rule"],
+
+["1 0x02 0x0000", "PICK DROP", "MINIMALDATA", "UNKNOWN_ERROR"],
+["1 0x02 0x0000", "ROLL DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0x02 0x0000", "1ADD DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0x02 0x0000", "1SUB DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0x02 0x0000", "NEGATE DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0x02 0x0000", "ABS DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0x02 0x0000", "NOT DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0x02 0x0000", "0NOTEQUAL DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+
+["0 0x02 0x0000", "ADD DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0x02 0x0000 0", "ADD DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0 0x02 0x0000", "SUB DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0x02 0x0000 0", "SUB DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0 0x02 0x0000", "BOOLAND DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0x02 0x0000 0", "BOOLAND DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0 0x02 0x0000", "BOOLOR DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0x02 0x0000 0", "BOOLOR DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0 0x02 0x0000", "NUMEQUAL DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0x02 0x0000 1", "NUMEQUAL DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0 0x02 0x0000", "NUMEQUALVERIFY 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0x02 0x0000 0", "NUMEQUALVERIFY 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0 0x02 0x0000", "NUMNOTEQUAL DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0x02 0x0000 0", "NUMNOTEQUAL DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0 0x02 0x0000", "LESSTHAN DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0x02 0x0000 0", "LESSTHAN DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0 0x02 0x0000", "GREATERTHAN DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0x02 0x0000 0", "GREATERTHAN DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0 0x02 0x0000", "LESSTHANOREQUAL DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0x02 0x0000 0", "LESSTHANOREQUAL DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0 0x02 0x0000", "GREATERTHANOREQUAL DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0x02 0x0000 0", "GREATERTHANOREQUAL DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0 0x02 0x0000", "MIN DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0x02 0x0000 0", "MIN DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0 0x02 0x0000", "MAX DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0x02 0x0000 0", "MAX DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+
+["0x02 0x0000 0 0", "WITHIN DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0 0x02 0x0000 0", "WITHIN DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0 0 0x02 0x0000", "WITHIN DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+
+["0 0 0x02 0x0000", "CHECKMULTISIG DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0 0x02 0x0000 0", "CHECKMULTISIG DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0 0x02 0x0000 0 1", "CHECKMULTISIG DROP 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0 0 0x02 0x0000", "CHECKMULTISIGVERIFY 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+["0 0x02 0x0000 0", "CHECKMULTISIGVERIFY 1", "MINIMALDATA", "UNKNOWN_ERROR"],
+
+["CHECKSEQUENCEVERIFY tests"],
+["", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY", "INVALID_STACK_OPERATION", "CSV automatically fails on an empty stack"],
+["-1", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY", "NEGATIVE_LOCKTIME", "CSV automatically fails if stack top is negative"],
+["0x0100", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY,MINIMALDATA", "UNKNOWN_ERROR", "CSV fails if stack top is not minimally encoded"],
+["0", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY", "UNSATISFIED_LOCKTIME", "CSV fails if stack top bit 1 << 31 is set and the tx version < 2"],
+["4294967296", "CHECKSEQUENCEVERIFY", "CHECKSEQUENCEVERIFY", "UNSATISFIED_LOCKTIME",
+  "CSV fails if stack top bit 1 << 31 is not set, and tx version < 2"],
+
+["The End"]
+]
diff --git a/core/src/test/resources/org/bitcoinj/script/script_valid.json b/core/src/test/resources/org/bitcoinj/script/script_valid.json
deleted file mode 100644
index 3b446d2f8d2..00000000000
--- a/core/src/test/resources/org/bitcoinj/script/script_valid.json
+++ /dev/null
@@ -1,525 +0,0 @@
-[
-["", "DEPTH 0 EQUAL", "P2SH,STRICTENC", "Test the test: we should have an empty stack after scriptSig evaluation"],
-["  ", "DEPTH 0 EQUAL", "P2SH,STRICTENC", "and multiple spaces should not change that."],
-["   ", "DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["    ", "DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["1 2", "2 EQUALVERIFY 1 EQUAL", "P2SH,STRICTENC", "Similarly whitespace around and between symbols"],
-["1  2", "2 EQUALVERIFY 1 EQUAL", "P2SH,STRICTENC"],
-["  1  2", "2 EQUALVERIFY 1 EQUAL", "P2SH,STRICTENC"],
-["1  2  ", "2 EQUALVERIFY 1 EQUAL", "P2SH,STRICTENC"],
-["  1  2  ", "2 EQUALVERIFY 1 EQUAL", "P2SH,STRICTENC"],
-
-["1", "", "P2SH,STRICTENC"],
-["0x02 0x01 0x00", "", "P2SH,STRICTENC", "all bytes are significant, not only the last one"],
-["0x09 0x00000000 0x00000000 0x10", "", "P2SH,STRICTENC", "equals zero when cast to Int64"],
-
-["0x01 0x0b", "11 EQUAL", "P2SH,STRICTENC", "push 1 byte"],
-["0x02 0x417a", "'Az' EQUAL", "P2SH,STRICTENC"],
-["0x4b 0x417a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a7a",
- "'Azzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz' EQUAL", "P2SH,STRICTENC", "push 75 bytes"],
-
-["0x4c 0x01 0x07","7 EQUAL", "P2SH,STRICTENC", "0x4c is OP_PUSHDATA1"],
-["0x4d 0x0100 0x08","8 EQUAL", "P2SH,STRICTENC", "0x4d is OP_PUSHDATA2"],
-["0x4e 0x01000000 0x09","9 EQUAL", "P2SH,STRICTENC", "0x4e is OP_PUSHDATA4"],
-
-["0x4c 0x00","0 EQUAL", "P2SH,STRICTENC"],
-["0x4d 0x0000","0 EQUAL", "P2SH,STRICTENC"],
-["0x4e 0x00000000","0 EQUAL", "P2SH,STRICTENC"],
-["0x4f 1000 ADD","999 EQUAL", "P2SH,STRICTENC"],
-["0", "IF 0x50 ENDIF 1", "P2SH,STRICTENC", "0x50 is reserved (ok if not executed)"],
-["0x51", "0x5f ADD 0x60 EQUAL", "P2SH,STRICTENC", "0x51 through 0x60 push 1 through 16 onto stack"],
-["1","NOP", "P2SH,STRICTENC"],
-["0", "IF VER ELSE 1 ENDIF", "P2SH,STRICTENC", "VER non-functional (ok if not executed)"],
-["0", "IF RESERVED RESERVED1 RESERVED2 ELSE 1 ENDIF", "P2SH,STRICTENC", "RESERVED ok in un-executed IF"],
-
-["1", "DUP IF ENDIF", "P2SH,STRICTENC"],
-["1", "IF 1 ENDIF", "P2SH,STRICTENC"],
-["1", "DUP IF ELSE ENDIF", "P2SH,STRICTENC"],
-["1", "IF 1 ELSE ENDIF", "P2SH,STRICTENC"],
-["0", "IF ELSE 1 ENDIF", "P2SH,STRICTENC"],
-
-["1 1", "IF IF 1 ELSE 0 ENDIF ENDIF", "P2SH,STRICTENC"],
-["1 0", "IF IF 1 ELSE 0 ENDIF ENDIF", "P2SH,STRICTENC"],
-["1 1", "IF IF 1 ELSE 0 ENDIF ELSE IF 0 ELSE 1 ENDIF ENDIF", "P2SH,STRICTENC"],
-["0 0", "IF IF 1 ELSE 0 ENDIF ELSE IF 0 ELSE 1 ENDIF ENDIF", "P2SH,STRICTENC"],
-
-["1 0", "NOTIF IF 1 ELSE 0 ENDIF ENDIF", "P2SH,STRICTENC"],
-["1 1", "NOTIF IF 1 ELSE 0 ENDIF ENDIF", "P2SH,STRICTENC"],
-["1 0", "NOTIF IF 1 ELSE 0 ENDIF ELSE IF 0 ELSE 1 ENDIF ENDIF", "P2SH,STRICTENC"],
-["0 1", "NOTIF IF 1 ELSE 0 ENDIF ELSE IF 0 ELSE 1 ENDIF ENDIF", "P2SH,STRICTENC"],
-
-["0", "IF 0 ELSE 1 ELSE 0 ENDIF", "P2SH,STRICTENC", "Multiple ELSE's are valid and executed inverts on each ELSE encountered"],
-["1", "IF 1 ELSE 0 ELSE ENDIF", "P2SH,STRICTENC"],
-["1", "IF ELSE 0 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["1", "IF 1 ELSE 0 ELSE 1 ENDIF ADD 2 EQUAL", "P2SH,STRICTENC"],
-["'' 1", "IF SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ENDIF 0x14 0x68ca4fec736264c13b859bac43d5173df6871682 EQUAL", "P2SH,STRICTENC"],
-
-["1", "NOTIF 0 ELSE 1 ELSE 0 ENDIF", "P2SH,STRICTENC", "Multiple ELSE's are valid and execution inverts on each ELSE encountered"],
-["0", "NOTIF 1 ELSE 0 ELSE ENDIF", "P2SH,STRICTENC"],
-["0", "NOTIF ELSE 0 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "NOTIF 1 ELSE 0 ELSE 1 ENDIF ADD 2 EQUAL", "P2SH,STRICTENC"],
-["'' 0", "NOTIF SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ELSE ELSE SHA1 ENDIF 0x14 0x68ca4fec736264c13b859bac43d5173df6871682 EQUAL", "P2SH,STRICTENC"],
-
-["0", "IF 1 IF RETURN ELSE RETURN ELSE RETURN ENDIF ELSE 1 IF 1 ELSE RETURN ELSE 1 ENDIF ELSE RETURN ENDIF ADD 2 EQUAL", "P2SH,STRICTENC", "Nested ELSE ELSE"],
-["1", "NOTIF 0 NOTIF RETURN ELSE RETURN ELSE RETURN ENDIF ELSE 0 NOTIF 1 ELSE RETURN ELSE 1 ENDIF ELSE RETURN ENDIF ADD 2 EQUAL", "P2SH,STRICTENC"],
-
-["0", "IF RETURN ENDIF 1", "P2SH,STRICTENC", "RETURN only works if executed"],
-
-["1 1", "VERIFY", "P2SH,STRICTENC"],
-["1 0x05 0x01 0x00 0x00 0x00 0x00", "VERIFY", "P2SH,STRICTENC", "values >4 bytes can be cast to boolean"],
-["1 0x01 0x80", "IF 0 ENDIF", "P2SH,STRICTENC", "negative 0 is false"],
-
-["10 0 11 TOALTSTACK DROP FROMALTSTACK", "ADD 21 EQUAL", "P2SH,STRICTENC"],
-["'gavin_was_here' TOALTSTACK 11 FROMALTSTACK", "'gavin_was_here' EQUALVERIFY 11 EQUAL", "P2SH,STRICTENC"],
-
-["0 IFDUP", "DEPTH 1 EQUALVERIFY 0 EQUAL", "P2SH,STRICTENC"],
-["1 IFDUP", "DEPTH 2 EQUALVERIFY 1 EQUALVERIFY 1 EQUAL", "P2SH,STRICTENC"],
-["0x05 0x0100000000 IFDUP", "DEPTH 2 EQUALVERIFY 0x05 0x0100000000 EQUAL", "P2SH,STRICTENC", "IFDUP dups non ints"],
-["0 DROP", "DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["0", "DUP 1 ADD 1 EQUALVERIFY 0 EQUAL", "P2SH,STRICTENC"],
-["0 1", "NIP", "P2SH,STRICTENC"],
-["1 0", "OVER DEPTH 3 EQUALVERIFY", "P2SH,STRICTENC"],
-["22 21 20", "0 PICK 20 EQUALVERIFY DEPTH 3 EQUAL", "P2SH,STRICTENC"],
-["22 21 20", "1 PICK 21 EQUALVERIFY DEPTH 3 EQUAL", "P2SH,STRICTENC"],
-["22 21 20", "2 PICK 22 EQUALVERIFY DEPTH 3 EQUAL", "P2SH,STRICTENC"],
-["22 21 20", "0 ROLL 20 EQUALVERIFY DEPTH 2 EQUAL", "P2SH,STRICTENC"],
-["22 21 20", "1 ROLL 21 EQUALVERIFY DEPTH 2 EQUAL", "P2SH,STRICTENC"],
-["22 21 20", "2 ROLL 22 EQUALVERIFY DEPTH 2 EQUAL", "P2SH,STRICTENC"],
-["22 21 20", "ROT 22 EQUAL", "P2SH,STRICTENC"],
-["22 21 20", "ROT DROP 20 EQUAL", "P2SH,STRICTENC"],
-["22 21 20", "ROT DROP DROP 21 EQUAL", "P2SH,STRICTENC"],
-["22 21 20", "ROT ROT 21 EQUAL", "P2SH,STRICTENC"],
-["22 21 20", "ROT ROT ROT 20 EQUAL", "P2SH,STRICTENC"],
-["25 24 23 22 21 20", "2ROT 24 EQUAL", "P2SH,STRICTENC"],
-["25 24 23 22 21 20", "2ROT DROP 25 EQUAL", "P2SH,STRICTENC"],
-["25 24 23 22 21 20", "2ROT 2DROP 20 EQUAL", "P2SH,STRICTENC"],
-["25 24 23 22 21 20", "2ROT 2DROP DROP 21 EQUAL", "P2SH,STRICTENC"],
-["25 24 23 22 21 20", "2ROT 2DROP 2DROP 22 EQUAL", "P2SH,STRICTENC"],
-["25 24 23 22 21 20", "2ROT 2DROP 2DROP DROP 23 EQUAL", "P2SH,STRICTENC"],
-["25 24 23 22 21 20", "2ROT 2ROT 22 EQUAL", "P2SH,STRICTENC"],
-["25 24 23 22 21 20", "2ROT 2ROT 2ROT 20 EQUAL", "P2SH,STRICTENC"],
-["1 0", "SWAP 1 EQUALVERIFY 0 EQUAL", "P2SH,STRICTENC"],
-["0 1", "TUCK DEPTH 3 EQUALVERIFY SWAP 2DROP", "P2SH,STRICTENC"],
-["13 14", "2DUP ROT EQUALVERIFY EQUAL", "P2SH,STRICTENC"],
-["-1 0 1 2", "3DUP DEPTH 7 EQUALVERIFY ADD ADD 3 EQUALVERIFY 2DROP 0 EQUALVERIFY", "P2SH,STRICTENC"],
-["1 2 3 5", "2OVER ADD ADD 8 EQUALVERIFY ADD ADD 6 EQUAL", "P2SH,STRICTENC"],
-["1 3 5 7", "2SWAP ADD 4 EQUALVERIFY ADD 12 EQUAL", "P2SH,STRICTENC"],
-["0", "SIZE 0 EQUAL", "P2SH,STRICTENC"],
-["1", "SIZE 1 EQUAL", "P2SH,STRICTENC"],
-["127", "SIZE 1 EQUAL", "P2SH,STRICTENC"],
-["128", "SIZE 2 EQUAL", "P2SH,STRICTENC"],
-["32767", "SIZE 2 EQUAL", "P2SH,STRICTENC"],
-["32768", "SIZE 3 EQUAL", "P2SH,STRICTENC"],
-["8388607", "SIZE 3 EQUAL", "P2SH,STRICTENC"],
-["8388608", "SIZE 4 EQUAL", "P2SH,STRICTENC"],
-["2147483647", "SIZE 4 EQUAL", "P2SH,STRICTENC"],
-["2147483648", "SIZE 5 EQUAL", "P2SH,STRICTENC"],
-["549755813887", "SIZE 5 EQUAL", "P2SH,STRICTENC"],
-["549755813888", "SIZE 6 EQUAL", "P2SH,STRICTENC"],
-["9223372036854775807", "SIZE 8 EQUAL", "P2SH,STRICTENC"],
-["-1", "SIZE 1 EQUAL", "P2SH,STRICTENC"],
-["-127", "SIZE 1 EQUAL", "P2SH,STRICTENC"],
-["-128", "SIZE 2 EQUAL", "P2SH,STRICTENC"],
-["-32767", "SIZE 2 EQUAL", "P2SH,STRICTENC"],
-["-32768", "SIZE 3 EQUAL", "P2SH,STRICTENC"],
-["-8388607", "SIZE 3 EQUAL", "P2SH,STRICTENC"],
-["-8388608", "SIZE 4 EQUAL", "P2SH,STRICTENC"],
-["-2147483647", "SIZE 4 EQUAL", "P2SH,STRICTENC"],
-["-2147483648", "SIZE 5 EQUAL", "P2SH,STRICTENC"],
-["-549755813887", "SIZE 5 EQUAL", "P2SH,STRICTENC"],
-["-549755813888", "SIZE 6 EQUAL", "P2SH,STRICTENC"],
-["-9223372036854775807", "SIZE 8 EQUAL", "P2SH,STRICTENC"],
-["'abcdefghijklmnopqrstuvwxyz'", "SIZE 26 EQUAL", "P2SH,STRICTENC"],
-
-["42", "SIZE 1 EQUALVERIFY 42 EQUAL", "P2SH,STRICTENC", "SIZE does not consume argument"],
-
-["2 -2 ADD", "0 EQUAL", "P2SH,STRICTENC"],
-["2147483647 -2147483647 ADD", "0 EQUAL", "P2SH,STRICTENC"],
-["-1 -1 ADD", "-2 EQUAL", "P2SH,STRICTENC"],
-
-["0 0","EQUAL", "P2SH,STRICTENC"],
-["1 1 ADD", "2 EQUAL", "P2SH,STRICTENC"],
-["1 1ADD", "2 EQUAL", "P2SH,STRICTENC"],
-["111 1SUB", "110 EQUAL", "P2SH,STRICTENC"],
-["111 1 ADD 12 SUB", "100 EQUAL", "P2SH,STRICTENC"],
-["0 ABS", "0 EQUAL", "P2SH,STRICTENC"],
-["16 ABS", "16 EQUAL", "P2SH,STRICTENC"],
-["-16 ABS", "-16 NEGATE EQUAL", "P2SH,STRICTENC"],
-["0 NOT", "NOP", "P2SH,STRICTENC"],
-["1 NOT", "0 EQUAL", "P2SH,STRICTENC"],
-["11 NOT", "0 EQUAL", "P2SH,STRICTENC"],
-["0 0NOTEQUAL", "0 EQUAL", "P2SH,STRICTENC"],
-["1 0NOTEQUAL", "1 EQUAL", "P2SH,STRICTENC"],
-["111 0NOTEQUAL", "1 EQUAL", "P2SH,STRICTENC"],
-["-111 0NOTEQUAL", "1 EQUAL", "P2SH,STRICTENC"],
-["1 1 BOOLAND", "NOP", "P2SH,STRICTENC"],
-["1 0 BOOLAND", "NOT", "P2SH,STRICTENC"],
-["0 1 BOOLAND", "NOT", "P2SH,STRICTENC"],
-["0 0 BOOLAND", "NOT", "P2SH,STRICTENC"],
-["16 17 BOOLAND", "NOP", "P2SH,STRICTENC"],
-["1 1 BOOLOR", "NOP", "P2SH,STRICTENC"],
-["1 0 BOOLOR", "NOP", "P2SH,STRICTENC"],
-["0 1 BOOLOR", "NOP", "P2SH,STRICTENC"],
-["0 0 BOOLOR", "NOT", "P2SH,STRICTENC"],
-["16 17 BOOLOR", "NOP", "P2SH,STRICTENC"],
-["11 10 1 ADD", "NUMEQUAL", "P2SH,STRICTENC"],
-["11 10 1 ADD", "NUMEQUALVERIFY 1", "P2SH,STRICTENC"],
-["11 10 1 ADD", "NUMNOTEQUAL NOT", "P2SH,STRICTENC"],
-["111 10 1 ADD", "NUMNOTEQUAL", "P2SH,STRICTENC"],
-["11 10", "LESSTHAN NOT", "P2SH,STRICTENC"],
-["4 4", "LESSTHAN NOT", "P2SH,STRICTENC"],
-["10 11", "LESSTHAN", "P2SH,STRICTENC"],
-["-11 11", "LESSTHAN", "P2SH,STRICTENC"],
-["-11 -10", "LESSTHAN", "P2SH,STRICTENC"],
-["11 10", "GREATERTHAN", "P2SH,STRICTENC"],
-["4 4", "GREATERTHAN NOT", "P2SH,STRICTENC"],
-["10 11", "GREATERTHAN NOT", "P2SH,STRICTENC"],
-["-11 11", "GREATERTHAN NOT", "P2SH,STRICTENC"],
-["-11 -10", "GREATERTHAN NOT", "P2SH,STRICTENC"],
-["11 10", "LESSTHANOREQUAL NOT", "P2SH,STRICTENC"],
-["4 4", "LESSTHANOREQUAL", "P2SH,STRICTENC"],
-["10 11", "LESSTHANOREQUAL", "P2SH,STRICTENC"],
-["-11 11", "LESSTHANOREQUAL", "P2SH,STRICTENC"],
-["-11 -10", "LESSTHANOREQUAL", "P2SH,STRICTENC"],
-["11 10", "GREATERTHANOREQUAL", "P2SH,STRICTENC"],
-["4 4", "GREATERTHANOREQUAL", "P2SH,STRICTENC"],
-["10 11", "GREATERTHANOREQUAL NOT", "P2SH,STRICTENC"],
-["-11 11", "GREATERTHANOREQUAL NOT", "P2SH,STRICTENC"],
-["-11 -10", "GREATERTHANOREQUAL NOT", "P2SH,STRICTENC"],
-["1 0 MIN", "0 NUMEQUAL", "P2SH,STRICTENC"],
-["0 1 MIN", "0 NUMEQUAL", "P2SH,STRICTENC"],
-["-1 0 MIN", "-1 NUMEQUAL", "P2SH,STRICTENC"],
-["0 -2147483647 MIN", "-2147483647 NUMEQUAL", "P2SH,STRICTENC"],
-["2147483647 0 MAX", "2147483647 NUMEQUAL", "P2SH,STRICTENC"],
-["0 100 MAX", "100 NUMEQUAL", "P2SH,STRICTENC"],
-["-100 0 MAX", "0 NUMEQUAL", "P2SH,STRICTENC"],
-["0 -2147483647 MAX", "0 NUMEQUAL", "P2SH,STRICTENC"],
-["0 0 1", "WITHIN", "P2SH,STRICTENC"],
-["1 0 1", "WITHIN NOT", "P2SH,STRICTENC"],
-["0 -2147483647 2147483647", "WITHIN", "P2SH,STRICTENC"],
-["-1 -100 100", "WITHIN", "P2SH,STRICTENC"],
-["11 -100 100", "WITHIN", "P2SH,STRICTENC"],
-["-2147483647 -100 100", "WITHIN NOT", "P2SH,STRICTENC"],
-["2147483647 -100 100", "WITHIN NOT", "P2SH,STRICTENC"],
-
-["2147483647 2147483647 SUB", "0 EQUAL", "P2SH,STRICTENC"],
-["2147483647 DUP ADD", "4294967294 EQUAL", "P2SH,STRICTENC", ">32 bit EQUAL is valid"],
-["2147483647 NEGATE DUP ADD", "-4294967294 EQUAL", "P2SH,STRICTENC"],
-
-["''", "RIPEMD160 0x14 0x9c1185a5c5e9fc54612808977ee8f548b2258d31 EQUAL", "P2SH,STRICTENC"],
-["'a'", "RIPEMD160 0x14 0x0bdc9d2d256b3ee9daae347be6f4dc835a467ffe EQUAL", "P2SH,STRICTENC"],
-["'abcdefghijklmnopqrstuvwxyz'", "RIPEMD160 0x14 0xf71c27109c692c1b56bbdceb5b9d2865b3708dbc EQUAL", "P2SH,STRICTENC"],
-["''", "SHA1 0x14 0xda39a3ee5e6b4b0d3255bfef95601890afd80709 EQUAL", "P2SH,STRICTENC"],
-["'a'", "SHA1 0x14 0x86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 EQUAL", "P2SH,STRICTENC"],
-["'abcdefghijklmnopqrstuvwxyz'", "SHA1 0x14 0x32d10c7b8cf96570ca04ce37f2a19d84240d3a89 EQUAL", "P2SH,STRICTENC"],
-["''", "SHA256 0x20 0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 EQUAL", "P2SH,STRICTENC"],
-["'a'", "SHA256 0x20 0xca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb EQUAL", "P2SH,STRICTENC"],
-["'abcdefghijklmnopqrstuvwxyz'", "SHA256 0x20 0x71c480df93d6ae2f1efad1447c66c9525e316218cf51fc8d9ed832f2daf18b73 EQUAL", "P2SH,STRICTENC"],
-["''", "DUP HASH160 SWAP SHA256 RIPEMD160 EQUAL", "P2SH,STRICTENC"],
-["''", "DUP HASH256 SWAP SHA256 SHA256 EQUAL", "P2SH,STRICTENC"],
-["''", "NOP HASH160 0x14 0xb472a266d0bd89c13706a4132ccfb16f7c3b9fcb EQUAL", "P2SH,STRICTENC"],
-["'a'", "HASH160 NOP 0x14 0x994355199e516ff76c4fa4aab39337b9d84cf12b EQUAL", "P2SH,STRICTENC"],
-["'abcdefghijklmnopqrstuvwxyz'", "HASH160 0x4c 0x14 0xc286a1af0947f58d1ad787385b1c2c4a976f9e71 EQUAL", "P2SH,STRICTENC"],
-["''", "HASH256 0x20 0x5df6e0e2761359d30a8275058e299fcc0381534545f55cf43e41983f5d4c9456 EQUAL", "P2SH,STRICTENC"],
-["'a'", "HASH256 0x20 0xbf5d3affb73efd2ec6c36ad3112dd933efed63c4e1cbffcfa88e2759c144f2d8 EQUAL", "P2SH,STRICTENC"],
-["'abcdefghijklmnopqrstuvwxyz'", "HASH256 0x4c 0x20 0xca139bc10c2f660da42666f72e89a225936fc60f193c161124a672050c434671 EQUAL", "P2SH,STRICTENC"],
-
-
-["1","NOP1 NOP2 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 1 EQUAL", "P2SH,STRICTENC"],
-["'NOP_1_to_10' NOP1 NOP2 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_10' EQUAL", "P2SH,STRICTENC"],
-
-["0", "IF 0xba ELSE 1 ENDIF", "P2SH,STRICTENC", "opcodes above NOP10 invalid if executed"],
-["0", "IF 0xbb ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xbc ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xbd ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xbe ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xbf ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xc0 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xc1 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xc2 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xc3 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xc4 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xc5 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xc6 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xc7 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xc8 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xc9 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xca ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xcb ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xcc ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xcd ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xce ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xcf ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xd0 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xd1 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xd2 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xd3 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xd4 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xd5 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xd6 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xd7 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xd8 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xd9 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xda ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xdb ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xdc ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xdd ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xde ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xdf ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xe0 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xe1 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xe2 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xe3 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xe4 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xe5 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xe6 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xe7 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xe8 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xe9 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xea ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xeb ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xec ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xed ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xee ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xef ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xf0 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xf1 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xf2 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xf3 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xf4 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xf5 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xf6 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xf7 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xf8 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xf9 ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xfa ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xfb ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xfc ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xfd ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xfe ELSE 1 ENDIF", "P2SH,STRICTENC"],
-["0", "IF 0xff ELSE 1 ENDIF", "P2SH,STRICTENC"],
-
-["NOP",
-"'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'",
-"P2SH,STRICTENC",
-"520 byte push"],
-["1",
-"0x616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161",
-"P2SH,STRICTENC",
-"201 opcodes executed. 0x61 is NOP"],
-["1 2 3 4 5 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f",
-"1 2 3 4 5 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f",
-"P2SH,STRICTENC",
-"1,000 stack size (0x6f is 3DUP)"],
-["1 TOALTSTACK 2 TOALTSTACK 3 4 5 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f",
-"1 2 3 4 5 6 7 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f",
-"P2SH,STRICTENC",
-"1,000 stack size (altstack cleared between scriptSig/scriptPubKey)"],
-["'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f",
-"'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' 0x6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f6f 2DUP 0x616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161",
-"P2SH,STRICTENC",
-"Max-size (10,000-byte), max-push(520 bytes), max-opcodes(201), max stack size(1,000 items). 0x6f is 3DUP, 0x61 is NOP"],
-
-["0",
-"IF 0x5050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050505050 ENDIF 1",
-"P2SH,STRICTENC",
-">201 opcodes, but RESERVED (0x50) doesn't count towards opcode limit."],
-
-["NOP","1", "P2SH,STRICTENC"],
-
-["1", "0x01 0x01 EQUAL", "P2SH,STRICTENC", "The following is useful for checking implementations of BN_bn2mpi"],
-["127", "0x01 0x7F EQUAL", "P2SH,STRICTENC"],
-["128", "0x02 0x8000 EQUAL", "P2SH,STRICTENC", "Leave room for the sign bit"],
-["32767", "0x02 0xFF7F EQUAL", "P2SH,STRICTENC"],
-["32768", "0x03 0x008000 EQUAL", "P2SH,STRICTENC"],
-["8388607", "0x03 0xFFFF7F EQUAL", "P2SH,STRICTENC"],
-["8388608", "0x04 0x00008000 EQUAL", "P2SH,STRICTENC"],
-["2147483647", "0x04 0xFFFFFF7F EQUAL", "P2SH,STRICTENC"],
-["2147483648", "0x05 0x0000008000 EQUAL", "P2SH,STRICTENC"],
-["549755813887", "0x05 0xFFFFFFFF7F EQUAL", "P2SH,STRICTENC"],
-["549755813888", "0x06 0xFFFFFFFF7F EQUAL", "P2SH,STRICTENC"],
-["9223372036854775807", "0x08 0xFFFFFFFFFFFFFF7F EQUAL", "P2SH,STRICTENC"],
-["-1", "0x01 0x81 EQUAL", "P2SH,STRICTENC", "Numbers are little-endian with the MSB being a sign bit"],
-["-127", "0x01 0xFF EQUAL", "P2SH,STRICTENC"],
-["-128", "0x02 0x8080 EQUAL", "P2SH,STRICTENC"],
-["-32767", "0x02 0xFFFF EQUAL", "P2SH,STRICTENC"],
-["-32768", "0x03 0x008080 EQUAL", "P2SH,STRICTENC"],
-["-8388607", "0x03 0xFFFFFF EQUAL", "P2SH,STRICTENC"],
-["-8388608", "0x04 0x00008080 EQUAL", "P2SH,STRICTENC"],
-["-2147483647", "0x04 0xFFFFFFFF EQUAL", "P2SH,STRICTENC"],
-["-2147483648", "0x05 0x0000008080 EQUAL", "P2SH,STRICTENC"],
-["-4294967295", "0x05 0xFFFFFFFF80 EQUAL", "P2SH,STRICTENC"],
-["-549755813887", "0x05 0xFFFFFFFFFF EQUAL", "P2SH,STRICTENC"],
-["-549755813888", "0x06 0x000000008080 EQUAL", "P2SH,STRICTENC"],
-["-9223372036854775807", "0x08 0xFFFFFFFFFFFFFFFF EQUAL", "P2SH,STRICTENC"],
-
-["2147483647", "1ADD 2147483648 EQUAL", "P2SH,STRICTENC", "We can do math on 4-byte integers, and compare 5-byte ones"],
-["2147483647", "1ADD 1", "P2SH,STRICTENC"],
-["-2147483647", "1ADD 1", "P2SH,STRICTENC"],
-
-["1", "0x02 0x0100 EQUAL NOT", "P2SH,STRICTENC", "Not the same byte array..."],
-["1", "0x02 0x0100 NUMEQUAL", "P2SH,STRICTENC", "... but they are numerically equal"],
-["11", "0x4c 0x03 0x0b0000 NUMEQUAL", "P2SH,STRICTENC"],
-["0", "0x01 0x80 EQUAL NOT", "P2SH,STRICTENC"],
-["0", "0x01 0x80 NUMEQUAL", "P2SH,STRICTENC", "Zero numerically equals negative zero"],
-["0", "0x02 0x0080 NUMEQUAL", "P2SH,STRICTENC"],
-["0x03 0x000080", "0x04 0x00000080 NUMEQUAL", "P2SH,STRICTENC"],
-["0x03 0x100080", "0x04 0x10000080 NUMEQUAL", "P2SH,STRICTENC"],
-["0x03 0x100000", "0x04 0x10000000 NUMEQUAL", "P2SH,STRICTENC"],
-
-["NOP", "NOP 1", "P2SH,STRICTENC", "The following tests check the if(stack.size() < N) tests in each opcode"],
-["1", "IF 1 ENDIF", "P2SH,STRICTENC", "They are here to catch copy-and-paste errors"],
-["0", "NOTIF 1 ENDIF", "P2SH,STRICTENC", "Most of them are duplicated elsewhere,"],
-["1", "VERIFY 1", "P2SH,STRICTENC", "but, hey, more is always better, right?"],
-
-["0", "TOALTSTACK 1", "P2SH,STRICTENC"],
-["1", "TOALTSTACK FROMALTSTACK", "P2SH,STRICTENC"],
-["0 0", "2DROP 1", "P2SH,STRICTENC"],
-["0 1", "2DUP", "P2SH,STRICTENC"],
-["0 0 1", "3DUP", "P2SH,STRICTENC"],
-["0 1 0 0", "2OVER", "P2SH,STRICTENC"],
-["0 1 0 0 0 0", "2ROT", "P2SH,STRICTENC"],
-["0 1 0 0", "2SWAP", "P2SH,STRICTENC"],
-["1", "IFDUP", "P2SH,STRICTENC"],
-["NOP", "DEPTH 1", "P2SH,STRICTENC"],
-["0", "DROP 1", "P2SH,STRICTENC"],
-["1", "DUP", "P2SH,STRICTENC"],
-["0 1", "NIP", "P2SH,STRICTENC"],
-["1 0", "OVER", "P2SH,STRICTENC"],
-["1 0 0 0 3", "PICK", "P2SH,STRICTENC"],
-["1 0", "PICK", "P2SH,STRICTENC"],
-["1 0 0 0 3", "ROLL", "P2SH,STRICTENC"],
-["1 0", "ROLL", "P2SH,STRICTENC"],
-["1 0 0", "ROT", "P2SH,STRICTENC"],
-["1 0", "SWAP", "P2SH,STRICTENC"],
-["0 1", "TUCK", "P2SH,STRICTENC"],
-
-["1", "SIZE", "P2SH,STRICTENC"],
-
-["0 0", "EQUAL", "P2SH,STRICTENC"],
-["0 0", "EQUALVERIFY 1", "P2SH,STRICTENC"],
-["0 0 1", "EQUAL EQUAL", "P2SH,STRICTENC", "OP_0 and bools must have identical byte representations"],
-
-["0", "1ADD", "P2SH,STRICTENC"],
-["2", "1SUB", "P2SH,STRICTENC"],
-["-1", "NEGATE", "P2SH,STRICTENC"],
-["-1", "ABS", "P2SH,STRICTENC"],
-["0", "NOT", "P2SH,STRICTENC"],
-["-1", "0NOTEQUAL", "P2SH,STRICTENC"],
-
-["1 0", "ADD", "P2SH,STRICTENC"],
-["1 0", "SUB", "P2SH,STRICTENC"],
-["-1 -1", "BOOLAND", "P2SH,STRICTENC"],
-["-1 0", "BOOLOR", "P2SH,STRICTENC"],
-["0 0", "NUMEQUAL", "P2SH,STRICTENC"],
-["0 0", "NUMEQUALVERIFY 1", "P2SH,STRICTENC"],
-["-1 0", "NUMNOTEQUAL", "P2SH,STRICTENC"],
-["-1 0", "LESSTHAN", "P2SH,STRICTENC"],
-["1 0", "GREATERTHAN", "P2SH,STRICTENC"],
-["0 0", "LESSTHANOREQUAL", "P2SH,STRICTENC"],
-["0 0", "GREATERTHANOREQUAL", "P2SH,STRICTENC"],
-["-1 0", "MIN", "P2SH,STRICTENC"],
-["1 0", "MAX", "P2SH,STRICTENC"],
-["-1 -1 0", "WITHIN", "P2SH,STRICTENC"],
-
-["0", "RIPEMD160", "P2SH,STRICTENC"],
-["0", "SHA1", "P2SH,STRICTENC"],
-["0", "SHA256", "P2SH,STRICTENC"],
-["0", "HASH160", "P2SH,STRICTENC"],
-["0", "HASH256", "P2SH,STRICTENC"],
-["NOP", "CODESEPARATOR 1", "P2SH,STRICTENC"],
-
-["NOP", "NOP1 1", "P2SH,STRICTENC"],
-["NOP", "NOP2 1", "P2SH,STRICTENC"],
-["NOP", "NOP3 1", "P2SH,STRICTENC"],
-["NOP", "NOP4 1", "P2SH,STRICTENC"],
-["NOP", "NOP5 1", "P2SH,STRICTENC"],
-["NOP", "NOP6 1", "P2SH,STRICTENC"],
-["NOP", "NOP7 1", "P2SH,STRICTENC"],
-["NOP", "NOP8 1", "P2SH,STRICTENC"],
-["NOP", "NOP9 1", "P2SH,STRICTENC"],
-["NOP", "NOP10 1", "P2SH,STRICTENC"],
-
-["", "0 0 0 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "CHECKMULTISIG is allowed to have zero keys and/or sigs"],
-["", "0 0 0 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 0 1 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "Zero sigs means no sigs are checked"],
-["", "0 0 0 1 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-
-["", "0 0 0 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "CHECKMULTISIG is allowed to have zero keys and/or sigs"],
-["", "0 0 0 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 0 1 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "Zero sigs means no sigs are checked"],
-["", "0 0 0 1 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-
-["", "0 0 'a' 'b' 2 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC", "Test from up to 20 pubkeys, all not checked"],
-["", "0 0 'a' 'b' 'c' 3 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 4 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 5 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 6 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 7 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 8 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 9 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 10 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 11 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 12 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 13 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 14 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 15 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 16 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 17 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 18 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 19 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG VERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 1 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 2 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 3 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 4 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 5 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 6 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 7 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 8 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 9 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 10 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 11 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 12 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 13 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 14 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 15 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 16 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 17 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 18 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 19 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-["", "0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY DEPTH 0 EQUAL", "P2SH,STRICTENC"],
-
-["",
-"0 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG",
-"P2SH,STRICTENC",
-"nOpCount is incremented by the number of keys evaluated in addition to the usual one op per op. In this case we have zero keys, so we can execute 201 CHECKMULTISIGS"],
-
-["1",
-"0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY 0 0 0 CHECKMULTISIGVERIFY",
-"P2SH,STRICTENC"],
-
-["",
-"NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIG",
-"P2SH,STRICTENC",
-"Even though there are no signatures being checked nOpCount is incremented by the number of keys."],
-
-["1",
-"NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY 0 0 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 20 CHECKMULTISIGVERIFY",
-"P2SH,STRICTENC"],
-
-["0 0x01 1", "HASH160 0x14 0xda1745e9b549bd0bfa1a569971c77eba30cd5a4b EQUAL", "P2SH,STRICTENC", "Very basic P2SH"],
-["0x4c 0 0x01 1", "HASH160 0x14 0xda1745e9b549bd0bfa1a569971c77eba30cd5a4b EQUAL", "P2SH,STRICTENC"],
-
-["0x40 0x42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242",
-"0x4d 0x4000 0x42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242 EQUAL",
-"P2SH,STRICTENC",
-"Basic PUSH signedness check"],
-
-["0x4c 0x40 0x42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242",
-"0x4d 0x4000 0x42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242 EQUAL",
-"P2SH,STRICTENC",
-"Basic PUSHDATA1 signedness check"],
-
-["0x00", "SIZE 0 EQUAL", "P2SH,STRICTENC", "Basic OP_0 execution"]
-]
diff --git a/core/src/test/resources/org/bitcoinj/script/tx_invalid.json b/core/src/test/resources/org/bitcoinj/script/tx_invalid.json
index 13e83a38044..5022036472d 100644
--- a/core/src/test/resources/org/bitcoinj/script/tx_invalid.json
+++ b/core/src/test/resources/org/bitcoinj/script/tx_invalid.json
@@ -182,5 +182,59 @@
 [[["a54b3bff74c910adff4f81b641587440c9f3b02a67c69b06d4eea36c0d199bac", 0, "DUP HASH160 0x14 0x33b9fe6942f268ae728136046e638c8863bed91f EQUALVERIFY CHECKSIG"]],
 "0100000001ac9b190d6ca3eed4069bc6672ab0f3c940745841b6814fffad10c974ff3b4ba5000000006c493046022100c16257354c7ec7fedda7ce724abfc6a8f26fd433d08b1a11bd01a8f0f157b1fb0221009069419fa4454cd52f1d3219c395b96c3dc0404257196f96d819d71e4f95b8290121039770779101a01dbbf6c25466df8869e648dc75a51d64ebf5136c824c32fcc9c8ffffffff0100000000000000001976a914aaf0529f46a86271255621ed566e79e67345916d88ac00000000", "P2SH,LOW_S"],
 
+["CHECKSEQUENCEVERIFY tests"],
+
+["By-height locks, with argument just beyond txin.nSequence"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "1 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000feff40000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+
+["By-time locks, with argument just beyond txin.nSequence (but within numerical boundries)"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194305 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000feff40000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+
+["Argument missing"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+
+["Argument negative with by-blockheight txin.nSequence=0"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "-1 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+
+["Argument negative with by-blocktime txin.nSequence=CTxIn::SEQUENCE_LOCKTIME_TYPE_FLAG"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "-1 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+
+["Argument/tx height/time mismatch, both versions"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "65535 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+
+["6 byte non-minimally-encoded arguments are invalid even if their contents are valid"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x06 0x000000000000 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffff00000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+
+["Failure due to failing CHECKSEQUENCEVERIFY in scriptSig"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "1"]],
+"02000000010001000000000000000000000000000000000000000000000000000000000000000000000251b2000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+
+["Failure due to failing CHECKSEQUENCEVERIFY in redeemScript"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "HASH160 0x14 0x7c17aff532f22beb54069942f9bf567a66133eaf EQUAL"]],
+"0200000001000100000000000000000000000000000000000000000000000000000000000000000000030251b2000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+
+["Failure due to insufficient tx.nVersion (<2)"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 CHECKSEQUENCEVERIFY 1"]],
+"010000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 CHECKSEQUENCEVERIFY 1"]],
+"010000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+
 ["Make diffs cleaner by leaving a comment here without comma at the end"]
 ]
diff --git a/core/src/test/resources/org/bitcoinj/script/tx_valid.json b/core/src/test/resources/org/bitcoinj/script/tx_valid.json
index 47700aec110..f021da8b839 100644
--- a/core/src/test/resources/org/bitcoinj/script/tx_valid.json
+++ b/core/src/test/resources/org/bitcoinj/script/tx_valid.json
@@ -232,5 +232,89 @@
 [[["a54b3bff74c910adff4f81b641587440c9f3b02a67c69b06d4eea36c0d199bac", 0, "DUP HASH160 0x14 0x33b9fe6942f268ae728136046e638c8863bed91f EQUALVERIFY CHECKSIG"]],
 "0100000001ac9b190d6ca3eed4069bc6672ab0f3c940745841b6814fffad10c974ff3b4ba5000000006c493046022100c16257354c7ec7fedda7ce724abfc6a8f26fd433d08b1a11bd01a8f0f157b1fb0221009069419fa4454cd52f1d3219c395b96c3dc0404257196f96d819d71e4f95b8290121039770779101a01dbbf6c25466df8869e648dc75a51d64ebf5136c824c32fcc9c8ffffffff0100000000000000001976a914aaf0529f46a86271255621ed566e79e67345916d88ac00000000", "P2SH"],
 
+["CHECKSEQUENCEVERIFY tests"],
+
+["By-height locks, with argument == 0 and == txin.nSequence"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "65535 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffff00000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "65535 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffbf7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffbf7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+
+["By-time locks, with argument == 0 and == txin.nSequence"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffff40000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4259839 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffff7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffff7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+
+["Upper sequence with upper sequence is fine"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000800100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000800100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000feffffff0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000feffffff0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+
+["Argument 2^31 with various nSequence"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffbf7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffff7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483648 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+
+["Argument 2^32-1 with various nSequence"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffbf7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffff7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4294967295 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+
+["Argument 3<<31 with various nSequence"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "6442450944 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffbf7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "6442450944 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffff7f0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "6442450944 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffffffff0100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+
+["5 byte non-minimally-encoded operandss are valid"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "0x05 0x0000000000 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+
+["The argument can be calculated rather than created directly by a PUSHDATA"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194303 1ADD CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "4194304 1SUB CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000ffff00000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+
+["An ADD producing a 5-byte result that sets CTxIn::SEQUENCE_LOCKTIME_DISABLE_FLAG"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483647 65536 CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "2147483647 4259840 ADD CHECKSEQUENCEVERIFY 1"]],
+"020000000100010000000000000000000000000000000000000000000000000000000000000000000000000040000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+
+["Valid CHECKSEQUENCEVERIFY in scriptSig"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "1"]],
+"02000000010001000000000000000000000000000000000000000000000000000000000000000000000251b2010000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+
+["Valid CHECKSEQUENCEVERIFY in redeemScript"],
+[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "HASH160 0x14 0x7c17aff532f22beb54069942f9bf567a66133eaf EQUAL"]],
+"0200000001000100000000000000000000000000000000000000000000000000000000000000000000030251b2010000000100000000000000000000000000", "P2SH,CHECKSEQUENCEVERIFY"],
+
 ["Make diffs cleaner by leaving a comment here without comma at the end"]
 ]
diff --git a/core/src/test/resources/org/bitcoinj/wallet/deterministic-wallet-bip44-serialization.txt b/core/src/test/resources/org/bitcoinj/wallet/deterministic-wallet-bip44-serialization.txt
new file mode 100644
index 00000000000..7323b59c9e5
--- /dev/null
+++ b/core/src/test/resources/org/bitcoinj/wallet/deterministic-wallet-bip44-serialization.txt
@@ -0,0 +1,357 @@
+type: DETERMINISTIC_MNEMONIC
+secret_bytes: "aerobic toe save section draw warm cute upon raccoon mother priority pilot taste sweet next traffic fatal sword dentist original crisp team caution rebel"
+creation_timestamp: 1389353062000
+deterministic_seed: "E\032\356\206\230,\275\263\364=\334^f\307\037\350\321X7R\262z\205\3564\371tp\2639R\342\027 J\266\253\250\320\022\031\233\271~O$\330\260\214\fz\231tI\353\215*\037\355\205\213.\224?"
+account_path: 2147483692
+account_path: 2147483649
+account_path: 2147483648
+
+type: DETERMINISTIC_KEY
+secret_bytes: "\270E0\202(\362b\023\276\264\347\226E2\360\221\347\325\233L\203\3276\272\213\2436&\304\373\221\025"
+public_key: "\002\342$\253\332\031\352\324q\316M\251}\274\267\370X$\366>Q\316\005\330\376\353f!WHLL\a"
+creation_timestamp: 1389353062000
+deterministic_key {
+  chain_code: "XL\240FW\203\316\230\334\374J\003\357=\215\001\206\365\207Z\006m\334X`\236,;_\304\000^"
+}
+output_script_type: P2PKH
+
+type: DETERMINISTIC_KEY
+secret_bytes: "\370\\\267\361L\021K\214\215\272yRP\234(\304\365\303h\251\250\0236\270\344\210\300\330\363(=\332"
+public_key: "\002\026n\227\337\232\000\032Q\204\374o-o\277\367;\027.\312Z\024\353\271\300\353j5\375O\270W\266"
+deterministic_key {
+  chain_code: "\367vcS\210\365\365\302\353\321\240\307\327\203\350H\334E\336 \236\037\256\265pT\235\035\221\235\"~"
+  path: 2147483692
+}
+
+type: DETERMINISTIC_KEY
+secret_bytes: "\274\244m\336\241`\024\301;Y\024m)\245\375\212\261B\005TnE\217\r \315\323\322\354w\227\225"
+public_key: "\003\243q\304\333\310{\001\317\250\266\264\250\353\271\217\r\322l\274M\235\306\347\224\nax\023\334\273\226\321"
+deterministic_key {
+  chain_code: "\344\021F\354\025\3341T\233\'\276&Q\324\325w\362\362n\004\320\210)\033\023\303\244T\371\331\373f"
+  path: 2147483692
+  path: 2147483649
+}
+
+type: DETERMINISTIC_KEY
+secret_bytes: "\023\354\032\244\374<y\254aq\a\362=\345\204\n^;5\213M\267\311\234\037RkX\235\363ae"
+public_key: "\002T5VO\274\362m\300\320\352\005\r!\307\024\250\307C\324\323\215[\232@\254S\270\217\362\370\214\362"
+deterministic_key {
+  chain_code: "F\336\2067\377M\026)%\357ZL#\203\320\324\217-\3305\310\244\n\205\277E\323L\250ww\314"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+}
+
+type: DETERMINISTIC_KEY
+secret_bytes: "\362\305\242\3637\2748Z?]\035s\272\253J\300\033\250\022r\350\020\277U\036K<\335\237\333/\303"
+public_key: "\003\2471\326i\331A\337|\373\276\3214\257\363\266Q\315x\341\317\200\243\234\336<s}\261\240,\233\371"
+deterministic_key {
+  chain_code: "Pd\032#\325\213\332\307\3755\020\316\276\002\037\262\241\213\211k\376\254\220R\351\270\"\260V\260\362\257"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  issued_subkeys: 2
+  lookahead_size: 10
+  sigsRequiredToSpend: 1
+}
+
+type: DETERMINISTIC_KEY
+secret_bytes: "\311\327\205Q\005\346\030\365\026\0331\356\346\036\234\024\b\322\202\3726I\351\001 \373\200\003\260\276\216\000"
+public_key: "\003\334\214L\003Zq\365\212P\203b~l\367C@T\341\300\216\037\375\002\224\t=\301:\266l\177\364"
+deterministic_key {
+  chain_code: "\036\277^\322!\227i^Z\212\347\272\365C\016\342\371\236a\022\\\n\037\304\264\021\335\344\340=\234T"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  issued_subkeys: 1
+  lookahead_size: 10
+  sigsRequiredToSpend: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\232\177\236W\2235py\021\331i\350\026H\235\nO\217\231\361M/}5\211v\023Kc\253\2307"
+deterministic_key {
+  chain_code: "\032\366\331\360\276Yo\243;!\023\005\305\246\354\337N\203\302\264\250\355\275\346\271!L\\\252\270\364t"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 0
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\231\254]q\030g3\316u\322h\304Ao4\246f\026\266\374\nY\233\022\034\243\'\000\030\256\342\006"
+deterministic_key {
+  chain_code: "\364\201U66\201$7l%Sy\365]A\265\277&\370\256\364\347\356\334T\323\375\347mB0\374"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002/ \336M\347\357pl@z\204\3240\027\366\0170\307\337\327\312_$\n\'\216\237W\017\263bg"
+deterministic_key {
+  chain_code: "i\206:\003\205BLMI\376\347S~\315\0306\255\274>\220\017\302\241u\017DvD\2662\342\316"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 2
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003 1\316\277\355_\343\214}\a\205\233\325\232\241n\256\325\300\2369\020\nh\335\0243\355\362$?7"
+deterministic_key {
+  chain_code: "\334(\\u\022\245\370\t*\372\315\330\365\256Ms\254J_{B\035[f\333\351\272\261\363\373_\023"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 3
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\354\fhI\2731\026\222\v\274\027\357\327\033X\324\270\323\252}\314}\221\213\272\\\362k\352\334\177#"
+deterministic_key {
+  chain_code: "#\351\"(\t\245\006\351\354f\334\216(\272\252\200\226\337\370\260XO\375\016/\377\306\263yE\222\311"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 4
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002-7\rx2\177zP\r(B\247\350\026\205\210w\251G\b\254\213\000\227\271Q\272\342\357\304>G"
+deterministic_key {
+  chain_code: "US\242J\307\2672<\373l\217\200[\316\352\361*~\324\f\304\267oD\273\300_\340K\247V\370"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 5
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002Y\260\332\377;T\263\335\331\004\020kv\207E=\311|\270*hP>)\340\272\203LD\036\313\271"
+deterministic_key {
+  chain_code: "\r34\'I\027\266\272\300\003\366f\274\333\260\006\311\3556!\227\216\301\361\247\354\025\305\321\376\274\214"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 6
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002I\367x\235p9\334\234\034\366\247&\321\237\217\241V\252\017`w\212\301\000\305-\312\003\352`\302V"
+deterministic_key {
+  chain_code: "\257\001\375\203E\315\221W\316&\035\244\306\037\351\361\027\020\346\305^Z\274O\212\363P\036\273n\367\326"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 7
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\0029\373\030u\305\214S\345/\373y%\t\252~\267\f\016t|\354\020\356\306\313\317\027\325\376\232kh"
+deterministic_key {
+  chain_code: "\260\203\277\231\352\265y\020\356r_bO\374l\347\002\032i\216Ct\260\221-\207\200\243\364;\247I"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 8
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002[\304\301.\342\253\256\364\025\'\017\356-t\340R\250Z\327\374\250\r\331\221`\334\362a[q\260\271"
+deterministic_key {
+  chain_code: "\376\277#\275\035S\362`\323\246<b~D\253\250p\263\256\364\257\256\201\016\223[\305\261\2758\353\203"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 9
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\253\213j!\316\\\372-tA\331\362T\363\252)\302\2620\246=X#\201\274\212\331Gi9\362\366"
+deterministic_key {
+  chain_code: "S`\237\003Q\021\201\301\341Ij\"\270:\335\374;\320\037\350m\037\331\343\3208\211E\276y\215."
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 10
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\231\323\307\3348\267\357\310\323\nWf$\326\334\v\360\273\357\207\0207\036)\270Api\346\321\270\351"
+deterministic_key {
+  chain_code: "\232Y6\020\317@\r\251]\204m\37796\v5\006\300\t\342\246.\231r\336Vt\370\373\023_M"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 11
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\3647\fs\313\367\022\317\207\276\305\370W\b \276\274\343\344r\351\303\035\235\227X\a\347Q2\325\351"
+deterministic_key {
+  chain_code: "\030F|\234$0\315\215\203\234\037\0054\344M\253\343\214S\360\274_\330\2663\364L\025\250\v\236\247"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 12
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\273\t\2539\246\023^H\232\202}Hi+\226Q\337\371\002\021\201\276\261*\236\353\'\247\325\367t^"
+deterministic_key {
+  chain_code: "\233\314\253j\213|Y\344\200k\217\357*\\\030\347`\016\266\033g|\273\330\261\226cj\204\351\234Z"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 0
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\266}M\017f0\350\357\232\037\2713\203N\nei\202_\t\034\0343X,\006Y\260\356\340\031W"
+deterministic_key {
+  chain_code: "\2569jU\231\242\230rH\202\025\356C\373\327\374-\305\313\277Jy5mx\034\350\2264\321\327J"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\221o\254\027\3547s\260&\217b\252r\fo)~\2107\016\255\273\223\245A\234\247ay\204\021H"
+deterministic_key {
+  chain_code: "\265\233\233\354DG\226\326\215\024\230\334\262J\257LL\363R\316$\357\347\017v\371rpA\244PK"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 2
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\301\036A\004O\323\350\240\227>C73n\326P]{\260@\327\242\'\263$H\271\371\371YIJ"
+deterministic_key {
+  chain_code: "9\214\315\275\300\206\253U;\235\002\177fA\016\215\222\235K\253\311\3648w20\2005\343\310\\:"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 3
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002!\373+L\341\025\265\232\a\247J?v\274\273|v\035g\033\211\026\332\233\37378c\226\020\304\360"
+deterministic_key {
+  chain_code: "i\003w\037b!Y]\214l\373]`x\355Je\\\v\205\n\310\254s\301\272\246\315\024}\366\037"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 4
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002p\261|\230%\350\a\347?-}\317\274W\210\032\331\006\350\320\016\331\300\024\302\321[O\210E\231\342"
+deterministic_key {
+  chain_code: "\367\263\236B#W\223\3206\3644!?Im\250\277\vY\322\302\254\212A\227\352\244\003\031)\374b"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 5
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\355\213b\333\3157\262iu\361\274\252\271\223\346\276^\350\260q\272m\025.\256\353\006\005\020\255&\017"
+deterministic_key {
+  chain_code: "\003\265\376U\001\240P\'X\364\326\326\275\375s\306\225\373\264\306H5[\356\b\301>\227\325\323\315\344"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 6
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\317\215\311\246\322\335\226,\355\243\274E\270\027\307I\264\344\260\350_\230\372\034\340\363\3113T\222\274c"
+deterministic_key {
+  chain_code: "r\203\252\217hI\312S\323\377](\331C\2711\214T.\031\277\333\267,U|\323x\006\003\263\233"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 7
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\277\306\215\221N\224\b=\v\001\216Ui\033v\250\326\361\221\332\215\343$\344A\306\357f\236\330\241\337"
+deterministic_key {
+  chain_code: "1n@\331(\246#4\262\017\006\360a\206i\270\211n\344\363\343Y\0000\372,\231\352\252f\272!"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 8
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002!\032\210\034\267\234\t\177\311T\'(~c-dKt;\366\030fI5[\026\242\372\310\342\'\205"
+deterministic_key {
+  chain_code: "\004AX{\301\030\035K\353\353S\223m\271\352\323\272\'\202=_5\322\240J.\227\370[gZ?"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 9
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002KZ\215?\f\365\"o\364\035\n\240\276_\335\\\256\277\212J\247\201A\325\220\361\356\213/!\301\224"
+deterministic_key {
+  chain_code: "\247\233H)F\252\276\242\370\350\263\270\b:^\247d]\232\316QUA2\n\262\321\177U\003\r]"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 10
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\204U\310%\024\"\363\267\340\220\031\341koQ\210\037\022\224Y\354\016\370\360\374\346\216\354@B\247\233"
+deterministic_key {
+  chain_code: "w\265\277h\352\025\351\274\233\310;rk\264`*-H-r\026\326\237%\230\034\005\236_6#a"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 11
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\213\241A\022c\322\031\367O\273\375\3354\'Vh\371\362\202\220\253\366\206:\033\347\300\227<6\252\034"
+deterministic_key {
+  chain_code: "R\222\341\341.\352\306O\340+\276\266#K\211\022\264\203\225\240\246\263\023l\327\356 \350\342\242]F"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 12
+}
\ No newline at end of file
diff --git a/core/src/test/resources/org/bitcoinj/wallet/deterministic-wallet-segwit-serialization.txt b/core/src/test/resources/org/bitcoinj/wallet/deterministic-wallet-segwit-serialization.txt
new file mode 100644
index 00000000000..49b12469f7e
--- /dev/null
+++ b/core/src/test/resources/org/bitcoinj/wallet/deterministic-wallet-segwit-serialization.txt
@@ -0,0 +1,280 @@
+type: DETERMINISTIC_MNEMONIC
+secret_bytes: "aerobic toe save section draw warm cute upon raccoon mother priority pilot taste sweet next traffic fatal sword dentist original crisp team caution rebel"
+creation_timestamp: 1389353062000
+deterministic_seed: "E\032\356\206\230,\275\263\364=\334^f\307\037\350\321X7R\262z\205\3564\371tp\2639R\342\027 J\266\253\250\320\022\031\233\271~O$\330\260\214\fz\231tI\353\215*\037\355\205\213.\224?"
+account_path: 2147483649
+
+type: DETERMINISTIC_KEY
+secret_bytes: "\270E0\202(\362b\023\276\264\347\226E2\360\221\347\325\233L\203\3276\272\213\2436&\304\373\221\025"
+public_key: "\002\342$\253\332\031\352\324q\316M\251}\274\267\370X$\366>Q\316\005\330\376\353f!WHLL\a"
+creation_timestamp: 1389353062000
+deterministic_key {
+  chain_code: "XL\240FW\203\316\230\334\374J\003\357=\215\001\206\365\207Z\006m\334X`\236,;_\304\000^"
+}
+output_script_type: P2WPKH
+
+type: DETERMINISTIC_KEY
+secret_bytes: "\267y\204N)\270Ysr\315?t\213.g\224\332\354#\262\216\341%\217B\322%v\365\357\301\202"
+public_key: "\002\270\032\242\r\210\310\316\361\360s3\233A\374\002\r\035m;w~\032\201\237\367/O5\231\270\216k"
+deterministic_key {
+  chain_code: "\255\v_(\027?\036\353\373\212\346\360\276\364q/\246\351z\331\332a\207\177&\335\206\220\276f+\211"
+  path: 2147483649
+}
+
+type: DETERMINISTIC_KEY
+secret_bytes: "\322j5\033\375\257\371-\211~d)\"{\30629\3446\025=H\370Q\227\325=\002\240|r\343"
+public_key: "\002\237\202\357O\355r\020(]\235\b\3162\263N\331\320\216\246\262\376\260\352\224\313Bw\347~\310\336X"
+deterministic_key {
+  chain_code: "*\210c\235x\377\001\277\b\"\321\363\r*\'ci\310\317\344\220\025\341\v\r\337\034\200H\366\312P"
+  path: 2147483649
+  path: 0
+  issued_subkeys: 2
+  lookahead_size: 10
+  sigsRequiredToSpend: 1
+}
+
+type: DETERMINISTIC_KEY
+secret_bytes: "(USw\200Yh\313F|o\213\240u\265@n\000r\033\305\376\211\a\304D\034\342\316\021\374\207"
+public_key: "\002\031\335\304L?`\236\224c\252\305\375\2678\275\342\236\242\230\266C\363\327U\341\340\337GeW\2544"
+deterministic_key {
+  chain_code: "\336m6\270\332/\363\016\340=;\003\225\341S\024\262\332vM\201L\207\342\306=!\352A\f\272{"
+  path: 2147483649
+  path: 1
+  issued_subkeys: 1
+  lookahead_size: 10
+  sigsRequiredToSpend: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002P\022\037\025\003\264\302/\321\314\243\246(\371\006\245\203\255\363o\237\250\b\233O?\225\316T)n\357"
+deterministic_key {
+  chain_code: "9\032\260\204\177\362\362\310`\243)\2067\351\324O\355\337V\245\375\t\375\214mw\353\355\316\246bA"
+  path: 2147483649
+  path: 0
+  path: 0
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\246\306%*\023\234\0316\273;9\341\033\370 \341\220\312\216\003\300\316`\201\352\357\327\216\234\0254\031"
+deterministic_key {
+  chain_code: "\335\267\305\177 \255ew\bH\210@\033\267\224f\375\325\205\362`\022.3\224\f\206\260\361z\260\371"
+  path: 2147483649
+  path: 0
+  path: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\am\036\377\ff8\003\222\351#?\356e\000\367\254i0\324H~\251E/\352B\2616\0030+"
+deterministic_key {
+  chain_code: "{#\231\t\034\023T@\317\322\344^w\254)\350!\327\221\033\263C\347\277zb\301^`\004\277\350"
+  path: 2147483649
+  path: 0
+  path: 2
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\307\214\031\332\032\205oH\346\272\v\267\n#9ivZ\247\327L)3\254\"\201\331K\340\211\026`"
+deterministic_key {
+  chain_code: "@}\204\033\347\346\270\345\376M\027\263\262h\242\322[l\254\263\351O\334^\273k\003\225\2065\017\031"
+  path: 2147483649
+  path: 0
+  path: 3
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\025N\\\177\273\325\224\353{5G\273\304J\234t\354\260f\036!L\202\246\361\223\356T.\200\223\206"
+deterministic_key {
+  chain_code: "\230\244\354A\316\272\223j\226\341\023-\327\302>\317\275\022\252\366R\230\312a\310\347u,\004\233\b9"
+  path: 2147483649
+  path: 0
+  path: 4
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\b\035p\217z\250\".;C\0313>\366\251\"\246Y\307\034\265\273V\202P\207\024\322\316\340$7"
+deterministic_key {
+  chain_code: "W&\026N5\205:1\216d\256m\357\2248\341\227\204\352\177P\265\"\036\v\204p1\177BC\236"
+  path: 2147483649
+  path: 0
+  path: 5
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\220L\270j\r\270\277\336\016\370\332\203\260\356\322\263<\357$\003\017k\nU<6\235\n\253\230;\205"
+deterministic_key {
+  chain_code: "\025\304d\363\376\aA\275p&_\336\355\374\224\315\264\222m\363m\222S\200\017-\274\330\322\244A\302"
+  path: 2147483649
+  path: 0
+  path: 6
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\232\370\302\261\006\200\347-\257[\205\v\273\352\v8_\270\304\331Z.Ud\351\264s\251*8_\375"
+deterministic_key {
+  chain_code: "0\345\362I\317=\033I\270\b\322J\316\275D\220\335\334\320\367\275\334\336\367\237l\377\376\3638\203\233"
+  path: 2147483649
+  path: 0
+  path: 7
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002E\317\324\302\345\b\021\275qQ\303\030\257-\352\2744>H\026\340\371\022\"X\025\255\357\367\271\316D"
+deterministic_key {
+  chain_code: "\313\"m\227\025\343o\2252\377\320\200FF~T\322\363\2330\021\251 \276\317\274\0227\322\a96"
+  path: 2147483649
+  path: 0
+  path: 8
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\376k!\002\320\037\352\030\211?\031/H*\242\326\365\022\374\273\254\323)3\370\1770\340nv\333\244"
+deterministic_key {
+  chain_code: "\315u1\361c\030\266@+\344\225\022\337\034\325\272\223r\251\262\357\211\255.\356\005\031Ds\217,\367"
+  path: 2147483649
+  path: 0
+  path: 9
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\003O\356\2103\362\253-\016\211\276\023i\233\256\3044\236RP<\253\367\346.R/\330\006\331\017\n"
+deterministic_key {
+  chain_code: "\231\026I\a1\'\350^]THS\323\355\v\347\237\356\302\226\343\216K,omM\237\272\373\234\207"
+  path: 2147483649
+  path: 0
+  path: 10
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\0035\304\365\255c\376\260\366\213l\246o\v\342\300\232f\301\306\233\245\373Z\300\230\231\206\201L\231\235\306"
+deterministic_key {
+  chain_code: "\256\216Pe\026\317\313\a\376\031\021\302\207&\363N\271\'\357\275|\334\315\215\272\237\202\231\277\370\264\356"
+  path: 2147483649
+  path: 0
+  path: 11
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002g\340hs\337]\302$\275\225\277\326\233\3016`\027\267Y+\323\376\360\353\266\350X\247\320\273\247\026"
+deterministic_key {
+  chain_code: " \217\242P&\336p\226W\200I+\346\t\213\347d\260-\243\241+\213+\304\365^\227\203\206\231\031"
+  path: 2147483649
+  path: 0
+  path: 12
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\036\220\032\376\211\327G\236\371\032\276\004l\341\206\235\001\336\2248\314\027\226u*j\251\262c\252\346\265"
+deterministic_key {
+  chain_code: "\363\345\031D\by@\353zGS\267o{ c`c\300NH\006T%miB\210\325x$\306"
+  path: 2147483649
+  path: 1
+  path: 0
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\00269\201\317\302t\016Q\247\205n\204\263MI\345X\330da\006>\251\204h\372+u.>\321v"
+deterministic_key {
+  chain_code: "\317j\363\36773\254u\037\3663\243\n-Z\237T\210\263\202u\315\337/\245.H\364\004\253+o"
+  path: 2147483649
+  path: 1
+  path: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\025#\214(\322\374C\000\234KO\1776\276T\354\217\372g:\340\035c\271\275\375RF`\357\260u"
+deterministic_key {
+  chain_code: "\351\345 \224\354I\201\254\275\207\300\357\240\216\326P\031f\232Ll@\363\207\236\203\027t\350\370Kn"
+  path: 2147483649
+  path: 1
+  path: 2
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\250+_^\241\353Z%ie\237\233\241.#\322\"\373W\276eJ\255\327\250\024v\016\0340\343\t"
+deterministic_key {
+  chain_code: "\211\220?,\212\350\001\233[><h\"\246{\311\372ET\353n\022\332\224\264\373\b\023\272\277$\325"
+  path: 2147483649
+  path: 1
+  path: 3
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\323\260\005\254\242\350\307\3556\302\373\003\246\330\000g`+0\253\365Q\323Zz\"?\376G.\356f"
+deterministic_key {
+  chain_code: "\273\016\342\\V\200w\252\203\350B\314\277\245;u\327\372wL\311b_S+\376\277\306\375k\" "
+  path: 2147483649
+  path: 1
+  path: 4
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\0032\331b?\"\026\337\235\026u^\331\327-j4p\357\177\247c\355\310(9\330\231\262\023& \227"
+deterministic_key {
+  chain_code: "\272\a\311\264\237\246\312G\v~\005\300\236\214ZHk\t\301\203@%iP\005\204\367\344\334\302`\r"
+  path: 2147483649
+  path: 1
+  path: 5
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\377\317\372\345\267\264\024\343\302>\f\202~&\034\376\206\360\006\314\035\243\261#*r@\"\037\275\004H"
+deterministic_key {
+  chain_code: "\335\030j\262\306\024\fg\346n\025\254\322U\331\323\270\004\017\023\240>\260\307_\343\235\304\222L\212\372"
+  path: 2147483649
+  path: 1
+  path: 6
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003!)\246\275\r\201\246\\\233\260\345\222\215v\371g\314\211\n\0375\203m\305\001`\177 zu4O"
+deterministic_key {
+  chain_code: "\333h\304\004\366\346\351*\366\205\236\377L_\200a\354N\241\235B\272\\\004|\245=\266\324W\352\'"
+  path: 2147483649
+  path: 1
+  path: 7
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\026o\366\273n\366\371Krn\335\216\246\022T\005\f\265t\377\036\217.\\\bV!\fs\251\365\243"
+deterministic_key {
+  chain_code: "\305\257\344_\027\025\033=>\000 \tm\273\":\265\214\023\267\203me\264*P\222\2247+Ow"
+  path: 2147483649
+  path: 1
+  path: 8
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\345M0`s\370\3617\n\254\'H<\301}n\326\374\253\240\273wT\t\201r|*\331\361\315\277"
+deterministic_key {
+  chain_code: "V\310\t\226\301\254\f\230\024\332\341a\271hG\331\232\024\266\235\377\004\021\212\016\257\227V\342c\212\203"
+  path: 2147483649
+  path: 1
+  path: 9
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002|h\274DS-\330\035\366o\203x\3343\020q\225\024\005c\326B\200q2\213f\346N?V\330"
+deterministic_key {
+  chain_code: "\233\211\254E\347\036\352\262\027\363WF\324\345\232\247j\277\f\344\031\\\177\263\223j\333?\003\025W\020"
+  path: 2147483649
+  path: 1
+  path: 10
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\256[\025\037L\371\365\300\357\315\224v\006\r\236\335BIO\210vvT\n\266\243{G\321`\366\377"
+deterministic_key {
+  chain_code: ":\240\372\237\034\033DR1\220\t\022\200\033\307/\200wBy\365\223\244\0170\327\277>Z9\365\277"
+  path: 2147483649
+  path: 1
+  path: 11
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\375\023ByLoCf\260\230\001\334\373\031\327\325\347\353Ad\253\244\246A=\217vf\034D5\250"
+deterministic_key {
+  chain_code: "\277\265\332jOb\260G6,u\342\263A]\214KF\360\337\217\231:\342x\225\330\250Fa*n"
+  path: 2147483649
+  path: 1
+  path: 12
+}
\ No newline at end of file
diff --git a/core/src/test/resources/org/bitcoinj/wallet/deterministic-wallet-serialization.txt b/core/src/test/resources/org/bitcoinj/wallet/deterministic-wallet-serialization.txt
index 5e648b16b8f..7bd8a0bbc9d 100644
--- a/core/src/test/resources/org/bitcoinj/wallet/deterministic-wallet-serialization.txt
+++ b/core/src/test/resources/org/bitcoinj/wallet/deterministic-wallet-serialization.txt
@@ -2,6 +2,7 @@ type: DETERMINISTIC_MNEMONIC
 secret_bytes: "aerobic toe save section draw warm cute upon raccoon mother priority pilot taste sweet next traffic fatal sword dentist original crisp team caution rebel"
 creation_timestamp: 1389353062000
 deterministic_seed: "E\032\356\206\230,\275\263\364=\334^f\307\037\350\321X7R\262z\205\3564\371tp\2639R\342\027 J\266\253\250\320\022\031\233\271~O$\330\260\214\fz\231tI\353\215*\037\355\205\213.\224?"
+account_path: 2147483648
 
 type: DETERMINISTIC_KEY
 secret_bytes: "\270E0\202(\362b\023\276\264\347\226E2\360\221\347\325\233L\203\3276\272\213\2436&\304\373\221\025"
@@ -10,12 +11,13 @@ creation_timestamp: 1389353062000
 deterministic_key {
   chain_code: "XL\240FW\203\316\230\334\374J\003\357=\215\001\206\365\207Z\006m\334X`\236,;_\304\000^"
 }
+output_script_type: P2PKH
 
 type: DETERMINISTIC_KEY
 secret_bytes: "\354B\331\275;\000\254?\3428\006\220G\365\243\333s\260s\213R\313\307\377f\331B\351\327=\001\333"
 public_key: "\002\357\\\252\376]\023\315\'\316`\317\362\032@\232\"\360\331\335\221] `\016,\351<\b\300\225\032m"
 deterministic_key {
-  chain_code: "\370\017\223\021O?.@gZ|\233j\3437\317q-\241!J \323\'\264s\203\314\321\v\346"
+  chain_code: "\370\017\223\021O?.@gZ|\233j\3437\317q-\241!\177J \323\'\264s\203\314\321\v\346"
   path: 2147483648
 }
 
@@ -161,7 +163,7 @@ deterministic_key {
 }
 
 type: DETERMINISTIC_KEY
-public_key: "\002\225b\3515\202\233\335\320.7\265\274uh\230N\242\254\317J\364\331\2345\220)\362\334\216\202\\"
+public_key: "\002\225b\3515\202\233\335\320.7\265\274uh\230N\242\254\317\177J\364\331\2345\220)\362\334\216\202\\"
 deterministic_key {
   chain_code: "\202:\344\3109?\350\345\001\314(\244q\370\233Rk\261}\302(\275\326\305R\342:\246\036\nV\330"
   path: 2147483648
@@ -170,7 +172,7 @@ deterministic_key {
 }
 
 type: DETERMINISTIC_KEY
-public_key: "\003>K!8\222VEL\371\305 z\aD8\020\233\330S\251T\330\201V\026-k2\227\266;"
+public_key: "\003>K!8\222VEL\371\305 z\aD\1778\020\233\330S\251T\330\201V\026-k2\227\266;"
 deterministic_key {
   chain_code: "\223\265.\200\316\361\241{\223\342c\212\0213ym+\032=#\360\333X\003\2770Z\311\335\267\342\313"
   path: 2147483648
@@ -206,9 +208,9 @@ deterministic_key {
 }
 
 type: DETERMINISTIC_KEY
-public_key: "\002\221\021\370a[\205\267\036\021\366`\036\371\253Yk\r\303\025\f\255\2768\310\212\234\221\333\344\340t"
+public_key: "\002\221\021\370a[\205\267\036\021\366`\036\371\253Yk\r\303\025\f\255\2768\310\212\234\221\177\333\344\340t"
 deterministic_key {
-  chain_code: "\370~\245F\n\307\377Q:\v\207\245\336F\376\2443R\034\346\b\372\b\\o\303\204D#}\266"
+  chain_code: "\370~\245F\n\307\377Q:\v\207\245\336F\376\2443R\034\346\b\177\372\b\\o\303\204D#}\266"
   path: 2147483648
   path: 1
   path: 5
@@ -217,7 +219,7 @@ deterministic_key {
 type: DETERMINISTIC_KEY
 public_key: "\002c\034w@c\225\257n~G\330\002\241^\264\231\030\025\220gr\202`u\b\262\361\312\246\202J\341"
 deterministic_key {
-  chain_code: "\\\2542\003\022\254\361*\a/4\307\3430\322\303\v\205\351\027\260 l\332\326\235<\363v\020\232"
+  chain_code: "\\\2542\003\022\254\361*\a/4\177\307\3430\322\303\v\205\351\027\260 l\332\326\235<\363v\020\232"
   path: 2147483648
   path: 1
   path: 6
@@ -242,7 +244,7 @@ deterministic_key {
 }
 
 type: DETERMINISTIC_KEY
-public_key: "\003\307\273B\334\212\303\025r\212\264|\250c\204\\=\360w\335\300\353\266\273\3209\260nl3\271+"
+public_key: "\003\177\307\273B\334\212\303\025r\212\264|\250c\204\\=\360w\335\300\353\266\273\3209\260nl3\271+"
 deterministic_key {
   chain_code: "\345\365\034\261\316\2121R\226/+\267K\326C&\236\246],\224\001\220\347\334\351\223K\023\252\360\023"
   path: 2147483648
diff --git a/core/src/test/resources/org/bitcoinj/wallet/spending-wallet-account-two-serialization.txt b/core/src/test/resources/org/bitcoinj/wallet/spending-wallet-account-two-serialization.txt
new file mode 100644
index 00000000000..75fe33630cb
--- /dev/null
+++ b/core/src/test/resources/org/bitcoinj/wallet/spending-wallet-account-two-serialization.txt
@@ -0,0 +1,267 @@
+type: DETERMINISTIC_KEY
+secret_bytes: "1\026\363o1\250\031\314\340Wdh\273\272Q\"\253\205\3170\254\022\330\265G\0238hb\037\230\260"
+public_key: "\003Zx!\n\a:\205\374<Fp\035\353\361\\\311\"\216\024\365\265\366y\v\346\253^\305\302H\275\360"
+creation_timestamp: 1389353062000
+deterministic_key {
+  chain_code: "_\377Y\344\324\234\263\356_\002\325\222\241B\307C\302\021L\345f\2731u\364~\325\306\333\367\233\257"
+  path: 2147483650
+}
+output_script_type: P2PKH
+
+type: DETERMINISTIC_KEY
+secret_bytes: "\214E-\031jfj\351\324\206;\304\034v93\035[\251\374\t_@\262\273%q.r\276\016\241"
+public_key: "\002@\222\t\313\325\326\230Y\026V}\317=\212\256\212A\023T\363\262\311\000\034_\363\354\005\fK\377\251"
+deterministic_key {
+  chain_code: "\245\246\023\032\263\204 \211\026\3071)\002\241\242\215\237q\250F\233\301\265\342\307GN\345\006=\276\232"
+  path: 2147483650
+  path: 0
+  issued_subkeys: 2
+  lookahead_size: 10
+  sigsRequiredToSpend: 1
+}
+
+type: DETERMINISTIC_KEY
+secret_bytes: "\327Il3\260&\310?\325\301;\006~\342\233W!n\027\210\336\270\022\033\274\207  \v\236\035\305"
+public_key: "\002\370\357\200\221k$F\322c\215\277\311\243\216G-Q\020\036\270Od\374\223\267\276(\v\273;\370<"
+deterministic_key {
+  chain_code: "A1\006\001Ce0\337\336x\200\276\325\326=\377\356\327\032\037)\205\332c\210o%\351o:z\257"
+  path: 2147483650
+  path: 1
+  issued_subkeys: 1
+  lookahead_size: 10
+  sigsRequiredToSpend: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\210n\200\333\034\314\247\257\221\254}\371\200\304\253\322?\366\244\206N\247]c\215a\225\t\207G\232\271"
+deterministic_key {
+  chain_code: "\206\362\311\302\023\374\017\365b\350\006\206\036(\'T!pBF\366\002\377\035\213G\215\367x:Mu"
+  path: 2147483650
+  path: 0
+  path: 0
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003Z\326\247\3134\033nm\031\212\305Z\257\237\241\266\334<7\030\r\347=\006\360\336[]\352|\034+"
+deterministic_key {
+  chain_code: "p@L\005\330\253\310\320\363 `\016\366>K\327\361R\372P%c\247\000\030\300m\237\'\224e\300"
+  path: 2147483650
+  path: 0
+  path: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002(\335\203\303\0160\032\006\002\215\333\034\r\260\031V\035\317)\223`\001\203\333jdu\245\002\2136M"
+deterministic_key {
+  chain_code: "j\234\034\360\311J\223\265\232\264\252=,\353\246J\332\332\337\306\204\371^FH\206\335\357\222\004a\032"
+  path: 2147483650
+  path: 0
+  path: 2
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002M\240_\234\315\312yR]\274}#.\356\263\006\365\247RC\'k<*\313s0\322\314\334\226|"
+deterministic_key {
+  chain_code: "M\333\206\366\2154\234yn@J\021h\244\016\224\034\210\365\214\221\313\332\017\016\030)F6\275}\340"
+  path: 2147483650
+  path: 0
+  path: 3
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\222\3609iC:O\2772T\371\3433\330Y\366n\247\v\366\37542t\231{\263$\036~]="
+deterministic_key {
+  chain_code: "1\327G\352\347M\'\246y\304XA\2302\362xp\335\327\306\334\226%\203/\v6\325r\020\215\304"
+  path: 2147483650
+  path: 0
+  path: 4
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002+r\001\212\325\256]\2571\222Or\356{\323\355\370\361\347\311\217:\262\326\003$\374\f\266\343\277\036"
+deterministic_key {
+  chain_code: "\246\341(N\216^\023\262\033\230\243v\345\266x\202\r=\003\312d\377\212k\231\262\303Z^\212[\357"
+  path: 2147483650
+  path: 0
+  path: 5
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\211\212;\0309T\310\240:j\031\244Y2\326w\036,Ul\351\331fFkv\246\2322\304\351B"
+deterministic_key {
+  chain_code: "_\324E7\v\035e\321\232 \325\272\305\352\245\340\036\375\033\331\236\233\0326\021n/\031}\220\2262"
+  path: 2147483650
+  path: 0
+  path: 6
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\022z\v\251\244 3\224\334\207o\307\334:\212\316\026fV/\261\353\034\3371\357\354\036 VsL"
+deterministic_key {
+  chain_code: "\224-e\373A\252\377\3105\322\341\322\330\366JY}_\202,\267\303\252\220$\362\235\344\337\265\273?"
+  path: 2147483650
+  path: 0
+  path: 7
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\327\366\0233\245*\036\020\313$\026\030\037z\221\033\202\243Kg\232\377K\202z\232N>\342\030\005^"
+deterministic_key {
+  chain_code: "\027\200\234\377q\263\221H\a\303\274y\rw\327\310Fb\326\177G\255f\231\213O\270 %c\371\251"
+  path: 2147483650
+  path: 0
+  path: 8
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\177\302\310T\314\340p\n\223\332=7R&\217#>\331x\031\225\205S\360\371b\025\200V\000\243\335"
+deterministic_key {
+  chain_code: "\256\370\271\335\305mh\240\337\"\352\227\203\232\263\304A\237\331\032\201k\203rH\345B@\366\230\354Z"
+  path: 2147483650
+  path: 0
+  path: 9
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\241\215I\215h\206&\372\235Wp{\004\032\344Q\r\364\263B\365{\216\343,\205#K\004E\027\240"
+deterministic_key {
+  chain_code: "/\tvR\\\221\362\334\322\214\220,\215\233\304\023\315\025\220\274\255\325\3513G\367\375\235x,\253o"
+  path: 2147483650
+  path: 0
+  path: 10
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003h\372k\206\376\fx6\025\364\002\221\275Ad\324\230{\325b6\330\025\377?Lt\342\027\302\376\316"
+deterministic_key {
+  chain_code: "\207YX\355S\345\251)\265C{\3245\320\314\255\354\354\261\351\335\224\365Q^\202\304\227\016u)\032"
+  path: 2147483650
+  path: 0
+  path: 11
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002S{/\211.E{\312}bC2\025\334@\333$\333\217$\252x\241\376@u\354\004\336\203\3711"
+deterministic_key {
+  chain_code: "K\364\263\253O\207\237\304|\021\331\271\203\240\313 q\377\212\256\312\230\032R(`J\355\\<\366\277"
+  path: 2147483650
+  path: 0
+  path: 12
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\001\303\003\230e/\217\303\360Q3v,q\244\340\003\314.\030D\354Y\002\240\361\274q\274H\353,"
+deterministic_key {
+  chain_code: ",\326\234\336\206Mf-y\353wFZ\300\'\303\303\256\355P\251{]\220z)\317\004V\214\376\251"
+  path: 2147483650
+  path: 1
+  path: 0
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\230\244\202\327\226\252Y\221R\227zx\264}i\330u\314\345L\215*\rp2\317\255O\v\240\205\362"
+deterministic_key {
+  chain_code: "\t\317\020\246\355\322\023\271\236\"\332\360v\002,\026\203\345\377D\353\213x[\022\376\3758Y[\020J"
+  path: 2147483650
+  path: 1
+  path: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\001e\312\334\330\016\367nL\224\021\033\n\300\203\f\247\332\323W\302%\307G\367f\016\325\226S\237{"
+deterministic_key {
+  chain_code: "\264\033\003I\021?\320\037\314,\230\330\006j\212\251\\\210]v\205\357\375b$-A\341\2224\256\017"
+  path: 2147483650
+  path: 1
+  path: 2
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002d+>kd\263\314Ld\261\026\027\276\221j{ \026\216\346\235t|\204\307\314\251\004\333\304\2320"
+deterministic_key {
+  chain_code: "TS\322\aU\266!\220\317M\317\353\265\337\212\314\254\000\3005\241\243\266\220\320\322\351\264l2\207\252"
+  path: 2147483650
+  path: 1
+  path: 3
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\212\2020\200\021\241\332\325\233\223\206\" &\303]\023\276A-B\232\256U\225\231\331\234\274o\344\f"
+deterministic_key {
+  chain_code: "\231\030s_\230qm$\246C\263m\344Wz\300\204\362\232\350\335\225\v\334,+\2065\247\fwg"
+  path: 2147483650
+  path: 1
+  path: 4
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003]R\374_ =\300y\344\343\300\276\037\005\316F\362d|m\277\312B\263\022v\313\266\266mvF"
+deterministic_key {
+  chain_code: "\220\322\2459V\327<A\005\361\035~\230\r\212\222\203\026|\267c(z\351\201\312=\210\335\311\326\226"
+  path: 2147483650
+  path: 1
+  path: 5
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\230\310\347\313\247.nE\225\033IC\\\b\202rR$\212\227\355\370\036T\332(\\\360\215\316\f\255"
+deterministic_key {
+  chain_code: "*\241\257\274\234|\023\310$}[ \035/D\205\341\246:\346u1W\266S\b\232\306\204\346T\332"
+  path: 2147483650
+  path: 1
+  path: 6
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\037\325;\235Ix\304\306\021\1775W8\344=a\2505J\a-\242M\307\004\355\351B6y\256\371"
+deterministic_key {
+  chain_code: "\227q!\v!\333\254\034W\3051\340V\316xJ\025\361\353Pf\355\341\352VD\b\027\360\270\034\v"
+  path: 2147483650
+  path: 1
+  path: 7
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\2563~\311\243\'\371\340\v\207s\374\257 T\227v^\362\3457\035\321\004\356\236v\235\025\266\003\220"
+deterministic_key {
+  chain_code: "\2201\025\364\v\032\242%\262\264\247\215/\362h\223\272\303\210>\003\225\361\251\365\354P\252\233Q\364\367"
+  path: 2147483650
+  path: 1
+  path: 8
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002I\000\325\334\376I\346+h\312\326\373\331\375z\310\342(\221\bY\232\345\004\361vy\235S\313(\266"
+deterministic_key {
+  chain_code: "\2445\361\252\300\232O\350yI\276W\'}\243:-\261p-\216\f\2243\276_\027{S \344w"
+  path: 2147483650
+  path: 1
+  path: 9
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\330\005Bd\263\230\311\225\263b\331\354|\260$\257\207Q\305\364[\261\365z\016H\371\242\317\301\273>"
+deterministic_key {
+  chain_code: "#M\366zV\006\3751\b\311\233\n8/z\214\354\035\220%\364\204\352M\023-\226\326\226\346\262\225"
+  path: 2147483650
+  path: 1
+  path: 10
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\337\027\036\342\333\032c\273X\202T\032?\243\256\313\311\3411\326J\017\2111@*\001\223xkp\352"
+deterministic_key {
+  chain_code: "8\336\262Z\314JCK\323\r\267\214\"\375U\215\247\217\211_\237\376\323.\247:\372\216\331\t\003\255"
+  path: 2147483650
+  path: 1
+  path: 11
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002l\255\003\316\3273l\034\241\r\003b\250y\201H\261\024\325$\302\351\226\224\345a\245\270\232%v\241"
+deterministic_key {
+  chain_code: "~\020\352Z\325\2674\245\272\003\221$\177\r\"\362\\\344\320\227\267\316\330\272.\"\272\031o\241\027\334"
+  path: 2147483650
+  path: 1
+  path: 12
+}
\ No newline at end of file
diff --git a/core/src/test/resources/org/bitcoinj/wallet/spending-wallet-from-bip44-serialization-two.txt b/core/src/test/resources/org/bitcoinj/wallet/spending-wallet-from-bip44-serialization-two.txt
new file mode 100644
index 00000000000..eccbc7ee094
--- /dev/null
+++ b/core/src/test/resources/org/bitcoinj/wallet/spending-wallet-from-bip44-serialization-two.txt
@@ -0,0 +1,325 @@
+type: DETERMINISTIC_KEY
+secret_bytes: "\023\354\032\244\374<y\254aq\a\362=\345\204\n^;5\213M\267\311\234\037RkX\235\363ae"
+public_key: "\002T5VO\274\362m\300\320\352\005\r!\307\024\250\307C\324\323\215[\232@\254S\270\217\362\370\214\362"
+creation_timestamp: 1389353062000
+deterministic_key {
+  chain_code: "F\336\2067\377M\026)%\357ZL#\203\320\324\217-\3305\310\244\n\205\277E\323L\250ww\314"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+}
+output_script_type: P2PKH
+
+type: DETERMINISTIC_KEY
+secret_bytes: "\362\305\242\3637\2748Z?]\035s\272\253J\300\033\250\022r\350\020\277U\036K<\335\237\333/\303"
+public_key: "\003\2471\326i\331A\337|\373\276\3214\257\363\266Q\315x\341\317\200\243\234\336<s}\261\240,\233\371"
+deterministic_key {
+  chain_code: "Pd\032#\325\213\332\307\3755\020\316\276\002\037\262\241\213\211k\376\254\220R\351\270\"\260V\260\362\257"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  issued_subkeys: 2
+  lookahead_size: 10
+  sigsRequiredToSpend: 1
+}
+
+type: DETERMINISTIC_KEY
+secret_bytes: "\311\327\205Q\005\346\030\365\026\0331\356\346\036\234\024\b\322\202\3726I\351\001 \373\200\003\260\276\216\000"
+public_key: "\003\334\214L\003Zq\365\212P\203b~l\367C@T\341\300\216\037\375\002\224\t=\301:\266l\177\364"
+deterministic_key {
+  chain_code: "\036\277^\322!\227i^Z\212\347\272\365C\016\342\371\236a\022\\\n\037\304\264\021\335\344\340=\234T"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  issued_subkeys: 1
+  lookahead_size: 10
+  sigsRequiredToSpend: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\232\177\236W\2235py\021\331i\350\026H\235\nO\217\231\361M/}5\211v\023Kc\253\2307"
+deterministic_key {
+  chain_code: "\032\366\331\360\276Yo\243;!\023\005\305\246\354\337N\203\302\264\250\355\275\346\271!L\\\252\270\364t"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 0
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\231\254]q\030g3\316u\322h\304Ao4\246f\026\266\374\nY\233\022\034\243\'\000\030\256\342\006"
+deterministic_key {
+  chain_code: "\364\201U66\201$7l%Sy\365]A\265\277&\370\256\364\347\356\334T\323\375\347mB0\374"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002/ \336M\347\357pl@z\204\3240\027\366\0170\307\337\327\312_$\n\'\216\237W\017\263bg"
+deterministic_key {
+  chain_code: "i\206:\003\205BLMI\376\347S~\315\0306\255\274>\220\017\302\241u\017DvD\2662\342\316"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 2
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003 1\316\277\355_\343\214}\a\205\233\325\232\241n\256\325\300\2369\020\nh\335\0243\355\362$?7"
+deterministic_key {
+  chain_code: "\334(\\u\022\245\370\t*\372\315\330\365\256Ms\254J_{B\035[f\333\351\272\261\363\373_\023"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 3
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\354\fhI\2731\026\222\v\274\027\357\327\033X\324\270\323\252}\314}\221\213\272\\\362k\352\334\177#"
+deterministic_key {
+  chain_code: "#\351\"(\t\245\006\351\354f\334\216(\272\252\200\226\337\370\260XO\375\016/\377\306\263yE\222\311"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 4
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002-7\rx2\177zP\r(B\247\350\026\205\210w\251G\b\254\213\000\227\271Q\272\342\357\304>G"
+deterministic_key {
+  chain_code: "US\242J\307\2672<\373l\217\200[\316\352\361*~\324\f\304\267oD\273\300_\340K\247V\370"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 5
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002Y\260\332\377;T\263\335\331\004\020kv\207E=\311|\270*hP>)\340\272\203LD\036\313\271"
+deterministic_key {
+  chain_code: "\r34\'I\027\266\272\300\003\366f\274\333\260\006\311\3556!\227\216\301\361\247\354\025\305\321\376\274\214"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 6
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002I\367x\235p9\334\234\034\366\247&\321\237\217\241V\252\017`w\212\301\000\305-\312\003\352`\302V"
+deterministic_key {
+  chain_code: "\257\001\375\203E\315\221W\316&\035\244\306\037\351\361\027\020\346\305^Z\274O\212\363P\036\273n\367\326"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 7
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\0029\373\030u\305\214S\345/\373y%\t\252~\267\f\016t|\354\020\356\306\313\317\027\325\376\232kh"
+deterministic_key {
+  chain_code: "\260\203\277\231\352\265y\020\356r_bO\374l\347\002\032i\216Ct\260\221-\207\200\243\364;\247I"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 8
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002[\304\301.\342\253\256\364\025\'\017\356-t\340R\250Z\327\374\250\r\331\221`\334\362a[q\260\271"
+deterministic_key {
+  chain_code: "\376\277#\275\035S\362`\323\246<b~D\253\250p\263\256\364\257\256\201\016\223[\305\261\2758\353\203"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 9
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\253\213j!\316\\\372-tA\331\362T\363\252)\302\2620\246=X#\201\274\212\331Gi9\362\366"
+deterministic_key {
+  chain_code: "S`\237\003Q\021\201\301\341Ij\"\270:\335\374;\320\037\350m\037\331\343\3208\211E\276y\215."
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 10
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\231\323\307\3348\267\357\310\323\nWf$\326\334\v\360\273\357\207\0207\036)\270Api\346\321\270\351"
+deterministic_key {
+  chain_code: "\232Y6\020\317@\r\251]\204m\37796\v5\006\300\t\342\246.\231r\336Vt\370\373\023_M"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 11
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\3647\fs\313\367\022\317\207\276\305\370W\b \276\274\343\344r\351\303\035\235\227X\a\347Q2\325\351"
+deterministic_key {
+  chain_code: "\030F|\234$0\315\215\203\234\037\0054\344M\253\343\214S\360\274_\330\2663\364L\025\250\v\236\247"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 12
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\273\t\2539\246\023^H\232\202}Hi+\226Q\337\371\002\021\201\276\261*\236\353\'\247\325\367t^"
+deterministic_key {
+  chain_code: "\233\314\253j\213|Y\344\200k\217\357*\\\030\347`\016\266\033g|\273\330\261\226cj\204\351\234Z"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 0
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\266}M\017f0\350\357\232\037\2713\203N\nei\202_\t\034\0343X,\006Y\260\356\340\031W"
+deterministic_key {
+  chain_code: "\2569jU\231\242\230rH\202\025\356C\373\327\374-\305\313\277Jy5mx\034\350\2264\321\327J"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\221o\254\027\3547s\260&\217b\252r\fo)~\2107\016\255\273\223\245A\234\247ay\204\021H"
+deterministic_key {
+  chain_code: "\265\233\233\354DG\226\326\215\024\230\334\262J\257LL\363R\316$\357\347\017v\371rpA\244PK"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 2
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\301\036A\004O\323\350\240\227>C73n\326P]{\260@\327\242\'\263$H\271\371\371YIJ"
+deterministic_key {
+  chain_code: "9\214\315\275\300\206\253U;\235\002\177fA\016\215\222\235K\253\311\3648w20\2005\343\310\\:"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 3
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002!\373+L\341\025\265\232\a\247J?v\274\273|v\035g\033\211\026\332\233\37378c\226\020\304\360"
+deterministic_key {
+  chain_code: "i\003w\037b!Y]\214l\373]`x\355Je\\\v\205\n\310\254s\301\272\246\315\024}\366\037"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 4
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002p\261|\230%\350\a\347?-}\317\274W\210\032\331\006\350\320\016\331\300\024\302\321[O\210E\231\342"
+deterministic_key {
+  chain_code: "\367\263\236B#W\223\3206\3644!?Im\250\277\vY\322\302\254\212A\227\352\244\003\031)\374b"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 5
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\355\213b\333\3157\262iu\361\274\252\271\223\346\276^\350\260q\272m\025.\256\353\006\005\020\255&\017"
+deterministic_key {
+  chain_code: "\003\265\376U\001\240P\'X\364\326\326\275\375s\306\225\373\264\306H5[\356\b\301>\227\325\323\315\344"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 6
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\317\215\311\246\322\335\226,\355\243\274E\270\027\307I\264\344\260\350_\230\372\034\340\363\3113T\222\274c"
+deterministic_key {
+  chain_code: "r\203\252\217hI\312S\323\377](\331C\2711\214T.\031\277\333\267,U|\323x\006\003\263\233"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 7
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\277\306\215\221N\224\b=\v\001\216Ui\033v\250\326\361\221\332\215\343$\344A\306\357f\236\330\241\337"
+deterministic_key {
+  chain_code: "1n@\331(\246#4\262\017\006\360a\206i\270\211n\344\363\343Y\0000\372,\231\352\252f\272!"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 8
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002!\032\210\034\267\234\t\177\311T\'(~c-dKt;\366\030fI5[\026\242\372\310\342\'\205"
+deterministic_key {
+  chain_code: "\004AX{\301\030\035K\353\353S\223m\271\352\323\272\'\202=_5\322\240J.\227\370[gZ?"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 9
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002KZ\215?\f\365\"o\364\035\n\240\276_\335\\\256\277\212J\247\201A\325\220\361\356\213/!\301\224"
+deterministic_key {
+  chain_code: "\247\233H)F\252\276\242\370\350\263\270\b:^\247d]\232\316QUA2\n\262\321\177U\003\r]"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 10
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\204U\310%\024\"\363\267\340\220\031\341koQ\210\037\022\224Y\354\016\370\360\374\346\216\354@B\247\233"
+deterministic_key {
+  chain_code: "w\265\277h\352\025\351\274\233\310;rk\264`*-H-r\026\326\237%\230\034\005\236_6#a"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 11
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\213\241A\022c\322\031\367O\273\375\3354\'Vh\371\362\202\220\253\366\206:\033\347\300\227<6\252\034"
+deterministic_key {
+  chain_code: "R\222\341\341.\352\306O\340+\276\266#K\211\022\264\203\225\240\246\263\023l\327\356 \350\342\242]F"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 12
+}
\ No newline at end of file
diff --git a/core/src/test/resources/org/bitcoinj/wallet/spending-wallet-from-bip44-serialization.txt b/core/src/test/resources/org/bitcoinj/wallet/spending-wallet-from-bip44-serialization.txt
new file mode 100644
index 00000000000..1d1c9f7e401
--- /dev/null
+++ b/core/src/test/resources/org/bitcoinj/wallet/spending-wallet-from-bip44-serialization.txt
@@ -0,0 +1,267 @@
+type: DETERMINISTIC_KEY
+secret_bytes: "\023\354\032\244\374<y\254aq\a\362=\345\204\n^;5\213M\267\311\234\037RkX\235\363ae"
+public_key: "\002T5VO\274\362m\300\320\352\005\r!\307\024\250\307C\324\323\215[\232@\254S\270\217\362\370\214\362"
+creation_timestamp: 1389353062000
+deterministic_key {
+  chain_code: "F\336\2067\377M\026)%\357ZL#\203\320\324\217-\3305\310\244\n\205\277E\323L\250ww\314"
+  path: 2147483648
+}
+output_script_type: P2PKH
+
+type: DETERMINISTIC_KEY
+secret_bytes: "\362\305\242\3637\2748Z?]\035s\272\253J\300\033\250\022r\350\020\277U\036K<\335\237\333/\303"
+public_key: "\003\2471\326i\331A\337|\373\276\3214\257\363\266Q\315x\341\317\200\243\234\336<s}\261\240,\233\371"
+deterministic_key {
+  chain_code: "Pd\032#\325\213\332\307\3755\020\316\276\002\037\262\241\213\211k\376\254\220R\351\270\"\260V\260\362\257"
+  path: 2147483648
+  path: 0
+  issued_subkeys: 2
+  lookahead_size: 10
+  sigsRequiredToSpend: 1
+}
+
+type: DETERMINISTIC_KEY
+secret_bytes: "\311\327\205Q\005\346\030\365\026\0331\356\346\036\234\024\b\322\202\3726I\351\001 \373\200\003\260\276\216\000"
+public_key: "\003\334\214L\003Zq\365\212P\203b~l\367C@T\341\300\216\037\375\002\224\t=\301:\266l\177\364"
+deterministic_key {
+  chain_code: "\036\277^\322!\227i^Z\212\347\272\365C\016\342\371\236a\022\\\n\037\304\264\021\335\344\340=\234T"
+  path: 2147483648
+  path: 1
+  issued_subkeys: 1
+  lookahead_size: 10
+  sigsRequiredToSpend: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\232\177\236W\2235py\021\331i\350\026H\235\nO\217\231\361M/}5\211v\023Kc\253\2307"
+deterministic_key {
+  chain_code: "\032\366\331\360\276Yo\243;!\023\005\305\246\354\337N\203\302\264\250\355\275\346\271!L\\\252\270\364t"
+  path: 2147483648
+  path: 0
+  path: 0
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\231\254]q\030g3\316u\322h\304Ao4\246f\026\266\374\nY\233\022\034\243\'\000\030\256\342\006"
+deterministic_key {
+  chain_code: "\364\201U66\201$7l%Sy\365]A\265\277&\370\256\364\347\356\334T\323\375\347mB0\374"
+  path: 2147483648
+  path: 0
+  path: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002/ \336M\347\357pl@z\204\3240\027\366\0170\307\337\327\312_$\n\'\216\237W\017\263bg"
+deterministic_key {
+  chain_code: "i\206:\003\205BLMI\376\347S~\315\0306\255\274>\220\017\302\241u\017DvD\2662\342\316"
+  path: 2147483648
+  path: 0
+  path: 2
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003 1\316\277\355_\343\214}\a\205\233\325\232\241n\256\325\300\2369\020\nh\335\0243\355\362$?7"
+deterministic_key {
+  chain_code: "\334(\\u\022\245\370\t*\372\315\330\365\256Ms\254J_{B\035[f\333\351\272\261\363\373_\023"
+  path: 2147483648
+  path: 0
+  path: 3
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\354\fhI\2731\026\222\v\274\027\357\327\033X\324\270\323\252}\314}\221\213\272\\\362k\352\334\177#"
+deterministic_key {
+  chain_code: "#\351\"(\t\245\006\351\354f\334\216(\272\252\200\226\337\370\260XO\375\016/\377\306\263yE\222\311"
+  path: 2147483648
+  path: 0
+  path: 4
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002-7\rx2\177zP\r(B\247\350\026\205\210w\251G\b\254\213\000\227\271Q\272\342\357\304>G"
+deterministic_key {
+  chain_code: "US\242J\307\2672<\373l\217\200[\316\352\361*~\324\f\304\267oD\273\300_\340K\247V\370"
+  path: 2147483648
+  path: 0
+  path: 5
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002Y\260\332\377;T\263\335\331\004\020kv\207E=\311|\270*hP>)\340\272\203LD\036\313\271"
+deterministic_key {
+  chain_code: "\r34\'I\027\266\272\300\003\366f\274\333\260\006\311\3556!\227\216\301\361\247\354\025\305\321\376\274\214"
+  path: 2147483648
+  path: 0
+  path: 6
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002I\367x\235p9\334\234\034\366\247&\321\237\217\241V\252\017`w\212\301\000\305-\312\003\352`\302V"
+deterministic_key {
+  chain_code: "\257\001\375\203E\315\221W\316&\035\244\306\037\351\361\027\020\346\305^Z\274O\212\363P\036\273n\367\326"
+  path: 2147483648
+  path: 0
+  path: 7
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\0029\373\030u\305\214S\345/\373y%\t\252~\267\f\016t|\354\020\356\306\313\317\027\325\376\232kh"
+deterministic_key {
+  chain_code: "\260\203\277\231\352\265y\020\356r_bO\374l\347\002\032i\216Ct\260\221-\207\200\243\364;\247I"
+  path: 2147483648
+  path: 0
+  path: 8
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002[\304\301.\342\253\256\364\025\'\017\356-t\340R\250Z\327\374\250\r\331\221`\334\362a[q\260\271"
+deterministic_key {
+  chain_code: "\376\277#\275\035S\362`\323\246<b~D\253\250p\263\256\364\257\256\201\016\223[\305\261\2758\353\203"
+  path: 2147483648
+  path: 0
+  path: 9
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\253\213j!\316\\\372-tA\331\362T\363\252)\302\2620\246=X#\201\274\212\331Gi9\362\366"
+deterministic_key {
+  chain_code: "S`\237\003Q\021\201\301\341Ij\"\270:\335\374;\320\037\350m\037\331\343\3208\211E\276y\215."
+  path: 2147483648
+  path: 0
+  path: 10
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\231\323\307\3348\267\357\310\323\nWf$\326\334\v\360\273\357\207\0207\036)\270Api\346\321\270\351"
+deterministic_key {
+  chain_code: "\232Y6\020\317@\r\251]\204m\37796\v5\006\300\t\342\246.\231r\336Vt\370\373\023_M"
+  path: 2147483648
+  path: 0
+  path: 11
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\3647\fs\313\367\022\317\207\276\305\370W\b \276\274\343\344r\351\303\035\235\227X\a\347Q2\325\351"
+deterministic_key {
+  chain_code: "\030F|\234$0\315\215\203\234\037\0054\344M\253\343\214S\360\274_\330\2663\364L\025\250\v\236\247"
+  path: 2147483648
+  path: 0
+  path: 12
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\273\t\2539\246\023^H\232\202}Hi+\226Q\337\371\002\021\201\276\261*\236\353\'\247\325\367t^"
+deterministic_key {
+  chain_code: "\233\314\253j\213|Y\344\200k\217\357*\\\030\347`\016\266\033g|\273\330\261\226cj\204\351\234Z"
+  path: 2147483648
+  path: 1
+  path: 0
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\266}M\017f0\350\357\232\037\2713\203N\nei\202_\t\034\0343X,\006Y\260\356\340\031W"
+deterministic_key {
+  chain_code: "\2569jU\231\242\230rH\202\025\356C\373\327\374-\305\313\277Jy5mx\034\350\2264\321\327J"
+  path: 2147483648
+  path: 1
+  path: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\221o\254\027\3547s\260&\217b\252r\fo)~\2107\016\255\273\223\245A\234\247ay\204\021H"
+deterministic_key {
+  chain_code: "\265\233\233\354DG\226\326\215\024\230\334\262J\257LL\363R\316$\357\347\017v\371rpA\244PK"
+  path: 2147483648
+  path: 1
+  path: 2
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\301\036A\004O\323\350\240\227>C73n\326P]{\260@\327\242\'\263$H\271\371\371YIJ"
+deterministic_key {
+  chain_code: "9\214\315\275\300\206\253U;\235\002\177fA\016\215\222\235K\253\311\3648w20\2005\343\310\\:"
+  path: 2147483648
+  path: 1
+  path: 3
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002!\373+L\341\025\265\232\a\247J?v\274\273|v\035g\033\211\026\332\233\37378c\226\020\304\360"
+deterministic_key {
+  chain_code: "i\003w\037b!Y]\214l\373]`x\355Je\\\v\205\n\310\254s\301\272\246\315\024}\366\037"
+  path: 2147483648
+  path: 1
+  path: 4
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002p\261|\230%\350\a\347?-}\317\274W\210\032\331\006\350\320\016\331\300\024\302\321[O\210E\231\342"
+deterministic_key {
+  chain_code: "\367\263\236B#W\223\3206\3644!?Im\250\277\vY\322\302\254\212A\227\352\244\003\031)\374b"
+  path: 2147483648
+  path: 1
+  path: 5
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\355\213b\333\3157\262iu\361\274\252\271\223\346\276^\350\260q\272m\025.\256\353\006\005\020\255&\017"
+deterministic_key {
+  chain_code: "\003\265\376U\001\240P\'X\364\326\326\275\375s\306\225\373\264\306H5[\356\b\301>\227\325\323\315\344"
+  path: 2147483648
+  path: 1
+  path: 6
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\317\215\311\246\322\335\226,\355\243\274E\270\027\307I\264\344\260\350_\230\372\034\340\363\3113T\222\274c"
+deterministic_key {
+  chain_code: "r\203\252\217hI\312S\323\377](\331C\2711\214T.\031\277\333\267,U|\323x\006\003\263\233"
+  path: 2147483648
+  path: 1
+  path: 7
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\277\306\215\221N\224\b=\v\001\216Ui\033v\250\326\361\221\332\215\343$\344A\306\357f\236\330\241\337"
+deterministic_key {
+  chain_code: "1n@\331(\246#4\262\017\006\360a\206i\270\211n\344\363\343Y\0000\372,\231\352\252f\272!"
+  path: 2147483648
+  path: 1
+  path: 8
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002!\032\210\034\267\234\t\177\311T\'(~c-dKt;\366\030fI5[\026\242\372\310\342\'\205"
+deterministic_key {
+  chain_code: "\004AX{\301\030\035K\353\353S\223m\271\352\323\272\'\202=_5\322\240J.\227\370[gZ?"
+  path: 2147483648
+  path: 1
+  path: 9
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002KZ\215?\f\365\"o\364\035\n\240\276_\335\\\256\277\212J\247\201A\325\220\361\356\213/!\301\224"
+deterministic_key {
+  chain_code: "\247\233H)F\252\276\242\370\350\263\270\b:^\247d]\232\316QUA2\n\262\321\177U\003\r]"
+  path: 2147483648
+  path: 1
+  path: 10
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\204U\310%\024\"\363\267\340\220\031\341koQ\210\037\022\224Y\354\016\370\360\374\346\216\354@B\247\233"
+deterministic_key {
+  chain_code: "w\265\277h\352\025\351\274\233\310;rk\264`*-H-r\026\326\237%\230\034\005\236_6#a"
+  path: 2147483648
+  path: 1
+  path: 11
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\213\241A\022c\322\031\367O\273\375\3354\'Vh\371\362\202\220\253\366\206:\033\347\300\227<6\252\034"
+deterministic_key {
+  chain_code: "R\222\341\341.\352\306O\340+\276\266#K\211\022\264\203\225\240\246\263\023l\327\356 \350\342\242]F"
+  path: 2147483648
+  path: 1
+  path: 12
+}
\ No newline at end of file
diff --git a/core/src/test/resources/org/bitcoinj/wallet/spending-wallet-serialization.txt b/core/src/test/resources/org/bitcoinj/wallet/spending-wallet-serialization.txt
new file mode 100644
index 00000000000..f9a01402064
--- /dev/null
+++ b/core/src/test/resources/org/bitcoinj/wallet/spending-wallet-serialization.txt
@@ -0,0 +1,267 @@
+type: DETERMINISTIC_KEY
+secret_bytes: "\354B\331\275;\000\254?\3428\006\220G\365\243\333s\260s\213R\313\307\377f\331B\351\327=\001\333"
+public_key: "\002\357\\\252\376]\023\315\'\316`\317\362\032@\232\"\360\331\335\221] `\016,\351<\b\300\225\032m"
+creation_timestamp: 100000000
+deterministic_key {
+  chain_code: "\370\017\223\021O?.@gZ|\233j\3437\317q-\241!\177J \323\'\264s\203\314\321\v\346"
+  path: 2147483648
+}
+output_script_type: P2PKH
+
+type: DETERMINISTIC_KEY
+secret_bytes: "<M\020I\364\276\336Z\255\341\330\257\337 \366E_\027\2433w\325\263\"$\350\f\244\006\251u\021"
+public_key: "\002\361V\216\001\371p\270\212\272\236%\216\356o\025g\r\035>a\305j\001P\217Q\242\261.\353\367\315"
+deterministic_key {
+  chain_code: "\231B\211S[\216\237\277q{a\365\216\325\250\223s\v\n(\364\257@3c\312rix\260c\217"
+  path: 2147483648
+  path: 0
+  issued_subkeys: 2
+  lookahead_size: 10
+  sigsRequiredToSpend: 1
+}
+
+type: DETERMINISTIC_KEY
+secret_bytes: "\f0\266\235\272\205\212:\265\372\214P\226\344\a{S0\354\250\210\316L\256;W\036\200t\347\343\246"
+public_key: "\0022\n\252\267NDr.7i7\332\232x\367\204G-|\204\301\333G\033g\300O\241\006\217\366\370"
+deterministic_key {
+  chain_code: "\213\237\327\245a\273\274\310\377\360\351\352<\211k\033g\0251>y\236\345Jb\244[\b\fO\0311"
+  path: 2147483648
+  path: 1
+  issued_subkeys: 1
+  lookahead_size: 10
+  sigsRequiredToSpend: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002O_Q\223\337\360\245\234\322b_op\b?\030\364\255l\206\344`w\274\204\"\257\235U<}\377"
+deterministic_key {
+  chain_code: "\331\233\342\227\336r\212>\021\022p\347* +\220\021{\206\310Z\314\335\322\230\331\365\221}\321\036\035"
+  path: 2147483648
+  path: 0
+  path: 0
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\270\311\006\363\375\002{\310\254n\301\366\303\315\255\3462\004/\251\'\205+\341~d\275\350\"\313\204\313"
+deterministic_key {
+  chain_code: "5\037!\360\335\017\276\231\273\3531\020\253\223 \312\240M+\250\2520e\006\034\214{\331\376\201\004\306"
+  path: 2147483648
+  path: 0
+  path: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\000\n\256n\324$.\324\365\231\f\224\001\376\266\341\036Q\212\374>\245\324\\8*\342\370\251x\b-"
+deterministic_key {
+  chain_code: "5\202n|A\251$y+t\005\365\231\357\323\264E\266l\220\367\211dA\306\370\247<\'\034\323\324"
+  path: 2147483648
+  path: 0
+  path: 2
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\313/\026\020\254\240\3455\216\342E\300\316\353m.\270\204\264\327\220H\326E9\310\227 \023~\204\215"
+deterministic_key {
+  chain_code: "\342\263a\033~\374\234UN\034\302\300\370\232\347B#L\251\267\035\255\210\356\vE\264\210\317\030]t"
+  path: 2147483648
+  path: 0
+  path: 3
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\217\n\021GL\354\214\354WhX\254\351\337w.\211&q1o\003\033\330\352**\351\356\210\264m"
+deterministic_key {
+  chain_code: "\036\216\345\320e\267p\241\000\204\254\370\251d\000\253\354\316RH\275RS\221\016\343=T\236\335\222P"
+  path: 2147483648
+  path: 0
+  path: 4
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\325\n\347\346\3273\312J\211e\335?\227\236\304i\227\377J\222;\253\017\213\371\235d\220\231\026aV"
+deterministic_key {
+  chain_code: "YSn>5\364i(j\b\326\212,\f,\322\3200\230\210)\366g\201\274\232\356\027\212O\345\215"
+  path: 2147483648
+  path: 0
+  path: 5
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\264\331\220\207*\342T\277\323\363\210\266\335\300\245?\024d\002\021\263|\253\035\253\244D\023\004\200\212X"
+deterministic_key {
+  chain_code: "yP\342|\327\364\034\f\302}\236\032\031\t\345h(q7\346?wR\221\325\370\021\225\334\317Bg"
+  path: 2147483648
+  path: 0
+  path: 6
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002HX\261\035\270!\263\2232-F\334\226n=<\0178\270^\202\225\264PF\v#\bdP/\355"
+deterministic_key {
+  chain_code: "Z#\227\222\225\303\203\006q\206\321\v\355\353\220#Oh\360]\001IQD\333\025\356\276\342\270\021\313"
+  path: 2147483648
+  path: 0
+  path: 7
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\020C\2310\227\302\342\274u\217\021h\270\235\356\326_\365\321\261\272\340\267\n\335~\360\343\"Ow\b"
+deterministic_key {
+  chain_code: "\232\000\3117\235\003`)\021g}/\203tk\201\021\364\247\245;\253\321\202\207\342\265\267_<\206\224"
+  path: 2147483648
+  path: 0
+  path: 8
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\276\211n\305\3339[D\337+\034\263\267U0\263\3039}/\376\207\030\364K\335\301\245\311\241\3419"
+deterministic_key {
+  chain_code: "B\232\f\')\277\034\316HOdn\213\b\204\361\030\357YS \365zY\2749e\260)\233.-"
+  path: 2147483648
+  path: 0
+  path: 9
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002h\356\202\222P\204x\345\226\017\256/E\304\273{)\272\034\375\2451\321\257\233\372?\320\352\356\271K"
+deterministic_key {
+  chain_code: "\035\222\325\fY\221(\006\tf#7\370\355el\377\276\245\354\002\327\320\247\315V\004\016v\367\351\225"
+  path: 2147483648
+  path: 0
+  path: 10
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\325\313@\"\320\035\277(\245\222\342{\374g\235\203\347\217\035\204j\027\034\244\021bY0\247P`\323"
+deterministic_key {
+  chain_code: "\226~!\327\210.\033\214\251\2367\205<\226`UF\354\234/\365\267E\317\202\354\211P\244\221\336\200"
+  path: 2147483648
+  path: 0
+  path: 11
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\000\334\035\2400n\26636x\316\327\3666\271\375K\031\366\307\221J@\331@dL\232Bv\324\262"
+deterministic_key {
+  chain_code: "\207^n\317\370\t\207\341*\\\360\026iBRTQ#\252Z\237\373{\315\333\004\340nA9\252\352"
+  path: 2147483648
+  path: 0
+  path: 12
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\225b\3515\202\233\335\320.7\265\274uh\230N\242\254\317\177J\364\331\2345\220)\362\334\216\202\\"
+deterministic_key {
+  chain_code: "\202:\344\3109?\350\345\001\314(\244q\370\233Rk\261}\302(\275\326\305R\342:\246\036\nV\330"
+  path: 2147483648
+  path: 1
+  path: 0
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003>K!8\222VEL\371\305 z\aD\1778\020\233\330S\251T\330\201V\026-k2\227\266;"
+deterministic_key {
+  chain_code: "\223\265.\200\316\361\241{\223\342c\212\0213ym+\032=#\360\333X\003\2770Z\311\335\267\342\313"
+  path: 2147483648
+  path: 1
+  path: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\331t\251d\023\355w\221\266\301\264\306T\252\350\200\260A\220\363\212\345\021\222\236\003\210\215\342\r\251\000"
+deterministic_key {
+  chain_code: "\276\262\033\030\227\271&e\254\377\346\031\2112\344[\234Z\221-\033\306P,Mi\021\313r\031\317\341"
+  path: 2147483648
+  path: 1
+  path: 2
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002D\374\231\027\306\310\251\261\200\350@\ro\314\216\037>rp\017\276Q\203\027\016\213\320\206VqO\237"
+deterministic_key {
+  chain_code: "_K4\n\356\235\036\243O\261\200\004\367\324\305;1\247I\350*\353`\204\004d\202\302\335\200/#"
+  path: 2147483648
+  path: 1
+  path: 3
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\370\352\3530]|\262\270]5\361\263\255)\027f\342\262\272a-\275\006\302\266\236\344\332\364\r\260\321"
+deterministic_key {
+  chain_code: "o!GH\357\030\264\003_S\305\204\234wO\344.\215\377\232\025\206\351\030\227,\303%U2x\225"
+  path: 2147483648
+  path: 1
+  path: 4
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\221\021\370a[\205\267\036\021\366`\036\371\253Yk\r\303\025\f\255\2768\310\212\234\221\177\333\344\340t"
+deterministic_key {
+  chain_code: "\370~\245F\n\307\377Q:\v\207\245\336F\376\2443R\034\346\b\177\372\b\\o\303\204D#}\266"
+  path: 2147483648
+  path: 1
+  path: 5
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002c\034w@c\225\257n~G\330\002\241^\264\231\030\025\220gr\202`u\b\262\361\312\246\202J\341"
+deterministic_key {
+  chain_code: "\\\2542\003\022\254\361*\a/4\177\307\3430\322\303\v\205\351\027\260 l\332\326\235<\363v\020\232"
+  path: 2147483648
+  path: 1
+  path: 6
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\266\304\006g\244l\271>\364\357G8B\374\026w\316\022\205\313\220\274\273>$\350\212o!\rt\230"
+deterministic_key {
+  chain_code: "6]\325WN\017o\255\314\213\344\201f\204\361\235\'\343\217\341m\327\326=T\2018g\324\261`\335"
+  path: 2147483648
+  path: 1
+  path: 7
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003X\331\344\227G\366//<V\226\b\352#\315\307j\263\232\273d\236)\004\225fk\304\000XM\305"
+deterministic_key {
+  chain_code: "&\025?\264\a\2334-\203\217\240R\221[{8)9\221\346bv=ut\346\226KVj\2659"
+  path: 2147483648
+  path: 1
+  path: 8
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\177\307\273B\334\212\303\025r\212\264|\250c\204\\=\360w\335\300\353\266\273\3209\260nl3\271+"
+deterministic_key {
+  chain_code: "\345\365\034\261\316\2121R\226/+\267K\326C&\236\246],\224\001\220\347\334\351\223K\023\252\360\023"
+  path: 2147483648
+  path: 1
+  path: 9
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002+[\230[E\225\225R2\350X=\366\343\244\237\260\220J\311\376\200@\\\334\312y\212\276\223\350\267"
+deterministic_key {
+  chain_code: "\250W]}O:@\t\016\311\016\335\016\271\260\327\261\237\030G\334\246\233\352t\266\\S\311\333m*"
+  path: 2147483648
+  path: 1
+  path: 10
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003-\221uJ\237\240\320\025\031w\001V\276\030j\217Z\222 \330\253\332\330F\216\377D\311\211\277\351\230"
+deterministic_key {
+  chain_code: "\241\363\245\033W\f*J\026\021\210Ic\2318a\"\036\302\005+\220\003\3364\211o\362\225R~\340"
+  path: 2147483648
+  path: 1
+  path: 11
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002V\3212\255\n\367\226%]0\342\003\317\031\350\265K\247\035\005}\004[N\262\262\376Ed\261j\377"
+deterministic_key {
+  chain_code: "0\236\330H\354\237\016\367-/E\344\311\024\353\307\331\367n\017\250n\351\000\204\233\224\242L\343&;"
+  path: 2147483648
+  path: 1
+  path: 12
+}
\ No newline at end of file
diff --git a/core/src/test/resources/org/bitcoinj/wallet/watching-wallet-arbitrary-path-serialization.txt b/core/src/test/resources/org/bitcoinj/wallet/watching-wallet-arbitrary-path-serialization.txt
new file mode 100644
index 00000000000..0677ebf89ac
--- /dev/null
+++ b/core/src/test/resources/org/bitcoinj/wallet/watching-wallet-arbitrary-path-serialization.txt
@@ -0,0 +1,322 @@
+type: DETERMINISTIC_KEY
+public_key: "\002T5VO\274\362m\300\320\352\005\r!\307\024\250\307C\324\323\215[\232@\254S\270\217\362\370\214\362"
+creation_timestamp: 100000000
+deterministic_key {
+  chain_code: "F\336\2067\377M\026)%\357ZL#\203\320\324\217-\3305\310\244\n\205\277E\323L\250ww\314"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+}
+output_script_type: P2PKH
+
+type: DETERMINISTIC_KEY
+public_key: "\003\2471\326i\331A\337|\373\276\3214\257\363\266Q\315x\341\317\200\243\234\336<s}\261\240,\233\371"
+deterministic_key {
+  chain_code: "Pd\032#\325\213\332\307\3755\020\316\276\002\037\262\241\213\211k\376\254\220R\351\270\"\260V\260\362\257"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  issued_subkeys: 2
+  lookahead_size: 10
+  sigsRequiredToSpend: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\334\214L\003Zq\365\212P\203b~l\367C@T\341\300\216\037\375\002\224\t=\301:\266l\177\364"
+deterministic_key {
+  chain_code: "\036\277^\322!\227i^Z\212\347\272\365C\016\342\371\236a\022\\\n\037\304\264\021\335\344\340=\234T"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  issued_subkeys: 1
+  lookahead_size: 10
+  sigsRequiredToSpend: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\232\177\236W\2235py\021\331i\350\026H\235\nO\217\231\361M/}5\211v\023Kc\253\2307"
+deterministic_key {
+  chain_code: "\032\366\331\360\276Yo\243;!\023\005\305\246\354\337N\203\302\264\250\355\275\346\271!L\\\252\270\364t"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 0
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\231\254]q\030g3\316u\322h\304Ao4\246f\026\266\374\nY\233\022\034\243\'\000\030\256\342\006"
+deterministic_key {
+  chain_code: "\364\201U66\201$7l%Sy\365]A\265\277&\370\256\364\347\356\334T\323\375\347mB0\374"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002/ \336M\347\357pl@z\204\3240\027\366\0170\307\337\327\312_$\n\'\216\237W\017\263bg"
+deterministic_key {
+  chain_code: "i\206:\003\205BLMI\376\347S~\315\0306\255\274>\220\017\302\241u\017DvD\2662\342\316"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 2
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003 1\316\277\355_\343\214}\a\205\233\325\232\241n\256\325\300\2369\020\nh\335\0243\355\362$?7"
+deterministic_key {
+  chain_code: "\334(\\u\022\245\370\t*\372\315\330\365\256Ms\254J_{B\035[f\333\351\272\261\363\373_\023"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 3
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\354\fhI\2731\026\222\v\274\027\357\327\033X\324\270\323\252}\314}\221\213\272\\\362k\352\334\177#"
+deterministic_key {
+  chain_code: "#\351\"(\t\245\006\351\354f\334\216(\272\252\200\226\337\370\260XO\375\016/\377\306\263yE\222\311"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 4
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002-7\rx2\177zP\r(B\247\350\026\205\210w\251G\b\254\213\000\227\271Q\272\342\357\304>G"
+deterministic_key {
+  chain_code: "US\242J\307\2672<\373l\217\200[\316\352\361*~\324\f\304\267oD\273\300_\340K\247V\370"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 5
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002Y\260\332\377;T\263\335\331\004\020kv\207E=\311|\270*hP>)\340\272\203LD\036\313\271"
+deterministic_key {
+  chain_code: "\r34\'I\027\266\272\300\003\366f\274\333\260\006\311\3556!\227\216\301\361\247\354\025\305\321\376\274\214"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 6
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002I\367x\235p9\334\234\034\366\247&\321\237\217\241V\252\017`w\212\301\000\305-\312\003\352`\302V"
+deterministic_key {
+  chain_code: "\257\001\375\203E\315\221W\316&\035\244\306\037\351\361\027\020\346\305^Z\274O\212\363P\036\273n\367\326"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 7
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\0029\373\030u\305\214S\345/\373y%\t\252~\267\f\016t|\354\020\356\306\313\317\027\325\376\232kh"
+deterministic_key {
+  chain_code: "\260\203\277\231\352\265y\020\356r_bO\374l\347\002\032i\216Ct\260\221-\207\200\243\364;\247I"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 8
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002[\304\301.\342\253\256\364\025\'\017\356-t\340R\250Z\327\374\250\r\331\221`\334\362a[q\260\271"
+deterministic_key {
+  chain_code: "\376\277#\275\035S\362`\323\246<b~D\253\250p\263\256\364\257\256\201\016\223[\305\261\2758\353\203"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 9
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\253\213j!\316\\\372-tA\331\362T\363\252)\302\2620\246=X#\201\274\212\331Gi9\362\366"
+deterministic_key {
+  chain_code: "S`\237\003Q\021\201\301\341Ij\"\270:\335\374;\320\037\350m\037\331\343\3208\211E\276y\215."
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 10
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\231\323\307\3348\267\357\310\323\nWf$\326\334\v\360\273\357\207\0207\036)\270Api\346\321\270\351"
+deterministic_key {
+  chain_code: "\232Y6\020\317@\r\251]\204m\37796\v5\006\300\t\342\246.\231r\336Vt\370\373\023_M"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 11
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\3647\fs\313\367\022\317\207\276\305\370W\b \276\274\343\344r\351\303\035\235\227X\a\347Q2\325\351"
+deterministic_key {
+  chain_code: "\030F|\234$0\315\215\203\234\037\0054\344M\253\343\214S\360\274_\330\2663\364L\025\250\v\236\247"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 0
+  path: 12
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\273\t\2539\246\023^H\232\202}Hi+\226Q\337\371\002\021\201\276\261*\236\353\'\247\325\367t^"
+deterministic_key {
+  chain_code: "\233\314\253j\213|Y\344\200k\217\357*\\\030\347`\016\266\033g|\273\330\261\226cj\204\351\234Z"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 0
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\266}M\017f0\350\357\232\037\2713\203N\nei\202_\t\034\0343X,\006Y\260\356\340\031W"
+deterministic_key {
+  chain_code: "\2569jU\231\242\230rH\202\025\356C\373\327\374-\305\313\277Jy5mx\034\350\2264\321\327J"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\221o\254\027\3547s\260&\217b\252r\fo)~\2107\016\255\273\223\245A\234\247ay\204\021H"
+deterministic_key {
+  chain_code: "\265\233\233\354DG\226\326\215\024\230\334\262J\257LL\363R\316$\357\347\017v\371rpA\244PK"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 2
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\301\036A\004O\323\350\240\227>C73n\326P]{\260@\327\242\'\263$H\271\371\371YIJ"
+deterministic_key {
+  chain_code: "9\214\315\275\300\206\253U;\235\002\177fA\016\215\222\235K\253\311\3648w20\2005\343\310\\:"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 3
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002!\373+L\341\025\265\232\a\247J?v\274\273|v\035g\033\211\026\332\233\37378c\226\020\304\360"
+deterministic_key {
+  chain_code: "i\003w\037b!Y]\214l\373]`x\355Je\\\v\205\n\310\254s\301\272\246\315\024}\366\037"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 4
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002p\261|\230%\350\a\347?-}\317\274W\210\032\331\006\350\320\016\331\300\024\302\321[O\210E\231\342"
+deterministic_key {
+  chain_code: "\367\263\236B#W\223\3206\3644!?Im\250\277\vY\322\302\254\212A\227\352\244\003\031)\374b"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 5
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\355\213b\333\3157\262iu\361\274\252\271\223\346\276^\350\260q\272m\025.\256\353\006\005\020\255&\017"
+deterministic_key {
+  chain_code: "\003\265\376U\001\240P\'X\364\326\326\275\375s\306\225\373\264\306H5[\356\b\301>\227\325\323\315\344"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 6
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\317\215\311\246\322\335\226,\355\243\274E\270\027\307I\264\344\260\350_\230\372\034\340\363\3113T\222\274c"
+deterministic_key {
+  chain_code: "r\203\252\217hI\312S\323\377](\331C\2711\214T.\031\277\333\267,U|\323x\006\003\263\233"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 7
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\277\306\215\221N\224\b=\v\001\216Ui\033v\250\326\361\221\332\215\343$\344A\306\357f\236\330\241\337"
+deterministic_key {
+  chain_code: "1n@\331(\246#4\262\017\006\360a\206i\270\211n\344\363\343Y\0000\372,\231\352\252f\272!"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 8
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002!\032\210\034\267\234\t\177\311T\'(~c-dKt;\366\030fI5[\026\242\372\310\342\'\205"
+deterministic_key {
+  chain_code: "\004AX{\301\030\035K\353\353S\223m\271\352\323\272\'\202=_5\322\240J.\227\370[gZ?"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 9
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002KZ\215?\f\365\"o\364\035\n\240\276_\335\\\256\277\212J\247\201A\325\220\361\356\213/!\301\224"
+deterministic_key {
+  chain_code: "\247\233H)F\252\276\242\370\350\263\270\b:^\247d]\232\316QUA2\n\262\321\177U\003\r]"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 10
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\204U\310%\024\"\363\267\340\220\031\341koQ\210\037\022\224Y\354\016\370\360\374\346\216\354@B\247\233"
+deterministic_key {
+  chain_code: "w\265\277h\352\025\351\274\233\310;rk\264`*-H-r\026\326\237%\230\034\005\236_6#a"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 11
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\213\241A\022c\322\031\367O\273\375\3354\'Vh\371\362\202\220\253\366\206:\033\347\300\227<6\252\034"
+deterministic_key {
+  chain_code: "R\222\341\341.\352\306O\340+\276\266#K\211\022\264\203\225\240\246\263\023l\327\356 \350\342\242]F"
+  path: 2147483692
+  path: 2147483649
+  path: 2147483648
+  path: 1
+  path: 12
+}
\ No newline at end of file
diff --git a/core/src/test/resources/org/bitcoinj/wallet/watching-wallet-p2wpkh-serialization.txt b/core/src/test/resources/org/bitcoinj/wallet/watching-wallet-p2wpkh-serialization.txt
new file mode 100644
index 00000000000..f1887cb9112
--- /dev/null
+++ b/core/src/test/resources/org/bitcoinj/wallet/watching-wallet-p2wpkh-serialization.txt
@@ -0,0 +1,264 @@
+type: DETERMINISTIC_KEY
+public_key: "\002\270\032\242\r\210\310\316\361\360s3\233A\374\002\r\035m;w~\032\201\237\367/O5\231\270\216k"
+creation_timestamp: 100000000
+deterministic_key {
+  chain_code: "\255\v_(\027?\036\353\373\212\346\360\276\364q/\246\351z\331\332a\207\177&\335\206\220\276f+\211"
+  path: 2147483649
+}
+output_script_type: P2WPKH
+
+type: DETERMINISTIC_KEY
+public_key: "\002\237\202\357O\355r\020(]\235\b\3162\263N\331\320\216\246\262\376\260\352\224\313Bw\347~\310\336X"
+deterministic_key {
+  chain_code: "*\210c\235x\377\001\277\b\"\321\363\r*\'ci\310\317\344\220\025\341\v\r\337\034\200H\366\312P"
+  path: 2147483649
+  path: 0
+  issued_subkeys: 2
+  lookahead_size: 10
+  sigsRequiredToSpend: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\031\335\304L?`\236\224c\252\305\375\2678\275\342\236\242\230\266C\363\327U\341\340\337GeW\2544"
+deterministic_key {
+  chain_code: "\336m6\270\332/\363\016\340=;\003\225\341S\024\262\332vM\201L\207\342\306=!\352A\f\272{"
+  path: 2147483649
+  path: 1
+  issued_subkeys: 1
+  lookahead_size: 10
+  sigsRequiredToSpend: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002P\022\037\025\003\264\302/\321\314\243\246(\371\006\245\203\255\363o\237\250\b\233O?\225\316T)n\357"
+deterministic_key {
+  chain_code: "9\032\260\204\177\362\362\310`\243)\2067\351\324O\355\337V\245\375\t\375\214mw\353\355\316\246bA"
+  path: 2147483649
+  path: 0
+  path: 0
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\246\306%*\023\234\0316\273;9\341\033\370 \341\220\312\216\003\300\316`\201\352\357\327\216\234\0254\031"
+deterministic_key {
+  chain_code: "\335\267\305\177 \255ew\bH\210@\033\267\224f\375\325\205\362`\022.3\224\f\206\260\361z\260\371"
+  path: 2147483649
+  path: 0
+  path: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\am\036\377\ff8\003\222\351#?\356e\000\367\254i0\324H~\251E/\352B\2616\0030+"
+deterministic_key {
+  chain_code: "{#\231\t\034\023T@\317\322\344^w\254)\350!\327\221\033\263C\347\277zb\301^`\004\277\350"
+  path: 2147483649
+  path: 0
+  path: 2
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\307\214\031\332\032\205oH\346\272\v\267\n#9ivZ\247\327L)3\254\"\201\331K\340\211\026`"
+deterministic_key {
+  chain_code: "@}\204\033\347\346\270\345\376M\027\263\262h\242\322[l\254\263\351O\334^\273k\003\225\2065\017\031"
+  path: 2147483649
+  path: 0
+  path: 3
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\025N\\\177\273\325\224\353{5G\273\304J\234t\354\260f\036!L\202\246\361\223\356T.\200\223\206"
+deterministic_key {
+  chain_code: "\230\244\354A\316\272\223j\226\341\023-\327\302>\317\275\022\252\366R\230\312a\310\347u,\004\233\b9"
+  path: 2147483649
+  path: 0
+  path: 4
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\b\035p\217z\250\".;C\0313>\366\251\"\246Y\307\034\265\273V\202P\207\024\322\316\340$7"
+deterministic_key {
+  chain_code: "W&\026N5\205:1\216d\256m\357\2248\341\227\204\352\177P\265\"\036\v\204p1\177BC\236"
+  path: 2147483649
+  path: 0
+  path: 5
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\220L\270j\r\270\277\336\016\370\332\203\260\356\322\263<\357$\003\017k\nU<6\235\n\253\230;\205"
+deterministic_key {
+  chain_code: "\025\304d\363\376\aA\275p&_\336\355\374\224\315\264\222m\363m\222S\200\017-\274\330\322\244A\302"
+  path: 2147483649
+  path: 0
+  path: 6
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\232\370\302\261\006\200\347-\257[\205\v\273\352\v8_\270\304\331Z.Ud\351\264s\251*8_\375"
+deterministic_key {
+  chain_code: "0\345\362I\317=\033I\270\b\322J\316\275D\220\335\334\320\367\275\334\336\367\237l\377\376\3638\203\233"
+  path: 2147483649
+  path: 0
+  path: 7
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002E\317\324\302\345\b\021\275qQ\303\030\257-\352\2744>H\026\340\371\022\"X\025\255\357\367\271\316D"
+deterministic_key {
+  chain_code: "\313\"m\227\025\343o\2252\377\320\200FF~T\322\363\2330\021\251 \276\317\274\0227\322\a96"
+  path: 2147483649
+  path: 0
+  path: 8
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\376k!\002\320\037\352\030\211?\031/H*\242\326\365\022\374\273\254\323)3\370\1770\340nv\333\244"
+deterministic_key {
+  chain_code: "\315u1\361c\030\266@+\344\225\022\337\034\325\272\223r\251\262\357\211\255.\356\005\031Ds\217,\367"
+  path: 2147483649
+  path: 0
+  path: 9
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\003O\356\2103\362\253-\016\211\276\023i\233\256\3044\236RP<\253\367\346.R/\330\006\331\017\n"
+deterministic_key {
+  chain_code: "\231\026I\a1\'\350^]THS\323\355\v\347\237\356\302\226\343\216K,omM\237\272\373\234\207"
+  path: 2147483649
+  path: 0
+  path: 10
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\0035\304\365\255c\376\260\366\213l\246o\v\342\300\232f\301\306\233\245\373Z\300\230\231\206\201L\231\235\306"
+deterministic_key {
+  chain_code: "\256\216Pe\026\317\313\a\376\031\021\302\207&\363N\271\'\357\275|\334\315\215\272\237\202\231\277\370\264\356"
+  path: 2147483649
+  path: 0
+  path: 11
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002g\340hs\337]\302$\275\225\277\326\233\3016`\027\267Y+\323\376\360\353\266\350X\247\320\273\247\026"
+deterministic_key {
+  chain_code: " \217\242P&\336p\226W\200I+\346\t\213\347d\260-\243\241+\213+\304\365^\227\203\206\231\031"
+  path: 2147483649
+  path: 0
+  path: 12
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\036\220\032\376\211\327G\236\371\032\276\004l\341\206\235\001\336\2248\314\027\226u*j\251\262c\252\346\265"
+deterministic_key {
+  chain_code: "\363\345\031D\by@\353zGS\267o{ c`c\300NH\006T%miB\210\325x$\306"
+  path: 2147483649
+  path: 1
+  path: 0
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\00269\201\317\302t\016Q\247\205n\204\263MI\345X\330da\006>\251\204h\372+u.>\321v"
+deterministic_key {
+  chain_code: "\317j\363\36773\254u\037\3663\243\n-Z\237T\210\263\202u\315\337/\245.H\364\004\253+o"
+  path: 2147483649
+  path: 1
+  path: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\025#\214(\322\374C\000\234KO\1776\276T\354\217\372g:\340\035c\271\275\375RF`\357\260u"
+deterministic_key {
+  chain_code: "\351\345 \224\354I\201\254\275\207\300\357\240\216\326P\031f\232Ll@\363\207\236\203\027t\350\370Kn"
+  path: 2147483649
+  path: 1
+  path: 2
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\250+_^\241\353Z%ie\237\233\241.#\322\"\373W\276eJ\255\327\250\024v\016\0340\343\t"
+deterministic_key {
+  chain_code: "\211\220?,\212\350\001\233[><h\"\246{\311\372ET\353n\022\332\224\264\373\b\023\272\277$\325"
+  path: 2147483649
+  path: 1
+  path: 3
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\323\260\005\254\242\350\307\3556\302\373\003\246\330\000g`+0\253\365Q\323Zz\"?\376G.\356f"
+deterministic_key {
+  chain_code: "\273\016\342\\V\200w\252\203\350B\314\277\245;u\327\372wL\311b_S+\376\277\306\375k\" "
+  path: 2147483649
+  path: 1
+  path: 4
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\0032\331b?\"\026\337\235\026u^\331\327-j4p\357\177\247c\355\310(9\330\231\262\023& \227"
+deterministic_key {
+  chain_code: "\272\a\311\264\237\246\312G\v~\005\300\236\214ZHk\t\301\203@%iP\005\204\367\344\334\302`\r"
+  path: 2147483649
+  path: 1
+  path: 5
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\377\317\372\345\267\264\024\343\302>\f\202~&\034\376\206\360\006\314\035\243\261#*r@\"\037\275\004H"
+deterministic_key {
+  chain_code: "\335\030j\262\306\024\fg\346n\025\254\322U\331\323\270\004\017\023\240>\260\307_\343\235\304\222L\212\372"
+  path: 2147483649
+  path: 1
+  path: 6
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003!)\246\275\r\201\246\\\233\260\345\222\215v\371g\314\211\n\0375\203m\305\001`\177 zu4O"
+deterministic_key {
+  chain_code: "\333h\304\004\366\346\351*\366\205\236\377L_\200a\354N\241\235B\272\\\004|\245=\266\324W\352\'"
+  path: 2147483649
+  path: 1
+  path: 7
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\026o\366\273n\366\371Krn\335\216\246\022T\005\f\265t\377\036\217.\\\bV!\fs\251\365\243"
+deterministic_key {
+  chain_code: "\305\257\344_\027\025\033=>\000 \tm\273\":\265\214\023\267\203me\264*P\222\2247+Ow"
+  path: 2147483649
+  path: 1
+  path: 8
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\345M0`s\370\3617\n\254\'H<\301}n\326\374\253\240\273wT\t\201r|*\331\361\315\277"
+deterministic_key {
+  chain_code: "V\310\t\226\301\254\f\230\024\332\341a\271hG\331\232\024\266\235\377\004\021\212\016\257\227V\342c\212\203"
+  path: 2147483649
+  path: 1
+  path: 9
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002|h\274DS-\330\035\366o\203x\3343\020q\225\024\005c\326B\200q2\213f\346N?V\330"
+deterministic_key {
+  chain_code: "\233\211\254E\347\036\352\262\027\363WF\324\345\232\247j\277\f\344\031\\\177\263\223j\333?\003\025W\020"
+  path: 2147483649
+  path: 1
+  path: 10
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\256[\025\037L\371\365\300\357\315\224v\006\r\236\335BIO\210vvT\n\266\243{G\321`\366\377"
+deterministic_key {
+  chain_code: ":\240\372\237\034\033DR1\220\t\022\200\033\307/\200wBy\365\223\244\0170\327\277>Z9\365\277"
+  path: 2147483649
+  path: 1
+  path: 11
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\375\023ByLoCf\260\230\001\334\373\031\327\325\347\353Ad\253\244\246A=\217vf\034D5\250"
+deterministic_key {
+  chain_code: "\277\265\332jOb\260G6,u\342\263A]\214KF\360\337\217\231:\342x\225\330\250Fa*n"
+  path: 2147483649
+  path: 1
+  path: 12
+}
\ No newline at end of file
diff --git a/core/src/test/resources/org/bitcoinj/wallet/watching-wallet-serialization-account-one.txt b/core/src/test/resources/org/bitcoinj/wallet/watching-wallet-serialization-account-one.txt
new file mode 100644
index 00000000000..5d784fd51ed
--- /dev/null
+++ b/core/src/test/resources/org/bitcoinj/wallet/watching-wallet-serialization-account-one.txt
@@ -0,0 +1,264 @@
+type: DETERMINISTIC_KEY
+public_key: "\002\221 {7k\345UH\324x)\006.)\201\363$\376\vN\215J\336\315\021\245\351w!\336\004\034"
+creation_timestamp: 100000000
+deterministic_key {
+  chain_code: "SE\031\000\277\023 \256W\237\036\034c\340\aB-I\246\304\025\325\262\314\235\240]\020\374T\315\027"
+  path: 1
+}
+output_script_type: P2PKH
+
+type: DETERMINISTIC_KEY
+public_key: "\003QO{n\351\326\357\343T\203u\345\025{]\231\234\273A\376U`\307\212\336h\255\215\335(\364\001"
+deterministic_key {
+  chain_code: "\375y\345\372\243\305\021\000p\325\320\232\277\022?\245\024\027\262T\364z\206\204C\216E\376C\275\\\b"
+  path: 1
+  path: 0
+  issued_subkeys: 2
+  lookahead_size: 10
+  sigsRequiredToSpend: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\006\371Ph\\*\342)*\232]\272\322\261\256<x0S\306\017\372\003z\313::\3369k&\364"
+deterministic_key {
+  chain_code: "B\217\f\n\276F\2269\246\004n\312\267\242\375\240[\254/ICl\256\242`\211\314i\321\367\351\347"
+  path: 1
+  path: 1
+  issued_subkeys: 1
+  lookahead_size: 10
+  sigsRequiredToSpend: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\206\215r6b\023\341\263\302\3122\256\001d\373\263=\270\2263\376\376\032\277\332\001*\272l\350\215\030"
+deterministic_key {
+  chain_code: "\a\254j\211\355w\217\361\003Gm\242\\\302\0226\255HH@\201\363\251S\314\004\005\266\207\306\360D"
+  path: 1
+  path: 0
+  path: 0
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002-\264\264X2\272\227\032&\313\027O\242\f\f\032\3041\330]s\200\236\177\206\324\235AF\337\356\260"
+deterministic_key {
+  chain_code: "\311\031\200\276\242te\217\3703%\227|V\341E\025D\244cd\277\022<\260\2350i4\236\220\367"
+  path: 1
+  path: 0
+  path: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\252\264.\253\304\257\346}\3167\357\030\022\273!;E\242\343dO\"u\200mU\336\242\202\036;\274"
+deterministic_key {
+  chain_code: "\036\321\205\277:\027o\210&\244Q\231.\365\002\264\273\210?k\214\372\303Et\261\261\276\037\344OB"
+  path: 1
+  path: 0
+  path: 2
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\350\214\322\274\216\250\261\362o\025g\221\256\264\262/\356\362G\217\f\231\332\304\210h\201\025\234\253\'7"
+deterministic_key {
+  chain_code: "\351\032_O\376^q\263!\273\342\006x\206W\023\336\325R\246V\300\277\216\036Rm\bQaA\216"
+  path: 1
+  path: 0
+  path: 3
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\\\363^\306\036s\\F2f\213\376\234\255s/\216m\032\210\r@\005\227\216\'R3-\264\332\347"
+deterministic_key {
+  chain_code: "o\b$\004\221;w|\353\253SL\r\305\261\307\2001\260s\361\347\207\371\000)\261\357\275b\360\265"
+  path: 1
+  path: 0
+  path: 4
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003|\353\226\017/\030E\320m\322\236\352\257\304{\360\r\346\221I\001,*\230\275h\363N\314E\016X"
+deterministic_key {
+  chain_code: "l\325\253]\2638u\362\200\251\301Y\242S\242]\252\363e\373\2258\254\255(\230\3652\030\350\027\020"
+  path: 1
+  path: 0
+  path: 5
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002,\"\246\243\304\'\021\002#S\rk\332\334\003\371\351\323\330\r3b\000\264\271\2420\3261\325\242/"
+deterministic_key {
+  chain_code: "\230\226\2270\360,\335\r\267\325I\t>\240\020\025\005\270\026\3636\246\342\200\240f\005\234\244\v\221\""
+  path: 1
+  path: 0
+  path: 6
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\v\370\324\n\332V\311\260\375U\261`\271/{\216\246\230\267\243\2664\001{\226\bP\265\"\273\356\'"
+deterministic_key {
+  chain_code: "\033\227\342\017\027O\205\2462\322\321\021\314vX\255+\3465\as\246T6\231\227G\273\n\221\355\002"
+  path: 1
+  path: 0
+  path: 7
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003o\244\334\344\3278f_\251\r\f\035d\326\251\300\231\206\032oL\323\320\254\'\336y\201N\364\265\017"
+deterministic_key {
+  chain_code: "ET\204]\017A\360_iHv\364\332\tO\354c\031\002\0301eI\236`\304\366\332i0\003\375"
+  path: 1
+  path: 0
+  path: 8
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003;\234\200F\370\217\277\2652\265Y\276%\020\226\304x\321\350\313v\316J,\373.\224\213\317\367\326\353"
+deterministic_key {
+  chain_code: "\260\3533#\203\322\376\322\301\233\177\260B\334\304\235_\342=\246\300\266\0234\345r\203\213\2576|\311"
+  path: 1
+  path: 0
+  path: 9
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\274Q\024Q\312\364\244\363~J\346\2250\nl\334\274\200\247\016\345;4u&\022tAY#MN"
+deterministic_key {
+  chain_code: "\357\025!\243\025Z\3614\327\310\211\3624\026\n\032\233\256\362\250\376\370>\tb)\340\357\177\3621\362"
+  path: 1
+  path: 0
+  path: 10
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\375\231\206\364\364m\v\232\230\233\355\001\357\237\237\214\343b\235\212\320E\261\tF \227\250y\a\3026"
+deterministic_key {
+  chain_code: "\3525>2\r\261\t\217H\f6 L\262\304$N\250JZ\0019\037\033w\201f,\371,s\342"
+  path: 1
+  path: 0
+  path: 11
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\362\021\026v`\310\333e\375\331\nE\r\242Z\337\321w(\316z\n\017#1F\323\302\317\370f\313"
+deterministic_key {
+  chain_code: "\205\302e\221\250\f\3705\233\303\261H\324\366\376\v\354g\333\031*J\267\226\303\347\037\354\275k\t\276"
+  path: 1
+  path: 0
+  path: 12
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002B\236[KR\272\273\315\030_\362V\272\252\245(\352m\276\020\260\027\365\362mM\b\265gq.M"
+deterministic_key {
+  chain_code: ",?\220\362\246\20356\321\250\276\3739<\334u\320\221\033qC\214\024id\252!6\375k\036]"
+  path: 1
+  path: 1
+  path: 0
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002&\2323!\301\254,\210e\"\222\"\357b\300u\341\000\275VDV\026\210\222U\277\016y\202@\240"
+deterministic_key {
+  chain_code: "\fj\300\'\227\fo\036N\r\370\004,\201\270\023m:E\335-\331I\032\032\203\310o\236\261\213\213"
+  path: 1
+  path: 1
+  path: 1
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\341\331\037\216I\026O\2271\316\301+IZ\\\004\225V\331\231\312\022Df\232_t}B\v\365\232"
+deterministic_key {
+  chain_code: "4YZ\277<\247\003\304\2672TS\362\b&\201\306\024\220\253\260m\267\001Y\201\342X\310R{x"
+  path: 1
+  path: 1
+  path: 2
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003-/ \26795Z\000\341\363\346\377:#\026A\001\335X:\r!K\000\275\005\251\203\260\024\016\377"
+deterministic_key {
+  chain_code: "\271\320\211\260W\fq\365\t\305\026!\n\364\362\0228\230\212\350\252\\\0048\250\n\017\231\244\334\344\341"
+  path: 1
+  path: 1
+  path: 3
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\\g\216\026\342\204\226z4K\330\a@yST\341c=\233r\224\0379\211I\347\341\363\333\264\263"
+deterministic_key {
+  chain_code: ">\341z\r\212\206\351{\221\353\337d\266\364y=\t\230\264.\302\321/\002\2140\017\244\271\361\362\226"
+  path: 1
+  path: 1
+  path: 4
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003GT\304l\350R\352\300\220\f\275_\223\201\374oU\327mx}\232\252-l\t\270\303\027O>\366"
+deterministic_key {
+  chain_code: "\2423\212H\335-\232\v:\330\307\227L\313\272.x\344\242\363\331\034y[\003>\323\276\334\033@\341"
+  path: 1
+  path: 1
+  path: 5
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\003\254\200U0\2106sb\305\3456\'\027\204\02716q\251\215*$\232S\'\303\375\272\325V\342Q"
+deterministic_key {
+  chain_code: "{i\034\237\236\233SE,\247\301\343\255J%\232\201\303\031\203=\303,D\313Pp6\f\r/\333"
+  path: 1
+  path: 1
+  path: 6
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\366\265^\241\263<_\316\036S]C\225S;\233\004\002E\a\261\324\004\336\003\276\345a\002>\311\233"
+deterministic_key {
+  chain_code: "\244\327\315\353\231\371 \302/\227\320\303D\207\033@^\334\024\223;\220{\355G\236k\220\303\320zL"
+  path: 1
+  path: 1
+  path: 7
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\243I\215\246\2358PN\3238A\262\370i\031\206\266\202!`h\221\274\r\344\220\\,\350;)\300"
+deterministic_key {
+  chain_code: "]/6\360\n\t\356\\B:Zs\317\274\363]\034`N\237`\337\340\277\347\001\231v:,\340\224"
+  path: 1
+  path: 1
+  path: 8
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\302rf\260E\306\303\205\271\222\222\315\364\317br\237\345w&\254}\314\363H\317fv\247\203\250\372"
+deterministic_key {
+  chain_code: ",\270\243\347Q\340U\tx\270\214S\306\205\312\242Y\302\0168\002\366\343\316\"&\034W\352\330\245\357"
+  path: 1
+  path: 1
+  path: 9
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\\\207\256\270oNU\203M\f/z\334\003\353\310A\226m#\321!\313E\237\361\310\211\255\376\316\262"
+deterministic_key {
+  chain_code: "\245\336+\332\307\342q\356)0\350\004mz\215\321\001U\2059g\200\177\247\240\252\fQ\341\276J\303"
+  path: 1
+  path: 1
+  path: 10
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002G\327\343 \210A\356\354\233\276\277\341\311\352F}D}F\233\000bu(\333\343\002\277\033\272\243\232"
+deterministic_key {
+  chain_code: "\301\261\333\361\275\255FE4k\224\301\302\325\223\272\216]D*f~\233\305\350\212\3678\242\262\257H"
+  path: 1
+  path: 1
+  path: 11
+}
+
+type: DETERMINISTIC_KEY
+public_key: "\002\366\2432<_\361\026W\372\f\004\224\027\367\360\346\347M\377\271\207\264\233\234\001I\340\322`Y\216k"
+deterministic_key {
+  chain_code: "c\324M\225h\242\374\021o~[\203\212\343wxVs\226\343\025\316\243|}\t\350\330\242*\247\\"
+  path: 1
+  path: 1
+  path: 12
+}
\ No newline at end of file
diff --git a/core/src/test/resources/org/bitcoinj/wallet/watching-wallet-serialization.txt b/core/src/test/resources/org/bitcoinj/wallet/watching-wallet-serialization.txt
index 8ab174ab267..25318b8ee00 100644
--- a/core/src/test/resources/org/bitcoinj/wallet/watching-wallet-serialization.txt
+++ b/core/src/test/resources/org/bitcoinj/wallet/watching-wallet-serialization.txt
@@ -2,9 +2,10 @@ type: DETERMINISTIC_KEY
 public_key: "\002\357\\\252\376]\023\315\'\316`\317\362\032@\232\"\360\331\335\221] `\016,\351<\b\300\225\032m"
 creation_timestamp: 100000000
 deterministic_key {
-  chain_code: "\370\017\223\021O?.@gZ|\233j\3437\317q-\241!J \323\'\264s\203\314\321\v\346"
+  chain_code: "\370\017\223\021O?.@gZ|\233j\3437\317q-\241!\177J \323\'\264s\203\314\321\v\346"
   path: 2147483648
 }
+output_script_type: P2PKH
 
 type: DETERMINISTIC_KEY
 public_key: "\002\361V\216\001\371p\270\212\272\236%\216\356o\025g\r\035>a\305j\001P\217Q\242\261.\353\367\315"
@@ -146,7 +147,7 @@ deterministic_key {
 }
 
 type: DETERMINISTIC_KEY
-public_key: "\002\225b\3515\202\233\335\320.7\265\274uh\230N\242\254\317J\364\331\2345\220)\362\334\216\202\\"
+public_key: "\002\225b\3515\202\233\335\320.7\265\274uh\230N\242\254\317\177J\364\331\2345\220)\362\334\216\202\\"
 deterministic_key {
   chain_code: "\202:\344\3109?\350\345\001\314(\244q\370\233Rk\261}\302(\275\326\305R\342:\246\036\nV\330"
   path: 2147483648
@@ -155,7 +156,7 @@ deterministic_key {
 }
 
 type: DETERMINISTIC_KEY
-public_key: "\003>K!8\222VEL\371\305 z\aD8\020\233\330S\251T\330\201V\026-k2\227\266;"
+public_key: "\003>K!8\222VEL\371\305 z\aD\1778\020\233\330S\251T\330\201V\026-k2\227\266;"
 deterministic_key {
   chain_code: "\223\265.\200\316\361\241{\223\342c\212\0213ym+\032=#\360\333X\003\2770Z\311\335\267\342\313"
   path: 2147483648
@@ -191,9 +192,9 @@ deterministic_key {
 }
 
 type: DETERMINISTIC_KEY
-public_key: "\002\221\021\370a[\205\267\036\021\366`\036\371\253Yk\r\303\025\f\255\2768\310\212\234\221\333\344\340t"
+public_key: "\002\221\021\370a[\205\267\036\021\366`\036\371\253Yk\r\303\025\f\255\2768\310\212\234\221\177\333\344\340t"
 deterministic_key {
-  chain_code: "\370~\245F\n\307\377Q:\v\207\245\336F\376\2443R\034\346\b\372\b\\o\303\204D#}\266"
+  chain_code: "\370~\245F\n\307\377Q:\v\207\245\336F\376\2443R\034\346\b\177\372\b\\o\303\204D#}\266"
   path: 2147483648
   path: 1
   path: 5
@@ -202,7 +203,7 @@ deterministic_key {
 type: DETERMINISTIC_KEY
 public_key: "\002c\034w@c\225\257n~G\330\002\241^\264\231\030\025\220gr\202`u\b\262\361\312\246\202J\341"
 deterministic_key {
-  chain_code: "\\\2542\003\022\254\361*\a/4\307\3430\322\303\v\205\351\027\260 l\332\326\235<\363v\020\232"
+  chain_code: "\\\2542\003\022\254\361*\a/4\177\307\3430\322\303\v\205\351\027\260 l\332\326\235<\363v\020\232"
   path: 2147483648
   path: 1
   path: 6
@@ -227,7 +228,7 @@ deterministic_key {
 }
 
 type: DETERMINISTIC_KEY
-public_key: "\003\307\273B\334\212\303\025r\212\264|\250c\204\\=\360w\335\300\353\266\273\3209\260nl3\271+"
+public_key: "\003\177\307\273B\334\212\303\025r\212\264|\250c\204\\=\360w\335\300\353\266\273\3209\260nl3\271+"
 deterministic_key {
   chain_code: "\345\365\034\261\316\2121R\226/+\267K\326C&\236\246],\224\001\220\347\334\351\223K\023\252\360\023"
   path: 2147483648
diff --git a/examples/build.gradle b/examples/build.gradle
new file mode 100644
index 00000000000..9e2983e6d45
--- /dev/null
+++ b/examples/build.gradle
@@ -0,0 +1,17 @@
+apply plugin: 'java'
+apply plugin: 'eclipse'
+
+eclipse.project.name = 'bitcoinj-examples'
+
+dependencies {
+    implementation project(':core')
+    implementation 'com.google.guava:guava:28.2-android'
+    implementation 'net.sf.jopt-simple:jopt-simple:5.0.4'
+    implementation 'org.slf4j:slf4j-jdk14:1.7.30'
+    implementation 'org.fusesource.leveldbjni:leveldbjni-all:1.8'
+}
+
+sourceCompatibility = 1.8
+compileJava.options.encoding = 'UTF-8'
+compileTestJava.options.encoding = 'UTF-8'
+javadoc.options.encoding = 'UTF-8'
diff --git a/examples/pom.xml b/examples/pom.xml
deleted file mode 100644
index ea37cb10766..00000000000
--- a/examples/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2012 Google Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>org.bitcoinj</groupId>
-        <artifactId>bitcoinj-parent</artifactId>
-        <version>0.14-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>bitcoinj-examples</artifactId>
-
-    <name>bitcoinj Examples</name>
-    <description>A collection of examples using the bitcoinj library</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.bitcoinj</groupId>
-            <artifactId>bitcoinj-core</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.jopt-simple</groupId>
-            <artifactId>jopt-simple</artifactId>
-            <version>4.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <version>1.7.20</version>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>1.3.167</version>
-        </dependency>
-        <dependency>
-            <groupId>org.fusesource.leveldbjni</groupId>
-            <artifactId>leveldbjni-all</artifactId>
-            <version>1.8</version>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/examples/src/main/java/org/bitcoinj/examples/BackupToMnemonicSeed.java b/examples/src/main/java/org/bitcoinj/examples/BackupToMnemonicSeed.java
index 3087a478b8f..66e5575ce93 100644
--- a/examples/src/main/java/org/bitcoinj/examples/BackupToMnemonicSeed.java
+++ b/examples/src/main/java/org/bitcoinj/examples/BackupToMnemonicSeed.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -39,6 +41,6 @@ public static void main(String[] args) {
         System.out.println("seed: " + seed.toString());
 
         System.out.println("creation time: " + seed.getCreationTimeSeconds());
-        System.out.println("mnemonicCode: " + Utils.join(seed.getMnemonicCode()));
+        System.out.println("mnemonicCode: " + Utils.SPACE_JOINER.join(seed.getMnemonicCode()));
     }
 }
diff --git a/examples/src/main/java/org/bitcoinj/examples/DoubleSpend.java b/examples/src/main/java/org/bitcoinj/examples/DoubleSpend.java
index 60d2a354a6a..33555897760 100644
--- a/examples/src/main/java/org/bitcoinj/examples/DoubleSpend.java
+++ b/examples/src/main/java/org/bitcoinj/examples/DoubleSpend.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -44,8 +46,8 @@ public static void main(String[] args) throws Exception {
         System.out.println(kit.wallet());
 
         kit.wallet().getBalanceFuture(COIN, Wallet.BalanceType.AVAILABLE).get();
-        Transaction tx1 = kit.wallet().createSend(Address.fromBase58(params, "muYPFNCv7KQEG2ZLM7Z3y96kJnNyXJ53wm"), CENT);
-        Transaction tx2 = kit.wallet().createSend(Address.fromBase58(params, "muYPFNCv7KQEG2ZLM7Z3y96kJnNyXJ53wm"), CENT.add(SATOSHI.multiply(10)));
+        Transaction tx1 = kit.wallet().createSend(LegacyAddress.fromBase58(params, "muYPFNCv7KQEG2ZLM7Z3y96kJnNyXJ53wm"), CENT);
+        Transaction tx2 = kit.wallet().createSend(LegacyAddress.fromBase58(params, "muYPFNCv7KQEG2ZLM7Z3y96kJnNyXJ53wm"), CENT.add(SATOSHI.multiply(10)));
         final Peer peer = kit.peerGroup().getConnectedPeers().get(0);
         peer.addPreMessageReceivedEventListener(Threading.SAME_THREAD,
             new PreMessageReceivedEventListener() {
diff --git a/examples/src/main/java/org/bitcoinj/examples/ExamplePaymentChannelClient.java b/examples/src/main/java/org/bitcoinj/examples/ExamplePaymentChannelClient.java
index 68550ece54a..e8db8f7eacf 100644
--- a/examples/src/main/java/org/bitcoinj/examples/ExamplePaymentChannelClient.java
+++ b/examples/src/main/java/org/bitcoinj/examples/ExamplePaymentChannelClient.java
@@ -23,10 +23,7 @@
 import org.bitcoinj.core.*;
 import org.bitcoinj.kits.WalletAppKit;
 import org.bitcoinj.params.RegTestParams;
-import org.bitcoinj.protocols.channels.PaymentChannelClient;
-import org.bitcoinj.protocols.channels.PaymentChannelClientConnection;
-import org.bitcoinj.protocols.channels.StoredPaymentChannelClientStates;
-import org.bitcoinj.protocols.channels.ValueOutOfRangeException;
+import org.bitcoinj.protocols.channels.*;
 import org.bitcoinj.utils.BriefLogFormatter;
 import org.bitcoinj.utils.Threading;
 import org.bitcoinj.wallet.Wallet;
@@ -70,14 +67,21 @@ public static void main(String[] args) throws Exception {
             parser.printHelpOn(System.err);
             return;
         }
-        PaymentChannelClient.VersionSelector versionSelector = PaymentChannelClient.VersionSelector.VERSION_1;
+        IPaymentChannelClient.ClientChannelProperties clientChannelProperties = new PaymentChannelClient.DefaultClientChannelProperties(){
+            @Override
+            public PaymentChannelClient.VersionSelector versionSelector() { return PaymentChannelClient.VersionSelector.VERSION_1; }
+        };
+
         if (opts.has("version")) {
             switch (version.value(opts)) {
                 case 1:
-                    versionSelector = PaymentChannelClient.VersionSelector.VERSION_1;
+                    // Keep the default
                     break;
                 case 2:
-                    versionSelector = PaymentChannelClient.VersionSelector.VERSION_2;
+                    clientChannelProperties = new PaymentChannelClient.DefaultClientChannelProperties(){
+                        @Override
+                        public PaymentChannelClient.VersionSelector versionSelector() { return PaymentChannelClient.VersionSelector.VERSION_2; }
+                    };
                     break;
                 default:
                     System.err.println("Invalid version - valid versions are 1, 2");
@@ -85,7 +89,7 @@ public static void main(String[] args) throws Exception {
             }
         }
         NetworkParameters params = net.value(opts).get();
-        new ExamplePaymentChannelClient().run(opts.nonOptionArguments().get(0), versionSelector, params);
+        new ExamplePaymentChannelClient().run((String) opts.nonOptionArguments().get(0), clientChannelProperties, params);
     }
 
     public ExamplePaymentChannelClient() {
@@ -94,7 +98,7 @@ public ExamplePaymentChannelClient() {
         params = RegTestParams.get();
     }
 
-    public void run(final String host, PaymentChannelClient.VersionSelector versionSelector, final NetworkParameters params) throws Exception {
+    public void run(final String host, IPaymentChannelClient.ClientChannelProperties clientChannelProperties, final NetworkParameters params) throws Exception {
         // Bring up all the objects we need, create/load a wallet, sync the chain, etc. We override WalletAppKit so we
         // can customize it by adding the extension objects - we have to do this before the wallet file is loaded so
         // the plugin that knows how to parse all the additional data is present during the load.
@@ -137,19 +141,19 @@ protected List<WalletExtension> provideWalletExtensions() {
         // demonstrates resuming a channel that wasn't closed yet. It should close automatically once we run out
         // of money on the channel.
         log.info("Round one ...");
-        openAndSend(timeoutSeconds, server, channelID, 5, versionSelector);
+        openAndSend(timeoutSeconds, server, channelID, 5, clientChannelProperties);
         log.info("Round two ...");
         log.info(appKit.wallet().toString());
-        openAndSend(timeoutSeconds, server, channelID, 4, versionSelector);   // 4 times because the opening of the channel made a payment.
+        openAndSend(timeoutSeconds, server, channelID, 4, clientChannelProperties);   // 4 times because the opening of the channel made a payment.
         log.info("Stopping ...");
         appKit.stopAsync();
         appKit.awaitTerminated();
     }
 
-    private void openAndSend(int timeoutSecs, InetSocketAddress server, String channelID, final int times, PaymentChannelClient.VersionSelector versionSelector) throws IOException, ValueOutOfRangeException, InterruptedException {
+    private void openAndSend(int timeoutSecs, InetSocketAddress server, String channelID, final int times, IPaymentChannelClient.ClientChannelProperties clientChannelProperties) throws IOException, ValueOutOfRangeException, InterruptedException {
         // Use protocol version 1 for simplicity
         PaymentChannelClientConnection client = new PaymentChannelClientConnection(
-                server, timeoutSecs, appKit.wallet(), myKey, channelSize, channelID, versionSelector);
+                server, timeoutSecs, appKit.wallet(), myKey, channelSize, channelID, null, clientChannelProperties);
         // Opening the channel requires talking to the server, so it's asynchronous.
         final CountDownLatch latch = new CountDownLatch(1);
         Futures.addCallback(client.getChannelOpenFuture(), new FutureCallback<PaymentChannelClientConnection>() {
@@ -206,7 +210,7 @@ private void waitForSufficientBalance(Coin amount) {
         ListenableFuture<Coin> balanceFuture = appKit.wallet().getBalanceFuture(amountPlusFee, Wallet.BalanceType.ESTIMATED);
         if (!balanceFuture.isDone()) {
             System.out.println("Please send " + amountPlusFee.toFriendlyString() +
-                    " to " + myKey.toAddress(params));
+                    " to " + LegacyAddress.fromKey(params, myKey));
             Futures.getUnchecked(balanceFuture);
         }
     }
diff --git a/examples/src/main/java/org/bitcoinj/examples/FetchBlock.java b/examples/src/main/java/org/bitcoinj/examples/FetchBlock.java
index d549274b2e8..5c5510b0fe0 100644
--- a/examples/src/main/java/org/bitcoinj/examples/FetchBlock.java
+++ b/examples/src/main/java/org/bitcoinj/examples/FetchBlock.java
@@ -17,34 +17,71 @@
 
 package org.bitcoinj.examples;
 
+import joptsimple.OptionException;
+import joptsimple.OptionParser;
+import joptsimple.OptionSet;
 import org.bitcoinj.core.*;
+import org.bitcoinj.net.discovery.DnsDiscovery;
 import org.bitcoinj.params.TestNet3Params;
 import org.bitcoinj.store.BlockStore;
 import org.bitcoinj.store.MemoryBlockStore;
 import org.bitcoinj.utils.BriefLogFormatter;
 
 import java.net.InetAddress;
+import java.util.List;
 import java.util.concurrent.Future;
 
 /**
- * Downloads the block given a block hash from the localhost node and prints it out.
+ * <p>Downloads the block given a block hash from the remote or localhost node and prints it out.</p>
+ * <p>When downloading from localhost, run bitcoind locally: bitcoind -testnet -daemon.
+ * After bitcoind is up and running, use command: org.bitcoinj.examples.FetchBlock --localhost &lt;blockHash&gt; </p>
+ * <p>Otherwise, use command: org.bitcoinj.examples.FetchBlock &lt;blockHash&gt;, this command will download blocks from a peer generated by DNS seeds.</p>
  */
 public class FetchBlock {
     public static void main(String[] args) throws Exception {
         BriefLogFormatter.init();
+        // Parse command line arguments
+        OptionParser parser = new OptionParser();
+        OptionSet opts = null;
+        List<byte[]> nonOpts = null;
+        try {
+            parser.accepts("localhost", "Connect to the localhost node");
+            parser.accepts("help", "Displays program options");
+            opts = parser.parse(args);
+            if (opts.has("help")) {
+                System.out.println("usage: org.bitcoinj.examples.FetchBlock [--localhost] <blockHash>");
+                parser.printHelpOn(System.out);
+                return;
+            }
+            nonOpts = (List<byte[]>) opts.nonOptionArguments();
+            if (nonOpts.size() != 1) {
+                throw new IllegalArgumentException("Incorrect number of block hash, please provide only one block hash.");
+            }
+        } catch (OptionException | IllegalArgumentException e) {
+            System.err.println(e.getMessage());
+            System.err.println("usage: org.bitcoinj.examples.FetchBlock [--localhost] <blockHash>");
+            parser.printHelpOn(System.err);
+            return;
+        }
+
+        // Connect to testnet and find a peer
         System.out.println("Connecting to node");
         final NetworkParameters params = TestNet3Params.get();
-
         BlockStore blockStore = new MemoryBlockStore(params);
         BlockChain chain = new BlockChain(params, blockStore);
         PeerGroup peerGroup = new PeerGroup(params, chain);
+        if (!opts.has("localhost")) {
+            peerGroup.addPeerDiscovery(new DnsDiscovery(params));
+        } else {
+            PeerAddress addr = new PeerAddress(params, InetAddress.getLocalHost());
+            peerGroup.addAddress(addr);
+        }
         peerGroup.start();
-        PeerAddress addr = new PeerAddress(InetAddress.getLocalHost(), params.getPort());
-        peerGroup.addAddress(addr);
         peerGroup.waitForPeers(1).get();
         Peer peer = peerGroup.getConnectedPeers().get(0);
 
-        Sha256Hash blockHash = Sha256Hash.wrap(args[0]);
+        // Retrieve a block through a peer
+        Sha256Hash blockHash = Sha256Hash.wrap(nonOpts.get(0));
         Future<Block> future = peer.getBlock(blockHash);
         System.out.println("Waiting for node to send us the requested block: " + blockHash);
         Block block = future.get();
diff --git a/examples/src/main/java/org/bitcoinj/examples/FetchTransactions.java b/examples/src/main/java/org/bitcoinj/examples/FetchTransactions.java
index b8e1ce81bb6..4c22556d7cf 100644
--- a/examples/src/main/java/org/bitcoinj/examples/FetchTransactions.java
+++ b/examples/src/main/java/org/bitcoinj/examples/FetchTransactions.java
@@ -40,7 +40,7 @@ public static void main(String[] args) throws Exception {
         BlockChain chain = new BlockChain(params, blockStore);
         PeerGroup peerGroup = new PeerGroup(params, chain);
         peerGroup.start();
-        peerGroup.addAddress(new PeerAddress(InetAddress.getLocalHost(), params.getPort()));
+        peerGroup.addAddress(new PeerAddress(params, InetAddress.getLocalHost()));
         peerGroup.waitForPeers(1).get();
         Peer peer = peerGroup.getConnectedPeers().get(0);
 
@@ -53,7 +53,7 @@ public static void main(String[] args) throws Exception {
         System.out.println("Waiting for node to send us the dependencies ...");
         List<Transaction> deps = peer.downloadDependencies(tx).get();
         for (Transaction dep : deps) {
-            System.out.println("Got dependency " + dep.getHashAsString());
+            System.out.println("Got dependency " + dep.getTxId());
         }
 
         System.out.println("Done.");
diff --git a/examples/src/main/java/org/bitcoinj/examples/ForwardingService.java b/examples/src/main/java/org/bitcoinj/examples/ForwardingService.java
index 5976658f02f..3bb45aca59a 100644
--- a/examples/src/main/java/org/bitcoinj/examples/ForwardingService.java
+++ b/examples/src/main/java/org/bitcoinj/examples/ForwardingService.java
@@ -17,13 +17,20 @@
 
 package org.bitcoinj.examples;
 
-import org.bitcoinj.core.*;
+import org.bitcoinj.core.Address;
+import org.bitcoinj.core.Coin;
+import org.bitcoinj.core.InsufficientMoneyException;
+import org.bitcoinj.core.LegacyAddress;
+import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.core.Transaction;
+import org.bitcoinj.core.TransactionConfidence;
 import org.bitcoinj.crypto.KeyCrypterException;
 import org.bitcoinj.kits.WalletAppKit;
 import org.bitcoinj.params.MainNetParams;
 import org.bitcoinj.params.RegTestParams;
 import org.bitcoinj.params.TestNet3Params;
 import org.bitcoinj.utils.BriefLogFormatter;
+import org.bitcoinj.wallet.SendRequest;
 import org.bitcoinj.wallet.Wallet;
 import org.bitcoinj.wallet.listeners.WalletCoinsReceivedEventListener;
 
@@ -65,7 +72,10 @@ public static void main(String[] args) throws Exception {
             filePrefix = "forwarding-service";
         }
         // Parse the address given as the first parameter.
-        forwardingAddress = Address.fromBase58(params, args[0]);
+        forwardingAddress = LegacyAddress.fromBase58(params, args[0]);
+
+        System.out.println("Network: " + params.getId());
+        System.out.println("Forwarding address: " + forwardingAddress);
 
         // Start up a basic app using a class that automates some boilerplate.
         kit = new WalletAppKit(params, new File("."), filePrefix);
@@ -99,6 +109,7 @@ public void onCoinsReceived(Wallet w, Transaction tx, Coin prevBalance, Coin new
                 Futures.addCallback(tx.getConfidence().getDepthFuture(1), new FutureCallback<TransactionConfidence>() {
                     @Override
                     public void onSuccess(TransactionConfidence result) {
+                        System.out.println("Confirmation received.");
                         forwardCoins(tx);
                     }
 
@@ -107,11 +118,11 @@ public void onFailure(Throwable t) {
                         // This kind of future can't fail, just rethrow in case something weird happens.
                         throw new RuntimeException(t);
                     }
-                });
+                }, MoreExecutors.directExecutor());
             }
         });
 
-        Address sendToAddress = kit.wallet().currentReceiveKey().toAddress(params);
+        Address sendToAddress = LegacyAddress.fromKey(params, kit.wallet().currentReceiveKey());
         System.out.println("Send coins to: " + sendToAddress);
         System.out.println("Waiting for coins to arrive. Press Ctrl-C to quit.");
 
@@ -122,11 +133,9 @@ public void onFailure(Throwable t) {
 
     private static void forwardCoins(Transaction tx) {
         try {
-            Coin value = tx.getValueSentToMe(kit.wallet());
-            System.out.println("Forwarding " + value.toFriendlyString());
-            // Now send the coins back! Send with a small fee attached to ensure rapid confirmation.
-            final Coin amountToSend = value.subtract(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE);
-            final Wallet.SendResult sendResult = kit.wallet().sendCoins(kit.peerGroup(), forwardingAddress, amountToSend);
+            // Now send the coins onwards.
+            SendRequest sendRequest = SendRequest.emptyWallet(forwardingAddress);
+            Wallet.SendResult sendResult = kit.wallet().sendCoins(sendRequest);
             checkNotNull(sendResult);  // We should never try to send more coins than we have!
             System.out.println("Sending ...");
             // Register a callback that is invoked when the transaction has propagated across the network.
@@ -136,9 +145,9 @@ private static void forwardCoins(Transaction tx) {
                 @Override
                 public void run() {
                     // The wallet has changed now, it'll get auto saved shortly or when the app shuts down.
-                    System.out.println("Sent coins onwards! Transaction hash is " + sendResult.tx.getHashAsString());
+                    System.out.println("Sent coins onwards! Transaction hash is " + sendResult.tx.getTxId());
                 }
-            }, MoreExecutors.sameThreadExecutor());
+            }, MoreExecutors.directExecutor());
         } catch (KeyCrypterException | InsufficientMoneyException e) {
             // We don't use encrypted wallets in this example - can never happen.
             throw new RuntimeException(e);
diff --git a/examples/src/main/java/org/bitcoinj/examples/GenerateLowSTests.java b/examples/src/main/java/org/bitcoinj/examples/GenerateLowSTests.java
index fdbfb5d8bbf..df6585bfa0d 100644
--- a/examples/src/main/java/org/bitcoinj/examples/GenerateLowSTests.java
+++ b/examples/src/main/java/org/bitcoinj/examples/GenerateLowSTests.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2015 Ross Nicoll.
+ * Copyright 2019 Andreas Schildbach
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,19 +25,23 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import org.bitcoinj.core.LegacyAddress;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.ECKey;
 import org.bitcoinj.core.NetworkParameters;
-import org.bitcoinj.core.ScriptException;
+import org.bitcoinj.core.SignatureDecodeException;
 import org.bitcoinj.core.Transaction;
 import org.bitcoinj.core.TransactionInput;
 import org.bitcoinj.core.TransactionOutput;
 import org.bitcoinj.core.Utils;
+import org.bitcoinj.core.VerificationException;
 import org.bitcoinj.crypto.TransactionSignature;
 import org.bitcoinj.params.MainNetParams;
 import org.bitcoinj.script.Script;
 import org.bitcoinj.script.ScriptBuilder;
 import org.bitcoinj.script.ScriptChunk;
+import org.bitcoinj.script.ScriptException;
+
 import static org.bitcoinj.script.ScriptOpCodes.getOpCodeName;
 import org.bitcoinj.signers.LocalTransactionSigner;
 import org.bitcoinj.signers.TransactionSigner.ProposedTransaction;
@@ -52,19 +57,20 @@
 public class GenerateLowSTests {
     public static final BigInteger HIGH_S_DIFFERENCE = new BigInteger("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141", 16);
 
-    public static void main(final String[] argv) throws NoSuchAlgorithmException, IOException {
+    public static void main(final String[] argv)
+            throws NoSuchAlgorithmException, IOException, VerificationException, SignatureDecodeException {
         final NetworkParameters params = new MainNetParams();
         final LocalTransactionSigner signer = new LocalTransactionSigner();
         final SecureRandom secureRandom = SecureRandom.getInstanceStrong();
         final ECKey key = new ECKey(secureRandom);
         final KeyBag bag = new KeyBag() {
             @Override
-            public ECKey findKeyFromPubHash(byte[] pubkeyHash) {
+            public ECKey findKeyFromPubKeyHash(byte[] pubkeyHash, Script.ScriptType scriptType) {
                 return key;
             }
 
             @Override
-            public ECKey findKeyFromPubKey(byte[] pubkey) {
+            public ECKey findKeyFromPubKey(byte[] pubKey) {
                 return key;
             }
 
@@ -80,11 +86,11 @@ public RedeemData findRedeemDataFromScriptHash(byte[] scriptHash) {
 
         final Transaction outputTransaction = new Transaction(params);
         final Transaction inputTransaction = new Transaction(params);
-        final TransactionOutput output = new TransactionOutput(params, inputTransaction, Coin.ZERO, key.toAddress(params));
+        final TransactionOutput output = new TransactionOutput(params, inputTransaction, Coin.ZERO, LegacyAddress.fromKey(params, key));
 
         inputTransaction.addOutput(output);
         outputTransaction.addInput(output);
-        outputTransaction.addOutput(Coin.ZERO, new ECKey(secureRandom).toAddress(params));
+        outputTransaction.addOutput(Coin.ZERO, LegacyAddress.fromKey(params, new ECKey(secureRandom)));
 
         addOutputs(outputTransaction, bag);
 
@@ -103,7 +109,7 @@ public RedeemData findRedeemDataFromScriptHash(byte[] scriptHash) {
         // First output a conventional low-S transaction with the LOW_S flag, for the tx_valid.json set
         System.out.println("[\"A transaction with a low-S signature.\"],");
         System.out.println("[[[\""
-            + inputTransaction.getHashAsString() + "\", "
+            + inputTransaction.getTxId() + "\", "
             + output.getIndex() + ", \""
             + scriptToString(output.getScriptPubKey()) + "\"]],\n"
             + "\"" + Utils.HEX.encode(proposedTransaction.partialTx.unsafeBitcoinSerialize()) + "\", \""
@@ -118,7 +124,7 @@ public RedeemData findRedeemDataFromScriptHash(byte[] scriptHash) {
         // A high-S transaction without the LOW_S flag, for the tx_valid.json set
         System.out.println("[\"A transaction with a high-S signature.\"],");
         System.out.println("[[[\""
-            + inputTransaction.getHashAsString() + "\", "
+            + inputTransaction.getTxId() + "\", "
             + output.getIndex() + ", \""
             + scriptToString(output.getScriptPubKey()) + "\"]],\n"
             + "\"" + Utils.HEX.encode(proposedTransaction.partialTx.unsafeBitcoinSerialize()) + "\", \""
@@ -127,7 +133,7 @@ public RedeemData findRedeemDataFromScriptHash(byte[] scriptHash) {
         // Lastly a conventional high-S transaction with the LOW_S flag, for the tx_invalid.json set
         System.out.println("[\"A transaction with a high-S signature.\"],");
         System.out.println("[[[\""
-            + inputTransaction.getHashAsString() + "\", "
+            + inputTransaction.getTxId() + "\", "
             + output.getIndex() + ", \""
             + scriptToString(output.getScriptPubKey()) + "\"]],\n"
             + "\"" + Utils.HEX.encode(proposedTransaction.partialTx.unsafeBitcoinSerialize()) + "\", \""
diff --git a/examples/src/main/java/org/bitcoinj/examples/Kit.java b/examples/src/main/java/org/bitcoinj/examples/Kit.java
index a03359dfea2..12a5473a4b4 100644
--- a/examples/src/main/java/org/bitcoinj/examples/Kit.java
+++ b/examples/src/main/java/org/bitcoinj/examples/Kit.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -59,14 +61,14 @@ public static void main(String[] args) {
         //kit.connectToLocalHost();
 
         // Now we start the kit and sync the blockchain.
-        // bitcoinj is working a lot with the Google Guava libraries. The WalletAppKit extends the AbstractIdleService. Have a look at the introduction to Guava services: https://code.google.com/p/guava-libraries/wiki/ServiceExplained
+        // bitcoinj is working a lot with the Google Guava libraries. The WalletAppKit extends the AbstractIdleService. Have a look at the introduction to Guava services: https://github.com/google/guava/wiki/ServiceExplained
         kit.startAsync();
         kit.awaitRunning();
 
         kit.wallet().addCoinsReceivedEventListener(new WalletCoinsReceivedEventListener() {
             @Override
             public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coin newBalance) {
-                System.out.println("-----> coins resceived: " + tx.getHashAsString());
+                System.out.println("-----> coins resceived: " + tx.getTxId());
                 System.out.println("received: " + tx.getValue(wallet));
             }
         });
@@ -95,7 +97,7 @@ public void onScriptsChanged(Wallet wallet, List<Script> scripts, boolean isAddi
         kit.wallet().addTransactionConfidenceEventListener(new TransactionConfidenceEventListener() {
             @Override
             public void onTransactionConfidenceChanged(Wallet wallet, Transaction tx) {
-                System.out.println("-----> confidence changed: " + tx.getHashAsString());
+                System.out.println("-----> confidence changed: " + tx.getTxId());
                 TransactionConfidence confidence = tx.getConfidence();
                 System.out.println("new block depth: " + confidence.getDepthInBlocks());
             }
diff --git a/examples/src/main/java/org/bitcoinj/examples/PrintPeers.java b/examples/src/main/java/org/bitcoinj/examples/PrintPeers.java
index e7439976d14..fdccfd0dabf 100644
--- a/examples/src/main/java/org/bitcoinj/examples/PrintPeers.java
+++ b/examples/src/main/java/org/bitcoinj/examples/PrintPeers.java
@@ -82,7 +82,7 @@ public static void main(String[] args) throws Exception {
         NioClientManager clientManager = new NioClientManager();
         for (final InetAddress addr : addrs) {
             InetSocketAddress address = new InetSocketAddress(addr, params.getPort());
-            final Peer peer = new Peer(params, new VersionMessage(params, 0), null, new PeerAddress(address));
+            final Peer peer = new Peer(params, new VersionMessage(params, 0), null, new PeerAddress(params, address));
             final SettableFuture<Void> future = SettableFuture.create();
             // Once the connection has completed version handshaking ...
             peer.addConnectedEventListener(new PeerConnectedEventListener() {
diff --git a/examples/src/main/java/org/bitcoinj/examples/PrivateKeys.java b/examples/src/main/java/org/bitcoinj/examples/PrivateKeys.java
index 961d754528a..f1199dcf3d0 100644
--- a/examples/src/main/java/org/bitcoinj/examples/PrivateKeys.java
+++ b/examples/src/main/java/org/bitcoinj/examples/PrivateKeys.java
@@ -17,7 +17,15 @@
 
 package org.bitcoinj.examples;
 
-import org.bitcoinj.core.*;
+import org.bitcoinj.core.Address;
+import org.bitcoinj.core.Base58;
+import org.bitcoinj.core.BlockChain;
+import org.bitcoinj.core.DumpedPrivateKey;
+import org.bitcoinj.core.ECKey;
+import org.bitcoinj.core.LegacyAddress;
+import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.core.PeerAddress;
+import org.bitcoinj.core.PeerGroup;
 import org.bitcoinj.params.MainNetParams;
 import org.bitcoinj.store.MemoryBlockStore;
 import org.bitcoinj.wallet.Wallet;
@@ -50,9 +58,9 @@ public static void main(String[] args) throws Exception {
                 BigInteger privKey = Base58.decodeToBigInteger(args[0]);
                 key = ECKey.fromPrivate(privKey);
             }
-            System.out.println("Address from private key is: " + key.toAddress(params).toString());
+            System.out.println("Address from private key is: " + LegacyAddress.fromKey(params, key).toString());
             // And the address ...
-            Address destination = Address.fromBase58(params, args[1]);
+            Address destination = LegacyAddress.fromBase58(params, args[1]);
 
             // Import the private key to a fresh wallet.
             Wallet wallet = new Wallet(params);
@@ -63,7 +71,7 @@ public static void main(String[] args) throws Exception {
             BlockChain chain = new BlockChain(params, wallet, blockStore);
 
             final PeerGroup peerGroup = new PeerGroup(params, chain);
-            peerGroup.addAddress(new PeerAddress(InetAddress.getLocalHost()));
+            peerGroup.addAddress(new PeerAddress(params, InetAddress.getLocalHost()));
             peerGroup.startAsync();
             peerGroup.downloadBlockChain();
             peerGroup.stopAsync();
diff --git a/examples/src/main/java/org/bitcoinj/examples/RefreshWallet.java b/examples/src/main/java/org/bitcoinj/examples/RefreshWallet.java
index 80e2ac56591..7a6524f1abc 100644
--- a/examples/src/main/java/org/bitcoinj/examples/RefreshWallet.java
+++ b/examples/src/main/java/org/bitcoinj/examples/RefreshWallet.java
@@ -47,7 +47,7 @@ public static void main(String[] args) throws Exception {
         wallet.addCoinsReceivedEventListener(new WalletCoinsReceivedEventListener() {
             @Override
             public synchronized void onCoinsReceived(Wallet w, Transaction tx, Coin prevBalance, Coin newBalance) {
-                System.out.println("\nReceived tx " + tx.getHashAsString());
+                System.out.println("\nReceived tx " + tx.getTxId());
                 System.out.println(tx.toString());
             }
         });
diff --git a/examples/src/main/java/org/bitcoinj/examples/RestoreFromSeed.java b/examples/src/main/java/org/bitcoinj/examples/RestoreFromSeed.java
index 7119841eed5..12b2ef844ae 100644
--- a/examples/src/main/java/org/bitcoinj/examples/RestoreFromSeed.java
+++ b/examples/src/main/java/org/bitcoinj/examples/RestoreFromSeed.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -18,8 +20,10 @@
 import org.bitcoinj.core.*;
 import org.bitcoinj.net.discovery.DnsDiscovery;
 import org.bitcoinj.params.TestNet3Params;
+import org.bitcoinj.script.Script;
 import org.bitcoinj.store.SPVBlockStore;
 import org.bitcoinj.wallet.DeterministicSeed;
+import org.bitcoinj.wallet.KeyChainGroupStructure;
 import org.bitcoinj.wallet.Wallet;
 
 import java.io.File;
@@ -44,7 +48,7 @@ public static void main(String[] args) throws Exception {
         DeterministicSeed seed = new DeterministicSeed(seedCode, null, passphrase, creationtime);
 
         // The wallet class provides a easy fromSeed() function that loads a new wallet from a given seed.
-        Wallet wallet = Wallet.fromSeed(params, seed);
+        Wallet wallet = Wallet.fromSeed(params, seed, Script.ScriptType.P2PKH);
 
         // Because we are importing an existing wallet which might already have transactions we must re-download the blockchain to make the wallet picks up these transactions
         // You can find some information about this in the guides: https://bitcoinj.github.io/working-with-the-wallet#setup
@@ -59,12 +63,12 @@ public static void main(String[] args) throws Exception {
         // Setting up the BlochChain, the BlocksStore and connecting to the network.
         SPVBlockStore chainStore = new SPVBlockStore(params, chainFile);
         BlockChain chain = new BlockChain(params, chainStore);
-        PeerGroup peers = new PeerGroup(params, chain);
-        peers.addPeerDiscovery(new DnsDiscovery(params));
+        PeerGroup peerGroup = new PeerGroup(params, chain);
+        peerGroup.addPeerDiscovery(new DnsDiscovery(params));
 
         // Now we need to hook the wallet up to the blockchain and the peers. This registers event listeners that notify our wallet about new transactions.
         chain.addWallet(wallet);
-        peers.addWallet(wallet);
+        peerGroup.addWallet(wallet);
 
         DownloadProgressTracker bListener = new DownloadProgressTracker() {
             @Override
@@ -74,8 +78,8 @@ public void doneDownload() {
         };
 
         // Now we re-download the blockchain. This replays the chain into the wallet. Once this is completed our wallet should know of all its transactions and print the correct balance.
-        peers.start();
-        peers.startBlockChainDownload(bListener);
+        peerGroup.start();
+        peerGroup.startBlockChainDownload(bListener);
 
         bListener.await();
 
@@ -83,6 +87,6 @@ public void doneDownload() {
         System.out.println(wallet.toString());
 
         // shutting down again
-        peers.stop();
+        peerGroup.stop();
     }
 }
diff --git a/examples/src/main/java/org/bitcoinj/examples/SendRequest.java b/examples/src/main/java/org/bitcoinj/examples/SendRequest.java
index 37b8d76335e..4d31838cbc8 100644
--- a/examples/src/main/java/org/bitcoinj/examples/SendRequest.java
+++ b/examples/src/main/java/org/bitcoinj/examples/SendRequest.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -17,6 +19,8 @@
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
+
 import org.bitcoinj.core.*;
 import org.bitcoinj.kits.WalletAppKit;
 import org.bitcoinj.params.TestNet3Params;
@@ -38,7 +42,6 @@ public static void main(String[] args) throws Exception {
         kit.startAsync();
         kit.awaitRunning();
 
-        System.out.println("Send money to: " + kit.wallet().currentReceiveAddress().toString());
 
         // How much coins do we want to send?
         // The Coin class represents a monetary Bitcoin value.
@@ -47,7 +50,8 @@ public static void main(String[] args) throws Exception {
 
         // To which address you want to send the coins?
         // The Address class represents a Bitcoin address.
-        Address to = Address.fromBase58(params, "mupBAFeT63hXfeeT4rnAUcpKHDkz1n4fdw");
+        LegacyAddress to = LegacyAddress.fromBase58(params, "mupBAFeT63hXfeeT4rnAUcpKHDkz1n4fdw");
+        System.out.println("Send money to: " + to.toString());
 
         // There are different ways to create and publish a SendRequest. This is probably the easiest one.
         // Have a look at the code of the SendRequest class to see what's happening and what other options you have: https://bitcoinj.github.io/javadoc/0.11/com/google/bitcoin/core/Wallet.SendRequest.html
@@ -57,7 +61,7 @@ public static void main(String[] args) throws Exception {
         // In this example we catch the InsufficientMoneyException and register a BalanceFuture callback that runs once the wallet has enough balance.
         try {
             Wallet.SendResult result = kit.wallet().sendCoins(kit.peerGroup(), to, value);
-            System.out.println("coins sent. transaction hash: " + result.tx.getHashAsString());
+            System.out.println("coins sent. transaction hash: " + result.tx.getTxId());
             // you can use a block explorer like https://www.biteasy.com/ to inspect the transaction with the printed transaction hash. 
         } catch (InsufficientMoneyException e) {
             System.out.println("Not enough coins in your wallet. Missing " + e.missing.getValue() + " satoshis are missing (including fees)");
@@ -65,7 +69,7 @@ public static void main(String[] args) throws Exception {
 
             // Bitcoinj allows you to define a BalanceFuture to execute a callback once your wallet has a certain balance.
             // Here we wait until the we have enough balance and display a notice.
-            // Bitcoinj is using the ListenableFutures of the Guava library. Have a look here for more information: https://code.google.com/p/guava-libraries/wiki/ListenableFutureExplained
+            // Bitcoinj is using the ListenableFutures of the Guava library. Have a look here for more information: https://github.com/google/guava/wiki/ListenableFutureExplained
             ListenableFuture<Coin> balanceFuture = kit.wallet().getBalanceFuture(value, BalanceType.AVAILABLE);
             FutureCallback<Coin> callback = new FutureCallback<Coin>() {
                 @Override
@@ -78,7 +82,7 @@ public void onFailure(Throwable t) {
                     System.out.println("something went wrong");
                 }
             };
-            Futures.addCallback(balanceFuture, callback);
+            Futures.addCallback(balanceFuture, callback, MoreExecutors.directExecutor());
         }
 
         // shutting down 
diff --git a/examples/src/main/javascript/demo.js b/examples/src/main/javascript/demo.js
index d8053973fe6..db039b4443d 100644
--- a/examples/src/main/javascript/demo.js
+++ b/examples/src/main/javascript/demo.js
@@ -1,3 +1,19 @@
+/*
+ * Copyright by the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 // This file shows how to use bitcoinj from Javascript.
 // To run, grab the bitcoinj bundled JAR and then do something like this:
 //
diff --git a/examples/src/main/javascript/forwarding.js b/examples/src/main/javascript/forwarding.js
index aab22db1eb0..888f22007ad 100644
--- a/examples/src/main/javascript/forwarding.js
+++ b/examples/src/main/javascript/forwarding.js
@@ -1,3 +1,19 @@
+/*
+ * Copyright by the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 // For more info on how to run/control logging look at demo.js
 //
 // This example shows how to implement the forwarding service demo from the Getting Started tutorial.
@@ -28,15 +44,15 @@ print("QRcode: http://qrickit.com/api/qr?d=" + uri);
 
 wallet.allowSpendingUnconfirmedTransactions()
 
-var listener = Java.extend(bcj.core.AbstractWalletEventListener);
+var listener = Java.extend(bcj.wallet.listeners.AbstractWalletEventListener);
 wallet.addEventListener(new listener() {
     onCoinsReceived: function(wallet, tx, prevBalance, newBalance) {
         print("Received money! " + newBalance.toFriendlyString());
-        var sendReq = bcj.core.Wallet.SendRequest.emptyWallet(forwardingAddr);
+        var sendReq = bcj.wallet.SendRequest.emptyWallet(forwardingAddr);
         var sendResult = wallet.sendCoins(sendReq);
         print("Sending back in tx " + sendResult.tx.hash);
     }
 });
 
 print("Press Ctrl-C to stop");
-java.lang.Thread.sleep(1000 * 60 * 60);  // One hour.
\ No newline at end of file
+java.lang.Thread.sleep(1000 * 60 * 60);  // One hour.
diff --git a/examples/src/main/javascript/payprotocol.js b/examples/src/main/javascript/payprotocol.js
index 0fa93e82ad5..a021b0ed2ae 100644
--- a/examples/src/main/javascript/payprotocol.js
+++ b/examples/src/main/javascript/payprotocol.js
@@ -1,3 +1,19 @@
+/*
+ * Copyright by the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 // Example app that creates a minimal BIP70 payment request with a multisig output, and then prints it to base64.
 
 var bcj = org.bitcoinj;
diff --git a/examples/src/main/javascript/tor.js b/examples/src/main/javascript/tor.js
deleted file mode 100644
index 121c66b119d..00000000000
--- a/examples/src/main/javascript/tor.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Example of how to connect to a Tor hidden service and use it as a peer.
-// See demo.js to learn how to invoke this program.
-
-var bcj = org.bitcoinj;
-var params = bcj.params.MainNetParams.get();
-var context = new bcj.core.Context(params);
-bcj.utils.BriefLogFormatter.init();
-
-var PeerAddress = Java.type("org.bitcoinj.core.PeerAddress");
-var pg = bcj.core.PeerGroup.newWithTor(context, null, new com.subgraph.orchid.TorClient(), false);
-pg.addAddress(new PeerAddress("nkf5e6b7pl4jfd4a.onion", params.port));
-pg.start();
-
-pg.waitForPeers(1).get();
-print("Connected to: " + pg.connectedPeers);
-
-for each (var peer in pg.connectedPeers) {
-    print(peer.peerVersionMessage.subVer);
-    peer.ping().get()
-}
-
-pg.stop();
\ No newline at end of file
diff --git a/examples/src/main/python/forwarding.py b/examples/src/main/python/forwarding.py
index 441c81c541e..d7e0827038b 100644
--- a/examples/src/main/python/forwarding.py
+++ b/examples/src/main/python/forwarding.py
@@ -1,3 +1,17 @@
+# Copyright by the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 # An example of how to use Jython to implement the "Getting Started" tutorial app, which receives coins and simply
 # sends them on (minus a fee).
 
diff --git a/orchid/.gitignore b/orchid/.gitignore
deleted file mode 100644
index f58915aa139..00000000000
--- a/orchid/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/
-orchid-*.jar
-orchid-*.zip
-build-revision
-lib/xmlrpc-*
diff --git a/orchid/LICENSE b/orchid/LICENSE
deleted file mode 100644
index 2738761a02c..00000000000
--- a/orchid/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2009-2011, Bruce Leidl
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the author nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/orchid/build.xml b/orchid/build.xml
deleted file mode 100644
index 8aa956c199b..00000000000
--- a/orchid/build.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<project name="orchid" default="all">
-
-  <exec executable="git" outputproperty="orchid.gittag" logError="true" failifexecutionfails="false">
-    <arg value="rev-parse"/>
-    <arg value="--short"/>
-    <arg value="HEAD"/>
-  </exec>
-
-  <property name="orchid.version" value="1.0.0" />
-
-  <condition property="orchid.basename" value="orchid-${orchid.version}.${orchid.gittag}">
-    <isset property="orchid.gittag"/>
-  </condition>
-
-  <property name="orchid.basename" value="orchid-${orchid.version}" />
-
-  <property name="orchid.jarfile" value="${orchid.basename}.jar" />
-  <property name="orchid.sourcefile" value="${orchid.basename}-src.zip" />
-
-  <path id="compile.classpath">
-    <fileset dir="lib">
-      <include name="*.jar"/>
-    </fileset>
-  </path>
-
-  <path id="test.classpath">
-    <fileset dir="lib/testing">
-      <include name="*.jar"/>
-    </fileset>
-  </path>
-
-  <path id="bin">
-    <pathelement location="${basedir}/bin"/>
-  </path>
-
-  <condition property="xmlrpc.present">
-    <and>
-      <available classname="org.apache.xmlrpc.client.XmlRpcTransportFactory" classpathref="compile.classpath"/>
-      <available classname="org.apache.xmlrpc.XmlRpcException" classpathref="compile.classpath"/>
-    </and>
-  </condition>
-
-  <target name="all" depends="write-revision,compile,compile-xmlrpc,package,source"/>
-			
-  <target name="clean">
-    <delete dir="${basedir}/bin" />
-  </target>
-
-  <target name="write-revision">
-    <echo message="${orchid.gittag}${line.separator}" file="build-revision" />
-  </target>
-
-  <target name="init">
-    <mkdir dir="${basedir}/bin" />
-  </target>
-
-  <target name="compile" depends="init">
-      <javac source="1.5" target="1.5" destdir="${basedir}/bin" includeantruntime="false">
-        <src path="${basedir}/src" />
-	    <classpath refid="compile.classpath"/>
-      </javac>
-  </target>
-
-  <target name="compile-xmlrpc" depends="init" if="xmlrpc.present">
-    <echo message="compiling optional xmlrpc classes"/>
-    <javac source="1.5" target="1.5" srcdir="opt/xmlrpc" destdir="bin" classpathref="compile.classpath" includeantruntime="false"/>
-  </target>
-
-  <target name="package">
-    <jar destfile="${orchid.jarfile}">
-      <manifest>
-        <attribute name="Main-Class" value="com.subgraph.orchid.TorClient"/>
-      </manifest>
-      <fileset dir="${basedir}/bin" />
-      <zipfileset dir="${basedir}/data" includes="GeoIP.dat" fullpath="data/GeoIP.dat" />
-      <zipfileset dir="${basedir}" includes="build-revision" />
-    </jar>
-  </target>
-
-  <target name="source">
-    <zip destfile="${orchid.sourcefile}">
-      <zipfileset dir="src" prefix="${orchid.basename}/src" />
-      <zipfileset dir="opt/xmlrpc" prefix="${orchid.basename}/src" />
-    </zip>
-  </target>
-
-  <target name="compile-test" depends="compile">
-    <javac source="1.5" target="1.5" destdir="${basedir}/bin" includeantruntime="false">
-      <src path="${basedir}/test"/>
-      <classpath>
-        <path refid="compile.classpath"/>
-        <path refid="test.classpath"/>
-      </classpath>
-   </javac>
-  </target>
-
-  <target name="test" depends="compile-test">
-    <junit printsummary="on" fork="yes" forkmode="once">
-      <assertions>
-        <enable/>
-      </assertions>
-      <classpath>
-        <path refid="compile.classpath"/>
-        <path refid="test.classpath"/>
-        <path refid="bin"/>
-      </classpath>
-      <test name="com.subgraph.orchid.TorConfigTest"/>
-      <test name="com.subgraph.orchid.circuits.TorInputStreamTest"/>
-      <test name="com.subgraph.orchid.circuits.path.ConfigNodeFilterTest"/>
-      <test name="com.subgraph.orchid.circuits.path.ConfigNodeFilterTest"/>
-      <test name="com.subgraph.orchid.crypto.ASN1ParserTest"/>
-      <test name="com.subgraph.orchid.crypto.RSAKeyEncoderTest"/>
-      <test name="com.subgraph.orchid.geoip.CountryCodeServiceTest"/>
-    </junit>
-  </target>
-</project>
diff --git a/orchid/data/GeoIP.dat b/orchid/data/GeoIP.dat
deleted file mode 100644
index fe563297c33..00000000000
Binary files a/orchid/data/GeoIP.dat and /dev/null differ
diff --git a/orchid/data/README b/orchid/data/README
deleted file mode 100644
index 3eccbba562e..00000000000
--- a/orchid/data/README
+++ /dev/null
@@ -1,3 +0,0 @@
-GeoIP.dat GeoLite Country database downloaded September, 2013 
-
-  http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz
diff --git a/orchid/doc/spec/address-spec.txt b/orchid/doc/spec/address-spec.txt
deleted file mode 100644
index 2e1aff2b8ab..00000000000
--- a/orchid/doc/spec/address-spec.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-
-                          Special Hostnames in Tor
-                               Nick Mathewson
-
-1. Overview
-
-  Most of the time, Tor treats user-specified hostnames as opaque:  When
-  the user connects to www.torproject.org, Tor picks an exit node and uses
-  that node to connect to "www.torproject.org".  Some hostnames, however,
-  can be used to override Tor's default behavior and circuit-building
-  rules.
-
-  These hostnames can be passed to Tor as the address part of a SOCKS4a or
-  SOCKS5 request.  If the application is connected to Tor using an IP-only
-  method (such as SOCKS4, TransPort, or NatdPort), these hostnames can be
-  substituted for certain IP addresses using the MapAddress configuration
-  option or the MAPADDRESS control command.
-
-2. .exit
-
-  SYNTAX:  [hostname].[name-or-digest].exit
-           [name-or-digest].exit
-
-  Hostname is a valid hostname; [name-or-digest] is either the nickname of a
-  Tor node or the hex-encoded digest of that node's public key.
-
-  When Tor sees an address in this format, it uses the specified hostname as
-  the exit node.  If no "hostname" component is given, Tor defaults to the
-  published IPv4 address of the exit node.
-
-  It is valid to try to resolve hostnames, and in fact upon success Tor
-  will cache an internal mapaddress of the form
-  "www.google.com.foo.exit=64.233.161.99.foo.exit" to speed subsequent
-  lookups.
-
-  The .exit notation is disabled by default as of Tor 0.2.2.1-alpha, due
-  to potential application-level attacks.
-
-  EXAMPLES:
-     www.example.com.exampletornode.exit
-
-        Connect to www.example.com from the node called "exampletornode".
-
-     exampletornode.exit
-
-        Connect to the published IP address of "exampletornode" using
-        "exampletornode" as the exit.
-
-3. .onion
-
-  SYNTAX:  [digest].onion
-
-  The digest is the first eighty bits of a SHA1 hash of the identity key for
-  a hidden service, encoded in base32.
-
-  When Tor sees an address in this format, it tries to look up and connect to
-  the specified hidden service.  See rend-spec.txt for full details.
-
diff --git a/orchid/doc/spec/bridges-spec.txt b/orchid/doc/spec/bridges-spec.txt
deleted file mode 100644
index 647118815c0..00000000000
--- a/orchid/doc/spec/bridges-spec.txt
+++ /dev/null
@@ -1,249 +0,0 @@
-
-                          Tor bridges specification
-
-0. Preface
-
-  This document describes the design decisions around support for bridge
-  users, bridge relays, and bridge authorities. It acts as an overview
-  of the bridge design and deployment for developers, and it also tries
-  to point out limitations in the current design and implementation.
-
-  For more details on what all of these mean, look at blocking.tex in
-  /doc/design-paper/
-
-1. Bridge relays
-
-  Bridge relays are just like normal Tor relays except they don't publish
-  their server descriptors to the main directory authorities.
-
-1.1. PublishServerDescriptor
-
-  To configure your relay to be a bridge relay, just add
-    BridgeRelay 1
-    PublishServerDescriptor bridge
-  to your torrc. This will cause your relay to publish its descriptor
-  to the bridge authorities rather than to the default authorities.
-
-  Alternatively, you can say
-    BridgeRelay 1
-    PublishServerDescriptor 0
-  which will cause your relay to not publish anywhere. This could be
-  useful for private bridges.
-
-1.2. Recommendations.
-
-  Bridge relays should use an exit policy of "reject *:*". This is
-  because they only need to relay traffic between the bridge users
-  and the rest of the Tor network, so there's no need to let people
-  exit directly from them.
-
-  We invented the RelayBandwidth* options for this situation: Tor clients
-  who want to allow relaying too. See proposal 111 for details. Relay
-  operators should feel free to rate-limit their relayed traffic.
-
-1.3. Implementation note.
-
-  Vidalia 0.0.15 has turned its "Relay" settings page into a tri-state
-  "Don't relay" / "Relay for the Tor network" / "Help censored users".
-
-  If you click the third choice, it forces your exit policy to reject *:*.
-
-  If all the bridges end up on port 9001, that's not so good. On the
-  other hand, putting the bridges on a low-numbered port in the Unix
-  world requires jumping through extra hoops. The current compromise is
-  that Vidalia makes the ORPort default to 443 on Windows, and 9001 on
-  other platforms.
-
-  At the bottom of the relay config settings window, Vidalia displays
-  the bridge identifier to the operator (see Section 3.1) so he can pass
-  it on to bridge users.
-
-2. Bridge authorities.
-
-  Bridge authorities are like normal v3 directory authorities, except
-  they don't create their own network-status documents or votes. So if
-  you ask a bridge authority for a network-status document or consensus,
-  they behave like a directory mirror: they give you one from one of
-  the main authorities. But if you ask the bridge authority for the
-  descriptor corresponding to a particular identity fingerprint, it will
-  happily give you the latest descriptor for that fingerprint.
-
-  To become a bridge authority, add these lines to your torrc:
-    AuthoritativeDirectory 1
-    BridgeAuthoritativeDir 1
-
-  Right now there's one bridge authority, running on the Tonga relay.
-
-2.1. Exporting bridge-purpose descriptors
-
-  We've added a new purpose for server descriptors: the "bridge"
-  purpose. With the new router-descriptors file format that includes
-  annotations, it's easy to look through it and find the bridge-purpose
-  descriptors.
-
-  Currently we export the bridge descriptors from Tonga to the
-  BridgeDB server, so it can give them out according to the policies
-  in blocking.pdf.
-
-2.2. Reachability/uptime testing
-
-  Right now the bridge authorities do active reachability testing of
-  bridges, so we know which ones to recommend for users.
-
-  But in the design document, we suggested that bridges should publish
-  anonymously (i.e. via Tor) to the bridge authority, so somebody watching
-  the bridge authority can't just enumerate all the bridges. But if we're
-  doing active measurement, the game is up. Perhaps we should back off on
-  this goal, or perhaps we should do our active measurement anonymously?
-
-  Answering this issue is scheduled for 0.2.1.x.
-
-2.3. Future work: migrating to multiple bridge authorities
-
-  Having only one bridge authority is both a trust bottleneck (if you
-  break into one place you learn about every single bridge we've got)
-  and a robustness bottleneck (when it's down, bridge users become sad).
-
-  Right now if we put up a second bridge authority, all the bridges would
-  publish to it, and (assuming the code works) bridge users would query
-  a random bridge authority. This resolves the robustness bottleneck,
-  but makes the trust bottleneck even worse.
-
-  In 0.2.2.x and later we should think about better ways to have multiple
-  bridge authorities.
-
-3. Bridge users.
-
-  Bridge users are like ordinary Tor users except they use encrypted
-  directory connections by default, and they use bridge relays as both
-  entry guards (their first hop) and directory guards (the source of
-  all their directory information).
-
-  To become a bridge user, add the following line to your torrc:
-    UseBridges 1
-
-  and then add at least one "Bridge" line to your torrc based on the
-  format below.
-
-3.1. Format of the bridge identifier.
-
-  The canonical format for a bridge identifier contains an IP address,
-  an ORPort, and an identity fingerprint:
-    bridge 128.31.0.34:9009 4C17 FB53 2E20 B2A8 AC19 9441 ECD2 B017 7B39 E4B1
-
-  However, the identity fingerprint can be left out, in which case the
-  bridge user will connect to that relay and use it as a bridge regardless
-  of what identity key it presents:
-    bridge 128.31.0.34:9009
-  This might be useful for cases where only short bridge identifiers
-  can be communicated to bridge users.
-
-  In a future version we may also support bridge identifiers that are
-  only a key fingerprint:
-    bridge 4C17 FB53 2E20 B2A8 AC19 9441 ECD2 B017 7B39 E4B1
-  and the bridge user can fetch the latest descriptor from the bridge
-  authority (see Section 3.4).
-
-3.2. Bridges as entry guards
-
-  For now, bridge users add their bridge relays to their list of "entry
-  guards" (see path-spec.txt for background on entry guards). They are
-  managed by the entry guard algorithms exactly as if they were a normal
-  entry guard -- their keys and timing get cached in the "state" file,
-  etc. This means that when the Tor user starts up with "UseBridges"
-  disabled, he will skip past the bridge entries since they won't be
-  listed as up and usable in his networkstatus consensus. But to be clear,
-  the "entry_guards" list doesn't currently distinguish guards by purpose.
-
-  Internally, each bridge user keeps a smartlist of "bridge_info_t"
-  that reflects the "bridge" lines from his torrc along with a download
-  schedule (see Section 3.5 below). When he starts Tor, he attempts
-  to fetch a descriptor for each configured bridge (see Section 3.4
-  below). When he succeeds at getting a descriptor for one of the bridges
-  in his list, he adds it directly to the entry guard list using the
-  normal add_an_entry_guard() interface. Once a bridge descriptor has
-  been added, should_delay_dir_fetches() will stop delaying further
-  directory fetches, and the user begins to bootstrap his directory
-  information from that bridge (see Section 3.3).
-
-  Currently bridge users cache their bridge descriptors to the
-  "cached-descriptors" file (annotated with purpose "bridge"), but
-  they don't make any attempt to reuse descriptors they find in this
-  file. The theory is that either the bridge is available now, in which
-  case you can get a fresh descriptor, or it's not, in which case an
-  old descriptor won't do you much good.
-
-  We could disable writing out the bridge lines to the state file, if
-  we think this is a problem.
-
-  As an exception, if we get an application request when we have one
-  or more bridge descriptors but we believe none of them are running,
-  we mark them all as running again. This is similar to the exception
-  already in place to help long-idle Tor clients realize they should
-  fetch fresh directory information rather than just refuse requests.
-
-3.3. Bridges as directory guards
-
-  In addition to using bridges as the first hop in their circuits, bridge
-  users also use them to fetch directory updates. Other than initial
-  bootstrapping to find a working bridge descriptor (see Section 3.4
-  below), all further non-anonymized directory fetches will be redirected
-  to the bridge.
-
-  This means that bridge relays need to have cached answers for all
-  questions the bridge user might ask. This makes the upgrade path
-  tricky --- for example, if we migrate to a v4 directory design, the
-  bridge user would need to keep using v3 so long as his bridge relays
-  only knew how to answer v3 queries.
-
-  In a future design, for cases where the user has enough information
-  to build circuits yet the chosen bridge doesn't know how to answer a
-  given query, we might teach bridge users to make an anonymized request
-  to a more suitable directory server.
-
-3.4. How bridge users get their bridge descriptor
-
-  Bridge users can fetch bridge descriptors in two ways: by going directly
-  to the bridge and asking for "/tor/server/authority", or by going to
-  the bridge authority and asking for "/tor/server/fp/ID". By default,
-  they will only try the direct queries. If the user sets
-    UpdateBridgesFromAuthority 1
-  in his config file, then he will try querying the bridge authority
-  first for bridges where he knows a digest (if he only knows an IP
-  address and ORPort, then his only option is a direct query).
-
-  If the user has at least one working bridge, then he will do further
-  queries to the bridge authority through a full three-hop Tor circuit.
-  But when bootstrapping, he will make a direct begin_dir-style connection
-  to the bridge authority.
-
-  As of Tor 0.2.0.10-alpha, if the user attempts to fetch a descriptor
-  from the bridge authority and it returns a 404 not found, the user
-  will automatically fall back to trying a direct query. Therefore it is
-  recommended that bridge users always set UpdateBridgesFromAuthority,
-  since at worst it will delay their fetches a little bit and notify
-  the bridge authority of the identity fingerprint (but not location)
-  of their intended bridges.
-
-3.5. Bridge descriptor retry schedule
-
-  Bridge users try to fetch a descriptor for each bridge (using the
-  steps in Section 3.4 above) on startup. Whenever they receive a
-  bridge descriptor, they reschedule a new descriptor download for 1
-  hour from then.
-
-  If on the other hand it fails, they try again after 15 minutes for the
-  first attempt, after 15 minutes for the second attempt, and after 60
-  minutes for subsequent attempts.
-
-  In 0.2.2.x we should come up with some smarter retry schedules.
-
-3.6. Implementation note.
-
-  Vidalia 0.1.0 has a new checkbox in its Network config window called
-  "My ISP blocks connections to the Tor network." Users who click that
-  box change their configuration to:
-    UseBridges 1
-    UpdateBridgesFromAuthority 1
-  and should add at least one bridge identifier.
-
diff --git a/orchid/doc/spec/control-spec.txt b/orchid/doc/spec/control-spec.txt
deleted file mode 100644
index 1a463afc60c..00000000000
--- a/orchid/doc/spec/control-spec.txt
+++ /dev/null
@@ -1,1853 +0,0 @@
-
-                   TC: A Tor control protocol (Version 1)
-
-0. Scope
-
-  This document describes an implementation-specific protocol that is used
-  for other programs (such as frontend user-interfaces) to communicate with a
-  locally running Tor process.  It is not part of the Tor onion routing
-  protocol.
-
-  This protocol replaces version 0 of TC, which is now deprecated.  For
-  reference, TC is described in "control-spec-v0.txt".  Implementors are
-  recommended to avoid using TC directly, but instead to use a library that
-  can easily be updated to use the newer protocol.  (Version 0 is used by Tor
-  versions 0.1.0.x; the protocol in this document only works with Tor
-  versions in the 0.1.1.x series and later.)
-
-1. Protocol outline
-
-  TC is a bidirectional message-based protocol.  It assumes an underlying
-  stream for communication between a controlling process (the "client"
-  or "controller") and a Tor process (or "server").  The stream may be
-  implemented via TCP, TLS-over-TCP, a Unix-domain socket, or so on,
-  but it must provide reliable in-order delivery.  For security, the
-  stream should not be accessible by untrusted parties.
-
-  In TC, the client and server send typed messages to each other over the
-  underlying stream.  The client sends "commands" and the server sends
-  "replies".
-
-  By default, all messages from the server are in response to messages from
-  the client.  Some client requests, however, will cause the server to send
-  messages to the client indefinitely far into the future.  Such
-  "asynchronous" replies are marked as such.
-
-  Servers respond to messages in the order messages are received.
-
-2. Message format
-
-2.1. Description format
-
-  The message formats listed below use ABNF as described in RFC 2234.
-  The protocol itself is loosely based on SMTP (see RFC 2821).
-
-  We use the following nonterminals from RFC 2822: atom, qcontent
-
-  We define the following general-use nonterminals:
-
-     String = DQUOTE *qcontent DQUOTE
-
-  There are explicitly no limits on line length.  All 8-bit characters are
-  permitted unless explicitly disallowed.
-
-  Wherever CRLF is specified to be accepted from the controller, Tor MAY also
-  accept LF.  Tor, however, MUST NOT generate LF instead of CRLF.
-  Controllers SHOULD always send CRLF.
-
-2.2. Commands from controller to Tor
-
-    Command = Keyword Arguments CRLF / "+" Keyword Arguments CRLF Data
-    Keyword = 1*ALPHA
-    Arguments = *(SP / VCHAR)
-
-  Specific commands and their arguments are described below in section 3.
-
-2.3. Replies from Tor to the controller
-
-    Reply = SyncReply / AsyncReply
-    SyncReply = *(MidReplyLine / DataReplyLine) EndReplyLine
-    AsyncReply = *(MidReplyLine / DataReplyLine) EndReplyLine
-
-    MidReplyLine = StatusCode "-" ReplyLine
-    DataReplyLine = StatusCode "+" ReplyLine Data
-    EndReplyLine = StatusCode SP ReplyLine
-    ReplyLine = [ReplyText] CRLF
-    ReplyText = XXXX
-    StatusCode = 3DIGIT
-
-  Specific replies are mentioned below in section 3, and described more fully
-  in section 4.
-
-  [Compatibility note:  versions of Tor before 0.2.0.3-alpha sometimes
-  generate AsyncReplies of the form "*(MidReplyLine / DataReplyLine)".
-  This is incorrect, but controllers that need to work with these
-  versions of Tor should be prepared to get multi-line AsyncReplies with
-  the final line (usually "650 OK") omitted.]
-
-2.4. General-use tokens
-
-  ; Identifiers for servers.
-  ServerID = Nickname / Fingerprint
-
-  Nickname = 1*19 NicknameChar
-  NicknameChar = "a"-"z" / "A"-"Z" / "0" - "9"
-  Fingerprint = "$" 40*HEXDIG
-
-  ; A "=" indicates that the given nickname is canonical; a "~" indicates
-  ; that the given nickname is not canonical.  If no nickname is given at
-  ; all, Tor does not even have a guess for what this router calls itself.
-  LongName = Fingerprint [ ( "=" / "~" ) Nickname ]
-
-  ; How a controller tells Tor about a particular OR.  There are four
-  ; possible formats:
-  ;    $Digest -- The router whose identity key hashes to the given digest.
-  ;        This is the preferred way to refer to an OR.
-  ;    $Digest~Name -- The router whose identity key hashes to the given
-  ;        digest, but only if the router has the given nickname.
-  ;    $Digest=Name -- The router whose identity key hashes to the given
-  ;        digest, but only if the router is Named and has the given
-  ;        nickname.
-  ;    Name -- The Named router with the given nickname, or, if no such
-  ;        router exists, any router whose nickname matches the one given.
-  ;        This is not a safe way to refer to routers, since Named status
-  ;        could under some circumstances change over time.
-  ServerSpec = LongName / Nickname
-
-  ; Unique identifiers for streams or circuits.  Currently, Tor only
-  ; uses digits, but this may change
-  StreamID = 1*16 IDChar
-  CircuitID = 1*16 IDChar
-  IDChar = ALPHA / DIGIT
-
-  Address = ip4-address / ip6-address / hostname   (XXXX Define these)
-
-  ; A "Data" section is a sequence of octets concluded by the terminating
-  ; sequence CRLF "." CRLF.  The terminating sequence may not appear in the
-  ; body of the data.  Leading periods on lines in the data are escaped with
-  ; an additional leading period as in RFC 2821 section 4.5.2.
-  Data = *DataLine "." CRLF
-  DataLine = CRLF / "." 1*LineItem CRLF / NonDotItem *LineItem CRLF
-  LineItem = NonCR / 1*CR NonCRLF
-  NonDotItem = NonDotCR / 1*CR NonCRLF
-
-3. Commands
-
-  All commands are case-insensitive, but most keywords are case-sensitive.
-
-3.1. SETCONF
-
-  Change the value of one or more configuration variables.  The syntax is:
-
-    "SETCONF" 1*(SP keyword ["=" value]) CRLF
-    value = String / QuotedString
-
-  Tor behaves as though it had just read each of the key-value pairs
-  from its configuration file.  Keywords with no corresponding values have
-  their configuration values reset to 0 or NULL (use RESETCONF if you want
-  to set it back to its default).  SETCONF is all-or-nothing: if there
-  is an error in any of the configuration settings, Tor sets none of them.
-
-  Tor responds with a "250 configuration values set" reply on success.
-  If some of the listed keywords can't be found, Tor replies with a
-  "552 Unrecognized option" message. Otherwise, Tor responds with a
-  "513 syntax error in configuration values" reply on syntax error, or a
-  "553 impossible configuration setting" reply on a semantic error.
-
-  When a configuration option takes multiple values, or when multiple
-  configuration keys form a context-sensitive group (see GETCONF below), then
-  setting _any_ of the options in a SETCONF command is taken to reset all of
-  the others.  For example, if two ORBindAddress values are configured, and a
-  SETCONF command arrives containing a single ORBindAddress value, the new
-  command's value replaces the two old values.
-
-  Sometimes it is not possible to change configuration options solely by
-  issuing a series of SETCONF commands, because the value of one of the
-  configuration options depends on the value of another which has not yet
-  been set. Such situations can be overcome by setting multiple configuration
-  options with a single SETCONF command (e.g. SETCONF ORPort=443
-  ORListenAddress=9001).
-
-3.2. RESETCONF
-
-  Remove all settings for a given configuration option entirely, assign
-  its default value (if any), and then assign the String provided.
-  Typically the String is left empty, to simply set an option back to
-  its default. The syntax is:
-
-    "RESETCONF" 1*(SP keyword ["=" String]) CRLF
-
-  Otherwise it behaves like SETCONF above.
-
-3.3. GETCONF
-
-  Request the value of a configuration variable.  The syntax is:
-
-    "GETCONF" 1*(SP keyword) CRLF
-
-  If all of the listed keywords exist in the Tor configuration, Tor replies
-  with a series of reply lines of the form:
-      250 keyword=value
-  If any option is set to a 'default' value semantically different from an
-  empty string, Tor may reply with a reply line of the form:
-      250 keyword
-
-  Value may be a raw value or a quoted string.  Tor will try to use
-  unquoted values except when the value could be misinterpreted through
-  not being quoted.
-
-  If some of the listed keywords can't be found, Tor replies with a
-  "552 unknown configuration keyword" message.
-
-  If an option appears multiple times in the configuration, all of its
-  key-value pairs are returned in order.
-
-  Some options are context-sensitive, and depend on other options with
-  different keywords.  These cannot be fetched directly.  Currently there
-  is only one such option: clients should use the "HiddenServiceOptions"
-  virtual keyword to get all HiddenServiceDir, HiddenServicePort,
-  HiddenServiceNodes, and HiddenServiceExcludeNodes option settings.
-
-3.4. SETEVENTS
-
-  Request the server to inform the client about interesting events.  The
-  syntax is:
-
-     "SETEVENTS" [SP "EXTENDED"] *(SP EventCode) CRLF
-
-     EventCode = "CIRC" / "STREAM" / "ORCONN" / "BW" / "DEBUG" /
-         "INFO" / "NOTICE" / "WARN" / "ERR" / "NEWDESC" / "ADDRMAP" /
-         "AUTHDIR_NEWDESCS" / "DESCCHANGED" / "STATUS_GENERAL" /
-         "STATUS_CLIENT" / "STATUS_SERVER" / "GUARD" / "NS" / "STREAM_BW" /
-         "CLIENTS_SEEN" / "NEWCONSENSUS"
-
-  Any events *not* listed in the SETEVENTS line are turned off; thus, sending
-  SETEVENTS with an empty body turns off all event reporting.
-
-  The server responds with a "250 OK" reply on success, and a "552
-  Unrecognized event" reply if one of the event codes isn't recognized.  (On
-  error, the list of active event codes isn't changed.)
-
-  If the flag string "EXTENDED" is provided, Tor may provide extra
-  information with events for this connection; see 4.1 for more information.
-  NOTE: All events on a given connection will be provided in extended format,
-  or none.
-  NOTE: "EXTENDED" is only supported in Tor 0.1.1.9-alpha or later.
-
-  Each event is described in more detail in Section 4.1.
-
-3.5. AUTHENTICATE
-
-  Sent from the client to the server.  The syntax is:
-     "AUTHENTICATE" [ SP 1*HEXDIG / QuotedString ] CRLF
-
-  The server responds with "250 OK" on success or "515 Bad authentication" if
-  the authentication cookie is incorrect.  Tor closes the connection on an
-  authentication failure.
-
-  The format of the 'cookie' is implementation-dependent; see 5.1 below for
-  information on how the standard Tor implementation handles it.
-
-  Before the client has authenticated, no command other than PROTOCOLINFO,
-  AUTHENTICATE, or QUIT is valid.  If the controller sends any other command,
-  or sends a malformed command, or sends an unsuccessful AUTHENTICATE
-  command, or sends PROTOCOLINFO more than once, Tor sends an error reply and
-  closes the connection.
-
-  To prevent some cross-protocol attacks, the AUTHENTICATE command is still
-  required even if all authentication methods in Tor are disabled.  In this
-  case, the controller should just send "AUTHENTICATE" CRLF.
-
-  (Versions of Tor before 0.1.2.16 and 0.2.0.4-alpha did not close the
-  connection after an authentication failure.)
-
-3.6. SAVECONF
-
-  Sent from the client to the server.  The syntax is:
-     "SAVECONF" CRLF
-
-  Instructs the server to write out its config options into its torrc. Server
-  returns "250 OK" if successful, or "551 Unable to write configuration
-  to disk" if it can't write the file or some other error occurs.
-
-3.7. SIGNAL
-
-  Sent from the client to the server. The syntax is:
-
-     "SIGNAL" SP Signal CRLF
-
-     Signal = "RELOAD" / "SHUTDOWN" / "DUMP" / "DEBUG" / "HALT" /
-              "HUP" / "INT" / "USR1" / "USR2" / "TERM" / "NEWNYM" /
-              "CLEARDNSCACHE"
-
-  The meaning of the signals are:
-
-      RELOAD    -- Reload: reload config items, refetch directory. (like HUP)
-      SHUTDOWN  -- Controlled shutdown: if server is an OP, exit immediately.
-                   If it's an OR, close listeners and exit after 30 seconds.
-                   (like INT)
-      DUMP      -- Dump stats: log information about open connections and
-                   circuits. (like USR1)
-      DEBUG     -- Debug: switch all open logs to loglevel debug. (like USR2)
-      HALT      -- Immediate shutdown: clean up and exit now. (like TERM)
-      CLEARDNSCACHE -- Forget the client-side cached IPs for all hostnames.
-      NEWNYM    -- Switch to clean circuits, so new application requests
-                   don't share any circuits with old ones.  Also clears
-                   the client-side DNS cache.  (Tor MAY rate-limit its
-                   response to this signal.)
-
-  The server responds with "250 OK" if the signal is recognized (or simply
-  closes the socket if it was asked to close immediately), or "552
-  Unrecognized signal" if the signal is unrecognized.
-
-3.8. MAPADDRESS
-
-  Sent from the client to the server.  The syntax is:
-
-    "MAPADDRESS" 1*(Address "=" Address SP) CRLF
-
-  The first address in each pair is an "original" address; the second is a
-  "replacement" address.  The client sends this message to the server in
-  order to tell it that future SOCKS requests for connections to the original
-  address should be replaced with connections to the specified replacement
-  address.  If the addresses are well-formed, and the server is able to
-  fulfill the request, the server replies with a 250 message:
-    250-OldAddress1=NewAddress1
-    250 OldAddress2=NewAddress2
-
-  containing the source and destination addresses.  If request is
-  malformed, the server replies with "512 syntax error in command
-  argument".  If the server can't fulfill the request, it replies with
-  "451 resource exhausted".
-
-  The client may decline to provide a body for the original address, and
-  instead send a special null address ("0.0.0.0" for IPv4, "::0" for IPv6, or
-  "." for hostname), signifying that the server should choose the original
-  address itself, and return that address in the reply.  The server
-  should ensure that it returns an element of address space that is unlikely
-  to be in actual use.  If there is already an address mapped to the
-  destination address, the server may reuse that mapping.
-
-  If the original address is already mapped to a different address, the old
-  mapping is removed.  If the original address and the destination address
-  are the same, the server removes any mapping in place for the original
-  address.
-
-  Example:
-    C: MAPADDRESS 0.0.0.0=torproject.org 1.2.3.4=tor.freehaven.net
-    S: 250-127.192.10.10=torproject.org
-    S: 250 1.2.3.4=tor.freehaven.net
-
-  {Note: This feature is designed to be used to help Tor-ify applications
-  that need to use SOCKS4 or hostname-less SOCKS5.  There are three
-  approaches to doing this:
-     1. Somehow make them use SOCKS4a or SOCKS5-with-hostnames instead.
-     2. Use tor-resolve (or another interface to Tor's resolve-over-SOCKS
-        feature) to resolve the hostname remotely.  This doesn't work
-        with special addresses like x.onion or x.y.exit.
-     3. Use MAPADDRESS to map an IP address to the desired hostname, and then
-        arrange to fool the application into thinking that the hostname
-        has resolved to that IP.
-  This functionality is designed to help implement the 3rd approach.}
-
-  Mappings set by the controller last until the Tor process exits:
-  they never expire. If the controller wants the mapping to last only
-  a certain time, then it must explicitly un-map the address when that
-  time has elapsed.
-
-3.9. GETINFO
-
-  Sent from the client to the server.  The syntax is as for GETCONF:
-    "GETINFO" 1*(SP keyword) CRLF
-  one or more NL-terminated strings.  The server replies with an INFOVALUE
-  message, or a 551 or 552 error.
-
-  Unlike GETCONF, this message is used for data that are not stored in the Tor
-  configuration file, and that may be longer than a single line.  On success,
-  one ReplyLine is sent for each requested value, followed by a final 250 OK
-  ReplyLine.  If a value fits on a single line, the format is:
-      250-keyword=value
-  If a value must be split over multiple lines, the format is:
-      250+keyword=
-      value
-      .
-  Recognized keys and their values include:
-
-    "version" -- The version of the server's software, including the name
-      of the software. (example: "Tor 0.0.9.4")
-
-    "config-file" -- The location of Tor's configuration file ("torrc").
-
-    ["exit-policy/prepend" -- The default exit policy lines that Tor will
-      *prepend* to the ExitPolicy config option.
-     -- Never implemented. Useful?]
-
-    "exit-policy/default" -- The default exit policy lines that Tor will
-      *append* to the ExitPolicy config option.
-
-    "desc/id/<OR identity>" or "desc/name/<OR nickname>" -- the latest
-      server descriptor for a given OR, NUL-terminated.
-
-    "desc-annotations/id/<OR identity>" -- outputs the annotations string
-      (source, timestamp of arrival, purpose, etc) for the corresponding
-      descriptor. [First implemented in 0.2.0.13-alpha.]
-
-    "extra-info/digest/<digest>"  -- the extrainfo document whose digest (in
-      hex) is <digest>.  Only available if we're downloading extra-info
-      documents.
-
-    "ns/id/<OR identity>" or "ns/name/<OR nickname>" -- the latest router
-      status info (v2 directory style) for a given OR.  Router status
-      info is as given in
-      dir-spec.txt, and reflects the current beliefs of this Tor about the
-      router in question. Like directory clients, controllers MUST
-      tolerate unrecognized flags and lines.  The published date and
-      descriptor digest are those believed to be best by this Tor,
-      not necessarily those for a descriptor that Tor currently has.
-      [First implemented in 0.1.2.3-alpha.]
-
-    "ns/all" -- Router status info (v2 directory style) for all ORs we
-      have an opinion about, joined by newlines. [First implemented
-      in 0.1.2.3-alpha.]
-
-    "ns/purpose/<purpose>" -- Router status info (v2 directory style)
-      for all ORs of this purpose. Mostly designed for /ns/purpose/bridge
-      queries. [First implemented in 0.2.0.13-alpha.]
-
-    "desc/all-recent" -- the latest server descriptor for every router that
-      Tor knows about.
-
-    "network-status" -- a space-separated list (v1 directory style)
-      of all known OR identities. This is in the same format as the
-      router-status line in v1 directories; see dir-spec-v1.txt section
-      3 for details.  (If VERBOSE_NAMES is enabled, the output will
-      not conform to dir-spec-v1.txt; instead, the result will be a
-      space-separated list of LongName, each preceded by a "!" if it is
-      believed to be not running.) This option is deprecated; use
-      "ns/all" instead.
-
-    "address-mappings/all"
-    "address-mappings/config"
-    "address-mappings/cache"
-    "address-mappings/control" -- a \r\n-separated list of address
-      mappings, each in the form of "from-address to-address expiry".
-      The 'config' key returns those address mappings set in the
-      configuration; the 'cache' key returns the mappings in the
-      client-side DNS cache; the 'control' key returns the mappings set
-      via the control interface; the 'all' target returns the mappings
-      set through any mechanism.
-      Expiry is formatted as with ADDRMAP events, except that "expiry" is
-      always a time in GMT or the string "NEVER"; see section 4.1.7.
-      First introduced in 0.2.0.3-alpha.
-
-    "addr-mappings/*" -- as for address-mappings/*, but without the
-      expiry portion of the value.  Use of this value is deprecated
-      since 0.2.0.3-alpha; use address-mappings instead.
-
-    "address" -- the best guess at our external IP address. If we
-      have no guess, return a 551 error. (Added in 0.1.2.2-alpha)
-
-    "fingerprint" -- the contents of the fingerprint file that Tor
-      writes as a server, or a 551 if we're not a server currently.
-      (Added in 0.1.2.3-alpha)
-
-    "circuit-status"
-      A series of lines as for a circuit status event. Each line is of
-      the form:
-         CircuitID SP CircStatus [SP Path] CRLF
-
-    "stream-status"
-      A series of lines as for a stream status event.  Each is of the form:
-         StreamID SP StreamStatus SP CircID SP Target CRLF
-
-    "orconn-status"
-      A series of lines as for an OR connection status event.  Each is of the
-      form:
-         ServerID SP ORStatus CRLF
-
-    "entry-guards"
-      A series of lines listing the currently chosen entry guards, if any.
-      Each is of the form:
-         ServerID2 SP Status [SP ISOTime] CRLF
-
-         Status-with-time = ("unlisted") SP ISOTime
-         Status = ("up" / "never-connected" / "down" /
-                      "unusable" / "unlisted" )
-
-         ServerID2 = Nickname / 40*HEXDIG
-
-      [From 0.1.1.4-alpha to 0.1.1.10-alpha, this was called "helper-nodes".
-       Tor still supports calling it that for now, but support will be
-       removed in 0.1.3.x.]
-
-      [Older versions of Tor (before 0.1.2.x-final) generated 'down' instead
-       of unlisted/unusable.  Current Tors never generate 'down'.]
-
-      [XXXX ServerID2 differs from ServerID in not prefixing fingerprints
-       with a $.  This is an implementation error.  It would be nice to add
-       the $ back in if we can do so without breaking compatibility.]
-
-    "accounting/enabled"
-    "accounting/hibernating"
-    "accounting/bytes"
-    "accounting/bytes-left"
-    "accounting/interval-start"
-    "accounting/interval-wake"
-    "accounting/interval-end"
-      Information about accounting status.  If accounting is enabled,
-      "enabled" is 1; otherwise it is 0.  The "hibernating" field is "hard"
-      if we are accepting no data; "soft" if we're accepting no new
-      connections, and "awake" if we're not hibernating at all.  The "bytes"
-      and "bytes-left" fields contain (read-bytes SP write-bytes), for the
-      start and the rest of the interval respectively.  The 'interval-start'
-      and 'interval-end' fields are the borders of the current interval; the
-      'interval-wake' field is the time within the current interval (if any)
-      where we plan[ned] to start being active. The times are GMT.
-
-    "config/names"
-      A series of lines listing the available configuration options. Each is
-      of the form:
-         OptionName SP OptionType [ SP Documentation ] CRLF
-         OptionName = Keyword
-         OptionType = "Integer" / "TimeInterval" / "DataSize" / "Float" /
-           "Boolean" / "Time" / "CommaList" / "Dependant" / "Virtual" /
-           "String" / "LineList"
-         Documentation = Text
-
-    "info/names"
-      A series of lines listing the available GETINFO options.  Each is of
-      one of these forms:
-         OptionName SP Documentation CRLF
-         OptionPrefix SP Documentation CRLF
-         OptionPrefix = OptionName "/*"
-
-    "events/names"
-      A space-separated list of all the events supported by this version of
-      Tor's SETEVENTS.
-
-    "features/names"
-      A space-separated list of all the events supported by this version of
-      Tor's USEFEATURE.
-
-    "ip-to-country/*"
-      Maps IP addresses to 2-letter country codes.  For example,
-      "GETINFO ip-to-country/18.0.0.1" should give "US".
-
-    "next-circuit/IP:port"
-      XXX todo.
-
-    "dir/status-vote/current/consensus" [added in Tor 0.2.1.6-alpha]
-    "dir/status/authority"
-    "dir/status/fp/<F>"
-    "dir/status/fp/<F1>+<F2>+<F3>"
-    "dir/status/all"
-    "dir/server/fp/<F>"
-    "dir/server/fp/<F1>+<F2>+<F3>"
-    "dir/server/d/<D>"
-    "dir/server/d/<D1>+<D2>+<D3>"
-    "dir/server/authority"
-    "dir/server/all"
-      A series of lines listing directory contents, provided according to the
-      specification for the URLs listed in Section 4.4 of dir-spec.txt.  Note
-      that Tor MUST NOT provide private information, such as descriptors for
-      routers not marked as general-purpose.  When asked for 'authority'
-      information for which this Tor is not authoritative, Tor replies with
-      an empty string.
-
-    "status/circuit-established"
-    "status/enough-dir-info"
-    "status/good-server-descriptor"
-    "status/accepted-server-descriptor"
-    "status/..."
-      These provide the current internal Tor values for various Tor
-      states. See Section 4.1.10 for explanations. (Only a few of the
-      status events are available as getinfo's currently. Let us know if
-      you want more exposed.)
-    "status/reachability-succeeded/or"
-      0 or 1, depending on whether we've found our ORPort reachable.
-    "status/reachability-succeeded/dir"
-      0 or 1, depending on whether we've found our DirPort reachable.
-    "status/reachability-succeeded"
-      "OR=" ("0"/"1") SP "DIR=" ("0"/"1")
-      Combines status/reachability-succeeded/*; controllers MUST ignore
-      unrecognized elements in this entry.
-    "status/bootstrap-phase"
-      Returns the most recent bootstrap phase status event
-      sent. Specifically, it returns a string starting with either
-      "NOTICE BOOTSTRAP ..." or "WARN BOOTSTRAP ...". Controllers should
-      use this getinfo when they connect or attach to Tor to learn its
-      current bootstrap state.
-    "status/version/recommended"
-      List of currently recommended versions.
-    "status/version/current"
-      Status of the current version. One of: new, old, unrecommended,
-      recommended, new in series, obsolete.
-    "status/clients-seen"
-      A summary of which countries we've seen clients from recently,
-      formatted the same as the CLIENTS_SEEN status event described in
-      Section 4.1.14. This GETINFO option is currently available only
-      for bridge relays.
-
-  Examples:
-     C: GETINFO version desc/name/moria1
-     S: 250+desc/name/moria=
-     S: [Descriptor for moria]
-     S: .
-     S: 250-version=Tor 0.1.1.0-alpha-cvs
-     S: 250 OK
-
-3.10. EXTENDCIRCUIT
-
-  Sent from the client to the server.  The format is:
-      "EXTENDCIRCUIT" SP CircuitID SP
-                      ServerSpec *("," ServerSpec)
-                      [SP "purpose=" Purpose] CRLF
-
-  This request takes one of two forms: either the CircuitID is zero, in
-  which case it is a request for the server to build a new circuit according
-  to the specified path, or the CircuitID is nonzero, in which case it is a
-  request for the server to extend an existing circuit with that ID according
-  to the specified path.
-
-  If CircuitID is 0 and "purpose=" is specified, then the circuit's
-  purpose is set. Two choices are recognized: "general" and
-  "controller". If not specified, circuits are created as "general".
-
-  If the request is successful, the server sends a reply containing a
-  message body consisting of the CircuitID of the (maybe newly created)
-  circuit. The syntax is "250" SP "EXTENDED" SP CircuitID CRLF.
-
-3.11. SETCIRCUITPURPOSE
-
-  Sent from the client to the server.  The format is:
-      "SETCIRCUITPURPOSE" SP CircuitID SP Purpose CRLF
-
-  This changes the circuit's purpose. See EXTENDCIRCUIT above for details.
-
-3.12. SETROUTERPURPOSE
-
-  Sent from the client to the server.  The format is:
-      "SETROUTERPURPOSE" SP NicknameOrKey SP Purpose CRLF
-
-  This changes the descriptor's purpose. See +POSTDESCRIPTOR below
-  for details.
-
-  NOTE: This command was disabled and made obsolete as of Tor
-  0.2.0.8-alpha. It doesn't exist anymore, and is listed here only for
-  historical interest.
-
-3.13. ATTACHSTREAM
-
-  Sent from the client to the server.  The syntax is:
-     "ATTACHSTREAM" SP StreamID SP CircuitID [SP "HOP=" HopNum] CRLF
-
-  This message informs the server that the specified stream should be
-  associated with the specified circuit.  Each stream may be associated with
-  at most one circuit, and multiple streams may share the same circuit.
-  Streams can only be attached to completed circuits (that is, circuits that
-  have sent a circuit status 'BUILT' event or are listed as built in a
-  GETINFO circuit-status request).
-
-  If the circuit ID is 0, responsibility for attaching the given stream is
-  returned to Tor.
-
-  If HOP=HopNum is specified, Tor will choose the HopNumth hop in the
-  circuit as the exit node, rather than the last node in the circuit.
-  Hops are 1-indexed; generally, it is not permitted to attach to hop 1.
-
-  Tor responds with "250 OK" if it can attach the stream, 552 if the circuit
-  or stream didn't exist, or 551 if the stream couldn't be attached for
-  another reason.
-
-  {Implementation note: Tor will close unattached streams by itself,
-  roughly two minutes after they are born. Let the developers know if
-  that turns out to be a problem.}
-
-  {Implementation note: By default, Tor automatically attaches streams to
-  circuits itself, unless the configuration variable
-  "__LeaveStreamsUnattached" is set to "1".  Attempting to attach streams
-  via TC when "__LeaveStreamsUnattached" is false may cause a race between
-  Tor and the controller, as both attempt to attach streams to circuits.}
-
-  {Implementation note: You can try to attachstream to a stream that
-  has already sent a connect or resolve request but hasn't succeeded
-  yet, in which case Tor will detach the stream from its current circuit
-  before proceeding with the new attach request.}
-
-3.14. POSTDESCRIPTOR
-
-  Sent from the client to the server. The syntax is:
-    "+POSTDESCRIPTOR" [SP "purpose=" Purpose] [SP "cache=" Cache]
-                      CRLF Descriptor CRLF "." CRLF
-
-  This message informs the server about a new descriptor. If Purpose is
-  specified, it must be either "general", "controller", or "bridge",
-  else we return a 552 error. The default is "general".
-
-  If Cache is specified, it must be either "no" or "yes", else we
-  return a 552 error. If Cache is not specified, Tor will decide for
-  itself whether it wants to cache the descriptor, and controllers
-  must not rely on its choice.
-
-  The descriptor, when parsed, must contain a number of well-specified
-  fields, including fields for its nickname and identity.
-
-  If there is an error in parsing the descriptor, the server must send a
-  "554 Invalid descriptor" reply. If the descriptor is well-formed but
-  the server chooses not to add it, it must reply with a 251 message
-  whose body explains why the server was not added. If the descriptor
-  is added, Tor replies with "250 OK".
-
-3.15. REDIRECTSTREAM
-
-  Sent from the client to the server. The syntax is:
-    "REDIRECTSTREAM" SP StreamID SP Address [SP Port] CRLF
-
-  Tells the server to change the exit address on the specified stream.  If
-  Port is specified, changes the destination port as well.  No remapping
-  is performed on the new provided address.
-
-  To be sure that the modified address will be used, this event must be sent
-  after a new stream event is received, and before attaching this stream to
-  a circuit.
-
-  Tor replies with "250 OK" on success.
-
-3.16. CLOSESTREAM
-
-  Sent from the client to the server.  The syntax is:
-
-    "CLOSESTREAM" SP StreamID SP Reason *(SP Flag) CRLF
-
-  Tells the server to close the specified stream.  The reason should be one
-  of the Tor RELAY_END reasons given in tor-spec.txt, as a decimal.  Flags is
-  not used currently; Tor servers SHOULD ignore unrecognized flags.  Tor may
-  hold the stream open for a while to flush any data that is pending.
-
-  Tor replies with "250 OK" on success, or a 512 if there aren't enough
-  arguments, or a 552 if it doesn't recognize the StreamID or reason.
-
-3.17. CLOSECIRCUIT
-
-   The syntax is:
-     CLOSECIRCUIT SP CircuitID *(SP Flag) CRLF
-     Flag = "IfUnused"
-
-  Tells the server to close the specified circuit.   If "IfUnused" is
-  provided, do not close the circuit unless it is unused.
-
-  Other flags may be defined in the future; Tor SHOULD ignore unrecognized
-  flags.
-
-  Tor replies with "250 OK" on success, or a 512 if there aren't enough
-  arguments, or a 552 if it doesn't recognize the CircuitID.
-
-3.18. QUIT
-
-  Tells the server to hang up on this controller connection. This command
-  can be used before authenticating.
-
-3.19. USEFEATURE
-
-  The syntax is:
-
-    "USEFEATURE" *(SP FeatureName) CRLF
-    FeatureName = 1*(ALPHA / DIGIT / "_" / "-")
-
-  Sometimes extensions to the controller protocol break compatibility with
-  older controllers.  In this case, whenever possible, the extensions are
-  first included in Tor disabled by default, and only enabled on a given
-  controller connection when the "USEFEATURE" command is given.  Once a
-  "USEFEATURE" command is given, it applies to all subsequent interactions on
-  the same connection; to disable an enabled feature, a new controller
-  connection must be opened.
-
-  This is a forward-compatibility mechanism; each feature will eventually
-  become a regular part of the control protocol in some future version of Tor.
-  Tor will ignore a request to use any feature that is already on by default.
-  Tor will give a "552" error if any requested feature is not recognized.
-
-  Feature names are case-insensitive.
-
-  EXTENDED_EVENTS
-
-     Same as passing 'EXTENDED' to SETEVENTS; this is the preferred way to
-     request the extended event syntax.
-
-    This feature was first used in 0.1.2.3-alpha.  It is always-on in
-    Tor 0.2.2.1-alpha and later.
-
-  VERBOSE_NAMES
-
-     Instead of ServerID as specified above, the controller should
-     identify ORs by LongName in events and GETINFO results.  This format is
-     strictly more informative: rather than including Nickname for
-     known Named routers and Fingerprint for unknown or unNamed routers, the
-     LongName format includes a Fingerprint, an indication of Named status,
-     and a Nickname (if one is known).
-
-     This will not be always-enabled until at least two stable
-     releases after 0.1.2.2-alpha, the release where it was first
-     available.  It is always-on in Tor 0.2.2.1-alpha and later.
-
-3.20. RESOLVE
-
-  The syntax is
-    "RESOLVE" *Option *Address CRLF
-    Option = "mode=reverse"
-    Address = a hostname or IPv4 address
-
-  This command launches a remote hostname lookup request for every specified
-  request (or reverse lookup if "mode=reverse" is specified).  Note that the
-  request is done in the background: to see the answers, your controller will
-  need to listen for ADDRMAP events; see 4.1.7 below.
-
-  [Added in Tor 0.2.0.3-alpha]
-
-3.21. PROTOCOLINFO
-
-  The syntax is:
-    "PROTOCOLINFO" *(SP PIVERSION) CRLF
-
-  The server reply format is:
-    "250-PROTOCOLINFO" SP PIVERSION CRLF *InfoLine "250 OK" CRLF
-
-    InfoLine = AuthLine / VersionLine / OtherLine
-
-     AuthLine = "250-AUTH" SP "METHODS=" AuthMethod *(",")AuthMethod
-                       *(SP "COOKIEFILE=" AuthCookieFile) CRLF
-     VersionLine = "250-VERSION" SP "Tor=" TorVersion [SP Arguments] CRLF
-
-     AuthMethod =
-      "NULL"           / ; No authentication is required
-      "HASHEDPASSWORD" / ; A controller must supply the original password
-      "COOKIE"         / ; A controller must supply the contents of a cookie
-
-     AuthCookieFile = QuotedString
-     TorVersion = QuotedString
-
-     OtherLine = "250-" Keyword [SP Arguments] CRLF
-
-    PIVERSION: 1*DIGIT
-
-  Tor MAY give its InfoLines in any order; controllers MUST ignore InfoLines
-  with keywords they do not recognize.  Controllers MUST ignore extraneous
-  data on any InfoLine.
-
-  PIVERSION is there in case we drastically change the syntax one day. For
-  now it should always be "1".  Controllers MAY provide a list of the
-  protocolinfo versions they support; Tor MAY select a version that the
-  controller does not support.
-
-  AuthMethod is used to specify one or more control authentication
-  methods that Tor currently accepts.
-
-  AuthCookieFile specifies the absolute path and filename of the
-  authentication cookie that Tor is expecting and is provided iff
-  the METHODS field contains the method "COOKIE".  Controllers MUST handle
-  escape sequences inside this string.
-
-  The VERSION line contains the Tor version.
-
-  [Unlike other commands besides AUTHENTICATE, PROTOCOLINFO may be used (but
-  only once!) before AUTHENTICATE.]
-
-  [PROTOCOLINFO was not supported before Tor 0.2.0.5-alpha.]
-
-4. Replies
-
-  Reply codes follow the same 3-character format as used by SMTP, with the
-  first character defining a status, the second character defining a
-  subsystem, and the third designating fine-grained information.
-
-  The TC protocol currently uses the following first characters:
-
-    2yz   Positive Completion Reply
-       The command was successful; a new request can be started.
-
-    4yz   Temporary Negative Completion reply
-       The command was unsuccessful but might be reattempted later.
-
-    5yz   Permanent Negative Completion Reply
-       The command was unsuccessful; the client should not try exactly
-       that sequence of commands again.
-
-    6yz   Asynchronous Reply
-       Sent out-of-order in response to an earlier SETEVENTS command.
-
-  The following second characters are used:
-
-    x0z   Syntax
-       Sent in response to ill-formed or nonsensical commands.
-
-    x1z   Protocol
-       Refers to operations of the Tor Control protocol.
-
-    x5z   Tor
-       Refers to actual operations of Tor system.
-
-  The following codes are defined:
-
-     250 OK
-     251 Operation was unnecessary
-         [Tor has declined to perform the operation, but no harm was done.]
-
-     451 Resource exhausted
-
-     500 Syntax error: protocol
-
-     510 Unrecognized command
-     511 Unimplemented command
-     512 Syntax error in command argument
-     513 Unrecognized command argument
-     514 Authentication required
-     515 Bad authentication
-
-     550 Unspecified Tor error
-
-     551 Internal error
-               [Something went wrong inside Tor, so that the client's
-                request couldn't be fulfilled.]
-
-     552 Unrecognized entity
-               [A configuration key, a stream ID, circuit ID, event,
-                mentioned in the command did not actually exist.]
-
-     553 Invalid configuration value
-         [The client tried to set a configuration option to an
-           incorrect, ill-formed, or impossible value.]
-
-     554 Invalid descriptor
-
-     555 Unmanaged entity
-
-     650 Asynchronous event notification
-
-  Unless specified to have specific contents, the human-readable messages
-  in error replies should not be relied upon to match those in this document.
-
-4.1. Asynchronous events
-
-  These replies can be sent after a corresponding SETEVENTS command has been
-  received.  They will not be interleaved with other Reply elements, but they
-  can appear between a command and its corresponding reply.  For example,
-  this sequence is possible:
-
-     C: SETEVENTS CIRC
-     S: 250 OK
-     C: GETCONF SOCKSPORT ORPORT
-     S: 650 CIRC 1000 EXTENDED moria1,moria2
-     S: 250-SOCKSPORT=9050
-     S: 250 ORPORT=0
-
-  But this sequence is disallowed:
-     C: SETEVENTS CIRC
-     S: 250 OK
-     C: GETCONF SOCKSPORT ORPORT
-     S: 250-SOCKSPORT=9050
-     S: 650 CIRC 1000 EXTENDED moria1,moria2
-     S: 250 ORPORT=0
-
-  Clients MUST tolerate more arguments in an asynchonous reply than
-  expected, and MUST tolerate more lines in an asynchronous reply than
-  expected.  For instance, a client that expects a CIRC message like:
-      650 CIRC 1000 EXTENDED moria1,moria2
-  must tolerate:
-      650-CIRC 1000 EXTENDED moria1,moria2 0xBEEF
-      650-EXTRAMAGIC=99
-      650 ANONYMITY=high
-
-  If clients ask for extended events, then each event line as specified below
-  will be followed by additional extensions. Additional lines will be of the
-  form
-      "650" ("-"/" ") KEYWORD ["=" ARGUMENTS] CRLF
-  Additional arguments will be of the form
-      SP KEYWORD ["=" ( QuotedString / * NonSpDquote ) ]
-  Such clients MUST tolerate lines with keywords they do not recognize.
-
-4.1.1. Circuit status changed
-
-   The syntax is:
-
-     "650" SP "CIRC" SP CircuitID SP CircStatus [SP Path]
-          [SP "REASON=" Reason [SP "REMOTE_REASON=" Reason]] CRLF
-
-      CircStatus =
-               "LAUNCHED" / ; circuit ID assigned to new circuit
-               "BUILT"    / ; all hops finished, can now accept streams
-               "EXTENDED" / ; one more hop has been completed
-               "FAILED"   / ; circuit closed (was not built)
-               "CLOSED"     ; circuit closed (was built)
-
-      Path = ServerID *("," ServerID)
-
-      Reason = "NONE" / "TORPROTOCOL" / "INTERNAL" / "REQUESTED" /
-               "HIBERNATING" / "RESOURCELIMIT" / "CONNECTFAILED" /
-               "OR_IDENTITY" / "OR_CONN_CLOSED" / "TIMEOUT" /
-               "FINISHED" / "DESTROYED" / "NOPATH" / "NOSUCHSERVICE"
-
-   The path is provided only when the circuit has been extended at least one
-   hop.
-
-   The "REASON" field is provided only for FAILED and CLOSED events, and only
-   if extended events are enabled (see 3.19).  Clients MUST accept reasons
-   not listed above.  Reasons are as given in tor-spec.txt, except for:
-
-      NOPATH          (Not enough nodes to make circuit)
-
-   The "REMOTE_REASON" field is provided only when we receive a DESTROY or
-   TRUNCATE cell, and only if extended events are enabled.  It contains the
-   actual reason given by the remote OR for closing the circuit. Clients MUST
-   accept reasons not listed above.  Reasons are as listed in tor-spec.txt.
-
-4.1.2. Stream status changed
-
-    The syntax is:
-
-      "650" SP "STREAM" SP StreamID SP StreamStatus SP CircID SP Target
-          [SP "REASON=" Reason [ SP "REMOTE_REASON=" Reason ]]
-          [SP "SOURCE=" Source] [ SP "SOURCE_ADDR=" Address ":" Port ]
-          [SP "PURPOSE=" Purpose]
-          CRLF
-
-      StreamStatus =
-               "NEW"          / ; New request to connect
-               "NEWRESOLVE"   / ; New request to resolve an address
-               "REMAP"        / ; Address re-mapped to another
-               "SENTCONNECT"  / ; Sent a connect cell along a circuit
-               "SENTRESOLVE"  / ; Sent a resolve cell along a circuit
-               "SUCCEEDED"    / ; Received a reply; stream established
-               "FAILED"       / ; Stream failed and not retriable
-               "CLOSED"       / ; Stream closed
-               "DETACHED"       ; Detached from circuit; still retriable
-
-       Target = Address ":" Port
-
-  The circuit ID designates which circuit this stream is attached to.  If
-  the stream is unattached, the circuit ID "0" is given.
-
-      Reason = "MISC" / "RESOLVEFAILED" / "CONNECTREFUSED" /
-               "EXITPOLICY" / "DESTROY" / "DONE" / "TIMEOUT" /
-               "HIBERNATING" / "INTERNAL"/ "RESOURCELIMIT" /
-               "CONNRESET" / "TORPROTOCOL" / "NOTDIRECTORY" / "END"
-
-   The "REASON" field is provided only for FAILED, CLOSED, and DETACHED
-   events, and only if extended events are enabled (see 3.19).  Clients MUST
-   accept reasons not listed above.  Reasons are as given in tor-spec.txt,
-   except for:
-
-      END          (We received a RELAY_END cell from the other side of this
-                    stream.)
-      [XXXX document more. -NM]
-
-   The "REMOTE_REASON" field is provided only when we receive a RELAY_END
-   cell, and only if extended events are enabled.  It contains the actual
-   reason given by the remote OR for closing the stream. Clients MUST accept
-   reasons not listed above.  Reasons are as listed in tor-spec.txt.
-
-   "REMAP" events include a Source if extended events are enabled:
-      Source = "CACHE" / "EXIT"
-   Clients MUST accept sources not listed above.  "CACHE" is given if
-   the Tor client decided to remap the address because of a cached
-   answer, and "EXIT" is given if the remote node we queried gave us
-   the new address as a response.
-
-   The "SOURCE_ADDR" field is included with NEW and NEWRESOLVE events if
-   extended events are enabled.  It indicates the address and port
-   that requested the connection, and can be (e.g.) used to look up the
-   requesting program.
-
-      Purpose = "DIR_FETCH" / "UPLOAD_DESC" / "DNS_REQUEST" /
-                 "USER" /  "DIRPORT_TEST"
-
-   The "PURPOSE" field is provided only for NEW and NEWRESOLVE events, and
-   only if extended events are enabled (see 3.19).  Clients MUST accept
-   purposes not listed above.
-
-4.1.3. OR Connection status changed
-
-  The syntax is:
-    "650" SP "ORCONN" SP (ServerID / Target) SP ORStatus [ SP "REASON="
-             Reason ] [ SP "NCIRCS=" NumCircuits ] CRLF
-
-    ORStatus = "NEW" / "LAUNCHED" / "CONNECTED" / "FAILED" / "CLOSED"
-
-  NEW is for incoming connections, and LAUNCHED is for outgoing
-  connections. CONNECTED means the TLS handshake has finished (in
-  either direction). FAILED means a connection is being closed that
-  hasn't finished its handshake, and CLOSED is for connections that
-  have handshaked.
-
-  A ServerID is specified unless it's a NEW connection, in which
-  case we don't know what server it is yet, so we use Address:Port.
-
-  If extended events are enabled (see 3.19), optional reason and
-  circuit counting information is provided for CLOSED and FAILED
-  events.
-
-      Reason = "MISC" / "DONE" / "CONNECTREFUSED" /
-               "IDENTITY" / "CONNECTRESET" / "TIMEOUT" / "NOROUTE" /
-               "IOERROR" / "RESOURCELIMIT"
-
-  NumCircuits counts both established and pending circuits.
-
-4.1.4. Bandwidth used in the last second
-
-  The syntax is:
-     "650" SP "BW" SP BytesRead SP BytesWritten *(SP Type "=" Num) CRLF
-     BytesRead = 1*DIGIT
-     BytesWritten = 1*DIGIT
-     Type = "DIR" / "OR" / "EXIT" / "APP" / ...
-     Num = 1*DIGIT
-
-  BytesRead and BytesWritten are the totals. [In a future Tor version,
-  we may also include a breakdown of the connection types that used
-  bandwidth this second (not implemented yet).]
-
-4.1.5. Log messages
-
-  The syntax is:
-     "650" SP Severity SP ReplyText CRLF
-  or
-     "650+" Severity CRLF Data 650 SP "OK" CRLF
-
-     Severity = "DEBUG" / "INFO" / "NOTICE" / "WARN"/ "ERR"
-
-4.1.6. New descriptors available
-
-  Syntax:
-     "650" SP "NEWDESC" 1*(SP ServerID) CRLF
-
-4.1.7. New Address mapping
-
-  Syntax:
-     "650" SP "ADDRMAP" SP Address SP NewAddress SP Expiry
-       [SP Error] SP GMTExpiry CRLF
-
-     NewAddress = Address / "<error>"
-     Expiry = DQUOTE ISOTime DQUOTE / "NEVER"
-
-     Error = "error=" ErrorCode
-     ErrorCode = XXXX
-     GMTExpiry = "EXPIRES=" DQUOTE IsoTime DQUOTE
-
-  Error and GMTExpiry are only provided if extended events are enabled.
-
-  Expiry is expressed as the local time (rather than GMT).  This is a bug,
-  left in for backward compatibility; new code should look at GMTExpiry
-  instead.
-
-  These events are generated when a new address mapping is entered in the
-  cache, or when the answer for a RESOLVE command is found.
-
-4.1.8. Descriptors uploaded to us in our role as authoritative dirserver
-
-  Syntax:
-     "650" "+" "AUTHDIR_NEWDESCS" CRLF Action CRLF Message CRLF
-       Descriptor CRLF "." CRLF "650" SP "OK" CRLF
-     Action = "ACCEPTED" / "DROPPED" / "REJECTED"
-     Message = Text
-
-4.1.9. Our descriptor changed
-
-  Syntax:
-     "650" SP "DESCCHANGED" CRLF
-
-  [First added in 0.1.2.2-alpha.]
-
-4.1.10. Status events
-
-  Status events (STATUS_GENERAL, STATUS_CLIENT, and STATUS_SERVER) are sent
-  based on occurrences in the Tor process pertaining to the general state of
-  the program.  Generally, they correspond to log messages of severity Notice
-  or higher.  They differ from log messages in that their format is a
-  specified interface.
-
-  Syntax:
-     "650" SP StatusType SP StatusSeverity SP StatusAction
-                                         [SP StatusArguments] CRLF
-
-     StatusType = "STATUS_GENERAL" / "STATUS_CLIENT" / "STATUS_SERVER"
-     StatusSeverity = "NOTICE" / "WARN" / "ERR"
-     StatusAction = 1*ALPHA
-     StatusArguments = StatusArgument *(SP StatusArgument)
-     StatusArgument = StatusKeyword '=' StatusValue
-     StatusKeyword = 1*(ALNUM / "_")
-     StatusValue = 1*(ALNUM / '_')  / QuotedString
-
-     Action is a string, and Arguments is a series of keyword=value
-     pairs on the same line.  Values may be space-terminated strings,
-     or quoted strings.
-
-     These events are always produced with EXTENDED_EVENTS and
-     VERBOSE_NAMES; see the explanations in the USEFEATURE section
-     for details.
-
-     Controllers MUST tolerate unrecognized actions, MUST tolerate
-     unrecognized arguments, MUST tolerate missing arguments, and MUST
-     tolerate arguments that arrive in any order.
-
-     Each event description below is accompanied by a recommendation for
-     controllers.  These recommendations are suggestions only; no controller
-     is required to implement them.
-
-  Compatibility note: versions of Tor before 0.2.0.22-rc incorrectly
-  generated "STATUS_SERVER" as "STATUS_SEVER".  To be compatible with those
-  versions, tools should accept both.
-
-  Actions for STATUS_GENERAL events can be as follows:
-
-     CLOCK_JUMPED
-     "TIME=NUM"
-       Tor spent enough time without CPU cycles that it has closed all
-       its circuits and will establish them anew. This typically
-       happens when a laptop goes to sleep and then wakes up again. It
-       also happens when the system is swapping so heavily that Tor is
-       starving. The "time" argument specifies the number of seconds Tor
-       thinks it was unconscious for (or alternatively, the number of
-       seconds it went back in time).
-
-       This status event is sent as NOTICE severity normally, but WARN
-       severity if Tor is acting as a server currently.
-
-       {Recommendation for controller: ignore it, since we don't really
-       know what the user should do anyway. Hm.}
-
-     DANGEROUS_VERSION
-     "CURRENT=version"
-     "REASON=NEW/OBSOLETE/UNRECOMMENDED"
-     "RECOMMENDED=\"version, version, ...\""
-       Tor has found that directory servers don't recommend its version of
-       the Tor software.  RECOMMENDED is a comma-and-space-separated string
-       of Tor versions that are recommended.  REASON is NEW if this version
-       of Tor is newer than any recommended version, OBSOLETE if
-       this version of Tor is older than any recommended version, and
-       UNRECOMMENDED if some recommended versions of Tor are newer and
-       some are older than this version. (The "OBSOLETE" reason was called
-       "OLD" from Tor 0.1.2.3-alpha up to and including 0.2.0.12-alpha.)
-
-       {Controllers may want to suggest that the user upgrade OLD or
-       UNRECOMMENDED versions.  NEW versions may be known-insecure, or may
-       simply be development versions.}
-
-     TOO_MANY_CONNECTIONS
-     "CURRENT=NUM"
-       Tor has reached its ulimit -n or whatever the native limit is on file
-       descriptors or sockets.  CURRENT is the number of sockets Tor
-       currently has open.  The user should really do something about
-       this. The "current" argument shows the number of connections currently
-       open.
-
-       {Controllers may recommend that the user increase the limit, or
-       increase it for them.  Recommendations should be phrased in an
-       OS-appropriate way and automated when possible.}
-
-     BUG
-     "REASON=STRING"
-       Tor has encountered a situation that its developers never expected,
-       and the developers would like to learn that it happened. Perhaps
-       the controller can explain this to the user and encourage her to
-       file a bug report?
-
-       {Controllers should log bugs, but shouldn't annoy the user in case a
-       bug appears frequently.}
-
-     CLOCK_SKEW
-       SKEW="+" / "-" SECONDS
-       MIN_SKEW="+" / "-" SECONDS.
-       SOURCE="DIRSERV:" IP ":" Port /
-              "NETWORKSTATUS:" IP ":" Port /
-              "OR:" IP ":" Port /
-              "CONSENSUS"
-         If "SKEW" is present, it's an estimate of how far we are from the
-         time declared in the source.  (In other words, if we're an hour in
-         the past, the value is -3600.)  "MIN_SKEW" is present, it's a lower
-         bound.  If the source is a DIRSERV, we got the current time from a
-         connection to a dirserver.  If the source is a NETWORKSTATUS, we
-         decided we're skewed because we got a v2 networkstatus from far in
-         the future.  If the source is OR, the skew comes from a NETINFO
-         cell from a connection to another relay.  If the source is
-         CONSENSUS, we decided we're skewed because we got a networkstatus
-         consensus from the future.
-
-         {Tor should send this message to controllers when it thinks the
-         skew is so high that it will interfere with proper Tor operation.
-         Controllers shouldn't blindly adjust the clock, since the more
-         accurate source of skew info (DIRSERV) is currently
-         unauthenticated.}
-
-     BAD_LIBEVENT
-     "METHOD=" libevent method
-     "VERSION=" libevent version
-     "BADNESS=" "BROKEN" / "BUGGY" / "SLOW"
-     "RECOVERED=" "NO" / "YES"
-        Tor knows about bugs in using the configured event method in this
-        version of libevent.  "BROKEN" libevents won't work at all;
-        "BUGGY" libevents might work okay; "SLOW" libevents will work
-        fine, but not quickly.  If "RECOVERED" is YES, Tor managed to
-        switch to a more reliable (but probably slower!) libevent method.
-
-        {Controllers may want to warn the user if this event occurs, though
-        generally it's the fault of whoever built the Tor binary and there's
-        not much the user can do besides upgrade libevent or upgrade the
-        binary.}
-
-     DIR_ALL_UNREACHABLE
-       Tor believes that none of the known directory servers are
-       reachable -- this is most likely because the local network is
-       down or otherwise not working, and might help to explain for the
-       user why Tor appears to be broken.
-
-       {Controllers may want to warn the user if this event occurs; further
-       action is generally not possible.}
-
-     CONSENSUS_ARRIVED
-        Tor has received and validated a new consensus networkstatus.
-        (This event can be delayed a little while after the consensus
-        is received, if Tor needs to fetch certificates.)
-
-  Actions for STATUS_CLIENT events can be as follows:
-
-     BOOTSTRAP
-     "PROGRESS=" num
-     "TAG=" Keyword
-     "SUMMARY=" String
-     ["WARNING=" String
-      "REASON=" Keyword
-      "COUNT=" num
-      "RECOMMENDATION=" Keyword
-     ]
-
-       Tor has made some progress at establishing a connection to the
-       Tor network, fetching directory information, or making its first
-       circuit; or it has encountered a problem while bootstrapping. This
-       status event is especially useful for users with slow connections
-       or with connectivity problems.
-
-       "Progress" gives a number between 0 and 100 for how far through
-       the bootstrapping process we are. "Summary" is a string that can
-       be displayed to the user to describe the *next* task that Tor
-       will tackle, i.e., the task it is working on after sending the
-       status event. "Tag" is a string that controllers can use to
-       recognize bootstrap phases, if they want to do something smarter
-       than just blindly displaying the summary string; see Section 5
-       for the current tags that Tor issues.
-
-       The StatusSeverity describes whether this is a normal bootstrap
-       phase (severity notice) or an indication of a bootstrapping
-       problem (severity warn).
-
-       For bootstrap problems, we include the same progress, tag, and
-       summary values as we would for a normal bootstrap event, but we
-       also include "warning", "reason", "count", and "recommendation"
-       key/value combos. The "count" number tells how many bootstrap
-       problems there have been so far at this phase. The "reason"
-       string lists one of the reasons allowed in the ORCONN event. The
-       "warning" argument string with any hints Tor has to offer about
-       why it's having troubles bootstrapping.
-
-       The "reason" values are long-term-stable controller-facing tags to
-       identify particular issues in a bootstrapping step.  The warning
-       strings, on the other hand, are human-readable. Controllers
-       SHOULD NOT rely on the format of any warning string. Currently
-       the possible values for "recommendation" are either "ignore" or
-       "warn" -- if ignore, the controller can accumulate the string in
-       a pile of problems to show the user if the user asks; if warn,
-       the controller should alert the user that Tor is pretty sure
-       there's a bootstrapping problem.
-
-       Currently Tor uses recommendation=ignore for the first
-       nine bootstrap problem reports for a given phase, and then
-       uses recommendation=warn for subsequent problems at that
-       phase. Hopefully this is a good balance between tolerating
-       occasional errors and reporting serious problems quickly.
-
-     ENOUGH_DIR_INFO
-       Tor now knows enough network-status documents and enough server
-       descriptors that it's going to start trying to build circuits now.
-
-       {Controllers may want to use this event to decide when to indicate
-       progress to their users, but should not interrupt the user's browsing
-       to tell them so.}
-
-     NOT_ENOUGH_DIR_INFO
-       We discarded expired statuses and router descriptors to fall
-       below the desired threshold of directory information. We won't
-       try to build any circuits until ENOUGH_DIR_INFO occurs again.
-
-       {Controllers may want to use this event to decide when to indicate
-       progress to their users, but should not interrupt the user's browsing
-       to tell them so.}
-
-     CIRCUIT_ESTABLISHED
-       Tor is able to establish circuits for client use. This event will
-       only be sent if we just built a circuit that changed our mind --
-       that is, prior to this event we didn't know whether we could
-       establish circuits.
-
-       {Suggested use: controllers can notify their users that Tor is
-       ready for use as a client once they see this status event. [Perhaps
-       controllers should also have a timeout if too much time passes and
-       this event hasn't arrived, to give tips on how to troubleshoot.
-       On the other hand, hopefully Tor will send further status events
-       if it can identify the problem.]}
-
-     CIRCUIT_NOT_ESTABLISHED
-     "REASON=" "EXTERNAL_ADDRESS" / "DIR_ALL_UNREACHABLE" / "CLOCK_JUMPED"
-       We are no longer confident that we can build circuits. The "reason"
-       keyword provides an explanation: which other status event type caused
-       our lack of confidence.
-
-       {Controllers may want to use this event to decide when to indicate
-       progress to their users, but should not interrupt the user's browsing
-       to do so.}
-       [Note: only REASON=CLOCK_JUMPED is implemented currently.]
-
-     DANGEROUS_PORT
-     "PORT=" port
-     "RESULT=" "REJECT" / "WARN"
-       A stream was initiated to a port that's commonly used for
-       vulnerable-plaintext protocols. If the Result is "reject", we
-       refused the connection; whereas if it's "warn", we allowed it.
-
-       {Controllers should warn their users when this occurs, unless they
-       happen to know that the application using Tor is in fact doing so
-       correctly (e.g., because it is part of a distributed bundle). They
-       might also want some sort of interface to let the user configure
-       their RejectPlaintextPorts and WarnPlaintextPorts config options.}
-
-     DANGEROUS_SOCKS
-     "PROTOCOL=" "SOCKS4" / "SOCKS5"
-     "ADDRESS=" IP:port
-       A connection was made to Tor's SOCKS port using one of the SOCKS
-       approaches that doesn't support hostnames -- only raw IP addresses.
-       If the client application got this address from gethostbyname(),
-       it may be leaking target addresses via DNS.
-
-       {Controllers should warn their users when this occurs, unless they
-       happen to know that the application using Tor is in fact doing so
-       correctly (e.g., because it is part of a distributed bundle).}
-
-     SOCKS_UNKNOWN_PROTOCOL
-       "DATA=string"
-       A connection was made to Tor's SOCKS port that tried to use it
-       for something other than the SOCKS protocol. Perhaps the user is
-       using Tor as an HTTP proxy?   The DATA is the first few characters
-       sent to Tor on the SOCKS port.
-
-       {Controllers may want to warn their users when this occurs: it
-       indicates a misconfigured application.}
-
-     SOCKS_BAD_HOSTNAME
-      "HOSTNAME=QuotedString"
-       Some application gave us a funny-looking hostname. Perhaps
-       it is broken? In any case it won't work with Tor and the user
-       should know.
-
-       {Controllers may want to warn their users when this occurs: it
-       usually indicates a misconfigured application.}
-
-  Actions for STATUS_SERVER can be as follows:
-
-     EXTERNAL_ADDRESS
-     "ADDRESS=IP"
-     "HOSTNAME=NAME"
-     "METHOD=CONFIGURED/DIRSERV/RESOLVED/INTERFACE/GETHOSTNAME"
-       Our best idea for our externally visible IP has changed to 'IP'.
-       If 'HOSTNAME' is present, we got the new IP by resolving 'NAME'.  If the
-       method is 'CONFIGURED', the IP was given verbatim as a configuration
-       option.  If the method is 'RESOLVED', we resolved the Address
-       configuration option to get the IP.  If the method is 'GETHOSTNAME',
-       we resolved our hostname to get the IP.  If the method is 'INTERFACE',
-       we got the address of one of our network interfaces to get the IP.  If
-       the method is 'DIRSERV', a directory server told us a guess for what
-       our IP might be.
-
-       {Controllers may want to record this info and display it to the user.}
-
-     CHECKING_REACHABILITY
-     "ORADDRESS=IP:port"
-     "DIRADDRESS=IP:port"
-       We're going to start testing the reachability of our external OR port
-       or directory port.
-
-       {This event could affect the controller's idea of server status, but
-       the controller should not interrupt the user to tell them so.}
-
-     REACHABILITY_SUCCEEDED
-     "ORADDRESS=IP:port"
-     "DIRADDRESS=IP:port"
-       We successfully verified the reachability of our external OR port or
-       directory port (depending on which of ORADDRESS or DIRADDRESS is
-       given.)
-
-       {This event could affect the controller's idea of server status, but
-       the controller should not interrupt the user to tell them so.}
-
-     GOOD_SERVER_DESCRIPTOR
-       We successfully uploaded our server descriptor to at least one
-       of the directory authorities, with no complaints.
-
-       {Originally, the goal of this event was to declare "every authority
-       has accepted the descriptor, so there will be no complaints
-       about it." But since some authorities might be offline, it's
-       harder to get certainty than we had thought. As such, this event
-       is equivalent to ACCEPTED_SERVER_DESCRIPTOR below. Controllers
-       should just look at ACCEPTED_SERVER_DESCRIPTOR and should ignore
-       this event for now.}
-
-     NAMESERVER_STATUS
-     "NS=addr"
-     "STATUS=" "UP" / "DOWN"
-     "ERR=" message
-        One of our nameservers has changed status.
-
-        {This event could affect the controller's idea of server status, but
-        the controller should not interrupt the user to tell them so.}
-
-     NAMESERVER_ALL_DOWN
-        All of our nameservers have gone down.
-
-        {This is a problem; if it happens often without the nameservers
-        coming up again, the user needs to configure more or better
-        nameservers.}
-
-     DNS_HIJACKED
-        Our DNS provider is providing an address when it should be saying
-        "NOTFOUND"; Tor will treat the address as a synonym for "NOTFOUND".
-
-        {This is an annoyance; controllers may want to tell admins that their
-        DNS provider is not to be trusted.}
-
-     DNS_USELESS
-        Our DNS provider is giving a hijacked address instead of well-known
-        websites; Tor will not try to be an exit node.
-
-        {Controllers could warn the admin if the server is running as an
-        exit server: the admin needs to configure a good DNS server.
-        Alternatively, this happens a lot in some restrictive environments
-        (hotels, universities, coffeeshops) when the user hasn't registered.}
-
-     BAD_SERVER_DESCRIPTOR
-     "DIRAUTH=addr:port"
-     "REASON=string"
-        A directory authority rejected our descriptor.  Possible reasons
-        include malformed descriptors, incorrect keys, highly skewed clocks,
-        and so on.
-
-        {Controllers should warn the admin, and try to cope if they can.}
-
-     ACCEPTED_SERVER_DESCRIPTOR
-     "DIRAUTH=addr:port"
-        A single directory authority accepted our descriptor.
-        // actually notice
-
-       {This event could affect the controller's idea of server status, but
-       the controller should not interrupt the user to tell them so.}
-
-     REACHABILITY_FAILED
-     "ORADDRESS=IP:port"
-     "DIRADDRESS=IP:port"
-       We failed to connect to our external OR port or directory port
-       successfully.
-
-       {This event could affect the controller's idea of server status.  The
-       controller should warn the admin and suggest reasonable steps to take.}
-
-4.1.11. Our set of guard nodes has changed
-
-  Syntax:
-     "650" SP "GUARD" SP Type SP Name SP Status ... CRLF
-     Type = "ENTRY"
-     Name = The (possibly verbose) nickname of the guard affected.
-     Status = "NEW" | "UP" | "DOWN" | "BAD" | "GOOD" | "DROPPED"
-
-  [explain states. XXX]
-
-4.1.12. Network status has changed
-
-  Syntax:
-     "650" "+" "NS" CRLF 1*NetworkStatus "." CRLF "650" SP "OK" CRLF
-
-  The event is used whenever our local view of a relay status changes.
-  This happens when we get a new v3 consensus (in which case the entries
-  we see are a duplicate of what we see in the NEWCONSENSUS event,
-  below), but it also happens when we decide to mark a relay as up or
-  down in our local status, for example based on connection attempts.
-
-  [First added in 0.1.2.3-alpha]
-
-4.1.13. Bandwidth used on an application stream
-
-  The syntax is:
-     "650" SP "STREAM_BW" SP StreamID SP BytesRead SP BytesWritten CRLF
-     BytesRead = 1*DIGIT
-     BytesWritten = 1*DIGIT
-
-  BytesRead and BytesWritten are the number of bytes read and written since
-  the last STREAM_BW event on this stream.  These events are generated about
-  once per second per stream; no events are generated for streams that have
-  not read or written.
-
-  These events apply only to streams entering Tor (such as on a SOCKSPort,
-  TransPort, or so on).  They are not generated for exiting streams.
-
-4.1.14. Per-country client stats
-
-  The syntax is:
-     "650" SP "CLIENTS_SEEN" SP TimeStarted SP CountrySummary CRLF
-
-  We just generated a new summary of which countries we've seen clients
-  from recently. The controller could display this for the user, e.g.
-  in their "relay" configuration window, to give them a sense that they
-  are actually being useful.
-
-  Currently only bridge relays will receive this event, but once we figure
-  out how to sufficiently aggregate and sanitize the client counts on
-  main relays, we might start sending these events in other cases too.
-
-  TimeStarted is a quoted string indicating when the reported summary
-  counts from (in GMT).
-
-  The CountrySummary keyword has as its argument a comma-separated
-  set of "countrycode=count" pairs. For example,
-  650-CLIENTS_SEEN TimeStarted="Thu Dec 25 23:50:43 EST 2008"
-  650 CountrySummary=us=16,de=8,uk=8
-[XXX Matt Edman informs me that the time format above is wrong. -RD]
-
-4.1.15. New consensus networkstatus has arrived.
-
-  The syntax is:
-     "650" "+" "NEWCONSENSUS" CRLF 1*NetworkStatus "." CRLF "650" SP
-     "OK" CRLF
-
-  A new consensus networkstatus has arrived. We include NS-style lines for
-  every relay in the consensus. NEWCONSENSUS is a separate event from the
-  NS event, because the list here represents every usable relay: so any
-  relay *not* mentioned in this list is implicitly no longer recommended.
-
-  [First added in 0.2.1.13-alpha]
-
-5. Implementation notes
-
-5.1. Authentication
-
-  If the control port is open and no authentication operation is enabled, Tor
-  trusts any local user that connects to the control port.  This is generally
-  a poor idea.
-
-  If the 'CookieAuthentication' option is true, Tor writes a "magic cookie"
-  file named "control_auth_cookie" into its data directory.  To authenticate,
-  the controller must send the contents of this file, encoded in hexadecimal.
-
-  If the 'HashedControlPassword' option is set, it must contain the salted
-  hash of a secret password.  The salted hash is computed according to the
-  S2K algorithm in RFC 2440 (OpenPGP), and prefixed with the s2k specifier.
-  This is then encoded in hexadecimal, prefixed by the indicator sequence
-  "16:".  Thus, for example, the password 'foo' could encode to:
-     16:660537E3E1CD49996044A3BF558097A981F539FEA2F9DA662B4626C1C2
-        ++++++++++++++++**^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-           salt                       hashed value
-                       indicator
-  You can generate the salt of a password by calling
-           'tor --hash-password <password>'
-  or by using the example code in the Python and Java controller libraries.
-  To authenticate under this scheme, the controller sends Tor the original
-  secret that was used to generate the password, either as a quoted string
-  or encoded in hexadecimal.
-
-5.2. Don't let the buffer get too big.
-
-  If you ask for lots of events, and 16MB of them queue up on the buffer,
-  the Tor process will close the socket.
-
-5.3. Backward compatibility with v0 control protocol.
-
-  The 'version 0' control protocol was replaced in Tor 0.1.1.x. Support
-  was removed in Tor 0.2.0.x. Every non-obsolete version of Tor now
-  supports the version 1 control protocol.
-
-  For backward compatibility with the "version 0" control protocol,
-  Tor used to check whether the third octet of the first command is zero.
-  (If it was, Tor assumed that version 0 is in use.)
-
-  This compatibility was removed in Tor 0.1.2.16 and 0.2.0.4-alpha.
-
-5.4. Tor config options for use by controllers
-
-  Tor provides a few special configuration options for use by controllers.
-  These options can be set and examined by the SETCONF and GETCONF commands,
-  but are not saved to disk by SAVECONF.
-
-  Generally, these options make Tor unusable by disabling a portion of Tor's
-  normal operations.  Unless a controller provides replacement functionality
-  to fill this gap, Tor will not correctly handle user requests.
-
-  __AllDirOptionsPrivate
-
-    If true, Tor will try to launch all directory operations through
-    anonymous connections.  (Ordinarily, Tor only tries to anonymize
-    requests related to hidden services.)  This option will slow down
-    directory access, and may stop Tor from working entirely if it does not
-    yet have enough directory information to build circuits.
-
-    (Boolean. Default: "0".)
-
-  __DisablePredictedCircuits
-
-    If true, Tor will not launch preemptive "general-purpose" circuits for
-    streams to attach to.  (It will still launch circuits for testing and
-    for hidden services.)
-
-    (Boolean. Default: "0".)
-
-  __LeaveStreamsUnattached
-
-    If true, Tor will not automatically attach new streams to circuits;
-    instead, the controller must attach them with ATTACHSTREAM.  If the
-    controller does not attach the streams, their data will never be routed.
-
-    (Boolean. Default: "0".)
-
-  __HashedControlSessionPassword
-
-    As HashedControlPassword, but is not saved to the torrc file by
-    SAVECONF.  Added in Tor 0.2.0.20-rc.
-
-  __ReloadTorrcOnSIGHUP
-
-    If this option is true (the default), we reload the torrc from disk
-    every time we get a SIGHUP (from the controller or via a signal).
-    Otherwise, we don't.  This option exists so that controllers can keep
-    their options from getting overwritten when a user sends Tor a HUP for
-    some other reason (for example, to rotate the logs).
-
-    (Boolean.  Default: "1")
-
-5.5. Phases from the Bootstrap status event.
-
-  This section describes the various bootstrap phases currently reported
-  by Tor. Controllers should not assume that the percentages and tags
-  listed here will continue to match up, or even that the tags will stay
-  in the same order. Some phases might also be skipped (not reported)
-  if the associated bootstrap step is already complete, or if the phase
-  no longer is necessary. Only "starting" and "done" are guaranteed to
-  exist in all future versions.
-
-  Current Tor versions enter these phases in order, monotonically.
-  Future Tors MAY revisit earlier stages.
-
-  Phase 0:
-  tag=starting summary="Starting"
-
-  Tor starts out in this phase.
-
-  Phase 5:
-  tag=conn_dir summary="Connecting to directory mirror"
-
-  Tor sends this event as soon as Tor has chosen a directory mirror --
-  e.g. one of the authorities if bootstrapping for the first time or
-  after a long downtime, or one of the relays listed in its cached
-  directory information otherwise.
-
-  Tor will stay at this phase until it has successfully established
-  a TCP connection with some directory mirror. Problems in this phase
-  generally happen because Tor doesn't have a network connection, or
-  because the local firewall is dropping SYN packets.
-
-  Phase 10:
-  tag=handshake_dir summary="Finishing handshake with directory mirror"
-
-  This event occurs when Tor establishes a TCP connection with a relay used
-  as a directory mirror (or its https proxy if it's using one). Tor remains
-  in this phase until the TLS handshake with the relay is finished.
-
-  Problems in this phase generally happen because Tor's firewall is
-  doing more sophisticated MITM attacks on it, or doing packet-level
-  keyword recognition of Tor's handshake.
-
-  Phase 15:
-  tag=onehop_create summary="Establishing one-hop circuit for dir info"
-
-  Once TLS is finished with a relay, Tor will send a CREATE_FAST cell
-  to establish a one-hop circuit for retrieving directory information.
-  It will remain in this phase until it receives the CREATED_FAST cell
-  back, indicating that the circuit is ready.
-
-  Phase 20:
-  tag=requesting_status summary="Asking for networkstatus consensus"
-
-  Once we've finished our one-hop circuit, we will start a new stream
-  for fetching the networkstatus consensus. We'll stay in this phase
-  until we get the 'connected' relay cell back, indicating that we've
-  established a directory connection.
-
-  Phase 25:
-  tag=loading_status summary="Loading networkstatus consensus"
-
-  Once we've established a directory connection, we will start fetching
-  the networkstatus consensus document. This could take a while; this
-  phase is a good opportunity for using the "progress" keyword to indicate
-  partial progress.
-
-  This phase could stall if the directory mirror we picked doesn't
-  have a copy of the networkstatus consensus so we have to ask another,
-  or it does give us a copy but we don't find it valid.
-
-  Phase 40:
-  tag=loading_keys summary="Loading authority key certs"
-
-  Sometimes when we've finished loading the networkstatus consensus,
-  we find that we don't have all the authority key certificates for the
-  keys that signed the consensus. At that point we put the consensus we
-  fetched on hold and fetch the keys so we can verify the signatures.
-
-  Phase 45
-  tag=requesting_descriptors summary="Asking for relay descriptors"
-
-  Once we have a valid networkstatus consensus and we've checked all
-  its signatures, we start asking for relay descriptors. We stay in this
-  phase until we have received a 'connected' relay cell in response to
-  a request for descriptors.
-
-  Phase 50:
-  tag=loading_descriptors summary="Loading relay descriptors"
-
-  We will ask for relay descriptors from several different locations,
-  so this step will probably make up the bulk of the bootstrapping,
-  especially for users with slow connections. We stay in this phase until
-  we have descriptors for at least 1/4 of the usable relays listed in
-  the networkstatus consensus. This phase is also a good opportunity to
-  use the "progress" keyword to indicate partial steps.
-
-  Phase 80:
-  tag=conn_or summary="Connecting to entry guard"
-
-  Once we have a valid consensus and enough relay descriptors, we choose
-  some entry guards and start trying to build some circuits. This step
-  is similar to the "conn_dir" phase above; the only difference is
-  the context.
-
-  If a Tor starts with enough recent cached directory information,
-  its first bootstrap status event will be for the conn_or phase.
-
-  Phase 85:
-  tag=handshake_or summary="Finishing handshake with entry guard"
-
-  This phase is similar to the "handshake_dir" phase, but it gets reached
-  if we finish a TCP connection to a Tor relay and we have already reached
-  the "conn_or" phase. We'll stay in this phase until we complete a TLS
-  handshake with a Tor relay.
-
-  Phase 90:
-  tag=circuit_create summary="Establishing circuits"
-
-  Once we've finished our TLS handshake with an entry guard, we will
-  set about trying to make some 3-hop circuits in case we need them soon.
-
-  Phase 100:
-  tag=done summary="Done"
-
-  A full 3-hop exit circuit has been established. Tor is ready to handle
-  application connections now.
-
diff --git a/orchid/doc/spec/dir-spec.txt b/orchid/doc/spec/dir-spec.txt
deleted file mode 100644
index faa3a6609b3..00000000000
--- a/orchid/doc/spec/dir-spec.txt
+++ /dev/null
@@ -1,2132 +0,0 @@
-
-                      Tor directory protocol, version 3
-
-0. Scope and preliminaries
-
-   This directory protocol is used by Tor version 0.2.0.x-alpha and later.
-   See dir-spec-v1.txt for information on the protocol used up to the
-   0.1.0.x series, and dir-spec-v2.txt for information on the protocol
-   used by the 0.1.1.x and 0.1.2.x series.
-
-   Caches and authorities must still support older versions of the
-   directory protocols, until the versions of Tor that require them are
-   finally out of commission.  See Section XXXX on backward compatibility.
-
-   This document merges and supersedes the following proposals:
-
-       101  Voting on the Tor Directory System
-       103  Splitting identity key from regularly used signing key
-       104  Long and Short Router Descriptors
-
-   AS OF 14 JUNE 2007, THIS SPECIFICATION HAS NOT YET BEEN COMPLETELY
-   IMPLEMENTED, OR COMPLETELY COMPLETED.
-
-   XXX when to download certificates.
-   XXX timeline
-   XXX fill in XXXXs
-
-0.1. History
-
-   The earliest versions of Onion Routing shipped with a list of known
-   routers and their keys.  When the set of routers changed, users needed to
-   fetch a new list.
-
-   The Version 1 Directory protocol
-   --------------------------------
-
-   Early versions of Tor (0.0.2) introduced "Directory authorities": servers
-   that served signed "directory" documents containing a list of signed
-   "router descriptors", along with short summary of the status of each
-   router.  Thus, clients could get up-to-date information on the state of
-   the network automatically, and be certain that the list they were getting
-   was attested by a trusted directory authority.
-
-   Later versions (0.0.8) added directory caches, which download
-   directories from the authorities and serve them to clients.  Non-caches
-   fetch from the caches in preference to fetching from the authorities, thus
-   distributing bandwidth requirements.
-
-   Also added during the version 1 directory protocol were "router status"
-   documents: short documents that listed only the up/down status of the
-   routers on the network, rather than a complete list of all the
-   descriptors.  Clients and caches would fetch these documents far more
-   frequently than they would fetch full directories.
-
-   The Version 2 Directory Protocol
-   --------------------------------
-
-   During the Tor 0.1.1.x series, Tor revised its handling of directory
-   documents in order to address two major problems:
-
-      * Directories had grown quite large (over 1MB), and most directory
-        downloads consisted mainly of router descriptors that clients
-        already had.
-
-      * Every directory authority was a trust bottleneck: if a single
-        directory authority lied, it could make clients believe for a time
-        an arbitrarily distorted view of the Tor network.  (Clients
-        trusted the most recent signed document they downloaded.) Thus,
-        adding more authorities would make the system less secure, not
-        more.
-
-   To address these, we extended the directory protocol so that
-   authorities now published signed "network status" documents.  Each
-   network status listed, for every router in the network: a hash of its
-   identity key, a hash of its most recent descriptor, and a summary of
-   what the authority believed about its status.  Clients would download
-   the authorities' network status documents in turn, and believe
-   statements about routers iff they were attested to by more than half of
-   the authorities.
-
-   Instead of downloading all router descriptors at once, clients
-   downloaded only the descriptors that they did not have.  Descriptors
-   were indexed by their digests, in order to prevent malicious caches
-   from giving different versions of a router descriptor to different
-   clients.
-
-   Routers began working harder to upload new descriptors only when their
-   contents were substantially changed.
-
-
-0.2. Goals of the version 3 protocol
-
-   Version 3 of the Tor directory protocol tries to solve the following
-   issues:
-
-      * A great deal of bandwidth used to transmit router descriptors was
-        used by two fields that are not actually used by Tor routers
-        (namely read-history and write-history).  We save about 60% by
-        moving them into a separate document that most clients do not
-        fetch or use.
-
-      * It was possible under certain perverse circumstances for clients
-        to download an unusual set of network status documents, thus
-        partitioning themselves from clients who have a more recent and/or
-        typical set of documents.  Even under the best of circumstances,
-        clients were sensitive to the ages of the network status documents
-        they downloaded.  Therefore, instead of having the clients
-        correlate multiple network status documents, we have the
-        authorities collectively vote on a single consensus network status
-        document.
-
-      * The most sensitive data in the entire network (the identity keys
-        of the directory authorities) needed to be stored unencrypted so
-        that the authorities can sign network-status documents on the fly.
-        Now, the authorities' identity keys are stored offline, and used
-        to certify medium-term signing keys that can be rotated.
-
-0.3. Some Remaining questions
-
-   Things we could solve on a v3 timeframe:
-
-     The SHA-1 hash is showing its age.  We should do something about our
-     dependency on it.  We could probably future-proof ourselves here in
-     this revision, at least so far as documents from the authorities are
-     concerned.
-
-     Too many things about the authorities are hardcoded by IP.
-
-     Perhaps we should start accepting longer identity keys for routers
-     too.
-
-   Things to solve eventually:
-
-     Requiring every client to know about every router won't scale forever.
-
-     Requiring every directory cache to know every router won't scale
-     forever.
-
-
-1. Outline
-
-   There is a small set (say, around 5-10) of semi-trusted directory
-   authorities.  A default list of authorities is shipped with the Tor
-   software.  Users can change this list, but are encouraged not to do so,
-   in order to avoid partitioning attacks.
-
-   Every authority has a very-secret, long-term "Authority Identity Key".
-   This is stored encrypted and/or offline, and is used to sign "key
-   certificate" documents.  Every key certificate contains a medium-term
-   (3-12 months) "authority signing key", that is used by the authority to
-   sign other directory information.  (Note that the authority identity
-   key is distinct from the router identity key that the authority uses
-   in its role as an ordinary router.)
-
-   Routers periodically upload signed "routers descriptors" to the
-   directory authorities describing their keys, capabilities, and other
-   information.  Routers may also upload signed "extra info documents"
-   containing information that is not required for the Tor protocol.
-   Directory authorities serve router descriptors indexed by router
-   identity, or by hash of the descriptor.
-
-   Routers may act as directory caches to reduce load on the directory
-   authorities.  They announce this in their descriptors.
-
-   Periodically, each directory authority generates a view of
-   the current descriptors and status for known routers.  They send a
-   signed summary of this view (a "status vote") to the other
-   authorities.  The authorities compute the result of this vote, and sign
-   a "consensus status" document containing the result of the vote.
-
-   Directory caches download, cache, and re-serve consensus documents.
-
-   Clients, directory caches, and directory authorities all use consensus
-   documents to find out when their list of routers is out-of-date.
-   (Directory authorities also use vote statuses.) If it is, they download
-   any missing router descriptors.  Clients download missing descriptors
-   from caches; caches and authorities download from authorities.
-   Descriptors are downloaded by the hash of the descriptor, not by the
-   server's identity key: this prevents servers from attacking clients by
-   giving them descriptors nobody else uses.
-
-   All directory information is uploaded and downloaded with HTTP.
-
-   [Authorities also generate and caches also cache documents produced and
-   used by earlier versions of this protocol; see section XXX for notes.]
-
-1.1. What's different from version 2?
-
-   Clients used to download multiple network status documents,
-   corresponding roughly to "status votes" above.  They would compute the
-   result of the vote on the client side.
-
-   Authorities used to sign documents using the same private keys they used
-   for their roles as routers.  This forced them to keep these extremely
-   sensitive keys in memory unencrypted.
-
-   All of the information in extra-info documents used to be kept in the
-   main descriptors.
-
-1.2. Document meta-format
-
-  Router descriptors, directories, and running-routers documents all obey the
-  following lightweight extensible information format.
-
-  The highest level object is a Document, which consists of one or more
-  Items.  Every Item begins with a KeywordLine, followed by zero or more
-  Objects. A KeywordLine begins with a Keyword, optionally followed by
-  whitespace and more non-newline characters, and ends with a newline.  A
-  Keyword is a sequence of one or more characters in the set [A-Za-z0-9-].
-  An Object is a block of encoded data in pseudo-Open-PGP-style
-  armor. (cf. RFC 2440)
-
-  More formally:
-
-    NL = The ascii LF character (hex value 0x0a).
-    Document ::= (Item | NL)+
-    Item ::= KeywordLine Object*
-    KeywordLine ::= Keyword NL | Keyword WS ArgumentChar+ NL
-    Keyword = KeywordChar+
-    KeywordChar ::= 'A' ... 'Z' | 'a' ... 'z' | '0' ... '9' | '-'
-    ArgumentChar ::= any printing ASCII character except NL.
-    WS = (SP | TAB)+
-    Object ::= BeginLine Base-64-encoded-data EndLine
-    BeginLine ::= "-----BEGIN " Keyword "-----" NL
-    EndLine ::= "-----END " Keyword "-----" NL
-
-    The BeginLine and EndLine of an Object must use the same keyword.
-
-  When interpreting a Document, software MUST ignore any KeywordLine that
-  starts with a keyword it doesn't recognize; future implementations MUST NOT
-  require current clients to understand any KeywordLine not currently
-  described.
-
-  The "opt" keyword was used until Tor 0.1.2.5-alpha for non-critical future
-  extensions.  All implementations MUST ignore any item of the form "opt
-  keyword ....." when they would not recognize "keyword ....."; and MUST
-  treat "opt keyword ....."  as synonymous with "keyword ......" when keyword
-  is recognized.
-
-  Implementations before 0.1.2.5-alpha rejected any document with a
-  KeywordLine that started with a keyword that they didn't recognize.
-  When generating documents that need to be read by older versions of Tor,
-  implementations MUST prefix items not recognized by older versions of
-  Tor with an "opt" until those versions of Tor are obsolete.  [Note that
-  key certificates, status vote documents, extra info documents, and
-  status consensus documents will never be read by older versions of Tor.]
-
-  Other implementations that want to extend Tor's directory format MAY
-  introduce their own items.  The keywords for extension items SHOULD start
-  with the characters "x-" or "X-", to guarantee that they will not conflict
-  with keywords used by future versions of Tor.
-
-  In our document descriptions below, we tag Items with a multiplicity in
-  brackets.  Possible tags are:
-
-    "At start, exactly once": These items MUST occur in every instance of
-      the document type, and MUST appear exactly once, and MUST be the
-      first item in their documents.
-
-    "Exactly once": These items MUST occur exactly one time in every
-      instance of the document type.
-
-    "At end, exactly once": These items MUST occur in every instance of
-      the document type, and MUST appear exactly once, and MUST be the
-      last item in their documents.
-
-    "At most once": These items MAY occur zero or one times in any
-      instance of the document type, but MUST NOT occur more than once.
-
-    "Any number": These items MAY occur zero, one, or more times in any
-      instance of the document type.
-
-    "Once or more": These items MUST occur at least once in any instance
-      of the document type, and MAY occur more.
-
-1.3. Signing documents
-
-   Every signable document below is signed in a similar manner, using a
-   given "Initial Item", a final "Signature Item", a digest algorithm, and
-   a signing key.
-
-   The Initial Item must be the first item in the document.
-
-   The Signature Item has the following format:
-
-     <signature item keyword> [arguments] NL SIGNATURE NL
-
-   The "SIGNATURE" Object contains a signature (using the signing key) of
-   the PKCS1-padded digest of the entire document, taken from the
-   beginning of the Initial item, through the newline after the Signature
-   Item's keyword and its arguments.
-
-   Unless otherwise, the digest algorithm is SHA-1.
-
-   All documents are invalid unless signed with the correct signing key.
-
-   The "Digest" of a document, unless stated otherwise, is its digest *as
-   signed by this signature scheme*.
-
-1.4. Voting timeline
-
-   Every consensus document has a "valid-after" (VA) time, a "fresh-until"
-   (FU) time and a "valid-until" (VU) time.  VA MUST precede FU, which MUST
-   in turn precede VU.  Times are chosen so that every consensus will be
-   "fresh" until the next consensus becomes valid, and "valid" for a while
-   after.  At least 3 consensuses should be valid at any given time.
-
-   The timeline for a given consensus is as follows:
-
-   VA-DistSeconds-VoteSeconds: The authorities exchange votes.
-
-   VA-DistSeconds-VoteSeconds/2: The authorities try to download any
-   votes they don't have.
-
-   VA-DistSeconds: The authorities calculate the consensus and exchange
-   signatures.
-
-   VA-DistSeconds/2: The authorities try to download any signatures
-   they don't have.
-
-   VA: All authorities have a multiply signed consensus.
-
-   VA ... FU: Caches download the consensus.  (Note that since caches have
-        no way of telling what VA and FU are until they have downloaded
-        the consensus, they assume that the present consensus's VA is
-        equal to the previous one's FU, and that its FU is one interval after
-        that.)
-
-   FU: The consensus is no longer the freshest consensus.
-
-   FU ... (the current consensus's VU): Clients download the consensus.
-        (See note above: clients guess that the next consensus's FU will be
-        two intervals after the current VA.)
-
-   VU: The consensus is no longer valid.
-
-   VoteSeconds and DistSeconds MUST each be at least 20 seconds; FU-VA and
-   VU-FU MUST each be at least 5 minutes.
-
-2. Router operation and formats
-
-   ORs SHOULD generate a new router descriptor and a new extra-info
-   document whenever any of the following events have occurred:
-
-      - A period of time (18 hrs by default) has passed since the last
-        time a descriptor was generated.
-
-      - A descriptor field other than bandwidth or uptime has changed.
-
-      - Bandwidth has changed by a factor of 2 from the last time a
-        descriptor was generated, and at least a given interval of time
-        (20 mins by default) has passed since then.
-
-      - Its uptime has been reset (by restarting).
-
-      [XXX this list is incomplete; see router_differences_are_cosmetic()
-       in routerlist.c for others]
-
-   ORs SHOULD NOT publish a new router descriptor or extra-info document
-   if none of the above events have occurred and not much time has passed
-   (12 hours by default).
-
-   After generating a descriptor, ORs upload them to every directory
-   authority they know, by posting them (in order) to the URL
-
-      http://<hostname:port>/tor/
-
-2.1. Router descriptor format
-
-   Router descriptors consist of the following items.  For backward
-   compatibility, there should be an extra NL at the end of each router
-   descriptor.
-
-   In lines that take multiple arguments, extra arguments SHOULD be
-   accepted and ignored.  Many of the nonterminals below are defined in
-   section 2.3.
-
-     "router" nickname address ORPort SOCKSPort DirPort NL
-
-       [At start, exactly once.]
-
-       Indicates the beginning of a router descriptor.  "nickname" must be a
-       valid router nickname as specified in 2.3.  "address" must be an IPv4
-       address in dotted-quad format.  The last three numbers indicate the
-       TCP ports at which this OR exposes functionality. ORPort is a port at
-       which this OR accepts TLS connections for the main OR protocol;
-       SOCKSPort is deprecated and should always be 0; and DirPort is the
-       port at which this OR accepts directory-related HTTP connections.  If
-       any port is not supported, the value 0 is given instead of a port
-       number.  (At least one of DirPort and ORPort SHOULD be set;
-       authorities MAY reject any descriptor with both DirPort and ORPort of
-       0.)
-
-    "bandwidth" bandwidth-avg bandwidth-burst bandwidth-observed NL
-
-       [Exactly once]
-
-       Estimated bandwidth for this router, in bytes per second.  The
-       "average" bandwidth is the volume per second that the OR is willing to
-       sustain over long periods; the "burst" bandwidth is the volume that
-       the OR is willing to sustain in very short intervals.  The "observed"
-       value is an estimate of the capacity this server can handle.  The
-       server remembers the max bandwidth sustained output over any ten
-       second period in the past day, and another sustained input.  The
-       "observed" value is the lesser of these two numbers.
-
-    "platform" string NL
-
-       [At most once]
-
-       A human-readable string describing the system on which this OR is
-       running.  This MAY include the operating system, and SHOULD include
-       the name and version of the software implementing the Tor protocol.
-
-    "published" YYYY-MM-DD HH:MM:SS NL
-
-       [Exactly once]
-
-       The time, in GMT, when this descriptor (and its corresponding
-       extra-info document if any)  was generated.
-
-    "fingerprint" fingerprint NL
-
-       [At most once]
-
-       A fingerprint (a HASH_LEN-byte of asn1 encoded public key, encoded in
-       hex, with a single space after every 4 characters) for this router's
-       identity key. A descriptor is considered invalid (and MUST be
-       rejected) if the fingerprint line does not match the public key.
-
-       [We didn't start parsing this line until Tor 0.1.0.6-rc; it should
-        be marked with "opt" until earlier versions of Tor are obsolete.]
-
-    "hibernating" bool NL
-
-       [At most once]
-
-       If the value is 1, then the Tor server was hibernating when the
-       descriptor was published, and shouldn't be used to build circuits.
-
-       [We didn't start parsing this line until Tor 0.1.0.6-rc; it should be
-        marked with "opt" until earlier versions of Tor are obsolete.]
-
-    "uptime" number NL
-
-       [At most once]
-
-       The number of seconds that this OR process has been running.
-
-    "onion-key" NL a public key in PEM format
-
-       [Exactly once]
-
-       This key is used to encrypt EXTEND cells for this OR.  The key MUST be
-       accepted for at least 1 week after any new key is published in a
-       subsequent descriptor. It MUST be 1024 bits.
-
-    "signing-key" NL a public key in PEM format
-
-       [Exactly once]
-
-       The OR's long-term identity key.  It MUST be 1024 bits.
-
-    "accept" exitpattern NL
-    "reject" exitpattern NL
-
-       [Any number]
-
-       These lines describe an "exit policy": the rules that an OR follows
-       when deciding whether to allow a new stream to a given address.  The
-       'exitpattern' syntax is described below.  There MUST be at least one
-       such entry.  The rules are considered in order; if no rule matches,
-       the address will be accepted.  For clarity, the last such entry SHOULD
-       be accept *:* or reject *:*.
-
-    "router-signature" NL Signature NL
-
-       [At end, exactly once]
-
-       The "SIGNATURE" object contains a signature of the PKCS1-padded
-       hash of the entire router descriptor, taken from the beginning of the
-       "router" line, through the newline after the "router-signature" line.
-       The router descriptor is invalid unless the signature is performed
-       with the router's identity key.
-
-    "contact" info NL
-
-       [At most once]
-
-       Describes a way to contact the server's administrator, preferably
-       including an email address and a PGP key fingerprint.
-
-    "family" names NL
-
-        [At most once]
-
-        'Names' is a space-separated list of server nicknames or
-        hexdigests. If two ORs list one another in their "family" entries,
-        then OPs should treat them as a single OR for the purpose of path
-        selection.
-
-        For example, if node A's descriptor contains "family B", and node B's
-        descriptor contains "family A", then node A and node B should never
-        be used on the same circuit.
-
-    "read-history" YYYY-MM-DD HH:MM:SS (NSEC s) NUM,NUM,NUM,NUM,NUM... NL
-        [At most once]
-    "write-history" YYYY-MM-DD HH:MM:SS (NSEC s) NUM,NUM,NUM,NUM,NUM... NL
-        [At most once]
-
-        Declare how much bandwidth the OR has used recently. Usage is divided
-        into intervals of NSEC seconds.  The YYYY-MM-DD HH:MM:SS field
-        defines the end of the most recent interval.  The numbers are the
-        number of bytes used in the most recent intervals, ordered from
-        oldest to newest.
-
-        [We didn't start parsing these lines until Tor 0.1.0.6-rc; they should
-         be marked with "opt" until earlier versions of Tor are obsolete.]
-
-        [See also migration notes in section 2.2.1.]
-
-    "eventdns" bool NL
-
-        [At most once]
-
-        Declare whether this version of Tor is using the newer enhanced
-        dns logic.  Versions of Tor with this field set to false SHOULD NOT
-        be used for reverse hostname lookups.
-
-        [All versions of Tor before 0.1.2.2-alpha should be assumed to have
-         this option set to 0 if it is not present.  All Tor versions at
-         0.1.2.2-alpha or later should be assumed to have this option set to
-         1 if it is not present.  Until 0.1.2.1-alpha-dev, this option was
-         not generated, even when the new DNS code was in use.  Versions of Tor
-         before 0.1.2.1-alpha-dev did not parse this option, so it should be
-         marked "opt".  The dnsworker logic has been removed, so this option
-         should not be used by new server code.  However, it can still be
-         used, and should still be recognized by new code until Tor 0.1.2.x
-         is obsolete.]
-
-   "caches-extra-info" NL
-
-       [At most once.]
-
-       Present only if this router is a directory cache that provides
-       extra-info documents.
-
-       [Versions before 0.2.0.1-alpha don't recognize this, and versions
-        before 0.1.2.5-alpha will reject descriptors containing it unless
-        it is prefixed with "opt"; it should be so prefixed until these
-        versions are obsolete.]
-
-   "extra-info-digest" digest NL
-
-       [At most once]
-
-       "Digest" is a hex-encoded digest (using upper-case characters) of the
-       router's extra-info document, as signed in the router's extra-info
-       (that is, not including the signature).  (If this field is absent, the
-       router is not uploading a corresponding extra-info document.)
-
-       [Versions before 0.2.0.1-alpha don't recognize this, and versions
-        before 0.1.2.5-alpha will reject descriptors containing it unless
-        it is prefixed with "opt"; it should be so prefixed until these
-        versions are obsolete.]
-
-   "hidden-service-dir" *(SP VersionNum) NL
-
-       [At most once.]
-
-       Present only if this router stores and serves hidden service
-       descriptors. If any VersionNum(s) are specified, this router
-       supports those descriptor versions. If none are specified, it
-       defaults to version 2 descriptors.
-
-       [Versions of Tor before 0.1.2.5-alpha rejected router descriptors
-        with unrecognized items; the protocols line should be preceded with
-        an "opt" until these Tors are obsolete.]
-
-   "protocols" SP "Link" SP LINK-VERSION-LIST SP "Circuit" SP
-          CIRCUIT-VERSION-LIST NL
-
-       [At most once.]
-
-       Both lists are space-separated sequences of numbers, to indicate which
-       protocols the server supports.  As of 30 Mar 2008, specified
-       protocols are "Link 1 2 Circuit 1".  See section 4.1 of tor-spec.txt
-       for more information about link protocol versions.
-
-       [Versions of Tor before 0.1.2.5-alpha rejected router descriptors
-        with unrecognized items; the protocols line should be preceded with
-        an "opt" until these Tors are obsolete.]
-
-   "allow-single-hop-exits"
-
-       [At most once.]
-
-       Present only if the router allows single-hop circuits to make exit
-       connections.  Most Tor servers do not support this: this is
-       included for specialized controllers designed to support perspective
-       access and such.
-
-
-2.2. Extra-info documents
-
-   Extra-info documents consist of the following items:
-
-    "extra-info" Nickname Fingerprint NL
-        [At start, exactly once.]
-
-        Identifies what router this is an extra info descriptor for.
-        Fingerprint is encoded in hex (using upper-case letters), with
-        no spaces.
-
-    "published"
-
-       [Exactly once.]
-
-       The time, in GMT, when this document (and its corresponding router
-       descriptor if any) was generated.  It MUST match the published time
-       in the corresponding router descriptor.
-
-    "read-history" YYYY-MM-DD HH:MM:SS (NSEC s) NUM,NUM,NUM,NUM,NUM... NL
-        [At most once.]
-    "write-history" YYYY-MM-DD HH:MM:SS (NSEC s) NUM,NUM,NUM,NUM,NUM... NL
-        [At most once.]
-
-        As documented in 2.1 above.  See migration notes in section 2.2.1.
-
-    "geoip-start" YYYY-MM-DD HH:MM:SS NL
-    "geoip-client-origins" CC=N,CC=N,... NL
-
-        Only generated by bridge routers (see blocking.pdf), and only
-        when they have been configured with a geoip database.
-        Non-bridges SHOULD NOT generate these fields.  Contains a list
-        of mappings from two-letter country codes (CC) to the number
-        of clients that have connected to that bridge from that
-        country (approximate, and rounded up to the nearest multiple of 8
-        in order to hamper traffic analysis).  A country is included
-        only if it has at least one address.  The time in
-        "geoip-start" is the time at which we began collecting geoip
-        statistics.
-
-    "dirreq-stats-end" YYYY-MM-DD HH:MM:SS (NSEC s) NL
-        [At most once.]
-
-        YYYY-MM-DD HH:MM:SS defines the end of the included measurement
-        interval of length NSEC seconds (86400 seconds by default).
-
-        A "dirreq-stats-end" line, as well as any other "dirreq-*" line,
-        is only added when the relay has opened its Dir port and after 24
-        hours of measuring directory requests.
-
-    "dirreq-v2-ips" CC=N,CC=N,... NL
-        [At most once.]
-    "dirreq-v3-ips" CC=N,CC=N,... NL
-        [At most once.]
-
-        List of mappings from two-letter country codes to the number of
-        unique IP addresses that have connected from that country to
-        request a v2/v3 network status, rounded up to the nearest multiple
-        of 8. Only those IP addresses are counted that the directory can
-        answer with a 200 OK status code.
-
-    "dirreq-v2-reqs" CC=N,CC=N,... NL
-        [At most once.]
-    "dirreq-v3-reqs" CC=N,CC=N,... NL
-        [At most once.]
-
-        List of mappings from two-letter country codes to the number of
-        requests for v2/v3 network statuses from that country, rounded up
-        to the nearest multiple of 8. Only those requests are counted that
-        the directory can answer with a 200 OK status code.
-
-    "dirreq-v2-share" num% NL
-        [At most once.]
-    "dirreq-v3-share" num% NL
-        [At most once.]
-
-        The share of v2/v3 network status requests that the directory
-        expects to receive from clients based on its advertised bandwidth
-        compared to the overall network bandwidth capacity. Shares are
-        formatted in percent with two decimal places. Shares are
-        calculated as means over the whole 24-hour interval.
-
-    "dirreq-v2-resp" status=num,... NL
-        [At most once.]
-    "dirreq-v3-resp" status=nul,... NL
-        [At most once.]
-
-        List of mappings from response statuses to the number of requests
-        for v2/v3 network statuses that were answered with that response
-        status, rounded up to the nearest multiple of 4. Only response
-        statuses with at least 1 response are reported. New response
-        statuses can be added at any time. The current list of response
-        statuses is as follows:
-
-        "ok": a network status request is answered; this number
-           corresponds to the sum of all requests as reported in
-           "dirreq-v2-reqs" or "dirreq-v3-reqs", respectively, before
-           rounding up.
-        "not-enough-sigs: a version 3 network status is not signed by a
-           sufficient number of requested authorities.
-        "unavailable": a requested network status object is unavailable.
-        "not-found": a requested network status is not found.
-        "not-modified": a network status has not been modified since the
-           If-Modified-Since time that is included in the request.
-        "busy": the directory is busy.
-
-    "dirreq-v2-direct-dl" key=val,... NL
-        [At most once.]
-    "dirreq-v3-direct-dl" key=val,... NL
-        [At most once.]
-    "dirreq-v2-tunneled-dl" key=val,... NL
-        [At most once.]
-    "dirreq-v3-tunneled-dl" key=val,... NL
-        [At most once.]
-
-        List of statistics about possible failures in the download process
-        of v2/v3 network statuses. Requests are either "direct"
-        HTTP-encoded requests over the relay's directory port, or
-        "tunneled" requests using a BEGIN_DIR cell over the relay's OR
-        port. The list of possible statistics can change, and statistics
-        can be left out from reporting. The current list of statistics is
-        as follows:
-
-        Successful downloads and failures:
-
-        "complete": a client has finished the download successfully.
-        "timeout": a download did not finish within 10 minutes after
-           starting to send the response.
-        "running": a download is still running at the end of the
-           measurement period for less than 10 minutes after starting to
-           send the response.
-
-        Download times:
-
-        "min", "max": smallest and largest measured bandwidth in B/s.
-        "d[1-4,6-9]": 1st to 4th and 6th to 9th decile of measured
-           bandwidth in B/s. For a given decile i, i/10 of all downloads
-           had a smaller bandwidth than di, and (10-i)/10 of all downloads
-           had a larger bandwidth than di.
-        "q[1,3]": 1st and 3rd quartile of measured bandwidth in B/s. One
-           fourth of all downloads had a smaller bandwidth than q1, one
-           fourth of all downloads had a larger bandwidth than q3, and the
-           remaining half of all downloads had a bandwidth between q1 and
-           q3.
-        "md": median of measured bandwidth in B/s. Half of the downloads
-           had a smaller bandwidth than md, the other half had a larger
-           bandwidth than md.
-
-    "entry-stats-end" YYYY-MM-DD HH:MM:SS (NSEC s) NL
-        [At most once.]
-
-        YYYY-MM-DD HH:MM:SS defines the end of the included measurement
-        interval of length NSEC seconds (86400 seconds by default).
-
-        An "entry-stats-end" line, as well as any other "entry-*"
-        line, is first added after the relay has been running for at least
-        24 hours.
-
-    "entry-ips" CC=N,CC=N,... NL
-        [At most once.]
-
-        List of mappings from two-letter country codes to the number of
-        unique IP addresses that have connected from that country to the
-        relay and which are no known other relays, rounded up to the
-        nearest multiple of 8.
-
-    "cell-stats-end" YYYY-MM-DD HH:MM:SS (NSEC s) NL
-        [At most once.]
-
-        YYYY-MM-DD HH:MM:SS defines the end of the included measurement
-        interval of length NSEC seconds (86400 seconds by default).
-
-        A "cell-stats-end" line, as well as any other "cell-*" line,
-        is first added after the relay has been running for at least 24
-        hours.
-
-    "cell-processed-cells" num,...,num NL
-        [At most once.]
-
-        Mean number of processed cells per circuit, subdivided into
-        deciles of circuits by the number of cells they have processed in
-        descending order from loudest to quietest circuits.
-
-    "cell-queued-cells" num,...,num NL
-        [At most once.]
-
-        Mean number of cells contained in queues by circuit decile. These
-        means are calculated by 1) determining the mean number of cells in
-        a single circuit between its creation and its termination and 2)
-        calculating the mean for all circuits in a given decile as
-        determined in "cell-processed-cells". Numbers have a precision of
-        two decimal places.
-
-    "cell-time-in-queue" num,...,num NL
-        [At most once.]
-
-        Mean time cells spend in circuit queues in milliseconds. Times are
-        calculated by 1) determining the mean time cells spend in the
-        queue of a single circuit and 2) calculating the mean for all
-        circuits in a given decile as determined in
-        "cell-processed-cells".
-
-    "cell-circuits-per-decile" num NL
-        [At most once.]
-
-        Mean number of circuits that are included in any of the deciles,
-        rounded up to the next integer.
-
-    "exit-stats-end" YYYY-MM-DD HH:MM:SS (NSEC s) NL
-        [At most once.]
-
-        YYYY-MM-DD HH:MM:SS defines the end of the included measurement
-        interval of length NSEC seconds (86400 seconds by default).
-
-        An "exit-stats-end" line, as well as any other "exit-*" line, is
-        first added after the relay has been running for at least 24 hours
-        and only if the relay permits exiting (where exiting to a single
-        port and IP address is sufficient).
-
-    "exit-kibibytes-written" port=N,port=N,... NL
-        [At most once.]
-    "exit-kibibytes-read" port=N,port=N,... NL
-        [At most once.]
-
-        List of mappings from ports to the number of kibibytes that the
-        relay has written to or read from exit connections to that port,
-        rounded up to the next full kibibyte.
-
-    "exit-streams-opened" port=N,port=N,... NL
-        [At most once.]
-
-        List of mappings from ports to the number of opened exit streams
-        to that port, rounded up to the nearest multiple of 4.
-
-    "router-signature" NL Signature NL
-        [At end, exactly once.]
-
-        A document signature as documented in section 1.3, using the
-        initial item "extra-info" and the final item "router-signature",
-        signed with the router's identity key.
-
-2.2.1. Moving history fields to extra-info documents.
-
-   Tools that want to use the read-history and write-history values SHOULD
-   download extra-info documents as well as router descriptors.  Such
-   tools SHOULD accept history values from both sources; if they appear in
-   both documents, the values in the extra-info documents are authoritative.
-
-   New versions of Tor no longer generate router descriptors
-   containing read-history or write-history.  Tools should continue to
-   accept read-history and write-history values in router descriptors
-   produced by older versions of Tor until all Tor versions earlier
-   than 0.2.0.x are obsolete.
-
-2.3. Nonterminals in router descriptors
-
-   nickname ::= between 1 and 19 alphanumeric characters ([A-Za-z0-9]),
-      case-insensitive.
-   hexdigest ::= a '$', followed by 40 hexadecimal characters
-      ([A-Fa-f0-9]). [Represents a server by the digest of its identity
-      key.]
-
-   exitpattern ::= addrspec ":" portspec
-   portspec ::= "*" | port | port "-" port
-   port ::= an integer between 1 and 65535, inclusive.
-
-      [Some implementations incorrectly generate ports with value 0.
-       Implementations SHOULD accept this, and SHOULD NOT generate it.
-       Connections to port 0 are never permitted.]
-
-   addrspec ::= "*" | ip4spec | ip6spec
-   ipv4spec ::= ip4 | ip4 "/" num_ip4_bits | ip4 "/" ip4mask
-   ip4 ::= an IPv4 address in dotted-quad format
-   ip4mask ::= an IPv4 mask in dotted-quad format
-   num_ip4_bits ::= an integer between 0 and 32
-   ip6spec ::= ip6 | ip6 "/" num_ip6_bits
-   ip6 ::= an IPv6 address, surrounded by square brackets.
-   num_ip6_bits ::= an integer between 0 and 128
-
-   bool ::= "0" | "1"
-
-3. Formats produced by directory authorities.
-
-   Every authority has two keys used in this protocol: a signing key, and
-   an authority identity key.  (Authorities also have a router identity
-   key used in their role as a router and by earlier versions of the
-   directory protocol.)  The identity key is used from time to time to
-   sign new key certificates using new signing keys; it is very sensitive.
-   The signing key is used to sign key certificates and status documents.
-
-   There are three kinds of documents generated by directory authorities:
-
-     Key certificates
-     Status votes
-     Status consensuses
-
-   Each is discussed below.
-
-3.1. Key certificates
-
-   Key certificates consist of the following items:
-
-    "dir-key-certificate-version" version NL
-
-        [At start, exactly once.]
-
-        Determines the version of the key certificate.  MUST be "3" for
-        the protocol described in this document.  Implementations MUST
-        reject formats they don't understand.
-
-    "dir-address" IPPort NL
-        [At most once]
-
-        An IP:Port for this authority's directory port.
-
-    "fingerprint" fingerprint NL
-
-        [Exactly once.]
-
-        Hexadecimal encoding without spaces based on the authority's
-        identity key.
-
-    "dir-identity-key" NL a public key in PEM format
-
-        [Exactly once.]
-
-        The long-term authority identity key for this authority.  This key
-        SHOULD be at least 2048 bits long; it MUST NOT be shorter than
-        1024 bits.
-
-    "dir-key-published" YYYY-MM-DD HH:MM:SS NL
-
-        [Exactly once.]
-
-        The time (in GMT) when this document and corresponding key were
-        last generated.
-
-    "dir-key-expires" YYYY-MM-DD HH:MM:SS NL
-
-        [Exactly once.]
-
-        A time (in GMT) after which this key is no longer valid.
-
-    "dir-signing-key" NL a key in PEM format
-
-        [Exactly once.]
-
-        The directory server's public signing key.  This key MUST be at
-        least 1024 bits, and MAY be longer.
-
-    "dir-key-crosscert" NL CrossSignature NL
-
-        [At most once.]
-
-        NOTE: Authorities MUST include this field in all newly generated
-        certificates.  A future version of this specification will make
-        the field required.
-
-        CrossSignature is a signature, made using the certificate's signing
-        key, of the digest of the PKCS1-padded hash of the certificate's
-        identity key.  For backward compatibility with broken versions of the
-        parser, we wrap the base64-encoded signature in -----BEGIN ID
-        SIGNATURE---- and -----END ID SIGNATURE----- tags.  Implementations
-        MUST allow the "ID " portion to be omitted, however.
-
-        When encountering a certificate with a dir-key-crosscert entry,
-        implementations MUST verify that the signature is a correct signature
-        of the hash of the identity key using the signing key.
-
-    "dir-key-certification" NL Signature NL
-
-        [At end, exactly once.]
-
-        A document signature as documented in section 1.3, using the
-        initial item "dir-key-certificate-version" and the final item
-        "dir-key-certification", signed with the authority identity key.
-
-   Authorities MUST generate a new signing key and corresponding
-   certificate before the key expires.
-
-3.2. Vote and consensus status documents
-
-   Votes and consensuses are more strictly formatted then other documents
-   in this specification, since different authorities must be able to
-   generate exactly the same consensus given the same set of votes.
-
-   The procedure for deciding when to generate vote and consensus status
-   documents are described in section XXX below.
-
-   Status documents contain a preamble, an authority section, a list of
-   router status entries, and one or more footer signature, in that order.
-
-   Unlike other formats described above, a SP in these documents must be a
-   single space character (hex 20).
-
-   Some items appear only in votes, and some items appear only in
-   consensuses.  Unless specified, items occur in both.
-
-   The preamble contains the following items.  They MUST occur in the
-   order given here:
-
-    "network-status-version" SP version NL.
-
-        [At start, exactly once.]
-
-        A document format version.  For this specification, the version is
-        "3".
-
-    "vote-status" SP type NL
-
-        [Exactly once.]
-
-        The status MUST be "vote" or "consensus", depending on the type of
-        the document.
-
-    "consensus-methods" SP IntegerList NL
-
-        [Exactly once for votes; does not occur in consensuses.]
-
-        A space-separated list of supported methods for generating
-        consensuses from votes.  See section 3.4.1 for details.  Method "1"
-        MUST be included.
-
-    "consensus-method" SP Integer NL
-
-        [Exactly once for consensuses; does not occur in votes.]
-
-        See section 3.4.1 for details.
-
-        (Only included when the vote is generated with consensus-method 2 or
-        later.)
-
-    "published" SP YYYY-MM-DD SP HH:MM:SS NL
-
-        [Exactly once for votes; does not occur in consensuses.]
-
-        The publication time for this status document (if a vote).
-
-    "valid-after" SP YYYY-MM-DD SP HH:MM:SS NL
-
-        [Exactly once.]
-
-        The start of the Interval for this vote.  Before this time, the
-        consensus document produced from this vote should not be used.
-        See 1.4 for voting timeline information.
-
-    "fresh-until" SP YYYY-MM-DD SP HH:MM:SS NL
-
-        [Exactly once.]
-
-        The time at which the next consensus should be produced; before this
-        time, there is no point in downloading another consensus, since there
-        won't be a new one.  See 1.4 for voting timeline information.
-
-    "valid-until" SP YYYY-MM-DD SP HH:MM:SS NL
-
-        [Exactly once.]
-
-        The end of the Interval for this vote.  After this time, the
-        consensus produced by this vote should not be used.  See 1.4 for
-        voting timeline information.
-
-    "voting-delay" SP VoteSeconds SP DistSeconds NL
-
-        [Exactly once.]
-
-        VoteSeconds is the number of seconds that we will allow to collect
-        votes from all authorities; DistSeconds is the number of seconds
-        we'll allow to collect signatures from all authorities. See 1.4 for
-        voting timeline information.
-
-    "client-versions" SP VersionList NL
-
-        [At most once.]
-
-        A comma-separated list of recommended client versions, in
-        ascending order.  If absent, no opinion is held about client
-        versions.
-
-    "server-versions" SP VersionList NL
-
-        [At most once.]
-
-        A comma-separated list of recommended server versions, in
-        ascending order.  If absent, no opinion is held about server
-        versions.
-
-    "known-flags" SP FlagList NL
-
-        [Exactly once.]
-
-        A space-separated list of all of the flags that this document
-        might contain.  A flag is "known" either because the authority
-        knows about them and might set them (if in a vote), or because
-        enough votes were counted for the consensus for an authoritative
-        opinion to have been formed about their status.
-
-    "params" SP [Parameters] NL
-
-        [At most once]
-
-        Parameter ::= Keyword '=' Int32
-        Int32 ::= A decimal integer between -2147483648 and 2147483647.
-        Parameters ::= Parameter | Parameters SP Parameter
-
-        The parameters list, if present, contains a space-separated list of
-        key-value pairs, sorted in lexical order by their keyword.  Each
-        parameter has its own meaning.
-
-        (Only included when the vote is generated with consensus-method 7 or
-        later.)
-
-   The authority section of a vote contains the following items, followed
-   in turn by the authority's current key certificate:
-
-    "dir-source" SP nickname SP identity SP address SP IP SP dirport SP
-       orport NL
-
-        [Exactly once, at start]
-
-        Describes this authority.  The nickname is a convenient identifier
-        for the authority.  The identity is an uppercase hex fingerprint of
-        the authority's current (v3 authority) identity key.  The address is
-        the server's hostname.  The IP is the server's current IP address,
-        and dirport is its current directory port. XXXXorport
-
-    "contact" SP string NL
-
-        [At most once.]
-
-        An arbitrary string describing how to contact the directory
-        server's administrator.  Administrators should include at least an
-        email address and a PGP fingerprint.
-
-    "legacy-key" SP FINGERPRINT NL
-
-        [At most once]
-
-        Lists a fingerprint for an obsolete _identity_ key still used
-        by this authority to keep older clients working.  This option
-        is used to keep key around for a little while in case the
-        authorities need to migrate many identity keys at once.
-        (Generally, this would only happen because of a security
-        vulnerability that affected multiple authorities, like the
-        Debian OpenSSL RNG bug of May 2008.)
-
-   The authority section of a consensus contains groups the following items,
-   in the order given, with one group for each authority that contributed to
-   the consensus, with groups sorted by authority identity digest:
-
-    "dir-source" SP nickname SP identity SP address SP IP SP dirport SP
-       orport NL
-
-        [Exactly once, at start]
-
-        As in the authority section of a vote.
-
-    "contact" SP string NL
-
-        [At most once.]
-
-        As in the authority section of a vote.
-
-    "vote-digest" SP digest NL
-
-        [Exactly once.]
-
-        A digest of the vote from the authority that contributed to this
-        consensus, as signed (that is, not including the signature).
-        (Hex, upper-case.)
-
-   Each router status entry contains the following items.  Router status
-   entries are sorted in ascending order by identity digest.
-
-    "r" SP nickname SP identity SP digest SP publication SP IP SP ORPort
-        SP DirPort NL
-
-        [At start, exactly once.]
-
-        "Nickname" is the OR's nickname.  "Identity" is a hash of its
-        identity key, encoded in base64, with trailing equals sign(s)
-        removed.  "Digest" is a hash of its most recent descriptor as
-        signed (that is, not including the signature), encoded in base64.
-        "Publication" is the
-        publication time of its most recent descriptor, in the form
-        YYYY-MM-DD HH:MM:SS, in GMT.  "IP" is its current IP address;
-        ORPort is its current OR port, "DirPort" is it's current directory
-        port, or "0" for "none".
-
-    "s" SP Flags NL
-
-        [At most once.]
-
-        A series of space-separated status flags, in alphabetical order.
-        Currently documented flags are:
-
-          "Authority" if the router is a directory authority.
-          "BadExit" if the router is believed to be useless as an exit node
-             (because its ISP censors it, because it is behind a restrictive
-             proxy, or for some similar reason).
-          "BadDirectory" if the router is believed to be useless as a
-             directory cache (because its directory port isn't working,
-             its bandwidth is always throttled, or for some similar
-             reason).
-          "Exit" if the router is more useful for building
-             general-purpose exit circuits than for relay circuits.  The
-             path building algorithm uses this flag; see path-spec.txt.
-          "Fast" if the router is suitable for high-bandwidth circuits.
-          "Guard" if the router is suitable for use as an entry guard.
-          "HSDir" if the router is considered a v2 hidden service directory.
-          "Named" if the router's identity-nickname mapping is canonical,
-             and this authority binds names.
-          "Stable" if the router is suitable for long-lived circuits.
-          "Running" if the router is currently usable.
-          "Unnamed" if another router has bound the name used by this
-             router, and this authority binds names.
-          "Valid" if the router has been 'validated'.
-          "V2Dir" if the router implements the v2 directory protocol.
-          "V3Dir" if the router implements this protocol.
-
-    "v" SP version NL
-
-        [At most once.]
-
-        The version of the Tor protocol that this server is running.  If
-        the value begins with "Tor" SP, the rest of the string is a Tor
-        version number, and the protocol is "The Tor protocol as supported
-        by the given version of Tor."  Otherwise, if the value begins with
-        some other string, Tor has upgraded to a more sophisticated
-        protocol versioning system, and the protocol is "a version of the
-        Tor protocol more recent than any we recognize."
-
-        Directory authorities SHOULD omit version strings they receive from
-        descriptors if they would cause "v" lines to be over 128 characters
-        long.
-
-    "w" SP "Bandwidth=" INT [SP "Measured=" INT] NL
-
-        [At most once.]
-
-        An estimate of the bandwidth of this server, in an arbitrary
-        unit (currently kilobytes per second).  Used to weight router
-        selection. 
-
-        Additionally, the Measured= keyword is present in votes by 
-        participating bandwidth measurement authorites to indicate
-        a measured bandwidth currently produced by measuring stream 
-        capacities. 
-
-        Other weighting keywords may be added later.
-        Clients MUST ignore keywords they do not recognize.
-
-    "p" SP ("accept" / "reject") SP PortList NL
-
-        [At most once.]
-
-        PortList = PortOrRange
-        PortList = PortList "," PortOrRange
-        PortOrRange = INT "-" INT / INT
-
-        A list of those ports that this router supports (if 'accept')
-        or does not support (if 'reject') for exit to "most
-        addresses".
-
-   The signature section contains the following item, which appears
-   Exactly Once for a vote, and At Least Once for a consensus.
-
-    "directory-signature" SP identity SP signing-key-digest NL Signature
-
-        This is a signature of the status document, with the initial item
-        "network-status-version", and the signature item
-        "directory-signature", using the signing key.  (In this case, we take
-        the hash through the _space_ after directory-signature, not the
-        newline: this ensures that all authorities sign the same thing.)
-        "identity" is the hex-encoded digest of the authority identity key of
-        the signing authority, and "signing-key-digest" is the hex-encoded
-        digest of the current authority signing key of the signing authority.
-
-3.3. Deciding how to vote.
-
-   (This section describes how directory authorities choose which status
-   flags to apply to routers, as of Tor 0.2.0.0-alpha-dev. Later directory
-   authorities MAY do things differently, so long as clients keep working
-   well.  Clients MUST NOT depend on the exact behaviors in this section.)
-
-   In the below definitions, a router is considered "active" if it is
-   running, valid, and not hibernating.
-
-   "Valid" -- a router is 'Valid' if it is running a version of Tor not
-   known to be broken, and the directory authority has not blacklisted
-   it as suspicious.
-
-   "Named" -- Directory authority administrators may decide to support name
-   binding.  If they do, then they must maintain a file of
-   nickname-to-identity-key mappings, and try to keep this file consistent
-   with other directory authorities.  If they don't, they act as clients, and
-   report bindings made by other directory authorities (name X is bound to
-   identity Y if at least one binding directory lists it, and no directory
-   binds X to some other Y'.)  A router is called 'Named' if the router
-   believes the given name should be bound to the given key.
-
-        Two strategies exist on the current network for deciding on
-        values for the Named flag.  In the original version, server
-        operators were asked to send nickname-identity pairs to a
-        mailing list of Naming directory authorities operators.  The
-        operators were then supposed to add the pairs to their
-        mapping files; in practice, they didn't get to this often.
-
-        Newer Naming authorities run a script that registers routers
-        in their mapping files once the routers have been online at
-        least two weeks, no other router has that nickname, and no
-        other router has wanted the nickname for a month.  If a router
-        has not been online for six months, the router is removed.
-
-   "Unnamed" -- Directory authorities that support naming should vote for a
-   router to be 'Unnamed' if its given nickname is mapped to a different
-   identity.
-
-   "Running" -- A router is 'Running' if the authority managed to connect to
-   it successfully within the last 30 minutes.
-
-   "Stable" -- A router is 'Stable' if it is active, and either its Weighted
-   MTBF is at least the median for known active routers or its Weighted MTBF
-   corresponds to at least 7 days. Routers are never called Stable if they are
-   running a version of Tor known to drop circuits stupidly.  (0.1.1.10-alpha
-   through 0.1.1.16-rc are stupid this way.)
-
-        To calculate weighted MTBF, compute the weighted mean of the lengths
-        of all intervals when the router was observed to be up, weighting
-        intervals by $\alpha^n$, where $n$ is the amount of time that has
-        passed since the interval ended, and $\alpha$ is chosen so that
-        measurements over approximately one month old no longer influence the
-        weighted MTBF much.
-
-        [XXXX what happens when we have less than 4 days of MTBF info.]
-
-   "Exit" -- A router is called an 'Exit' iff it allows exits to at
-    least two of the ports 80, 443, and 6667 and allows exits to at
-    least one /8 address space.
-
-   "Fast" -- A router is 'Fast' if it is active, and its bandwidth is
-   either in the top 7/8ths for known active routers or at least 100KB/s.
-
-   "Guard" -- A router is a possible 'Guard' if its Weighted Fractional
-   Uptime is at least the median for "familiar" active routers, and if
-   its bandwidth is at least median or at least 250KB/s.
-   If the total bandwidth of active non-BadExit Exit servers is less
-   than one third of the total bandwidth of all active servers, no Exit is
-   listed as a Guard.
-
-        To calculate weighted fractional uptime, compute the fraction
-        of time that the router is up in any given day, weighting so that
-        downtime and uptime in the past counts less.
-
-        A node is 'familiar' if 1/8 of all active nodes have appeared more
-        recently than it, OR it has been around for a few weeks.
-
-   "Authority" -- A router is called an 'Authority' if the authority
-   generating the network-status document believes it is an authority.
-
-   "V2Dir" -- A router supports the v2 directory protocol if it has an open
-   directory port, and it is running a version of the directory protocol that
-   supports the functionality clients need.  (Currently, this is
-   0.1.1.9-alpha or later.)
-
-   "V3Dir" -- A router supports the v3 directory protocol if it has an open
-   directory port, and it is running a version of the directory protocol that
-   supports the functionality clients need.  (Currently, this is
-   0.2.0.?????-alpha or later.)
-
-   "HSDir" -- A router is a v2 hidden service directory if it stores and
-   serves v2 hidden service descriptors and the authority managed to connect
-   to it successfully within the last 24 hours.
-
-   Directory server administrators may label some servers or IPs as
-   blacklisted, and elect not to include them in their network-status lists.
-
-   Authorities SHOULD 'disable' any servers in excess of 3 on any single IP.
-   When there are more than 3 to choose from, authorities should first prefer
-   authorities to non-authorities, then prefer Running to non-Running, and
-   then prefer high-bandwidth to low-bandwidth.  To 'disable' a server, the
-   authority *should* advertise it without the Running or Valid flag.
-
-   Thus, the network-status vote includes all non-blacklisted,
-   non-expired, non-superseded descriptors.
-
-   The bandwidth in a "w" line should be taken as the best estimate
-   of the router's actual capacity that the authority has.  For now,
-   this should be the lesser of the observed bandwidth and bandwidth
-   rate limit from the router descriptor.  It is given in kilobytes
-   per second, and capped at some arbitrary value (currently 10 MB/s).
-
-   The Measured= keyword on a "w" line vote is currently computed
-   by multiplying the previous published consensus bandwidth by the 
-   ratio of the measured average node stream capacity to the network 
-   average. If 3 or more authorities provide a Measured= keyword for 
-   a router, the authorites produce a consensus containing a "w" 
-   Bandwidth= keyword equal to the median of the Measured= votes.
-
-   The ports listed in a "p" line should be taken as those ports for
-   which the router's exit policy permits 'most' addresses, ignoring any
-   accept not for all addresses, ignoring all rejects for private
-   netblocks.  "Most" addresses are permitted if no more than 2^25
-   IPv4 addresses (two /8 networks) were blocked.  The list is encoded
-   as described in 3.4.2.
-
-3.4. Computing a consensus from a set of votes
-
-   Given a set of votes, authorities compute the contents of the consensus
-   document as follows:
-
-     The "valid-after", "valid-until", and "fresh-until" times are taken as
-     the median of the respective values from all the votes.
-
-     The times in the "voting-delay" line are taken as the median of the
-     VoteSeconds and DistSeconds times in the votes.
-
-     Known-flags is the union of all flags known by any voter.
-
-     Entries are given on the "params" line for every keyword on which any
-     authority voted.  The values given are the low-median of all votes on
-     that keyword.
-
-    "client-versions" and "server-versions" are sorted in ascending
-     order; A version is recommended in the consensus if it is recommended
-     by more than half of the voting authorities that included a
-     client-versions or server-versions lines in their votes.
-
-     The authority item groups (dir-source, contact, fingerprint,
-     vote-digest) are taken from the votes of the voting
-     authorities. These groups are sorted by the digests of the
-     authorities identity keys, in ascending order.  If the consensus
-     method is 3 or later, a dir-source line must be included for
-     every vote with legacy-key entry, using the legacy-key's
-     fingerprint, the voter's ordinary nickname with the string
-     "-legacy" appended, and all other fields as from the original
-     vote's dir-source line.
-
-     A router status entry:
-        * is included in the result if some router status entry with the same
-          identity is included by more than half of the authorities (total
-          authorities, not just those whose votes we have).
-
-        * For any given identity, we include at most one router status entry.
-
-        * A router entry has a flag set if that is included by more than half
-          of the authorities who care about that flag.
-
-        * Two router entries are "the same" if they have the same
-          <descriptor digest, published time, nickname, IP, ports> tuple.
-          We choose the tuple for a given router as whichever tuple appears
-          for that router in the most votes.  We break ties first in favor of
-          the more recently published, then in favor of smaller server
-          descriptor digest.
-
-        * The Named flag appears if it is included for this routerstatus by
-          _any_ authority, and if all authorities that list it list the same
-          nickname. However, if consensus-method 2 or later is in use, and
-          any authority calls this identity/nickname pair Unnamed, then
-          this routerstatus does not get the Named flag.
-
-        * If consensus-method 2 or later is in use, the Unnamed flag is
-          set for a routerstatus if any authorities have voted for a different
-          identities to be Named with that nickname, or if any authority
-          lists that nickname/ID pair as Unnamed.
-
-          (With consensus-method 1, Unnamed is set like any other flag.)
-
-        * The version is given as whichever version is listed by the most
-          voters, with ties decided in favor of more recent versions.
-
-        * If consensus-method 4 or later is in use, then routers that
-          do not have the Running flag are not listed at all.
-
-        * If consensus-method 5 or later is in use, then the "w" line
-          is generated using a low-median of the bandwidth values from
-          the votes that included "w" lines for this router.
-
-        * If consensus-method 5 or later is in use, then the "p" line
-          is taken from the votes that have the same policy summary
-          for the descriptor we are listing.  (They should all be the
-          same.  If they are not, we pick the most commonly listed
-          one, breaking ties in favor of the lexicographically larger
-          vote.)  The port list is encoded as specified in 3.4.2.
-
-        * If consensus-method 6 or later is in use and if 3 or more 
-          authorities provide a Measured= keyword in their votes for 
-          a router, the authorities produce a consensus containing a 
-          Bandwidth= keyword equal to the median of the Measured= votes.
-
-        * If consensus-method 7 or later is in use, the params line is
-          included in the output.
-
-     The signatures at the end of a consensus document are sorted in
-     ascending order by identity digest.
-
-   All ties in computing medians are broken in favor of the smaller or
-   earlier item.
-
-3.4.1. Forward compatibility
-
-   Future versions of Tor will need to include new information in the
-   consensus documents, but it is important that all authorities (or at least
-   half) generate and sign the same signed consensus.
-
-   To achieve this, authorities list in their votes their supported methods
-   for generating consensuses from votes.  Later methods will be assigned
-   higher numbers.  Currently recognized methods:
-     "1" -- The first implemented version.
-     "2" -- Added support for the Unnamed flag.
-     "3" -- Added legacy ID key support to aid in authority ID key rollovers
-     "4" -- No longer list routers that are not running in the consensus
-     "5" -- adds support for "w" and "p" lines.
-     "6" -- Prefers measured bandwidth values rather than advertised
-
-   Before generating a consensus, an authority must decide which consensus
-   method to use.  To do this, it looks for the highest version number
-   supported by more than 2/3 of the authorities voting.  If it supports this
-   method, then it uses it.  Otherwise, it falls back to method 1.
-
-   (The consensuses generated by new methods must be parsable by
-   implementations that only understand the old methods, and must not cause
-   those implementations to compromise their anonymity.  This is a means for
-   making changes in the contents of consensus; not for making
-   backward-incompatible changes in their format.)
-
-3.4.2. Encoding port lists
-
-  Whether the summary shows the list of accepted ports or the list of
-  rejected ports depends on which list is shorter (has a shorter string
-  representation).  In case of ties we choose the list of accepted
-  ports.  As an exception to this rule an allow-all policy is
-  represented as "accept 1-65535" instead of "reject " and a reject-all
-  policy is similarly given as "reject 1-65535".
-
-  Summary items are compressed, that is instead of "80-88,89-100" there
-  only is a single item of "80-100", similarly instead of "20,21" a
-  summary will say "20-21".
-
-  Port lists are sorted in ascending order.
-
-  The maximum allowed length of a policy summary (including the "accept "
-  or "reject ") is 1000 characters.  If a summary exceeds that length we
-  use an accept-style summary and list as much of the port list as is
-  possible within these 1000 bytes.  [XXXX be more specific.]
-
-3.5. Detached signatures
-
-   Assuming full connectivity, every authority should compute and sign the
-   same consensus directory in each period.  Therefore, it isn't necessary to
-   download the consensus computed by each authority; instead, the
-   authorities only push/fetch each others' signatures.  A "detached
-   signature" document contains items as follows:
-
-    "consensus-digest" SP Digest NL
-
-        [At start, at most once.]
-
-        The digest of the consensus being signed.
-
-    "valid-after" SP YYYY-MM-DD SP HH:MM:SS NL
-    "fresh-until" SP YYYY-MM-DD SP HH:MM:SS NL
-    "valid-until" SP YYYY-MM-DD SP HH:MM:SS NL
-
-        [As in the consensus]
-
-    "directory-signature"
-
-        [As in the consensus; the signature object is the same as in the
-        consensus document.]
-
-
-4. Directory server operation
-
-   All directory authorities and directory caches ("directory servers")
-   implement this section, except as noted.
-
-4.1. Accepting uploads (authorities only)
-
-   When a router posts a signed descriptor to a directory authority, the
-   authority first checks whether it is well-formed and correctly
-   self-signed.  If it is, the authority next verifies that the nickname
-   in question is not already assigned to a router with a different
-   public key.
-   Finally, the authority MAY check that the router is not blacklisted
-   because of its key, IP, or another reason.
-
-   If the descriptor passes these tests, and the authority does not already
-   have a descriptor for a router with this public key, it accepts the
-   descriptor and remembers it.
-
-   If the authority _does_ have a descriptor with the same public key, the
-   newly uploaded descriptor is remembered if its publication time is more
-   recent than the most recent old descriptor for that router, and either:
-      - There are non-cosmetic differences between the old descriptor and the
-        new one.
-      - Enough time has passed between the descriptors' publication times.
-        (Currently, 12 hours.)
-
-   Differences between router descriptors are "non-cosmetic" if they would be
-   sufficient to force an upload as described in section 2 above.
-
-   Note that the "cosmetic difference" test only applies to uploaded
-   descriptors, not to descriptors that the authority downloads from other
-   authorities.
-
-   When a router posts a signed extra-info document to a directory authority,
-   the authority again checks it for well-formedness and correct signature,
-   and checks that its matches the extra-info-digest in some router
-   descriptor that it believes is currently useful.  If so, it accepts it and
-   stores it and serves it as requested.  If not, it drops it.
-
-4.2. Voting (authorities only)
-
-   Authorities divide time into Intervals.  Authority administrators SHOULD
-   try to all pick the same interval length, and SHOULD pick intervals that
-   are commonly used divisions of time (e.g., 5 minutes, 15 minutes, 30
-   minutes, 60 minutes, 90 minutes).  Voting intervals SHOULD be chosen to
-   divide evenly into a 24-hour day.
-
-   Authorities SHOULD act according to interval and delays in the
-   latest consensus.  Lacking a latest consensus, they SHOULD default to a
-   30-minute Interval, a 5 minute VotingDelay, and a 5 minute DistDelay.
-
-   Authorities MUST take pains to ensure that their clocks remain accurate
-   within a few seconds.  (Running NTP is usually sufficient.)
-
-   The first voting period of each day begins at 00:00 (midnight) GMT.  If
-   the last period of the day would be truncated by one-half or more, it is
-   merged with the second-to-last period.
-
-   An authority SHOULD publish its vote immediately at the start of each voting
-   period (minus VoteSeconds+DistSeconds).  It does this by making it
-   available at
-     http://<hostname>/tor/status-vote/next/authority.z
-   and sending it in an HTTP POST request to each other authority at the URL
-     http://<hostname>/tor/post/vote
-
-   If, at the start of the voting period, minus DistSeconds, an authority
-   does not have a current statement from another authority, the first
-   authority downloads the other's statement.
-
-   Once an authority has a vote from another authority, it makes it available
-   at
-      http://<hostname>/tor/status-vote/next/<fp>.z
-   where <fp> is the fingerprint of the other authority's identity key.
-   And at
-      http://<hostname>/tor/status-vote/next/d/<d>.z
-   where <d> is the digest of the vote document.
-
-   The consensus status, along with as many signatures as the server
-   currently knows, should be available at
-      http://<hostname>/tor/status-vote/next/consensus.z
-   All of the detached signatures it knows for consensus status should be
-   available at:
-      http://<hostname>/tor/status-vote/next/consensus-signatures.z
-
-   Once there are enough signatures, or once the voting period starts,
-   these documents are available at
-      http://<hostname>/tor/status-vote/current/consensus.z
-   and
-      http://<hostname>/tor/status-vote/current/consensus-signatures.z
-   [XXX current/consensus-signatures is not currently implemented, as it
-    is not used in the voting protocol.]
-
-   The other vote documents are analogously made available under
-     http://<hostname>/tor/status-vote/current/authority.z
-     http://<hostname>/tor/status-vote/current/<fp>.z
-     http://<hostname>/tor/status-vote/current/d/<d>.z
-   once the consensus is complete.
-
-   Once an authority has computed and signed a consensus network status, it
-   should send its detached signature to each other authority in an HTTP POST
-   request to the URL:
-      http://<hostname>/tor/post/consensus-signature
-
-   [XXX Note why we support push-and-then-pull.]
-
-   [XXX possible future features include support for downloading old
-    consensuses.]
-
-4.3. Downloading consensus status documents (caches only)
-
-   All directory servers (authorities and caches) try to keep a recent
-   network-status consensus document to serve to clients.  A cache ALWAYS
-   downloads a network-status consensus if any of the following are true:
-     - The cache has no consensus document.
-     - The cache's consensus document is no longer valid.
-   Otherwise, the cache downloads a new consensus document at a randomly
-   chosen time in the first half-interval after its current consensus
-   stops being fresh.  (This time is chosen at random to avoid swarming
-   the authorities at the start of each period.  The interval size is
-   inferred from the difference between the valid-after time and the
-   fresh-until time on the consensus.)
-
-   [For example, if a cache has a consensus that became valid at 1:00,
-    and is fresh until 2:00, that cache will fetch a new consensus at
-    a random time between 2:00 and 2:30.]
-
-4.4. Downloading and storing router descriptors (authorities and caches)
-
-   Periodically (currently, every 10 seconds), directory servers check
-   whether there are any specific descriptors that they do not have and that
-   they are not currently trying to download.  Caches identify these
-   descriptors by hash in the recent network-status consensus documents;
-   authorities identify them by hash in vote (if publication date is more
-   recent than the descriptor we currently have).
-
- [XXXX need a way to fetch descriptors ahead of the vote?  v2 status docs can
- do that for now.]
-
-   If so, the directory server launches requests to the authorities for these
-   descriptors, such that each authority is only asked for descriptors listed
-   in its most recent vote (if the requester is an authority) or in the
-   consensus (if the requester is a cache).  If we're an authority, and more
-   than one authority lists the descriptor, we choose which to ask at random.
-
-   If one of these downloads fails, we do not try to download that descriptor
-   from the authority that failed to serve it again unless we receive a newer
-   network-status (consensus or vote) from that authority that lists the same
-   descriptor.
-
-   Directory servers must potentially cache multiple descriptors for each
-   router. Servers must not discard any descriptor listed by any recent
-   consensus.  If there is enough space to store additional descriptors,
-   servers SHOULD try to hold those which clients are likely to download the
-   most.  (Currently, this is judged based on the interval for which each
-   descriptor seemed newest.)
-[XXXX define recent]
-
-   Authorities SHOULD NOT download descriptors for routers that they would
-   immediately reject for reasons listed in 3.1.
-
-4.5. Downloading and storing extra-info documents
-
-   All authorities, and any cache that chooses to cache extra-info documents,
-   and any client that uses extra-info documents, should implement this
-   section.
-
-   Note that generally, clients don't need extra-info documents.
-
-   Periodically, the Tor instance checks whether it is missing any extra-info
-   documents: in other words, if it has any router descriptors with an
-   extra-info-digest field that does not match any of the extra-info
-   documents currently held.  If so, it downloads whatever extra-info
-   documents are missing.  Caches download from authorities; non-caches try
-   to download from caches.  We follow the same splitting and back-off rules
-   as in 4.4 (if a cache) or 5.3 (if a client).
-
-4.6. General-use HTTP URLs
-
-   "Fingerprints" in these URLs are base-16-encoded SHA1 hashes.
-
-   The most recent v3 consensus should be available at:
-      http://<hostname>/tor/status-vote/current/consensus.z
-
-   Starting with Tor version 0.2.1.1-alpha is also available at:
-      http://<hostname>/tor/status-vote/current/consensus/<F1>+<F2>+<F3>.z
-
-   Where F1, F2, etc. are authority identity fingerprints the client trusts.
-   Servers will only return a consensus if more than half of the requested
-   authorities have signed the document, otherwise a 404 error will be sent
-   back.  The fingerprints can be shortened to a length of any multiple of
-   two, using only the leftmost part of the encoded fingerprint.  Tor uses
-   3 bytes (6 hex characters) of the fingerprint.
-
-   Clients SHOULD sort the fingerprints in ascending order.  Server MUST
-   accept any order.
-
-   Clients SHOULD use this format when requesting consensus documents from
-   directory authority servers and from caches running a version of Tor
-   that is known to support this URL format.
-
-   A concatenated set of all the current key certificates should be available
-   at:
-      http://<hostname>/tor/keys/all.z
-
-   The key certificate for this server (if it is an authority) should be
-   available at:
-      http://<hostname>/tor/keys/authority.z
-
-   The key certificate for an authority whose authority identity fingerprint
-   is <F> should be available at:
-      http://<hostname>/tor/keys/fp/<F>.z
-
-   The key certificate whose signing key fingerprint is <F> should be
-   available at:
-      http://<hostname>/tor/keys/sk/<F>.z
-
-   The key certificate whose identity key fingerprint is <F> and whose signing
-   key fingerprint is <S> should be available at:
-
-      http://<hostname>/tor/keys/fp-sk/<F>-<S>.z
-
-   (As usual, clients may request multiple certificates using:
-       http://<hostname>/tor/keys/fp-sk/<F1>-<S1>+<F2>-<S2>.z  )
-   [The above fp-sk format was not supported before Tor 0.2.1.9-alpha.]
-
-   The most recent descriptor for a server whose identity key has a
-   fingerprint of <F> should be available at:
-      http://<hostname>/tor/server/fp/<F>.z
-
-   The most recent descriptors for servers with identity fingerprints
-   <F1>,<F2>,<F3> should be available at:
-      http://<hostname>/tor/server/fp/<F1>+<F2>+<F3>.z
-
-   (NOTE: Implementations SHOULD NOT download descriptors by identity key
-   fingerprint. This allows a corrupted server (in collusion with a cache) to
-   provide a unique descriptor to a client, and thereby partition that client
-   from the rest of the network.)
-
-   The server descriptor with (descriptor) digest <D> (in hex) should be
-   available at:
-      http://<hostname>/tor/server/d/<D>.z
-
-   The most recent descriptors with digests <D1>,<D2>,<D3> should be
-   available at:
-      http://<hostname>/tor/server/d/<D1>+<D2>+<D3>.z
-
-   The most recent descriptor for this server should be at:
-      http://<hostname>/tor/server/authority.z
-    [Nothing in the Tor protocol uses this resource yet, but it is useful
-     for debugging purposes. Also, the official Tor implementations
-     (starting at 0.1.1.x) use this resource to test whether a server's
-     own DirPort is reachable.]
-
-   A concatenated set of the most recent descriptors for all known servers
-   should be available at:
-      http://<hostname>/tor/server/all.z
-
-   Extra-info documents are available at the URLS
-      http://<hostname>/tor/extra/d/...
-      http://<hostname>/tor/extra/fp/...
-      http://<hostname>/tor/extra/all[.z]
-      http://<hostname>/tor/extra/authority[.z]
-         (As for /tor/server/ URLs: supports fetching extra-info
-         documents by their digest, by the fingerprint of their servers,
-         or all at once. When serving by fingerprint, we serve the
-         extra-info that corresponds to the descriptor we would serve by
-         that fingerprint. Only directory authorities of version
-         0.2.0.1-alpha or later are guaranteed to support the first
-         three classes of URLs.  Caches may support them, and MUST
-         support them if they have advertised "caches-extra-info".)
-
-   For debugging, directories SHOULD expose non-compressed objects at URLs like
-   the above, but without the final ".z".
-   Clients MUST handle compressed concatenated information in two forms:
-     - A concatenated list of zlib-compressed objects.
-     - A zlib-compressed concatenated list of objects.
-   Directory servers MAY generate either format: the former requires less
-   CPU, but the latter requires less bandwidth.
-
-   Clients SHOULD use upper case letters (A-F) when base16-encoding
-   fingerprints.  Servers MUST accept both upper and lower case fingerprints
-   in requests.
-
-5. Client operation: downloading information
-
-   Every Tor that is not a directory server (that is, those that do
-   not have a DirPort set) implements this section.
-
-5.1. Downloading network-status documents
-
-   Each client maintains a list of directory authorities.  Insofar as
-   possible, clients SHOULD all use the same list.
-
-   Clients try to have a live consensus network-status document at all times.
-   A network-status document is "live" if the time in its valid-until field
-   has not passed.
-
-   If a client is missing a live network-status document, it tries to fetch
-   it from a directory cache (or from an authority if it knows no caches).
-   On failure, the client waits briefly, then tries that network-status
-   document again from another cache.  The client does not build circuits
-   until it has a live network-status consensus document, and it has
-   descriptors for more than 1/4 of the routers that it believes are running.
-
-   (Note: clients can and should pick caches based on the network-status
-   information they have: once they have first fetched network-status info
-   from an authority, they should not need to go to the authority directly
-   again.)
-
-   To avoid swarming the caches whenever a consensus expires, the
-   clients download new consensuses at a randomly chosen time after the
-   caches are expected to have a fresh consensus, but before their
-   consensus will expire.  (This time is chosen uniformly at random from
-   the interval between the time 3/4 into the first interval after the
-   consensus is no longer fresh, and 7/8 of the time remaining after
-   that before the consensus is invalid.)
-
-   [For example, if a cache has a consensus that became valid at 1:00,
-    and is fresh until 2:00, and expires at 4:00, that cache will fetch
-    a new consensus at a random time between 2:45 and 3:50, since 3/4
-    of the one-hour interval is 45 minutes, and 7/8 of the remaining 75
-    minutes is 65 minutes.]
-
-5.2. Downloading and storing router descriptors
-
-   Clients try to have the best descriptor for each router.  A descriptor is
-   "best" if:
-      * It is listed in the consensus network-status document.
-
-   Periodically (currently every 10 seconds) clients check whether there are
-   any "downloadable" descriptors.  A descriptor is downloadable if:
-      - It is the "best" descriptor for some router.
-      - The descriptor was published at least 10 minutes in the past.
-        (This prevents clients from trying to fetch descriptors that the
-        mirrors have probably not yet retrieved and cached.)
-      - The client does not currently have it.
-      - The client is not currently trying to download it.
-      - The client would not discard it immediately upon receiving it.
-      - The client thinks it is running and valid (see 6.1 below).
-
-   If at least 16 known routers have downloadable descriptors, or if
-   enough time (currently 10 minutes) has passed since the last time the
-   client tried to download descriptors, it launches requests for all
-   downloadable descriptors, as described in 5.3 below.
-
-   When a descriptor download fails, the client notes it, and does not
-   consider the descriptor downloadable again until a certain amount of time
-   has passed. (Currently 0 seconds for the first failure, 60 seconds for the
-   second, 5 minutes for the third, 10 minutes for the fourth, and 1 day
-   thereafter.)  Periodically (currently once an hour) clients reset the
-   failure count.
-
-   Clients retain the most recent descriptor they have downloaded for each
-   router so long as it is not too old (currently, 48 hours), OR so long as
-   no better descriptor has been downloaded for the same router.
-
-   [Versions of Tor before 0.1.2.3-alpha would discard descriptors simply for
-   being published too far in the past.]  [The code seems to discard
-   descriptors in all cases after they're 5 days old. True? -RD]
-
-5.3. Managing downloads
-
-   When a client has no consensus network-status document, it downloads it
-   from a randomly chosen authority.  In all other cases, the client
-   downloads from caches randomly chosen from among those believed to be V2
-   directory servers.  (This information comes from the network-status
-   documents; see 6 below.)
-
-   When downloading multiple router descriptors, the client chooses multiple
-   mirrors so that:
-     - At least 3 different mirrors are used, except when this would result
-       in more than one request for under 4 descriptors.
-     - No more than 128 descriptors are requested from a single mirror.
-     - Otherwise, as few mirrors as possible are used.
-   After choosing mirrors, the client divides the descriptors among them
-   randomly.
-
-   After receiving any response client MUST discard any network-status
-   documents and descriptors that it did not request.
-
-6. Using directory information
-
-   Everyone besides directory authorities uses the approaches in this section
-   to decide which servers to use and what their keys are likely to be.
-   (Directory authorities just believe their own opinions, as in 3.1 above.)
-
-6.1. Choosing routers for circuits.
-
-   Circuits SHOULD NOT be built until the client has enough directory
-   information: a live consensus network status [XXXX fallback?]  and
-   descriptors for at least 1/4 of the servers believed to be running.
-
-   A server is "listed" if it is included by the consensus network-status
-   document.  Clients SHOULD NOT use unlisted servers.
-
-   These flags are used as follows:
-
-     - Clients SHOULD NOT use non-'Valid' or non-'Running' routers unless
-       requested to do so.
-
-     - Clients SHOULD NOT use non-'Fast' routers for any purpose other than
-       very-low-bandwidth circuits (such as introduction circuits).
-
-     - Clients SHOULD NOT use non-'Stable' routers for circuits that are
-       likely to need to be open for a very long time (such as those used for
-       IRC or SSH connections).
-
-     - Clients SHOULD NOT choose non-'Guard' nodes when picking entry guard
-       nodes.
-
-     - Clients SHOULD NOT download directory information from non-'V2Dir'
-       caches.
-
-   See the "path-spec.txt" document for more details.
-
-6.2. Managing naming
-
-   In order to provide human-memorable names for individual server
-   identities, some directory servers bind names to IDs.  Clients handle
-   names in two ways:
-
-   When a client encounters a name it has not mapped before:
-
-      If the consensus lists any router with that name as "Named", or if
-      consensus-method 2 or later is in use and the consensus lists any
-      router with that name as having the "Unnamed" flag, then the name is
-      bound.  (It's bound to the ID listed in the entry with the Named,
-      or to an unknown ID if no name is found.)
-
-   When the user refers to a bound name, the implementation SHOULD provide
-   only the router with ID bound to that name, and no other router, even
-   if the router with the right ID can't be found.
-
-   When a user tries to refer to a non-bound name, the implementation SHOULD
-   warn the user. After warning the user, the implementation MAY use any
-   router that advertises the name.
-
-   Not every router needs a nickname.  When a router doesn't configure a
-   nickname, it publishes with the default nickname "Unnamed".  Authorities
-   SHOULD NOT ever mark a router with this nickname as Named; client software
-   SHOULD NOT ever use a router in response to a user request for a router
-   called "Unnamed".
-
-6.3. Software versions
-
-   An implementation of Tor SHOULD warn when it has fetched a consensus
-   network-status, and it is running a software version not listed.
-
-6.4. Warning about a router's status.
-
-   If a router tries to publish its descriptor to a Naming authority
-   that has its nickname mapped to another key, the router SHOULD
-   warn the operator that it is either using the wrong key or is using
-   an already claimed nickname.
-
-   If a router has fetched a consensus document,, and the
-   authorities do not publish a binding for the router's nickname, the
-   router MAY remind the operator that the chosen nickname is not
-   bound to this key at the authorities, and suggest contacting the
-   authority operators.
-
-   ...
-
-6.5. Router protocol versions
-
-   A client should believe that a router supports a given feature if that
-   feature is supported by the router or protocol versions in more than half
-   of the live networkstatuses' "v" entries for that router.  In other words,
-   if the "v" entries for some router are:
-       v Tor 0.0.8pre1                (from authority 1)
-       v Tor 0.1.2.11                 (from authority 2)
-       v FutureProtocolDescription 99 (from authority 3)
-   then the client should believe that the router supports any feature
-   supported by 0.1.2.11.
-
-   This is currently equivalent to believing the median declared version for
-   a router in all live networkstatuses.
-
-7. Standards compliance
-
-   All clients and servers MUST support HTTP 1.0.  Clients and servers MAY
-   support later versions of HTTP as well.
-
-7.1. HTTP headers
-
-  Servers MAY set the Content-Length: header.  Servers SHOULD set
-  Content-Encoding to "deflate" or "identity".
-
-  Servers MAY include an X-Your-Address-Is: header, whose value is the
-  apparent IP address of the client connecting to them (as a dotted quad).
-  For directory connections tunneled over a BEGIN_DIR stream, servers SHOULD
-  report the IP from which the circuit carrying the BEGIN_DIR stream reached
-  them.  [Servers before version 0.1.2.5-alpha reported 127.0.0.1 for all
-  BEGIN_DIR-tunneled connections.]
-
-  Servers SHOULD disable caching of multiple network statuses or multiple
-  router descriptors.  Servers MAY enable caching of single descriptors,
-  single network statuses, the list of all router descriptors, a v1
-  directory, or a v1 running routers document.  XXX mention times.
-
-7.2. HTTP status codes
-
-  Tor delivers the following status codes.  Some were chosen without much
-  thought; other code SHOULD NOT rely on specific status codes yet.
-
-  200 -- the operation completed successfully
-      -- the user requested statuses or serverdescs, and none of the ones we
-         requested were found (0.2.0.4-alpha and earlier).
-
-  304 -- the client specified an if-modified-since time, and none of the
-         requested resources have changed since that time.
-
-  400 -- the request is malformed, or
-      -- the URL is for a malformed variation of one of the URLs we support,
-          or
-      -- the client tried to post to a non-authority, or
-      -- the authority rejected a malformed posted document, or
-
-  404 -- the requested document was not found.
-      -- the user requested statuses or serverdescs, and none of the ones
-         requested were found (0.2.0.5-alpha and later).
-
-  503 -- we are declining the request in order to save bandwidth
-      -- user requested some items that we ordinarily generate or store,
-         but we do not have any available.
-
-9. Backward compatibility and migration plans
-
-  Until Tor versions before 0.1.1.x are completely obsolete, directory
-  authorities should generate, and mirrors should download and cache, v1
-  directories and running-routers lists, and allow old clients to download
-  them.  These documents and the rules for retrieving, serving, and caching
-  them are described in dir-spec-v1.txt.
-
-  Until Tor versions before 0.2.0.x are completely obsolete, directory
-  authorities should generate, mirrors should download and cache, v2
-  network-status documents, and allow old clients to download them.
-  Additionally, all directory servers and caches should download, store, and
-  serve any router descriptor that is required because of v2 network-status
-  documents. These documents and the rules for retrieving, serving, and
-  caching them are described in dir-spec-v1.txt.
-
-A. Consensus-negotiation timeline.
-
-
-   Period begins: this is the Published time.
-     Everybody sends votes
-   Reconciliation: everybody tries to fetch missing votes.
-     consensus may exist at this point.
-   End of voting period:
-     everyone swaps signatures.
-   Now it's okay for caches to download
-     Now it's okay for clients to download.
-
-   Valid-after/valid-until switchover
-
diff --git a/orchid/doc/spec/path-spec.txt b/orchid/doc/spec/path-spec.txt
deleted file mode 100644
index 78f3b63bcbf..00000000000
--- a/orchid/doc/spec/path-spec.txt
+++ /dev/null
@@ -1,437 +0,0 @@
-
-                           Tor Path Specification
-
-                              Roger Dingledine
-                               Nick Mathewson
-
-Note: This is an attempt to specify Tor as currently implemented.  Future
-versions of Tor will implement improved algorithms.
-
-This document tries to cover how Tor chooses to build circuits and assign
-streams to circuits.  Other implementations MAY take other approaches, but
-implementors should be aware of the anonymity and load-balancing implications
-of their choices.
-
-                    THIS SPEC ISN'T DONE YET.
-
-1. General operation
-
-   Tor begins building circuits as soon as it has enough directory
-   information to do so (see section 5 of dir-spec.txt).  Some circuits are
-   built preemptively because we expect to need them later (for user
-   traffic), and some are built because of immediate need (for user traffic
-   that no current circuit can handle, for testing the network or our
-   reachability, and so on).
-
-   When a client application creates a new stream (by opening a SOCKS
-   connection or launching a resolve request), we attach it to an appropriate
-   open circuit if one exists, or wait if an appropriate circuit is
-   in-progress. We launch a new circuit only
-   if no current circuit can handle the request.  We rotate circuits over
-   time to avoid some profiling attacks.
-
-   To build a circuit, we choose all the nodes we want to use, and then
-   construct the circuit.  Sometimes, when we want a circuit that ends at a
-   given hop, and we have an appropriate unused circuit, we "cannibalize" the
-   existing circuit and extend it to the new terminus.
-
-   These processes are described in more detail below.
-
-   This document describes Tor's automatic path selection logic only; path
-   selection can be overridden by a controller (with the EXTENDCIRCUIT and
-   ATTACHSTREAM commands).  Paths constructed through these means may
-   violate some constraints given below.
-
-1.1. Terminology
-
-   A "path" is an ordered sequence of nodes, not yet built as a circuit.
-
-   A "clean" circuit is one that has not yet been used for any traffic.
-
-   A "fast" or "stable" or "valid" node is one that has the 'Fast' or
-   'Stable' or 'Valid' flag
-   set respectively, based on our current directory information.  A "fast"
-   or "stable" circuit is one consisting only of "fast" or "stable" nodes.
-
-   In an "exit" circuit, the final node is chosen based on waiting stream
-   requests if any, and in any case it avoids nodes with exit policy of
-   "reject *:*". An "internal" circuit, on the other hand, is one where
-   the final node is chosen just like a middle node (ignoring its exit
-   policy).
-
-   A "request" is a client-side stream or DNS resolve that needs to be
-   served by a circuit.
-
-   A "pending" circuit is one that we have started to build, but which has
-   not yet completed.
-
-   A circuit or path "supports" a request if it is okay to use the
-   circuit/path to fulfill the request, according to the rules given below.
-   A circuit or path "might support" a request if some aspect of the request
-   is unknown (usually its target IP), but we believe the path probably
-   supports the request according to the rules given below.
-
-1.1. A server's bandwidth
-
-   Old versions of Tor did not report bandwidths in network status
-   documents, so clients had to learn them from the routers' advertised
-   server descriptors.
-
-   For versions of Tor prior to 0.2.1.17-rc, everywhere below where we
-   refer to a server's "bandwidth", we mean its clipped advertised
-   bandwidth, computed by taking the smaller of the 'rate' and
-   'observed' arguments to the "bandwidth" element in the server's
-   descriptor.  If a router's advertised bandwidth is greater than
-   MAX_BELIEVABLE_BANDWIDTH (currently 10 MB/s), we clipped to that
-   value.
-
-   For more recent versions of Tor, we take the bandwidth value declared
-   in the consensus, and fall back to the clipped advertised bandwidth
-   only if the consensus does not have bandwidths listed.
-
-2. Building circuits
-
-2.1. When we build
-
-2.1.1. Clients build circuits preemptively
-
-   When running as a client, Tor tries to maintain at least a certain
-   number of clean circuits, so that new streams can be handled
-   quickly.  To increase the likelihood of success, Tor tries to
-   predict what circuits will be useful by choosing from among nodes
-   that support the ports we have used in the recent past (by default
-   one hour). Specifically, on startup Tor tries to maintain one clean
-   fast exit circuit that allows connections to port 80, and at least
-   two fast clean stable internal circuits in case we get a resolve
-   request or hidden service request (at least three if we _run_ a
-   hidden service).
-
-   After that, Tor will adapt the circuits that it preemptively builds
-   based on the requests it sees from the user: it tries to have two fast
-   clean exit circuits available for every port seen within the past hour
-   (each circuit can be adequate for many predicted ports -- it doesn't
-   need two separate circuits for each port), and it tries to have the
-   above internal circuits available if we've seen resolves or hidden
-   service activity within the past hour. If there are 12 or more clean
-   circuits open, it doesn't open more even if it has more predictions.
-
-   Only stable circuits can "cover" a port that is listed in the
-   LongLivedPorts config option. Similarly, hidden service requests
-   to ports listed in LongLivedPorts make us create stable internal
-   circuits.
-
-   Note that if there are no requests from the user for an hour, Tor
-   will predict no use and build no preemptive circuits.
-
-   The Tor client SHOULD NOT store its list of predicted requests to a
-   persistent medium.
-
-2.1.2. Clients build circuits on demand
-
-   Additionally, when a client request exists that no circuit (built or
-   pending) might support, we create a new circuit to support the request.
-   For exit connections, we pick an exit node that will handle the
-   most pending requests (choosing arbitrarily among ties), launch a
-   circuit to end there, and repeat until every unattached request
-   might be supported by a pending or built circuit. For internal
-   circuits, we pick an arbitrary acceptable path, repeating as needed.
-
-   In some cases we can reuse an already established circuit if it's
-   clean; see Section 2.3 (cannibalizing circuits) for details.
-
-2.1.3. Servers build circuits for testing reachability and bandwidth
-
-   Tor servers test reachability of their ORPort once they have
-   successfully built a circuit (on start and whenever their IP address
-   changes). They build an ordinary fast internal circuit with themselves
-   as the last hop. As soon as any testing circuit succeeds, the Tor
-   server decides it's reachable and is willing to publish a descriptor.
-
-   We launch multiple testing circuits (one at a time), until we
-   have NUM_PARALLEL_TESTING_CIRC (4) such circuits open. Then we
-   do a "bandwidth test" by sending a certain number of relay drop
-   cells down each circuit: BandwidthRate * 10 / CELL_NETWORK_SIZE
-   total cells divided across the four circuits, but never more than
-   CIRCWINDOW_START (1000) cells total. This exercises both outgoing and
-   incoming bandwidth, and helps to jumpstart the observed bandwidth
-   (see dir-spec.txt).
-
-   Tor servers also test reachability of their DirPort once they have
-   established a circuit, but they use an ordinary exit circuit for
-   this purpose.
-
-2.1.4. Hidden-service circuits
-
-   See section 4 below.
-
-2.1.5. Rate limiting of failed circuits
-
-   If we fail to build a circuit N times in a X second period (see Section
-   2.3 for how this works), we stop building circuits until the X seconds
-   have elapsed.
-   XXXX
-
-2.1.6. When to tear down circuits
-
-   XXXX
-
-2.2. Path selection and constraints
-
-   We choose the path for each new circuit before we build it.  We choose the
-   exit node first, followed by the other nodes in the circuit.  All paths
-   we generate obey the following constraints:
-     - We do not choose the same router twice for the same path.
-     - We do not choose any router in the same family as another in the same
-       path.
-     - We do not choose more than one router in a given /16 subnet
-       (unless EnforceDistinctSubnets is 0).
-     - We don't choose any non-running or non-valid router unless we have
-       been configured to do so. By default, we are configured to allow
-       non-valid routers in "middle" and "rendezvous" positions.
-     - If we're using Guard nodes, the first node must be a Guard (see 5
-       below)
-     - XXXX Choosing the length
-
-   For circuits that do not need to be "fast", when choosing among
-   multiple candidates for a path element, we choose randomly.
-
-   For "fast" circuits, we pick a given router as an exit with probability
-   proportional to its bandwidth.
-
-   For non-exit positions on "fast" circuits, we pick routers as above, but
-   we weight the bandwidth of Exit-flagged nodes depending
-   on the fraction of bandwidth available from non-Exit nodes.  Call the
-   total bandwidth for Exit nodes under consideration E,
-   and the total bandwidth for all nodes under
-   consideration T.  If E<T/3, we do not consider Exit-flagged nodes.
-   Otherwise, we weight their bandwidth with the factor (E-T/3)/E. This 
-   ensures that bandwidth is evenly distributed over nodes in 3-hop paths.
-
-   Similarly, guard nodes are weighted by the factor (G-T/3)/G, and not
-   considered for non-guard positions if this value is less than 0.
-
-   Additionally, we may be building circuits with one or more requests in
-   mind.  Each kind of request puts certain constraints on paths:
-
-     - All service-side introduction circuits and all rendezvous paths
-       should be Stable.
-     - All connection requests for connections that we think will need to
-       stay open a long time require Stable circuits.  Currently, Tor decides
-       this by examining the request's target port, and comparing it to a
-       list of "long-lived" ports. (Default: 21, 22, 706, 1863, 5050,
-       5190, 5222, 5223, 6667, 6697, 8300.)
-     - DNS resolves require an exit node whose exit policy is not equivalent
-       to "reject *:*".
-     - Reverse DNS resolves require a version of Tor with advertised eventdns
-       support (available in Tor 0.1.2.1-alpha-dev and later).
-     - All connection requests require an exit node whose exit policy
-       supports their target address and port (if known), or which "might
-       support it" (if the address isn't known).  See 2.2.1.
-     - Rules for Fast? XXXXX
-
-2.2.1. Choosing an exit
-
-   If we know what IP address we want to connect to or resolve, we can
-   trivially tell whether a given router will support it by simulating
-   its declared exit policy.
-
-   Because we often connect to addresses of the form hostname:port, we do not
-   always know the target IP address when we select an exit node.  In these
-   cases, we need to pick an exit node that "might support" connections to a
-   given address port with an unknown address.  An exit node "might support"
-   such a connection if any clause that accepts any connections to that port
-   precedes all clauses (if any) that reject all connections to that port.
-
-   Unless requested to do so by the user, we never choose an exit server
-   flagged as "BadExit" by more than half of the authorities who advertise
-   themselves as listing bad exits.
-
-2.2.2. User configuration
-
-   Users can alter the default behavior for path selection with configuration
-   options.
-
-   - If "ExitNodes" is provided, then every request requires an exit node on
-     the ExitNodes list.  (If a request is supported by no nodes on that list,
-     and StrictExitNodes is false, then Tor treats that request as if
-     ExitNodes were not provided.)
-
-   - "EntryNodes" and "StrictEntryNodes" behave analogously.
-
-   - If a user tries to connect to or resolve a hostname of the form
-     <target>.<servername>.exit, the request is rewritten to a request for
-     <target>, and the request is only supported by the exit whose nickname
-     or fingerprint is <servername>.
-
-2.3. Cannibalizing circuits
-
-   If we need a circuit and have a clean one already established, in
-   some cases we can adapt the clean circuit for our new
-   purpose. Specifically,
-
-   For hidden service interactions, we can "cannibalize" a clean internal
-   circuit if one is available, so we don't need to build those circuits
-   from scratch on demand.
-
-   We can also cannibalize clean circuits when the client asks to exit
-   at a given node -- either via the ".exit" notation or because the
-   destination is running at the same location as an exit node.
-
-
-2.4. Handling failure
-
-   If an attempt to extend a circuit fails (either because the first create
-   failed or a subsequent extend failed) then the circuit is torn down and is
-   no longer pending.  (XXXX really?)  Requests that might have been
-   supported by the pending circuit thus become unsupported, and a new
-   circuit needs to be constructed.
-
-   If a stream "begin" attempt fails with an EXITPOLICY error, we
-   decide that the exit node's exit policy is not correctly advertised,
-   so we treat the exit node as if it were a non-exit until we retrieve
-   a fresh descriptor for it.
-
-   XXXX
-
-3. Attaching streams to circuits
-
-   When a circuit that might support a request is built, Tor tries to attach
-   the request's stream to the circuit and sends a BEGIN, BEGIN_DIR,
-   or RESOLVE relay
-   cell as appropriate.  If the request completes unsuccessfully, Tor
-   considers the reason given in the CLOSE relay cell. [XXX yes, and?]
-
-
-   After a request has remained unattached for SocksTimeout (2 minutes
-   by default), Tor abandons the attempt and signals an error to the
-   client as appropriate (e.g., by closing the SOCKS connection).
-
-   XXX Timeouts and when Tor auto-retries.
-    * What stream-end-reasons are appropriate for retrying.
-
-   If no reply to BEGIN/RESOLVE, then the stream will timeout and fail.
-
-4. Hidden-service related circuits
-
-  XXX Tracking expected hidden service use (client-side and hidserv-side)
-
-5. Guard nodes
-
-  We use Guard nodes (also called "helper nodes" in the literature) to
-  prevent certain profiling attacks.  Here's the risk: if we choose entry and
-  exit nodes at random, and an attacker controls C out of N servers
-  (ignoring bandwidth), then the
-  attacker will control the entry and exit node of any given circuit with
-  probability (C/N)^2.  But as we make many different circuits over time,
-  then the probability that the attacker will see a sample of about (C/N)^2
-  of our traffic goes to 1.  Since statistical sampling works, the attacker
-  can be sure of learning a profile of our behavior.
-
-  If, on the other hand, we picked an entry node and held it fixed, we would
-  have probability C/N of choosing a bad entry and being profiled, and
-  probability (N-C)/N of choosing a good entry and not being profiled.
-
-  When guard nodes are enabled, Tor maintains an ordered list of entry nodes
-  as our chosen guards, and stores this list persistently to disk.  If a Guard
-  node becomes unusable, rather than replacing it, Tor adds new guards to the
-  end of the list.  When choosing the first hop of a circuit, Tor
-  chooses at
-  random from among the first NumEntryGuards (default 3) usable guards on the
-  list.  If there are not at least 2 usable guards on the list, Tor adds
-  routers until there are, or until there are no more usable routers to add.
-
-  A guard is unusable if any of the following hold:
-    - it is not marked as a Guard by the networkstatuses,
-    - it is not marked Valid (and the user hasn't set AllowInvalid entry)
-    - it is not marked Running
-    - Tor couldn't reach it the last time it tried to connect
-
-  A guard is unusable for a particular circuit if any of the rules for path
-  selection in 2.2 are not met.  In particular, if the circuit is "fast"
-  and the guard is not Fast, or if the circuit is "stable" and the guard is
-  not Stable, or if the guard has already been chosen as the exit node in
-  that circuit, Tor can't use it as a guard node for that circuit.
-
-  If the guard is excluded because of its status in the networkstatuses for
-  over 30 days, Tor removes it from the list entirely, preserving order.
-
-  If Tor fails to connect to an otherwise usable guard, it retries
-  periodically: every hour for six hours, every 4 hours for 3 days, every
-  18 hours for a week, and every 36 hours thereafter.  Additionally, Tor
-  retries unreachable guards the first time it adds a new guard to the list,
-  since it is possible that the old guards were only marked as unreachable
-  because the network was unreachable or down.
-
-  Tor does not add a guard persistently to the list until the first time we
-  have connected to it successfully.
-
-6. Router descriptor purposes
-
-  There are currently three "purposes" supported for router descriptors:
-  general, controller, and bridge. Most descriptors are of type general
-  -- these are the ones listed in the consensus, and the ones fetched
-  and used in normal cases.
-
-  Controller-purpose descriptors are those delivered by the controller
-  and labelled as such: they will be kept around (and expire like
-  normal descriptors), and they can be used by the controller in its
-  CIRCUITEXTEND commands. Otherwise they are ignored by Tor when it
-  chooses paths.
-
-  Bridge-purpose descriptors are for routers that are used as bridges. See
-  doc/design-paper/blocking.pdf for more design explanation, or proposal
-  125 for specific details. Currently bridge descriptors are used in place
-  of normal entry guards, for Tor clients that have UseBridges enabled.
-
-
-X. Old notes
-
-X.1. Do we actually do this?
-
-How to deal with network down.
-  - While all helpers are down/unreachable and there are no established
-    or on-the-way testing circuits, launch a testing circuit. (Do this
-    periodically in the same way we try to establish normal circuits
-    when things are working normally.)
-    (Testing circuits are a special type of circuit, that streams won't
-    attach to by accident.)
-  - When a testing circuit succeeds, mark all helpers up and hold
-    the testing circuit open.
-  - If a connection to a helper succeeds, close all testing circuits.
-    Else mark that helper down and try another.
-  - If the last helper is marked down and we already have a testing
-    circuit established, then add the first hop of that testing circuit
-    to the end of our helper node list, close that testing circuit,
-    and go back to square one. (Actually, rather than closing the
-    testing circuit, can we get away with converting it to a normal
-    circuit and beginning to use it immediately?)
-
-  [Do we actually do any of the above?  If so, let's spec it.  If not, let's
-  remove it. -NM]
-
-X.2. A thing we could do to deal with reachability.
-
-And as a bonus, it leads to an answer to Nick's attack ("If I pick
-my helper nodes all on 18.0.0.0:*, then I move, you'll know where I
-bootstrapped") -- the answer is to pick your original three helper nodes
-without regard for reachability. Then the above algorithm will add some
-more that are reachable for you, and if you move somewhere, it's more
-likely (though not certain) that some of the originals will become useful.
-Is that smart or just complex?
-
-X.3. Some stuff that worries me about entry guards. 2006 Jun, Nickm.
-
-  It is unlikely for two users to have the same set of entry guards.
-  Observing a user is sufficient to learn its entry guards.  So, as we move
-  around, entry guards make us linkable.  If we want to change guards when
-  our location (IP? subnet?) changes, we have two bad options.  We could
-    - Drop the old guards.  But if we go back to our old location,
-      we'll not use our old guards.  For a laptop that sometimes gets used
-      from work and sometimes from home, this is pretty fatal.
-    - Remember the old guards as associated with the old location, and use
-      them again if we ever go back to the old location.  This would be
-      nasty, since it would force us to record where we've been.
-
-  [Do we do any of this now? If not, this should move into 099-misc or
-  098-todo. -NM]
-
diff --git a/orchid/doc/spec/rend-spec.txt b/orchid/doc/spec/rend-spec.txt
deleted file mode 100644
index f0300926796..00000000000
--- a/orchid/doc/spec/rend-spec.txt
+++ /dev/null
@@ -1,751 +0,0 @@
-
-                    Tor Rendezvous Specification
-
-0. Overview and preliminaries
-
-   Read
-   https://www.torproject.org/doc/design-paper/tor-design.html#sec:rendezvous
-   before you read this specification. It will make more sense.
-
-   Rendezvous points provide location-hidden services (server
-   anonymity) for the onion routing network. With rendezvous points,
-   Bob can offer a TCP service (say, a webserver) via the onion
-   routing network, without revealing the IP of that service.
-
-   Bob does this by anonymously advertising a public key for his
-   service, along with a list of onion routers to act as "Introduction
-   Points" for his service.  He creates forward circuits to those
-   introduction points, and tells them about his public key.  To
-   connect to Bob, Alice first builds a circuit to an OR to act as
-   her "Rendezvous Point." She then connects to one of Bob's chosen
-   introduction points, optionally provides authentication or
-   authorization information, and asks it to tell him about her Rendezvous
-   Point (RP).  If Bob chooses to answer, he builds a circuit to her
-   RP, and tells it to connect him to Alice.  The RP joins their
-   circuits together, and begins relaying cells.  Alice's 'BEGIN'
-   cells are received directly by Bob's OP, which passes data to
-   and from the local server implementing Bob's service.
-
-   Below we describe a network-level specification of this service,
-   along with interfaces to make this process transparent to Alice
-   (so long as she is using an OP).
-
-0.1. Notation, conventions and prerequisites
-
-   In the specifications below, we use the same notation and terminology
-   as in "tor-spec.txt".  The service specified here also requires the
-   existence of an onion routing network as specified in that file.
-
-        H(x) is a SHA1 digest of x.
-        PKSign(SK,x) is a PKCS.1-padded RSA signature of x with SK.
-        PKEncrypt(SK,x) is a PKCS.1-padded RSA encryption of x with SK.
-        Public keys are all RSA, and encoded in ASN.1.
-        All integers are stored in network (big-endian) order.
-        All symmetric encryption uses AES in counter mode, except where
-            otherwise noted.
-
-   In all discussions, "Alice" will refer to a user connecting to a
-   location-hidden service, and "Bob" will refer to a user running a
-   location-hidden service.
-
-   An OP is (as defined elsewhere) an "Onion Proxy" or Tor client.
-
-   An OR is (as defined elsewhere) an "Onion Router" or Tor server.
-
-   An "Introduction point" is a Tor server chosen to be Bob's medium-term
-   'meeting place'.  A "Rendezvous point" is a Tor server chosen by Alice to
-   be a short-term communication relay between her and Bob.  All Tor servers
-   potentially act as introduction and rendezvous points.
-
-0.2. Protocol outline
-
-   1. Bob->Bob's OP: "Offer IP:Port as
-      public-key-name:Port". [configuration]
-      (We do not specify this step; it is left to the implementor of
-      Bob's OP.)
-
-   2. Bob's OP generates keypair and rendezvous service descriptor:
-        "Meet public-key X at introduction point A, B, or C." (signed)
-
-   3. Bob's OP->Introduction point via Tor: [introduction setup]
-        "This pk is me."
-
-   4. Bob's OP->directory service via Tor: publishes Bob's service
-      descriptor [advertisement]
-
-   5. Out of band, Alice receives a [x.y.]z.onion:port address.
-      She opens a SOCKS connection to her OP, and requests
-      x.y.z.onion:port.
-
-   6. Alice's OP retrieves Bob's descriptor via Tor. [descriptor lookup.]
-
-   7. Alice's OP chooses a rendezvous point, opens a circuit to that
-      rendezvous point, and establishes a rendezvous circuit. [rendezvous
-      setup.]
-
-   8. Alice connects to the Introduction point via Tor, and tells it about
-      her rendezvous point and optional authentication/authorization
-      information.  (Encrypted to Bob.)  [Introduction 1]
-
-   9. The Introduction point passes this on to Bob's OP via Tor, along the
-      introduction circuit. [Introduction 2]
-
-  10. Bob's OP decides whether to connect to Alice, and if so, creates a
-      circuit to Alice's RP via Tor.  Establishes a shared circuit.
-      [Rendezvous.]
-
-  11. Alice's OP sends begin cells to Bob's OP.  [Connection]
-
-0.3. Constants and new cell types
-
-  Relay cell types
-      32 -- RELAY_ESTABLISH_INTRO
-      33 -- RELAY_ESTABLISH_RENDEZVOUS
-      34 -- RELAY_INTRODUCE1
-      35 -- RELAY_INTRODUCE2
-      36 -- RELAY_RENDEZVOUS1
-      37 -- RELAY_RENDEZVOUS2
-      38 -- RELAY_INTRO_ESTABLISHED
-      39 -- RELAY_RENDEZVOUS_ESTABLISHED
-      40 -- RELAY_COMMAND_INTRODUCE_ACK
-
-0.4. Version overview
-
-   There are several parts in the hidden service protocol that have
-   changed over time, each of them having its own version number, whereas
-   other parts remained the same. The following list of potentially
-   versioned protocol parts should help reduce some confusion:
-
-   - Hidden service descriptor: the binary-based v0 was the default for
-     a long time, and an ascii-based v2 has been added by proposal
-     114. See 1.2.
-
-   - Hidden service descriptor propagation mechanism: currently related to
-     the hidden service descriptor version -- v0 publishes to the original
-     hs directory authorities, whereas v2 publishes to a rotating subset
-     of relays with the "hsdir" flag; see 1.4 and 1.6.
-
-   - Introduction protocol for how to generate an introduction cell:
-     v0 specified a nickname for the rendezvous point and assumed the
-     relay would know about it, whereas v2 now specifies IP address,
-     port, and onion key so the relay doesn't need to already recognize
-     it. See 1.8.
-
-1. The Protocol
-
-1.1. Bob configures his local OP.
-
-   We do not specify a format for the OP configuration file.  However,
-   OPs SHOULD allow Bob to provide more than one advertised service
-   per OP, and MUST allow Bob to specify one or more virtual ports per
-   service.  Bob provides a mapping from each of these virtual ports
-   to a local IP:Port pair.
-
-1.2. Bob's OP generates service descriptors.
-
-   The first time the OP provides an advertised service, it generates
-   a public/private keypair (stored locally).
-
-   Beginning with 0.2.0.10-alpha, Bob's OP encodes "V2" descriptors. The
-   format of a "V2" descriptor is as follows:
-
-     "rendezvous-service-descriptor" descriptor-id NL
-
-       [At start, exactly once]
-
-       Indicates the beginning of the descriptor. "descriptor-id" is a
-       periodically changing identifier of 160 bits formatted as 32 base32
-       chars that is calculated by the hidden service and its clients. If
-       the optional "descriptor-cookie" is used, this "descriptor-id"
-       cannot be computed by anyone else. (Everyone can verify that this
-       "descriptor-id" belongs to the rest of the descriptor, even without
-       knowing the optional "descriptor-cookie", as described below.) The
-       "descriptor-id" is calculated by performing the following operation:
-
-         descriptor-id =
-             H(permanent-id | H(time-period | descriptor-cookie | replica))
-
-       "permanent-id" is the permanent identifier of the hidden service,
-       consisting of 80 bits. It can be calculated by computing the hash value
-       of the public hidden service key and truncating after the first 80 bits:
-
-         permanent-id = H(public-key)[:10]
-
-       "H(time-period | descriptor-cookie | replica)" is the (possibly
-       secret) id part that is
-       necessary to verify that the hidden service is the true originator
-       of this descriptor. It can only be created by the hidden service
-       and its clients, but the "signature" below can only be created by
-       the service.
-
-       "descriptor-cookie" is an optional secret password of 128 bits that
-       is shared between the hidden service provider and its clients.
-
-       "replica" denotes the number of the non-consecutive replica.
-
-        (Each descriptor is replicated on a number of _consecutive_ nodes
-         in the identifier ring by making every storing node responsible
-         for the identifier intervals starting from its 3rd predecessor's
-         ID to its own ID. In addition to that, every service publishes
-         multiple descriptors with different descriptor IDs in order to
-         distribute them to different places on the ring. Therefore,
-         "replica" chooses one of the _non-consecutive_ replicas. -KL)
-
-       The "time-period" changes periodically depending on the global time and
-       as a function of "permanent-id". The current value for "time-period" can
-       be calculated using the following formula:
-
-         time-period = (current-time + permanent-id-byte * 86400 / 256)
-                         / 86400
-
-       "current-time" contains the current system time in seconds since
-       1970-01-01 00:00, e.g. 1188241957. "permanent-id-byte" is the first
-       (unsigned) byte of the permanent identifier (which is in network
-       order), e.g. 143. Adding the product of "permanent-id-byte" and
-       86400 (seconds per day), divided by 256, prevents "time-period" from
-       changing for all descriptors at the same time of the day. The result
-       of the overall operation is a (network-ordered) 32-bit integer, e.g.
-       13753 or 0x000035B9 with the example values given above.
-
-     "version" version-number NL
-
-       [Exactly once]
-
-       The version number of this descriptor's format.  In this case: 2.
-
-     "permanent-key" NL a public key in PEM format
-
-       [Exactly once]
-
-       The public key of the hidden service which is required to verify the
-       "descriptor-id" and the "signature".
-
-     "secret-id-part" secret-id-part NL
-
-       [Exactly once]
-
-       The result of the following operation as explained above, formatted as
-       32 base32 chars. Using this secret id part, everyone can verify that
-       the signed descriptor belongs to "descriptor-id".
-
-         secret-id-part = H(time-period | descriptor-cookie | replica)
-
-     "publication-time" YYYY-MM-DD HH:MM:SS NL
-
-       [Exactly once]
-
-       A timestamp when this descriptor has been created.
-
-     "protocol-versions" version-string NL
-
-       [Exactly once]
-
-       A comma-separated list of recognized and permitted version numbers
-       for use in INTRODUCE cells; these versions are described in section
-       1.8 below.
-
-     "introduction-points" NL encrypted-string
-
-       [At most once]
-
-       A list of introduction points. If the optional "descriptor-cookie" is
-       used, this list is encrypted with AES in CTR mode with a random
-       initialization vector of 128 bits that is written to
-       the beginning of the encrypted string, and the "descriptor-cookie" as
-       secret key of 128 bits length.
-
-       The string containing the introduction point data (either encrypted
-       or not) is encoded in base64, and surrounded with
-       "-----BEGIN MESSAGE-----" and "-----END MESSAGE-----".
-
-       The unencrypted string may begin with:
-
-        ["service-authentication" auth-type NL auth-data ... reserved]
-
-           [At start, any number]
-
-           The service-specific authentication data can be used to perform
-           client authentication. This data is independent of the selected
-           introduction point as opposed to "intro-authentication" below.
-
-       Subsequently, an arbitrary number of introduction point entries may
-       follow, each containing the following data:
-
-         "introduction-point" identifier NL
-
-           [At start, exactly once]
-
-           The identifier of this introduction point: the base-32 encoded
-           hash of this introduction point's identity key.
-
-         "ip-address" ip-address NL
-
-           [Exactly once]
-
-           The IP address of this introduction point.
-
-         "onion-port" port NL
-
-           [Exactly once]
-
-           The TCP port on which the introduction point is listening for
-           incoming onion requests.
-
-         "onion-key" NL a public key in PEM format
-
-           [Exactly once]
-
-           The public key that can be used to encrypt messages to this
-           introduction point.
-
-         "service-key" NL a public key in PEM format
-
-           [Exactly once]
-
-           The public key that can be used to encrypt messages to the hidden
-           service.
-
-        ["intro-authentication" auth-type NL auth-data ... reserved]
-
-           [Any number]
-
-           The introduction-point-specific authentication data can be used
-           to perform client authentication. This data depends on the
-           selected introduction point as opposed to "service-authentication"
-           above.
-
-        (This ends the fields in the encrypted portion of the descriptor.)
-
-       [It's ok for Bob to advertise 0 introduction points. He might want
-        to do that if he previously advertised some introduction points,
-        and now he doesn't have any. -RD]
-
-     "signature" NL signature-string
-
-       [At end, exactly once]
-
-       A signature of all fields above with the private key of the hidden
-       service.
-
-1.2.1. Other descriptor formats we don't use.
-
-   Support for the V0 descriptor format was dropped in 0.2.2.0-alpha-dev:
-
-         KL    Key length                            [2 octets]
-         PK    Bob's public key                      [KL octets]
-         TS    A timestamp                           [4 octets]
-         NI    Number of introduction points         [2 octets]
-         Ipt   A list of NUL-terminated ORs          [variable]
-         SIG   Signature of above fields             [variable]
-
-   KL is the length of PK, in octets.
-   TS is the number of seconds elapsed since Jan 1, 1970.
-
-   The members of Ipt may be either (a) nicknames, or (b) identity key
-   digests, encoded in hex, and prefixed with a '$'.
-
-   The V1 descriptor format was understood and accepted from
-   0.1.1.5-alpha-cvs to 0.2.0.6-alpha-dev, but no Tors generated it and
-   it was removed:
-
-         V     Format byte: set to 255               [1 octet]
-         V     Version byte: set to 1                [1 octet]
-         KL    Key length                            [2 octets]
-         PK    Bob's public key                      [KL octets]
-         TS    A timestamp                           [4 octets]
-         PROTO Protocol versions: bitmask            [2 octets]
-         NI    Number of introduction points         [2 octets]
-         For each introduction point: (as in INTRODUCE2 cells)
-             IP     Introduction point's address     [4 octets]
-             PORT   Introduction point's OR port     [2 octets]
-             ID     Introduction point identity ID   [20 octets]
-             KLEN   Length of onion key              [2 octets]
-             KEY    Introduction point onion key     [KLEN octets]
-         SIG   Signature of above fields             [variable]
-
-   A hypothetical "V1" descriptor, that has never been used but might
-   be useful for historical reasons, contains:
-
-         V     Format byte: set to 255               [1 octet]
-         V     Version byte: set to 1                [1 octet]
-         KL    Key length                            [2 octets]
-         PK    Bob's public key                      [KL octets]
-         TS    A timestamp                           [4 octets]
-         PROTO Rendezvous protocol versions: bitmask [2 octets]
-         NA    Number of auth mechanisms accepted    [1 octet]
-         For each auth mechanism:
-             AUTHT  The auth type that is supported  [2 octets]
-             AUTHL  Length of auth data              [1 octet]
-             AUTHD  Auth data                        [variable]
-         NI    Number of introduction points         [2 octets]
-         For each introduction point: (as in INTRODUCE2 cells)
-             ATYPE  An address type (typically 4)    [1 octet]
-             ADDR   Introduction point's IP address  [4 or 16 octets]
-             PORT   Introduction point's OR port     [2 octets]
-             AUTHT  The auth type that is supported  [2 octets]
-             AUTHL  Length of auth data              [1 octet]
-             AUTHD  Auth data                        [variable]
-             ID     Introduction point identity ID   [20 octets]
-             KLEN   Length of onion key              [2 octets]
-             KEY    Introduction point onion key     [KLEN octets]
-         SIG   Signature of above fields             [variable]
-
-   AUTHT specifies which authentication/authorization mechanism is
-   required by the hidden service or the introduction point. AUTHD
-   is arbitrary data that can be associated with an auth approach.
-   Currently only AUTHT of [00 00] is supported, with an AUTHL of 0.
-   See section 2 of this document for details on auth mechanisms.
-
-1.3. Bob's OP establishes his introduction points.
-
-   The OP establishes a new introduction circuit to each introduction
-   point.  These circuits MUST NOT be used for anything but hidden service
-   introduction.  To establish the introduction, Bob sends a
-   RELAY_ESTABLISH_INTRO cell, containing:
-
-        KL   Key length                             [2 octets]
-        PK   Introduction public key                [KL octets]
-        HS   Hash of session info                   [20 octets]
-        SIG  Signature of above information         [variable]
-
-   [XXX011, need to add auth information here. -RD]
-
-   To prevent replay attacks, the HS field contains a SHA-1 hash based on the
-   shared secret KH between Bob's OP and the introduction point, as
-   follows:
-       HS = H(KH | "INTRODUCE")
-   That is:
-       HS = H(KH | [49 4E 54 52 4F 44 55 43 45])
-   (KH, as specified in tor-spec.txt, is H(g^xy | [00]) .)
-
-   Upon receiving such a cell, the OR first checks that the signature is
-   correct with the included public key.  If so, it checks whether HS is
-   correct given the shared state between Bob's OP and the OR.  If either
-   check fails, the OP discards the cell; otherwise, it associates the
-   circuit with Bob's public key, and dissociates any other circuits
-   currently associated with PK.  On success, the OR sends Bob a
-   RELAY_INTRO_ESTABLISHED cell with an empty payload.
-
-   Bob's OP does not include its own public key in the RELAY_ESTABLISH_INTRO
-   cell, but the public key of a freshly generated introduction key pair.
-   The OP also includes these fresh public keys in the v2 hidden service
-   descriptor together with the other introduction point information. The
-   reason is that the introduction point does not need to and therefore
-   should not know for which hidden service it works, so as to prevent it
-   from tracking the hidden service's activity.
-
-1.4. Bob's OP advertises his service descriptor(s).
-
-   Bob's OP opens a stream to each directory server's directory port via Tor.
-   (He may re-use old circuits for this.)  Over this stream, Bob's OP makes
-   an HTTP 'POST' request, to a URL "/tor/rendezvous/publish" relative to the
-   directory server's root, containing as its body Bob's service descriptor.
-
-   Bob should upload a service descriptor for each version format that
-   is supported in the current Tor network.
-
-   Upon receiving a descriptor, the directory server checks the signature,
-   and discards the descriptor if the signature does not match the enclosed
-   public key.  Next, the directory server checks the timestamp.  If the
-   timestamp is more than 24 hours in the past or more than 1 hour in the
-   future, or the directory server already has a newer descriptor with the
-   same public key, the server discards the descriptor.  Otherwise, the
-   server discards any older descriptors with the same public key and
-   version format, and associates the new descriptor with the public key.
-   The directory server remembers this descriptor for at least 24 hours
-   after its timestamp.  At least every 18 hours, Bob's OP uploads a
-   fresh descriptor.
-
-   Bob's OP publishes v2 descriptors to a changing subset of all v2 hidden
-   service directories. Therefore, Bob's OP opens a stream via Tor to each
-   responsible hidden service directory. (He may re-use old circuits
-   for this.) Over this stream, Bob's OP makes an HTTP 'POST' request to a
-   URL "/tor/rendezvous2/publish" relative to the hidden service
-   directory's root, containing as its body Bob's service descriptor.
-
-   At any time, there are 6 hidden service directories responsible for
-   keeping replicas of a descriptor; they consist of 2 sets of 3 hidden
-   service directories with consecutive onion IDs. Bob's OP learns about
-   the complete list of hidden service directories by filtering the
-   consensus status document received from the directory authorities. A
-   hidden service directory is deemed responsible for all descriptor IDs in
-   the interval from its direct predecessor, exclusive, to its own ID,
-   inclusive; it further holds replicas for its 2 predecessors. A
-   participant only trusts its own routing list and never learns about
-   routing information from other parties.
-
-   Bob's OP publishes a new v2 descriptor once an hour or whenever its
-   content changes. V2 descriptors can be found by clients within a given
-   time period of 24 hours, after which they change their ID as described
-   under 1.2. If a published descriptor would be valid for less than 60
-   minutes (= 2 x 30 minutes to allow the server to be 30 minutes behind
-   and the client 30 minutes ahead), Bob's OP publishes the descriptor
-   under the ID of both, the current and the next publication period.
-
-1.5. Alice receives a x.y.z.onion address.
-
-   When Alice receives a pointer to a location-hidden service, it is as a
-   hostname of the form "z.onion" or "y.z.onion" or "x.y.z.onion", where
-   z is a base-32 encoding of a 10-octet hash of Bob's service's public
-   key, computed as follows:
-
-         1. Let H = H(PK).
-         2. Let H' = the first 80 bits of H, considering each octet from
-            most significant bit to least significant bit.
-         2. Generate a 16-character encoding of H', using base32 as defined
-            in RFC 3548.
-
-   (We only use 80 bits instead of the 160 bits from SHA1 because we
-   don't need to worry about arbitrary collisions, and because it will
-   make handling the url's more convenient.)
-
-   The string "x", if present, is the base-32 encoding of the
-   authentication/authorization required by the introduction point.
-   The string "y", if present, is the base-32 encoding of the
-   authentication/authorization required by the hidden service.
-   Omitting a string is taken to mean auth type [00 00].
-   See section 2 of this document for details on auth mechanisms.
-
-   [Yes, numbers are allowed at the beginning.  See RFC 1123. -NM]
-
-1.6. Alice's OP retrieves a service descriptor.
-
-   Similarly to the description in section 1.4, Alice's OP fetches a v2
-   descriptor from a randomly chosen hidden service directory out of the
-   changing subset of 6 nodes. If the request is unsuccessful, Alice retries
-   the other remaining responsible hidden service directories in a random
-   order. Alice relies on Bob to care about a potential clock skew between
-   the two by possibly storing two sets of descriptors (see end of section
-   1.4).
-
-   Alice's OP opens a stream via Tor to the chosen v2 hidden service
-   directory. (She may re-use old circuits for this.) Over this stream,
-   Alice's OP makes an HTTP 'GET' request for the document
-   "/tor/rendezvous2/<z>", where z is replaced with the encoding of the
-   descriptor ID. The directory replies with a 404 HTTP response if it does
-   not recognize <z>, and otherwise returns Bob's most recently uploaded
-   service descriptor.
-
-   If Alice's OP receives a 404 response, it tries the other directory
-   servers, and only fails the lookup if none recognize the public key hash.
-
-   Upon receiving a service descriptor, Alice verifies with the same process
-   as the directory server uses, described above in section 1.4.
-
-   The directory server gives a 400 response if it cannot understand Alice's
-   request.
-
-   Alice should cache the descriptor locally, but should not use
-   descriptors that are more than 24 hours older than their timestamp.
-   [Caching may make her partitionable, but she fetched it anonymously,
-    and we can't very well *not* cache it. -RD]
-
-1.7. Alice's OP establishes a rendezvous point.
-
-   When Alice requests a connection to a given location-hidden service,
-   and Alice's OP does not have an established circuit to that service,
-   the OP builds a rendezvous circuit.  It does this by establishing
-   a circuit to a randomly chosen OR, and sending a
-   RELAY_ESTABLISH_RENDEZVOUS cell to that OR.  The body of that cell
-   contains:
-
-        RC   Rendezvous cookie    [20 octets]
-
-   [XXX011 this looks like an auth mechanism. should we generalize here? -RD]
-
-   The rendezvous cookie is an arbitrary 20-byte value, chosen randomly by
-   Alice's OP.
-
-   Upon receiving a RELAY_ESTABLISH_RENDEZVOUS cell, the OR associates the
-   RC with the circuit that sent it.  It replies to Alice with an empty
-   RELAY_RENDEZVOUS_ESTABLISHED cell to indicate success.
-
-   Alice's OP MUST NOT use the circuit which sent the cell for any purpose
-   other than rendezvous with the given location-hidden service.
-
-1.8. Introduction: from Alice's OP to Introduction Point
-
-   Alice builds a separate circuit to one of Bob's chosen introduction
-   points, and sends it a RELAY_INTRODUCE1 cell containing:
-
-       Cleartext
-          PK_ID  Identifier for Bob's PK      [20 octets]
-       Encrypted to Bob's PK: (in the v0 intro protocol)
-          RP     Rendezvous point's nickname  [20 octets]
-          RC     Rendezvous cookie            [20 octets]
-          g^x    Diffie-Hellman data, part 1 [128 octets]
-        OR (in the v1 intro protocol)
-          VER    Version byte: set to 1.        [1 octet]
-          RP     Rendezvous point nick or ID  [42 octets]
-          RC     Rendezvous cookie            [20 octets]
-          g^x    Diffie-Hellman data, part 1 [128 octets]
-        OR (in the v2 intro protocol)
-          VER    Version byte: set to 2.        [1 octet]
-          IP     Rendezvous point's address    [4 octets]
-          PORT   Rendezvous point's OR port    [2 octets]
-          ID     Rendezvous point identity ID [20 octets]
-          KLEN   Length of onion key           [2 octets]
-          KEY    Rendezvous point onion key [KLEN octets]
-          RC     Rendezvous cookie            [20 octets]
-          g^x    Diffie-Hellman data, part 1 [128 octets]
-
-   PK_ID is the hash of Bob's public key.  RP is NUL-padded and
-   terminated. In version 0, it must contain a nickname. In version 1,
-   it must contain EITHER a nickname or an identity key digest that is
-   encoded in hex and prefixed with a '$'.
-
-   The hybrid encryption to Bob's PK works just like the hybrid
-   encryption in CREATE cells (see tor-spec). Thus the payload of the
-   version 0 RELAY_INTRODUCE1 cell on the wire will contain
-   20+42+16+20+20+128=246 bytes, and the version 1 and version 2
-   introduction formats have other sizes.
-
-   Through Tor 0.2.0.6-alpha, clients only generated the v0 introduction
-   format, whereas hidden services have understood and accepted v0,
-   v1, and v2 since 0.1.1.x. As of Tor 0.2.0.7-alpha and 0.1.2.18,
-   clients switched to using the v2 intro format.
-
-   If Alice has downloaded a v2 descriptor, she uses the contained public
-   key ("service-key") instead of Bob's public key to create the
-   RELAY_INTRODUCE1 cell as described above.
-
-1.8.1. Other introduction formats we don't use.
-
-    We briefly speculated about using the following format for the
-    "encrypted to Bob's PK" part of the introduction, but no Tors have
-    ever generated these.
-
-          VER    Version byte: set to 3.           [1 octet]
-          ATYPE  An address type (typically 4)     [1 octet]
-          ADDR   Rendezvous point's IP address     [4 or 16 octets]
-          PORT   Rendezvous point's OR port        [2 octets]
-          AUTHT  The auth type that is supported   [2 octets]
-          AUTHL  Length of auth data               [1 octet]
-          AUTHD  Auth data                        [variable]
-          ID     Rendezvous point identity ID    [20 octets]
-          KLEN  Length of onion key               [2 octets]
-          KEY    Rendezvous point onion key    [KLEN octets]
-          RC     Rendezvous cookie               [20 octets]
-          g^x    Diffie-Hellman data, part 1    [128 octets]
-
-1.9. Introduction: From the Introduction Point to Bob's OP
-
-   If the Introduction Point recognizes PK_ID as a public key which has
-   established a circuit for introductions as in 1.3 above, it sends the body
-   of the cell in a new RELAY_INTRODUCE2 cell down the corresponding circuit.
-   (If the PK_ID is unrecognized, the RELAY_INTRODUCE1 cell is discarded.)
-
-   After sending the RELAY_INTRODUCE2 cell, the OR replies to Alice with an
-   empty RELAY_COMMAND_INTRODUCE_ACK cell.  If no RELAY_INTRODUCE2 cell can
-   be sent, the OR replies to Alice with a non-empty cell to indicate an
-   error.  (The semantics of the cell body may be determined later; the
-   current implementation sends a single '1' byte on failure.)
-
-   When Bob's OP receives the RELAY_INTRODUCE2 cell, it decrypts it with
-   the private key for the corresponding hidden service, and extracts the
-   rendezvous point's nickname, the rendezvous cookie, and the value of g^x
-   chosen by Alice.
-
-1.10. Rendezvous
-
-   Bob's OP builds a new Tor circuit ending at Alice's chosen rendezvous
-   point, and sends a RELAY_RENDEZVOUS1 cell along this circuit, containing:
-       RC       Rendezvous cookie  [20 octets]
-       g^y      Diffie-Hellman     [128 octets]
-       KH       Handshake digest   [20 octets]
-
-   (Bob's OP MUST NOT use this circuit for any other purpose.)
-
-   If the RP recognizes RC, it relays the rest of the cell down the
-   corresponding circuit in a RELAY_RENDEZVOUS2 cell, containing:
-
-       g^y      Diffie-Hellman     [128 octets]
-       KH       Handshake digest   [20 octets]
-
-   (If the RP does not recognize the RC, it discards the cell and
-   tears down the circuit.)
-
-   When Alice's OP receives a RELAY_RENDEZVOUS2 cell on a circuit which
-   has sent a RELAY_ESTABLISH_RENDEZVOUS cell but which has not yet received
-   a reply, it uses g^y and H(g^xy) to complete the handshake as in the Tor
-   circuit extend process: they establish a 60-octet string as
-       K = SHA1(g^xy | [00]) | SHA1(g^xy | [01]) | SHA1(g^xy | [02])
-   and generate
-       KH = K[0..15]
-       Kf = K[16..31]
-       Kb = K[32..47]
-
-   Subsequently, the rendezvous point passes relay cells, unchanged, from
-   each of the two circuits to the other.  When Alice's OP sends
-   RELAY cells along the circuit, it first encrypts them with the
-   Kf, then with all of the keys for the ORs in Alice's side of the circuit;
-   and when Alice's OP receives RELAY cells from the circuit, it decrypts
-   them with the keys for the ORs in Alice's side of the circuit, then
-   decrypts them with Kb.  Bob's OP does the same, with Kf and Kb
-   interchanged.
-
-1.11. Creating streams
-
-   To open TCP connections to Bob's location-hidden service, Alice's OP sends
-   a RELAY_BEGIN cell along the established circuit, using the special
-   address "", and a chosen port.  Bob's OP chooses a destination IP and
-   port, based on the configuration of the service connected to the circuit,
-   and opens a TCP stream.  From then on, Bob's OP treats the stream as an
-   ordinary exit connection.
-   [ Except he doesn't include addr in the connected cell or the end
-     cell. -RD]
-
-   Alice MAY send multiple RELAY_BEGIN cells along the circuit, to open
-   multiple streams to Bob.  Alice SHOULD NOT send RELAY_BEGIN cells for any
-   other address along her circuit to Bob; if she does, Bob MUST reject them.
-
-2. Authentication and authorization.
-
-Foo.
-
-3. Hidden service directory operation
-
-   This section has been introduced with the v2 hidden service descriptor
-   format. It describes all operations of the v2 hidden service descriptor
-   fetching and propagation mechanism that are required for the protocol
-   described in section 1 to succeed with v2 hidden service descriptors.
-
-3.1. Configuring as hidden service directory
-
-   Every onion router that has its directory port open can decide whether it
-   wants to store and serve hidden service descriptors. An onion router which
-   is configured as such includes the "hidden-service-dir" flag in its router
-   descriptors that it sends to directory authorities.
-
-   The directory authorities include a new flag "HSDir" for routers that
-   decided to provide storage for hidden service descriptors and that
-   have been running for at least 24 hours.
-
-3.2. Accepting publish requests
-
-   Hidden service directory nodes accept publish requests for v2 hidden service
-   descriptors and store them to their local memory. (It is not necessary to
-   make descriptors persistent, because after restarting, the onion router
-   would not be accepted as a storing node anyway, because it has not been
-   running for at least 24 hours.) All requests and replies are formatted as
-   HTTP messages. Requests are initiated via BEGIN_DIR cells directed to
-   the router's directory port, and formatted as HTTP POST requests to the URL
-   "/tor/rendezvous2/publish" relative to the hidden service directory's root,
-   containing as its body a v2 service descriptor.
-
-   A hidden service directory node parses every received descriptor and only
-   stores it when it thinks that it is responsible for storing that descriptor
-   based on its own routing table. See section 1.4 for more information on how
-   to determine responsibility for a certain descriptor ID.
-
-3.3. Processing fetch requests
-
-   Hidden service directory nodes process fetch requests for hidden service
-   descriptors by looking them up in their local memory. (They do not need to
-   determine if they are responsible for the passed ID, because it does no harm
-   if they deliver a descriptor for which they are not (any more) responsible.)
-   All requests and replies are formatted as HTTP messages. Requests are
-   initiated via BEGIN_DIR cells directed to the router's directory port,
-   and formatted as HTTP GET requests for the document "/tor/rendezvous2/<z>",
-   where z is replaced with the encoding of the descriptor ID.
-
diff --git a/orchid/doc/spec/socks-extensions.txt b/orchid/doc/spec/socks-extensions.txt
deleted file mode 100644
index 62d86acd9f5..00000000000
--- a/orchid/doc/spec/socks-extensions.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-Tor's extensions to the SOCKS protocol
-
-1. Overview
-
-  The SOCKS protocol provides a generic interface for TCP proxies.  Client
-  software connects to a SOCKS server via TCP, and requests a TCP connection
-  to another address and port.  The SOCKS server establishes the connection,
-  and reports success or failure to the client.  After the connection has
-  been established, the client application uses the TCP stream as usual.
-
-  Tor supports SOCKS4 as defined in [1], SOCKS4A as defined in [2], and
-  SOCKS5 as defined in [3].
-
-  The stickiest issue for Tor in supporting clients, in practice, is forcing
-  DNS lookups to occur at the OR side: if clients do their own DNS lookup,
-  the DNS server can learn which addresses the client wants to reach.
-  SOCKS4 supports addressing by IPv4 address; SOCKS4A is a kludge on top of
-  SOCKS4 to allow addressing by hostname; SOCKS5 supports IPv4, IPv6, and
-  hostnames.
-
-1.1. Extent of support
-
-  Tor supports the SOCKS4, SOCKS4A, and SOCKS5 standards, except as follows:
-
-  BOTH:
-  - The BIND command is not supported.
-
-  SOCKS4,4A:
-  - SOCKS4 usernames are ignored.
-
-  SOCKS5:
-  - The (SOCKS5) "UDP ASSOCIATE" command is not supported.
-  - IPv6 is not supported in CONNECT commands.
-  - Only the "NO AUTHENTICATION" (SOCKS5) authentication method [00] is
-    supported.
-
-2. Name lookup
-
-  As an extension to SOCKS4A and SOCKS5, Tor implements a new command value,
-  "RESOLVE" [F0].  When Tor receives a "RESOLVE" SOCKS command, it initiates
-  a remote lookup of the hostname provided as the target address in the SOCKS
-  request.  The reply is either an error (if the address couldn't be
-  resolved) or a success response.  In the case of success, the address is
-  stored in the portion of the SOCKS response reserved for remote IP address.
-
-  (We support RESOLVE in SOCKS4 too, even though it is unnecessary.)
-
-  For SOCKS5 only, we support reverse resolution with a new command value,
-  "RESOLVE_PTR" [F1]. In response to a "RESOLVE_PTR" SOCKS5 command with
-  an IPv4 address as its target, Tor attempts to find the canonical
-  hostname for that IPv4 record, and returns it in the "server bound
-  address" portion of the reply.
-  (This command was not supported before Tor 0.1.2.2-alpha.)
-
-3. Other command extensions.
-
-  Tor 0.1.2.4-alpha added a new command value: "CONNECT_DIR" [F2].
-  In this case, Tor will open an encrypted direct TCP connection to the
-  directory port of the Tor server specified by address:port (the port
-  specified should be the ORPort of the server). It uses a one-hop tunnel
-  and a "BEGIN_DIR" relay cell to accomplish this secure connection.
-
-  The F2 command value was removed in Tor 0.2.0.10-alpha in favor of a
-  new use_begindir flag in edge_connection_t.
-
-4. HTTP-resistance
-
-  Tor checks the first byte of each SOCKS request to see whether it looks
-  more like an HTTP request (that is, it starts with a "G", "H", or "P").  If
-  so, Tor returns a small webpage, telling the user that his/her browser is
-  misconfigured.  This is helpful for the many users who mistakenly try to
-  use Tor as an HTTP proxy instead of a SOCKS proxy.
-
-References:
- [1] http://archive.socks.permeo.com/protocol/socks4.protocol
- [2] http://archive.socks.permeo.com/protocol/socks4a.protocol
- [3] SOCKS5: RFC1928
-
diff --git a/orchid/doc/spec/tor-spec.txt b/orchid/doc/spec/tor-spec.txt
deleted file mode 100644
index efa6029f22e..00000000000
--- a/orchid/doc/spec/tor-spec.txt
+++ /dev/null
@@ -1,992 +0,0 @@
-
-                         Tor Protocol Specification
-
-                              Roger Dingledine
-                               Nick Mathewson
-
-Note: This document aims to specify Tor as implemented in 0.2.1.x.  Future
-versions of Tor may implement improved protocols, and compatibility is not
-guaranteed.  Compatibility notes are given for versions 0.1.1.15-rc and
-later; earlier versions are not compatible with the Tor network as of this
-writing.
-
-This specification is not a design document; most design criteria
-are not examined.  For more information on why Tor acts as it does,
-see tor-design.pdf.
-
-0. Preliminaries
-
-0.1.  Notation and encoding
-
-   PK -- a public key.
-   SK -- a private key.
-   K  -- a key for a symmetric cypher.
-
-   a|b -- concatenation of 'a' and 'b'.
-
-   [A0 B1 C2] -- a three-byte sequence, containing the bytes with
-   hexadecimal values A0, B1, and C2, in that order.
-
-   All numeric values are encoded in network (big-endian) order.
-
-   H(m) -- a cryptographic hash of m.
-
-0.2. Security parameters
-
-   Tor uses a stream cipher, a public-key cipher, the Diffie-Hellman
-   protocol, and a hash function.
-
-   KEY_LEN -- the length of the stream cipher's key, in bytes.
-
-   PK_ENC_LEN -- the length of a public-key encrypted message, in bytes.
-   PK_PAD_LEN -- the number of bytes added in padding for public-key
-     encryption, in bytes. (The largest number of bytes that can be encrypted
-     in a single public-key operation is therefore PK_ENC_LEN-PK_PAD_LEN.)
-
-   DH_LEN -- the number of bytes used to represent a member of the
-     Diffie-Hellman group.
-   DH_SEC_LEN -- the number of bytes used in a Diffie-Hellman private key (x).
-
-   HASH_LEN -- the length of the hash function's output, in bytes.
-
-   PAYLOAD_LEN -- The longest allowable cell payload, in bytes. (509)
-
-   CELL_LEN -- The length of a Tor cell, in bytes.
-
-0.3. Ciphers
-
-   For a stream cipher, we use 128-bit AES in counter mode, with an IV of all
-   0 bytes.
-
-   For a public-key cipher, we use RSA with 1024-bit keys and a fixed
-   exponent of 65537.  We use OAEP-MGF1 padding, with SHA-1 as its digest
-   function.  We leave the optional "Label" parameter unset. (For OAEP
-   padding, see ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-1/pkcs-1v2-1.pdf)
-
-   For Diffie-Hellman, we use a generator (g) of 2.  For the modulus (p), we
-   use the 1024-bit safe prime from rfc2409 section 6.2 whose hex
-   representation is:
-
-     "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E08"
-     "8A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B"
-     "302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9"
-     "A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE6"
-     "49286651ECE65381FFFFFFFFFFFFFFFF"
-
-   As an optimization, implementations SHOULD choose DH private keys (x) of
-   320 bits.  Implementations that do this MUST never use any DH key more
-   than once.
-   [May other implementations reuse their DH keys?? -RD]
-   [Probably not. Conceivably, you could get away with changing DH keys once
-   per second, but there are too many oddball attacks for me to be
-   comfortable that this is safe. -NM]
-
-   For a hash function, we use SHA-1.
-
-   KEY_LEN=16.
-   DH_LEN=128; DH_SEC_LEN=40.
-   PK_ENC_LEN=128; PK_PAD_LEN=42.
-   HASH_LEN=20.
-
-   When we refer to "the hash of a public key", we mean the SHA-1 hash of the
-   DER encoding of an ASN.1 RSA public key (as specified in PKCS.1).
-
-   All "random" values should be generated with a cryptographically strong
-   random number generator, unless otherwise noted.
-
-   The "hybrid encryption" of a byte sequence M with a public key PK is
-   computed as follows:
-      1. If M is less than PK_ENC_LEN-PK_PAD_LEN, pad and encrypt M with PK.
-      2. Otherwise, generate a KEY_LEN byte random key K.
-         Let M1 = the first PK_ENC_LEN-PK_PAD_LEN-KEY_LEN bytes of M,
-         and let M2 = the rest of M.
-         Pad and encrypt K|M1 with PK.  Encrypt M2 with our stream cipher,
-         using the key K.  Concatenate these encrypted values.
-   [XXX Note that this "hybrid encryption" approach does not prevent
-   an attacker from adding or removing bytes to the end of M. It also
-   allows attackers to modify the bytes not covered by the OAEP --
-   see Goldberg's PET2006 paper for details. We will add a MAC to this
-   scheme one day. -RD]
-
-0.4. Other parameter values
-
-   CELL_LEN=512
-
-1. System overview
-
-   Tor is a distributed overlay network designed to anonymize
-   low-latency TCP-based applications such as web browsing, secure shell,
-   and instant messaging. Clients choose a path through the network and
-   build a ``circuit'', in which each node (or ``onion router'' or ``OR'')
-   in the path knows its predecessor and successor, but no other nodes in
-   the circuit.  Traffic flowing down the circuit is sent in fixed-size
-   ``cells'', which are unwrapped by a symmetric key at each node (like
-   the layers of an onion) and relayed downstream.
-
-1.1. Keys and names
-
-   Every Tor server has multiple public/private keypairs:
-
-    - A long-term signing-only "Identity key" used to sign documents and
-      certificates, and used to establish server identity.
-    - A medium-term "Onion key" used to decrypt onion skins when accepting
-      circuit extend attempts.  (See 5.1.)  Old keys MUST be accepted for at
-      least one week after they are no longer advertised.  Because of this,
-      servers MUST retain old keys for a while after they're rotated.
-    - A short-term "Connection key" used to negotiate TLS connections.
-      Tor implementations MAY rotate this key as often as they like, and
-      SHOULD rotate this key at least once a day.
-
-   Tor servers are also identified by "nicknames"; these are specified in
-   dir-spec.txt.
-
-2. Connections
-
-   Connections between two Tor servers, or between a client and a server,
-   use TLS/SSLv3 for link authentication and encryption.  All
-   implementations MUST support the SSLv3 ciphersuite
-   "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA", and SHOULD support the TLS
-   ciphersuite "TLS_DHE_RSA_WITH_AES_128_CBC_SHA" if it is available.
-
-   There are three acceptable ways to perform a TLS handshake when
-   connecting to a Tor server: "certificates up-front", "renegotiation", and
-   "backwards-compatible renegotiation".  ("Backwards-compatible
-   renegotiation" is, as the name implies, compatible with both other
-   handshake types.)
-
-   Before Tor 0.2.0.21, only "certificates up-front" was supported.  In Tor
-   0.2.0.21 or later, "backwards-compatible renegotiation" is used.
-
-   In "certificates up-front", the connection initiator always sends a
-   two-certificate chain, consisting of an X.509 certificate using a
-   short-term connection public key and a second, self- signed X.509
-   certificate containing its identity key.  The other party sends a similar
-   certificate chain.  The initiator's ClientHello MUST NOT include any
-   ciphersuites other than:
-     TLS_DHE_RSA_WITH_AES_256_CBC_SHA
-     TLS_DHE_RSA_WITH_AES_128_CBC_SHA
-     SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA
-     SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA
-
-   In "renegotiation", the connection initiator sends no certificates, and
-   the responder sends a single connection certificate.  Once the TLS
-   handshake is complete, the initiator renegotiates the handshake, with each
-   parties sending a two-certificate chain as in "certificates up-front".
-   The initiator's ClientHello MUST include at least once ciphersuite not in
-   the list above.  The responder SHOULD NOT select any ciphersuite besides
-   those in the list above.
-     [The above "should not" is because some of the ciphers that
-     clients list may be fake.]
-
-   In "backwards-compatible renegotiation", the connection initiator's
-   ClientHello MUST include at least one ciphersuite other than those listed
-   above. The connection responder examines the initiator's ciphersuite list
-   to see whether it includes any ciphers other than those included in the
-   list above.  If extra ciphers are included, the responder proceeds as in
-   "renegotiation": it sends a single certificate and does not request
-   client certificates.  Otherwise (in the case that no extra ciphersuites
-   are included in the ClientHello) the responder proceeds as in
-   "certificates up-front": it requests client certificates, and sends a
-   two-certificate chain.  In either case, once the responder has sent its
-   certificate or certificates, the initiator counts them.  If two
-   certificates have been sent, it proceeds as in "certificates up-front";
-   otherwise, it proceeds as in "renegotiation".
-
-   All new implementations of the Tor server protocol MUST support
-   "backwards-compatible renegotiation"; clients SHOULD do this too.  If
-   this is not possible, new client implementations MUST support both
-   "renegotiation" and "certificates up-front" and use the router's
-   published link protocols list (see dir-spec.txt on the "protocols" entry)
-   to decide which to use.
-
-   In all of the above handshake variants, certificates sent in the clear
-   SHOULD NOT include any strings to identify the host as a Tor server.  In
-   the "renegotation" and "backwards-compatible renegotiation", the
-   initiator SHOULD chose a list of ciphersuites and TLS extensions chosen
-   to mimic one used by a popular web browser.
-
-   Responders MUST NOT select any TLS ciphersuite that lacks ephemeral keys,
-   or whose symmetric keys are less then KEY_LEN bits, or whose digests are
-   less than HASH_LEN bits.  Responders SHOULD NOT select any SSLv3
-   ciphersuite other than those listed above.
-
-   Even though the connection protocol is identical, we will think of the
-   initiator as either an onion router (OR) if it is willing to relay
-   traffic for other Tor users, or an onion proxy (OP) if it only handles
-   local requests. Onion proxies SHOULD NOT provide long-term-trackable
-   identifiers in their handshakes.
-
-   In all handshake variants, once all certificates are exchanged, all
-   parties receiving certificates must confirm that the identity key is as
-   expected.  (When initiating a connection, the expected identity key is
-   the one given in the directory; when creating a connection because of an
-   EXTEND cell, the expected identity key is the one given in the cell.)  If
-   the key is not as expected, the party must close the connection.
-
-   When connecting to an OR, all parties SHOULD reject the connection if that
-   OR has a malformed or missing certificate.  When accepting an incoming
-   connection, an OR SHOULD NOT reject incoming connections from parties with
-   malformed or missing certificates.  (However, an OR should not believe
-   that an incoming connection is from another OR unless the certificates
-   are present and well-formed.)
-
-   [Before version 0.1.2.8-rc, ORs rejected incoming connections from ORs and
-   OPs alike if their certificates were missing or malformed.]
-
-   Once a TLS connection is established, the two sides send cells
-   (specified below) to one another.  Cells are sent serially.  All
-   cells are CELL_LEN bytes long.  Cells may be sent embedded in TLS
-   records of any size or divided across TLS records, but the framing
-   of TLS records MUST NOT leak information about the type or contents
-   of the cells.
-
-   TLS connections are not permanent. Either side MAY close a connection
-   if there are no circuits running over it and an amount of time
-   (KeepalivePeriod, defaults to 5 minutes) has passed since the last time
-   any traffic was transmitted over the TLS connection.  Clients SHOULD
-   also hold a TLS connection with no circuits open, if it is likely that a
-   circuit will be built soon using that connection.
-
-   (As an exception, directory servers may try to stay connected to all of
-   the ORs -- though this will be phased out for the Tor 0.1.2.x release.)
-
-   To avoid being trivially distinguished from servers, client-only Tor
-   instances are encouraged but not required to use a two-certificate chain
-   as well.  Clients SHOULD NOT keep using the same certificates when
-   their IP address changes.  Clients MAY send no certificates at all.
-
-3. Cell Packet format
-
-   The basic unit of communication for onion routers and onion
-   proxies is a fixed-width "cell".
-
-   On a version 1 connection, each cell contains the following
-   fields:
-
-        CircID                                [2 bytes]
-        Command                               [1 byte]
-        Payload (padded with 0 bytes)         [PAYLOAD_LEN bytes]
-
-   On a version 2 connection, all cells are as in version 1 connections,
-   except for the initial VERSIONS cell, whose format is:
-
-        Circuit                               [2 octets; set to 0]
-        Command                               [1 octet; set to 7 for VERSIONS]
-        Length                                [2 octets; big-endian integer]
-        Payload                               [Length bytes]
-
-   The CircID field determines which circuit, if any, the cell is
-   associated with.
-
-   The 'Command' field holds one of the following values:
-         0 -- PADDING     (Padding)                 (See Sec 7.2)
-         1 -- CREATE      (Create a circuit)        (See Sec 5.1)
-         2 -- CREATED     (Acknowledge create)      (See Sec 5.1)
-         3 -- RELAY       (End-to-end data)         (See Sec 5.5 and 6)
-         4 -- DESTROY     (Stop using a circuit)    (See Sec 5.4)
-         5 -- CREATE_FAST (Create a circuit, no PK) (See Sec 5.1)
-         6 -- CREATED_FAST (Circuit created, no PK) (See Sec 5.1)
-         7 -- VERSIONS    (Negotiate proto version) (See Sec 4)
-         8 -- NETINFO     (Time and address info)   (See Sec 4)
-         9 -- RELAY_EARLY (End-to-end data; limited) (See sec 5.6)
-
-   The interpretation of 'Payload' depends on the type of the cell.
-      PADDING: Payload is unused.
-      CREATE:  Payload contains the handshake challenge.
-      CREATED: Payload contains the handshake response.
-      RELAY:   Payload contains the relay header and relay body.
-      DESTROY: Payload contains a reason for closing the circuit.
-               (see 5.4)
-   Upon receiving any other value for the command field, an OR must
-   drop the cell.  Since more cell types may be added in the future, ORs
-   should generally not warn when encountering unrecognized commands.
-
-   The payload is padded with 0 bytes.
-
-   PADDING cells are currently used to implement connection keepalive.
-   If there is no other traffic, ORs and OPs send one another a PADDING
-   cell every few minutes.
-
-   CREATE, CREATED, and DESTROY cells are used to manage circuits;
-   see section 5 below.
-
-   RELAY cells are used to send commands and data along a circuit; see
-   section 6 below.
-
-   VERSIONS and NETINFO cells are used to set up connections.  See section 4
-   below.
-
-4. Negotiating and initializing connections
-
-4.1. Negotiating versions with VERSIONS cells
-
-   There are multiple instances of the Tor link connection protocol.  Any
-   connection negotiated using the "certificates up front" handshake (see
-   section 2 above) is "version 1".  In any connection where both parties
-   have behaved as in the "renegotiation" handshake, the link protocol
-   version is 2 or higher.
-
-   To determine the version, in any connection where the "renegotiation"
-   handshake was used (that is, where the server sent only one certificate
-   at first and where the client did not send any certificates until
-   renegotiation), both parties MUST send a VERSIONS cell immediately after
-   the renegotiation is finished, before any other cells are sent.  Parties
-   MUST NOT send any other cells on a connection until they have received a
-   VERSIONS cell.
-
-   The payload in a VERSIONS cell is a series of big-endian two-byte
-   integers.  Both parties MUST select as the link protocol version the
-   highest number contained both in the VERSIONS cell they sent and in the
-   versions cell they received.  If they have no such version in common,
-   they cannot communicate and MUST close the connection.
-
-   Since the version 1 link protocol does not use the "renegotiation"
-   handshake, implementations MUST NOT list version 1 in their VERSIONS
-   cell.
-
-4.2. NETINFO cells
-
-   If version 2 or higher is negotiated, each party sends the other a
-   NETINFO cell.  The cell's payload is:
-
-         Timestamp              [4 bytes]
-         Other OR's address     [variable]
-         Number of addresses    [1 byte]
-         This OR's addresses    [variable]
-
-   The address format is a type/length/value sequence as given in section
-   6.4 below.  The timestamp is a big-endian unsigned integer number of
-   seconds since the unix epoch.
-
-   Implementations MAY use the timestamp value to help decide if their
-   clocks are skewed.  Initiators MAY use "other OR's address" to help
-   learn which address their connections are originating from, if they do
-   not know it.  Initiators SHOULD use "this OR's address" to make sure
-   that they have connected to another OR at its canonical address.
-
-   [As of 0.2.0.23-rc, implementations use none of the above values.]
-
-
-5. Circuit management
-
-5.1. CREATE and CREATED cells
-
-   Users set up circuits incrementally, one hop at a time. To create a
-   new circuit, OPs send a CREATE cell to the first node, with the
-   first half of the DH handshake; that node responds with a CREATED
-   cell with the second half of the DH handshake plus the first 20 bytes
-   of derivative key data (see section 5.2). To extend a circuit past
-   the first hop, the OP sends an EXTEND relay cell (see section 5)
-   which instructs the last node in the circuit to send a CREATE cell
-   to extend the circuit.
-
-   The payload for a CREATE cell is an 'onion skin', which consists
-   of the first step of the DH handshake data (also known as g^x).
-   This value is hybrid-encrypted (see 0.3) to Bob's onion key, giving
-   an onion-skin of:
-       PK-encrypted:
-         Padding                       [PK_PAD_LEN bytes]
-         Symmetric key                 [KEY_LEN bytes]
-         First part of g^x             [PK_ENC_LEN-PK_PAD_LEN-KEY_LEN bytes]
-       Symmetrically encrypted:
-         Second part of g^x            [DH_LEN-(PK_ENC_LEN-PK_PAD_LEN-KEY_LEN)
-                                           bytes]
-
-   The relay payload for an EXTEND relay cell consists of:
-         Address                       [4 bytes]
-         Port                          [2 bytes]
-         Onion skin                    [DH_LEN+KEY_LEN+PK_PAD_LEN bytes]
-         Identity fingerprint          [HASH_LEN bytes]
-
-   The port and address field denote the IPV4 address and port of the next
-   onion router in the circuit; the public key hash is the hash of the PKCS#1
-   ASN1 encoding of the next onion router's identity (signing) key.  (See 0.3
-   above.)  Including this hash allows the extending OR verify that it is
-   indeed connected to the correct target OR, and prevents certain
-   man-in-the-middle attacks.
-
-   The payload for a CREATED cell, or the relay payload for an
-   EXTENDED cell, contains:
-         DH data (g^y)                 [DH_LEN bytes]
-         Derivative key data (KH)      [HASH_LEN bytes]   <see 5.2 below>
-
-   The CircID for a CREATE cell is an arbitrarily chosen 2-byte integer,
-   selected by the node (OP or OR) that sends the CREATE cell.  To prevent
-   CircID collisions, when one node sends a CREATE cell to another, it chooses
-   from only one half of the possible values based on the ORs' public
-   identity keys: if the sending node has a lower key, it chooses a CircID with
-   an MSB of 0; otherwise, it chooses a CircID with an MSB of 1.
-
-   (An OP with no public key MAY choose any CircID it wishes, since an OP
-   never needs to process a CREATE cell.)
-
-   Public keys are compared numerically by modulus.
-
-   As usual with DH, x and y MUST be generated randomly.
-
-5.1.1. CREATE_FAST/CREATED_FAST cells
-
-   When initializing the first hop of a circuit, the OP has already
-   established the OR's identity and negotiated a secret key using TLS.
-   Because of this, it is not always necessary for the OP to perform the
-   public key operations to create a circuit.  In this case, the
-   OP MAY send a CREATE_FAST cell instead of a CREATE cell for the first
-   hop only.  The OR responds with a CREATED_FAST cell, and the circuit is
-   created.
-
-   A CREATE_FAST cell contains:
-
-       Key material (X)    [HASH_LEN bytes]
-
-   A CREATED_FAST cell contains:
-
-       Key material (Y)    [HASH_LEN bytes]
-       Derivative key data [HASH_LEN bytes] (See 5.2 below)
-
-   The values of X and Y must be generated randomly.
-
-   If an OR sees a circuit created with CREATE_FAST, the OR is sure to be the
-   first hop of a circuit.  ORs SHOULD reject attempts to create streams with
-   RELAY_BEGIN exiting the circuit at the first hop: letting Tor be used as a
-   single hop proxy makes exit nodes a more attractive target for compromise.
-
-5.2. Setting circuit keys
-
-   Once the handshake between the OP and an OR is completed, both can
-   now calculate g^xy with ordinary DH.  Before computing g^xy, both client
-   and server MUST verify that the received g^x or g^y value is not degenerate;
-   that is, it must be strictly greater than 1 and strictly less than p-1
-   where p is the DH modulus.  Implementations MUST NOT complete a handshake
-   with degenerate keys.  Implementations MUST NOT discard other "weak"
-   g^x values.
-
-   (Discarding degenerate keys is critical for security; if bad keys
-   are not discarded, an attacker can substitute the server's CREATED
-   cell's g^y with 0 or 1, thus creating a known g^xy and impersonating
-   the server. Discarding other keys may allow attacks to learn bits of
-   the private key.)
-
-   If CREATE or EXTEND is used to extend a circuit, the client and server
-   base their key material on K0=g^xy, represented as a big-endian unsigned
-   integer.
-
-   If CREATE_FAST is used, the client and server base their key material on
-   K0=X|Y.
-
-   From the base key material K0, they compute KEY_LEN*2+HASH_LEN*3 bytes of
-   derivative key data as
-       K = H(K0 | [00]) | H(K0 | [01]) | H(K0 | [02]) | ...
-
-   The first HASH_LEN bytes of K form KH; the next HASH_LEN form the forward
-   digest Df; the next HASH_LEN 41-60 form the backward digest Db; the next
-   KEY_LEN 61-76 form Kf, and the final KEY_LEN form Kb.  Excess bytes from K
-   are discarded.
-
-   KH is used in the handshake response to demonstrate knowledge of the
-   computed shared key. Df is used to seed the integrity-checking hash
-   for the stream of data going from the OP to the OR, and Db seeds the
-   integrity-checking hash for the data stream from the OR to the OP. Kf
-   is used to encrypt the stream of data going from the OP to the OR, and
-   Kb is used to encrypt the stream of data going from the OR to the OP.
-
-5.3. Creating circuits
-
-   When creating a circuit through the network, the circuit creator
-   (OP) performs the following steps:
-
-      1. Choose an onion router as an exit node (R_N), such that the onion
-         router's exit policy includes at least one pending stream that
-         needs a circuit (if there are any).
-
-      2. Choose a chain of (N-1) onion routers
-         (R_1...R_N-1) to constitute the path, such that no router
-         appears in the path twice.
-
-      3. If not already connected to the first router in the chain,
-         open a new connection to that router.
-
-      4. Choose a circID not already in use on the connection with the
-         first router in the chain; send a CREATE cell along the
-         connection, to be received by the first onion router.
-
-      5. Wait until a CREATED cell is received; finish the handshake
-         and extract the forward key Kf_1 and the backward key Kb_1.
-
-      6. For each subsequent onion router R (R_2 through R_N), extend
-         the circuit to R.
-
-   To extend the circuit by a single onion router R_M, the OP performs
-   these steps:
-
-      1. Create an onion skin, encrypted to R_M's public onion key.
-
-      2. Send the onion skin in a relay EXTEND cell along
-         the circuit (see section 5).
-
-      3. When a relay EXTENDED cell is received, verify KH, and
-         calculate the shared keys.  The circuit is now extended.
-
-   When an onion router receives an EXTEND relay cell, it sends a CREATE
-   cell to the next onion router, with the enclosed onion skin as its
-   payload.  As special cases, if the extend cell includes a digest of
-   all zeroes, or asks to extend back to the relay that sent the extend
-   cell, the circuit will fail and be torn down. The initiating onion
-   router chooses some circID not yet used on the connection between the
-   two onion routers.  (But see section 5.1. above, concerning choosing
-   circIDs based on lexicographic order of nicknames.)
-
-   When an onion router receives a CREATE cell, if it already has a
-   circuit on the given connection with the given circID, it drops the
-   cell.  Otherwise, after receiving the CREATE cell, it completes the
-   DH handshake, and replies with a CREATED cell.  Upon receiving a
-   CREATED cell, an onion router packs it payload into an EXTENDED relay
-   cell (see section 5), and sends that cell up the circuit.  Upon
-   receiving the EXTENDED relay cell, the OP can retrieve g^y.
-
-   (As an optimization, OR implementations may delay processing onions
-   until a break in traffic allows time to do so without harming
-   network latency too greatly.)
-
-5.3.1. Canonical connections
-
-   It is possible for an attacker to launch a man-in-the-middle attack
-   against a connection by telling OR Alice to extend to OR Bob at some
-   address X controlled by the attacker.  The attacker cannot read the
-   encrypted traffic, but the attacker is now in a position to count all
-   bytes sent between Alice and Bob (assuming Alice was not already
-   connected to Bob.)
-
-   To prevent this, when an OR we gets an extend request, it SHOULD use an
-   existing OR connection if the ID matches, and ANY of the following
-   conditions hold:
-       - The IP matches the requested IP.
-       - The OR knows that the IP of the connection it's using is canonical
-         because it was listed in the NETINFO cell.
-       - The OR knows that the IP of the connection it's using is canonical
-         because it was listed in the server descriptor.
-
-   [This is not implemented in Tor 0.2.0.23-rc.]
-
-5.4. Tearing down circuits
-
-   Circuits are torn down when an unrecoverable error occurs along
-   the circuit, or when all streams on a circuit are closed and the
-   circuit's intended lifetime is over.  Circuits may be torn down
-   either completely or hop-by-hop.
-
-   To tear down a circuit completely, an OR or OP sends a DESTROY
-   cell to the adjacent nodes on that circuit, using the appropriate
-   direction's circID.
-
-   Upon receiving an outgoing DESTROY cell, an OR frees resources
-   associated with the corresponding circuit. If it's not the end of
-   the circuit, it sends a DESTROY cell for that circuit to the next OR
-   in the circuit. If the node is the end of the circuit, then it tears
-   down any associated edge connections (see section 6.1).
-
-   After a DESTROY cell has been processed, an OR ignores all data or
-   destroy cells for the corresponding circuit.
-
-   To tear down part of a circuit, the OP may send a RELAY_TRUNCATE cell
-   signaling a given OR (Stream ID zero).  That OR sends a DESTROY
-   cell to the next node in the circuit, and replies to the OP with a
-   RELAY_TRUNCATED cell.
-
-   When an unrecoverable error occurs along one connection in a
-   circuit, the nodes on either side of the connection should, if they
-   are able, act as follows:  the node closer to the OP should send a
-   RELAY_TRUNCATED cell towards the OP; the node farther from the OP
-   should send a DESTROY cell down the circuit.
-
-   The payload of a RELAY_TRUNCATED or DESTROY cell contains a single octet,
-   describing why the circuit is being closed or truncated.  When sending a
-   TRUNCATED or DESTROY cell because of another TRUNCATED or DESTROY cell,
-   the error code should be propagated.  The origin of a circuit always sets
-   this error code to 0, to avoid leaking its version.
-
-   The error codes are:
-     0 -- NONE            (No reason given.)
-     1 -- PROTOCOL        (Tor protocol violation.)
-     2 -- INTERNAL        (Internal error.)
-     3 -- REQUESTED       (A client sent a TRUNCATE command.)
-     4 -- HIBERNATING     (Not currently operating; trying to save bandwidth.)
-     5 -- RESOURCELIMIT   (Out of memory, sockets, or circuit IDs.)
-     6 -- CONNECTFAILED   (Unable to reach server.)
-     7 -- OR_IDENTITY     (Connected to server, but its OR identity was not
-                           as expected.)
-     8 -- OR_CONN_CLOSED  (The OR connection that was carrying this circuit
-                           died.)
-     9 -- FINISHED        (The circuit has expired for being dirty or old.)
-    10 -- TIMEOUT         (Circuit construction took too long)
-    11 -- DESTROYED       (The circuit was destroyed w/o client TRUNCATE)
-    12 -- NOSUCHSERVICE   (Request for unknown hidden service)
-
-5.5. Routing relay cells
-
-   When an OR receives a RELAY or RELAY_EARLY cell, it checks the cell's
-   circID and determines whether it has a corresponding circuit along that
-   connection.  If not, the OR drops the cell.
-
-   Otherwise, if the OR is not at the OP edge of the circuit (that is,
-   either an 'exit node' or a non-edge node), it de/encrypts the payload
-   with the stream cipher, as follows:
-        'Forward' relay cell (same direction as CREATE):
-            Use Kf as key; decrypt.
-        'Back' relay cell (opposite direction from CREATE):
-            Use Kb as key; encrypt.
-   Note that in counter mode, decrypt and encrypt are the same operation.
-
-   The OR then decides whether it recognizes the relay cell, by
-   inspecting the payload as described in section 6.1 below.  If the OR
-   recognizes the cell, it processes the contents of the relay cell.
-   Otherwise, it passes the decrypted relay cell along the circuit if
-   the circuit continues.  If the OR at the end of the circuit
-   encounters an unrecognized relay cell, an error has occurred: the OR
-   sends a DESTROY cell to tear down the circuit.
-
-   When a relay cell arrives at an OP, the OP decrypts the payload
-   with the stream cipher as follows:
-         OP receives data cell:
-            For I=N...1,
-                Decrypt with Kb_I.  If the payload is recognized (see
-                section 6..1), then stop and process the payload.
-
-   For more information, see section 6 below.
-
-5.6. Handling relay_early cells
-
-   A RELAY_EARLY cell is designed to limit the length any circuit can reach.
-   When an OR receives a RELAY_EARLY cell, and the next node in the circuit
-   is speaking v2 of the link protocol or later, the OR relays the cell as a
-   RELAY_EARLY cell.  Otherwise, it relays it as a RELAY cell.
-
-   If a node ever receives more than 8 RELAY_EARLY cells on a given
-   outbound circuit, it SHOULD close the circuit. (For historical reasons,
-   we don't limit the number of inbound RELAY_EARLY cells; they should
-   be harmless anyway because clients won't accept extend requests. See
-   bug 1038.)
-
-   When speaking v2 of the link protocol or later, clients MUST only send
-   EXTEND cells inside RELAY_EARLY cells.  Clients SHOULD send the first ~8
-   RELAY cells that are not targeted at the first hop of any circuit as
-   RELAY_EARLY cells too, in order to partially conceal the circuit length.
-
-   [In a future version of Tor, servers will reject any EXTEND cell not
-   received in a RELAY_EARLY cell.  See proposal 110.]
-
-6. Application connections and stream management
-
-6.1. Relay cells
-
-   Within a circuit, the OP and the exit node use the contents of
-   RELAY packets to tunnel end-to-end commands and TCP connections
-   ("Streams") across circuits.  End-to-end commands can be initiated
-   by either edge; streams are initiated by the OP.
-
-   The payload of each unencrypted RELAY cell consists of:
-         Relay command           [1 byte]
-         'Recognized'            [2 bytes]
-         StreamID                [2 bytes]
-         Digest                  [4 bytes]
-         Length                  [2 bytes]
-         Data                    [CELL_LEN-14 bytes]
-
-   The relay commands are:
-         1 -- RELAY_BEGIN     [forward]
-         2 -- RELAY_DATA      [forward or backward]
-         3 -- RELAY_END       [forward or backward]
-         4 -- RELAY_CONNECTED [backward]
-         5 -- RELAY_SENDME    [forward or backward] [sometimes control]
-         6 -- RELAY_EXTEND    [forward]             [control]
-         7 -- RELAY_EXTENDED  [backward]            [control]
-         8 -- RELAY_TRUNCATE  [forward]             [control]
-         9 -- RELAY_TRUNCATED [backward]            [control]
-        10 -- RELAY_DROP      [forward or backward] [control]
-        11 -- RELAY_RESOLVE   [forward]
-        12 -- RELAY_RESOLVED  [backward]
-        13 -- RELAY_BEGIN_DIR [forward]
-
-        32..40 -- Used for hidden services; see rend-spec.txt.
-
-   Commands labelled as "forward" must only be sent by the originator
-   of the circuit. Commands labelled as "backward" must only be sent by
-   other nodes in the circuit back to the originator. Commands marked
-   as either can be sent either by the originator or other nodes.
-
-   The 'recognized' field in any unencrypted relay payload is always set
-   to zero; the 'digest' field is computed as the first four bytes of
-   the running digest of all the bytes that have been destined for
-   this hop of the circuit or originated from this hop of the circuit,
-   seeded from Df or Db respectively (obtained in section 5.2 above),
-   and including this RELAY cell's entire payload (taken with the digest
-   field set to zero).
-
-   When the 'recognized' field of a RELAY cell is zero, and the digest
-   is correct, the cell is considered "recognized" for the purposes of
-   decryption (see section 5.5 above).
-
-   (The digest does not include any bytes from relay cells that do
-   not start or end at this hop of the circuit. That is, it does not
-   include forwarded data. Therefore if 'recognized' is zero but the
-   digest does not match, the running digest at that node should
-   not be updated, and the cell should be forwarded on.)
-
-   All RELAY cells pertaining to the same tunneled stream have the
-   same stream ID.  StreamIDs are chosen arbitrarily by the OP.  RELAY
-   cells that affect the entire circuit rather than a particular
-   stream use a StreamID of zero -- they are marked in the table above
-   as "[control]" style cells. (Sendme cells are marked as "sometimes
-   control" because they can take include a StreamID or not depending
-   on their purpose -- see Section 7.)
-
-   The 'Length' field of a relay cell contains the number of bytes in
-   the relay payload which contain real payload data. The remainder of
-   the payload is padded with NUL bytes.
-
-   If the RELAY cell is recognized but the relay command is not
-   understood, the cell must be dropped and ignored. Its contents
-   still count with respect to the digests, though.
-
-6.2. Opening streams and transferring data
-
-   To open a new anonymized TCP connection, the OP chooses an open
-   circuit to an exit that may be able to connect to the destination
-   address, selects an arbitrary StreamID not yet used on that circuit,
-   and constructs a RELAY_BEGIN cell with a payload encoding the address
-   and port of the destination host.  The payload format is:
-
-         ADDRESS | ':' | PORT | [00]
-
-   where  ADDRESS can be a DNS hostname, or an IPv4 address in
-   dotted-quad format, or an IPv6 address surrounded by square brackets;
-   and where PORT is a decimal integer between 1 and 65535, inclusive.
-
-   [What is the [00] for? -NM]
-   [It's so the payload is easy to parse out with string funcs -RD]
-
-   Upon receiving this cell, the exit node resolves the address as
-   necessary, and opens a new TCP connection to the target port.  If the
-   address cannot be resolved, or a connection can't be established, the
-   exit node replies with a RELAY_END cell.  (See 6.4 below.)
-   Otherwise, the exit node replies with a RELAY_CONNECTED cell, whose
-   payload is in one of the following formats:
-       The IPv4 address to which the connection was made [4 octets]
-       A number of seconds (TTL) for which the address may be cached [4 octets]
-    or
-       Four zero-valued octets [4 octets]
-       An address type (6)     [1 octet]
-       The IPv6 address to which the connection was made [16 octets]
-       A number of seconds (TTL) for which the address may be cached [4 octets]
-   [XXXX No version of Tor currently generates the IPv6 format.]
-
-   [Tor servers before 0.1.2.0 set the TTL field to a fixed value.  Later
-   versions set the TTL to the last value seen from a DNS server, and expire
-   their own cached entries after a fixed interval.  This prevents certain
-   attacks.]
-
-   The OP waits for a RELAY_CONNECTED cell before sending any data.
-   Once a connection has been established, the OP and exit node
-   package stream data in RELAY_DATA cells, and upon receiving such
-   cells, echo their contents to the corresponding TCP stream.
-   RELAY_DATA cells sent to unrecognized streams are dropped.
-
-   Relay RELAY_DROP cells are long-range dummies; upon receiving such
-   a cell, the OR or OP must drop it.
-
-6.2.1. Opening a directory stream
-
-   If a Tor server is a directory server, it should respond to a
-   RELAY_BEGIN_DIR cell as if it had received a BEGIN cell requesting a
-   connection to its directory port.  RELAY_BEGIN_DIR cells ignore exit
-   policy, since the stream is local to the Tor process.
-
-   If the Tor server is not running a directory service, it should respond
-   with a REASON_NOTDIRECTORY RELAY_END cell.
-
-   Clients MUST generate an all-zero payload for RELAY_BEGIN_DIR cells,
-   and servers MUST ignore the payload.
-
-   [RELAY_BEGIN_DIR was not supported before Tor 0.1.2.2-alpha; clients
-   SHOULD NOT send it to routers running earlier versions of Tor.]
-
-6.3. Closing streams
-
-   When an anonymized TCP connection is closed, or an edge node
-   encounters error on any stream, it sends a 'RELAY_END' cell along the
-   circuit (if possible) and closes the TCP connection immediately.  If
-   an edge node receives a 'RELAY_END' cell for any stream, it closes
-   the TCP connection completely, and sends nothing more along the
-   circuit for that stream.
-
-   The payload of a RELAY_END cell begins with a single 'reason' byte to
-   describe why the stream is closing, plus optional data (depending on
-   the reason.)  The values are:
-
-       1 -- REASON_MISC           (catch-all for unlisted reasons)
-       2 -- REASON_RESOLVEFAILED  (couldn't look up hostname)
-       3 -- REASON_CONNECTREFUSED (remote host refused connection) [*]
-       4 -- REASON_EXITPOLICY     (OR refuses to connect to host or port)
-       5 -- REASON_DESTROY        (Circuit is being destroyed)
-       6 -- REASON_DONE           (Anonymized TCP connection was closed)
-       7 -- REASON_TIMEOUT        (Connection timed out, or OR timed out
-                                   while connecting)
-       8 -- (unallocated) [**]
-       9 -- REASON_HIBERNATING    (OR is temporarily hibernating)
-      10 -- REASON_INTERNAL       (Internal error at the OR)
-      11 -- REASON_RESOURCELIMIT  (OR has no resources to fulfill request)
-      12 -- REASON_CONNRESET      (Connection was unexpectedly reset)
-      13 -- REASON_TORPROTOCOL    (Sent when closing connection because of
-                                   Tor protocol violations.)
-      14 -- REASON_NOTDIRECTORY   (Client sent RELAY_BEGIN_DIR to a
-                                   non-directory server.)
-
-   (With REASON_EXITPOLICY, the 4-byte IPv4 address or 16-byte IPv6 address
-   forms the optional data, along with a 4-byte TTL; no other reason
-   currently has extra data.)
-
-   OPs and ORs MUST accept reasons not on the above list, since future
-   versions of Tor may provide more fine-grained reasons.
-
-   Tors SHOULD NOT send any reason except REASON_MISC for a stream that they
-   have originated.
-
-   [*] Older versions of Tor also send this reason when connections are
-       reset.
-   [**] Due to a bug in versions of Tor through 0095, error reason 8 must
-        remain allocated until that version is obsolete.
-
-   --- [The rest of this section describes unimplemented functionality.]
-
-   Because TCP connections can be half-open, we follow an equivalent
-   to TCP's FIN/FIN-ACK/ACK protocol to close streams.
-
-   An exit connection can have a TCP stream in one of three states:
-   'OPEN', 'DONE_PACKAGING', and 'DONE_DELIVERING'.  For the purposes
-   of modeling transitions, we treat 'CLOSED' as a fourth state,
-   although connections in this state are not, in fact, tracked by the
-   onion router.
-
-   A stream begins in the 'OPEN' state.  Upon receiving a 'FIN' from
-   the corresponding TCP connection, the edge node sends a 'RELAY_FIN'
-   cell along the circuit and changes its state to 'DONE_PACKAGING'.
-   Upon receiving a 'RELAY_FIN' cell, an edge node sends a 'FIN' to
-   the corresponding TCP connection (e.g., by calling
-   shutdown(SHUT_WR)) and changing its state to 'DONE_DELIVERING'.
-
-   When a stream in already in 'DONE_DELIVERING' receives a 'FIN', it
-   also sends a 'RELAY_FIN' along the circuit, and changes its state
-   to 'CLOSED'.  When a stream already in 'DONE_PACKAGING' receives a
-   'RELAY_FIN' cell, it sends a 'FIN' and changes its state to
-   'CLOSED'.
-
-   If an edge node encounters an error on any stream, it sends a
-   'RELAY_END' cell (if possible) and closes the stream immediately.
-
-6.4. Remote hostname lookup
-
-   To find the address associated with a hostname, the OP sends a
-   RELAY_RESOLVE cell containing the hostname to be resolved with a nul
-   terminating byte. (For a reverse lookup, the OP sends a RELAY_RESOLVE
-   cell containing an in-addr.arpa address.) The OR replies with a
-   RELAY_RESOLVED cell containing a status byte, and any number of
-   answers. Each answer is of the form:
-       Type   (1 octet)
-       Length (1 octet)
-       Value  (variable-width)
-       TTL    (4 octets)
-   "Length" is the length of the Value field.
-   "Type" is one of:
-      0x00 -- Hostname
-      0x04 -- IPv4 address
-      0x06 -- IPv6 address
-      0xF0 -- Error, transient
-      0xF1 -- Error, nontransient
-
-    If any answer has a type of 'Error', then no other answer may be given.
-
-    The RELAY_RESOLVE cell must use a nonzero, distinct streamID; the
-    corresponding RELAY_RESOLVED cell must use the same streamID.  No stream
-    is actually created by the OR when resolving the name.
-
-7. Flow control
-
-7.1. Link throttling
-
-   Each client or relay should do appropriate bandwidth throttling to
-   keep its user happy.
-
-   Communicants rely on TCP's default flow control to push back when they
-   stop reading.
-
-   The mainline Tor implementation uses token buckets (one for reads,
-   one for writes) for the rate limiting.
-
-   Since 0.2.0.x, Tor has let the user specify an additional pair of
-   token buckets for "relayed" traffic, so people can deploy a Tor relay
-   with strict rate limiting, but also use the same Tor as a client. To
-   avoid partitioning concerns we combine both classes of traffic over a
-   given OR connection, and keep track of the last time we read or wrote
-   a high-priority (non-relayed) cell. If it's been less than N seconds
-   (currently N=30), we give the whole connection high priority, else we
-   give the whole connection low priority. We also give low priority
-   to reads and writes for connections that are serving directory
-   information. See proposal 111 for details.
-
-7.2. Link padding
-
-   Link padding can be created by sending PADDING cells along the
-   connection; relay cells of type "DROP" can be used for long-range
-   padding.
-
-   Currently nodes are not required to do any sort of link padding or
-   dummy traffic. Because strong attacks exist even with link padding,
-   and because link padding greatly increases the bandwidth requirements
-   for running a node, we plan to leave out link padding until this
-   tradeoff is better understood.
-
-7.3. Circuit-level flow control
-
-   To control a circuit's bandwidth usage, each OR keeps track of two
-   'windows', consisting of how many RELAY_DATA cells it is allowed to
-   originate (package for transmission), and how many RELAY_DATA cells
-   it is willing to consume (receive for local streams).  These limits
-   do not apply to cells that the OR receives from one host and relays
-   to another.
-
-   Each 'window' value is initially set to 1000 data cells
-   in each direction (cells that are not data cells do not affect
-   the window).  When an OR is willing to deliver more cells, it sends a
-   RELAY_SENDME cell towards the OP, with Stream ID zero.  When an OR
-   receives a RELAY_SENDME cell with stream ID zero, it increments its
-   packaging window.
-
-   Each of these cells increments the corresponding window by 100.
-
-   The OP behaves identically, except that it must track a packaging
-   window and a delivery window for every OR in the circuit.
-
-   An OR or OP sends cells to increment its delivery window when the
-   corresponding window value falls under some threshold (900).
-
-   If a packaging window reaches 0, the OR or OP stops reading from
-   TCP connections for all streams on the corresponding circuit, and
-   sends no more RELAY_DATA cells until receiving a RELAY_SENDME cell.
-[this stuff is badly worded; copy in the tor-design section -RD]
-
-7.4. Stream-level flow control
-
-   Edge nodes use RELAY_SENDME cells to implement end-to-end flow
-   control for individual connections across circuits. Similarly to
-   circuit-level flow control, edge nodes begin with a window of cells
-   (500) per stream, and increment the window by a fixed value (50)
-   upon receiving a RELAY_SENDME cell. Edge nodes initiate RELAY_SENDME
-   cells when both a) the window is <= 450, and b) there are less than
-   ten cell payloads remaining to be flushed at that edge.
-
-A.1. Differences between spec and implementation
-
-- The current specification requires all ORs to have IPv4 addresses, but
-  allows servers to exit and resolve to IPv6 addresses, and to declare IPv6
-  addresses in their exit policies.  The current codebase has no IPv6
-  support at all.
-
diff --git a/orchid/logging.properties b/orchid/logging.properties
deleted file mode 100644
index 5a212d03510..00000000000
--- a/orchid/logging.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-handlers=java.util.logging.ConsoleHandler
-.level = INFO
-
-java.util.logging.ConsoleHandler.level = FINEST
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-java.util.logging.SimpleFormatter.format =[%1$tT] %4$s: %5$s%6$s%n
-
-# com.subgraph.orchid.circuits.level=FINE
diff --git a/orchid/opt/xmlrpc/com/subgraph/orchid/xmlrpc/OrchidXmlRpcTransport.java b/orchid/opt/xmlrpc/com/subgraph/orchid/xmlrpc/OrchidXmlRpcTransport.java
deleted file mode 100644
index bce6d6abe5f..00000000000
--- a/orchid/opt/xmlrpc/com/subgraph/orchid/xmlrpc/OrchidXmlRpcTransport.java
+++ /dev/null
@@ -1,309 +0,0 @@
-package com.subgraph.orchid.xmlrpc;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.ConnectException;
-import java.net.Socket;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.logging.Logger;
-
-import javax.net.SocketFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-
-import org.apache.xmlrpc.XmlRpcException;
-import org.apache.xmlrpc.XmlRpcRequest;
-import org.apache.xmlrpc.client.XmlRpcClient;
-import org.apache.xmlrpc.client.XmlRpcClientException;
-import org.apache.xmlrpc.client.XmlRpcHttpClientConfig;
-import org.apache.xmlrpc.client.XmlRpcHttpTransport;
-import org.apache.xmlrpc.client.XmlRpcHttpTransportException;
-import org.apache.xmlrpc.client.XmlRpcLiteHttpTransport;
-import org.apache.xmlrpc.common.XmlRpcStreamRequestConfig;
-import org.apache.xmlrpc.util.HttpUtil;
-import org.apache.xmlrpc.util.LimitedInputStream;
-import org.xml.sax.SAXException;
-
-import com.subgraph.orchid.Tor;
-import com.subgraph.orchid.sockets.AndroidSSLSocketFactory;
-
-public class OrchidXmlRpcTransport extends XmlRpcHttpTransport {
-	
-	private final static Logger logger = Logger.getLogger(OrchidXmlRpcTransport.class.getName());
-	
-	private final SocketFactory socketFactory;
-	private final SSLContext sslContext;
-
-	private SSLSocketFactory sslSocketFactory;
-
-	public OrchidXmlRpcTransport(XmlRpcClient pClient, SocketFactory socketFactory, SSLContext sslContext) {
-		super(pClient, userAgent);
-		this.socketFactory = socketFactory;
-		this.sslContext = sslContext;
-	}
-	
-	public synchronized SSLSocketFactory getSSLSocketFactory() {
-		if(sslSocketFactory == null) {
-			sslSocketFactory = createSSLSocketFactory();
-		}
-		return sslSocketFactory;
-	}
-
-	private SSLSocketFactory createSSLSocketFactory() {
-		if(Tor.isAndroidRuntime()) {
-			return createAndroidSSLSocketFactory();
-		}
-		if(sslContext == null) {
-			return (SSLSocketFactory) SSLSocketFactory.getDefault();
-		} else {
-			return sslContext.getSocketFactory();
-		}
-	}
-
-	private SSLSocketFactory createAndroidSSLSocketFactory() {
-		if(sslContext == null) {
-			try {
-				return new AndroidSSLSocketFactory();
-			} catch (NoSuchAlgorithmException e) {
-				logger.severe("Failed to create default ssl context");
-				System.exit(1);
-				return null;
-			}
-		} else {
-			return new AndroidSSLSocketFactory(sslContext);
-		}
-	}
-
-	protected Socket newSocket(boolean pSSL, String pHostName, int pPort) throws UnknownHostException, IOException {
-		final Socket s = socketFactory.createSocket(pHostName, pPort);
-		if(pSSL) {
-			return getSSLSocketFactory().createSocket(s, pHostName, pPort, true);
-		} else {
-			return s;
-		}
-	}
-	
-	private static final String userAgent = USER_AGENT + " (Lite HTTP Transport)";
-	private boolean ssl;
-	private String hostname;
-	private String host;
-	private int port;
-	private String uri;
-	private Socket socket;
-	private OutputStream output;
-	private InputStream input;
-	private final Map<String, Object> headers = new HashMap<String, Object>();
-	private boolean responseGzipCompressed = false;
-	private XmlRpcHttpClientConfig config;
-
-
-	public Object sendRequest(XmlRpcRequest pRequest) throws XmlRpcException {
-		config = (XmlRpcHttpClientConfig) pRequest.getConfig();
-		URL url = config.getServerURL();
-		ssl = "https".equals(url.getProtocol());
-		hostname = url.getHost();
-        int p = url.getPort();
-		port = p < 1 ? 80 : p;
-		String u = url.getFile();
-		uri = (u == null  ||  "".equals(u)) ? "/" : u;
-		host = port == 80 ? hostname : hostname + ":" + port;
-		headers.put("Host", host);
-		return super.sendRequest(pRequest);
-	}
-
-	protected void setRequestHeader(String pHeader, String pValue) {
-		Object value = headers.get(pHeader);
-		if (value == null) {
-			headers.put(pHeader, pValue);
-		} else {
-			List<Object> list;
-			if (value instanceof String) {
-				list = new ArrayList<Object>();
-				list.add((String)value);
-				headers.put(pHeader, list);
-			} else {
-				list = (List<Object>) value;
-			}
-			list.add(pValue);
-		}
-	}
-
-	protected void close() throws XmlRpcClientException {
-		IOException e = null;
-		if (input != null) {
-			try {
-				input.close();
-			} catch (IOException ex) {
-				e = ex;
-			}
-		}
-		if (output != null) {
-			try {
-				output.close();
-			} catch (IOException ex) {
-				if (e != null) {
-					e = ex;
-				}
-			}
-		}
-		if (socket != null) {
-			try {
-				socket.close();
-			} catch (IOException ex) {
-				if (e != null) {
-					e = ex;
-				}
-			}
-		}
-		if (e != null) {
-			throw new XmlRpcClientException("Failed to close connection: " + e.getMessage(), e);
-		}
-	}
-
-	private OutputStream getOutputStream() throws XmlRpcException {
-		try {
-			final int retries = 3;
-	        final int delayMillis = 100;
-	
-			for (int tries = 0;  ;  tries++) {
-				try {
-					socket = newSocket(ssl, hostname, port);
-					output = new BufferedOutputStream(socket.getOutputStream()){
-						/** Closing the output stream would close the whole socket, which we don't want,
-						 * because the don't want until the request is processed completely.
-						 * A close will later occur within
-						 * {@link XmlRpcLiteHttpTransport#close()}.
-						 */
-						public void close() throws IOException {
-							flush();
-							if(!(socket instanceof SSLSocket)) {
-								socket.shutdownOutput();
-							}
-						}
-					};
-					break;
-				} catch (ConnectException e) {
-					if (tries >= retries) {
-						throw new XmlRpcException("Failed to connect to "
-								+ hostname + ":" + port + ": " + e.getMessage(), e);
-					} else {
-	                    try {
-	                        Thread.sleep(delayMillis);
-	                    } catch (InterruptedException ignore) {
-	                    }
-					}
-				}
-			}
-			sendRequestHeaders(output);
-			return output;
-		} catch (IOException e) {
-			throw new XmlRpcException("Failed to open connection to "
-					+ hostname + ":" + port + ": " + e.getMessage(), e);
-		}
-	}
-
-   
-
-	private byte[] toHTTPBytes(String pValue) throws UnsupportedEncodingException {
-		return pValue.getBytes("US-ASCII");
-	}
-
-	private void sendHeader(OutputStream pOut, String pKey, String pValue) throws IOException {
-		pOut.write(toHTTPBytes(pKey + ": " + pValue + "\r\n"));
-	}
-
-	private void sendRequestHeaders(OutputStream pOut) throws IOException {
-		pOut.write(("POST " + uri + " HTTP/1.0\r\n").getBytes("US-ASCII"));
-		for (Iterator iter = headers.entrySet().iterator();  iter.hasNext();  ) {
-			Map.Entry entry = (Map.Entry) iter.next();
-			String key = (String) entry.getKey();
-			Object value = entry.getValue();
-			if (value instanceof String) {
-				sendHeader(pOut, key, (String) value);
-			} else {
-				List list = (List) value;
-				for (int i = 0;  i < list.size();  i++) {
-					sendHeader(pOut, key, (String) list.get(i));
-				}
-			}
-		}
-		pOut.write(toHTTPBytes("\r\n"));
-	}
-
-	protected boolean isResponseGzipCompressed(XmlRpcStreamRequestConfig pConfig) {
-		return responseGzipCompressed;
-	}
-
-	protected InputStream getInputStream() throws XmlRpcException {
-		final byte[] buffer = new byte[2048];
-		try {
-            // If reply timeout specified, set the socket timeout accordingly
-            if (config.getReplyTimeout() != 0)
-                socket.setSoTimeout(config.getReplyTimeout());
-            input = new BufferedInputStream(socket.getInputStream());
-			// start reading  server response headers
-			String line = HttpUtil.readLine(input, buffer);
-			StringTokenizer tokens = new StringTokenizer(line);
-			tokens.nextToken(); // Skip HTTP version
-			String statusCode = tokens.nextToken();
-			String statusMsg = tokens.nextToken("\n\r");
-			final int code;
-			try {
-			    code = Integer.parseInt(statusCode);
-			} catch (NumberFormatException e) {
-                throw new XmlRpcClientException("Server returned invalid status code: "
-                        + statusCode + " " + statusMsg, null);
-			}
-			if (code < 200  ||  code > 299) {
-		        throw new XmlRpcHttpTransportException(code, statusMsg);
-		    }
-			int contentLength = -1;
-			for (;;) {
-				line = HttpUtil.readLine(input, buffer);
-				if (line == null  ||  "".equals(line)) {
-					break;
-				}
-				line = line.toLowerCase();
-				if (line.startsWith("content-length:")) {
-					contentLength = Integer.parseInt(line.substring("content-length:".length()).trim());
-				} else if (line.startsWith("content-encoding:")) {
-					responseGzipCompressed = HttpUtil.isUsingGzipEncoding(line.substring("content-encoding:".length()));
-				}
-			}
-			InputStream result;
-			if (contentLength == -1) {
-				result = input;
-			} else {
-				result = new LimitedInputStream(input, contentLength);
-			}
-			return result;
-		} catch (IOException e) {
-			throw new XmlRpcClientException("Failed to read server response: " + e.getMessage(), e);
-		}
-	}
-
-	protected boolean isUsingByteArrayOutput(XmlRpcHttpClientConfig pConfig) {
-	    boolean result = super.isUsingByteArrayOutput(pConfig);
-        if (!result) {
-            throw new IllegalStateException("The Content-Length header is required with HTTP/1.0, and HTTP/1.1 is unsupported by the Lite HTTP Transport.");
-        }
-        return result;
-    }
-
-    protected void writeRequest(ReqWriter pWriter) throws XmlRpcException, IOException, SAXException {
-        pWriter.write(getOutputStream());
-	}
-}
diff --git a/orchid/opt/xmlrpc/com/subgraph/orchid/xmlrpc/OrchidXmlRpcTransportFactory.java b/orchid/opt/xmlrpc/com/subgraph/orchid/xmlrpc/OrchidXmlRpcTransportFactory.java
deleted file mode 100644
index 3f7bcfc7f8c..00000000000
--- a/orchid/opt/xmlrpc/com/subgraph/orchid/xmlrpc/OrchidXmlRpcTransportFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.subgraph.orchid.xmlrpc;
-
-import javax.net.SocketFactory;
-import javax.net.ssl.SSLContext;
-
-import org.apache.xmlrpc.client.XmlRpcClient;
-import org.apache.xmlrpc.client.XmlRpcTransport;
-import org.apache.xmlrpc.client.XmlRpcTransportFactory;
-import com.subgraph.orchid.TorClient;
-import com.subgraph.orchid.sockets.OrchidSocketFactory;
-
-public class OrchidXmlRpcTransportFactory implements XmlRpcTransportFactory {
-	private final XmlRpcClient client;
-	private final SSLContext sslContext;
-	private final SocketFactory socketFactory;
-		
-	public OrchidXmlRpcTransportFactory(XmlRpcClient client, TorClient torClient) {
-		this(client, torClient, null);
-	}
-
-	public OrchidXmlRpcTransportFactory(XmlRpcClient client, TorClient torClient, SSLContext sslContext) {
-		this.client = client;
-		this.socketFactory = new OrchidSocketFactory(torClient);
-		this.sslContext = sslContext;
-	}
-
-	public XmlRpcTransport getTransport() {
-		return new OrchidXmlRpcTransport(client, socketFactory, sslContext);
-	}
-}
diff --git a/orchid/pom.xml b/orchid/pom.xml
deleted file mode 100644
index 4d2081a6144..00000000000
--- a/orchid/pom.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.bitcoinj</groupId>
-        <artifactId>bitcoinj-parent</artifactId>
-        <version>0.14-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>orchid</artifactId>
-    <version>1.2</version>
-
-    <name>Orchid</name>
-    <description>Tor library</description>
-
-    <packaging>jar</packaging>
-
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <build>
-        <sourceDirectory>src</sourceDirectory>
-        <plugins>
-            <!-- Ensure compilation is done under Java 6 for backwards compatibility -->
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>doclint-java8-disable</id>
-            <activation>
-                <jdk>[1.8,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <configuration>
-                            <additionalparam>-Xdoclint:none</additionalparam>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>jar-no-fork</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-shade-plugin</artifactId>
-                        <configuration>
-                            <minimizeJar>false</minimizeJar>
-                            <filters>
-                                <filter>
-                                    <!-- exclude signatures, the bundling process breaks them for some reason -->
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>shade</goal>
-                                </goals>
-                                <configuration>
-                                    <shadedArtifactAttached>true</shadedArtifactAttached>
-                                    <shadedClassifierName>bundled</shadedClassifierName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.5</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>18.0</version>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/orchid/src/com/subgraph/orchid/BridgeRouter.java b/orchid/src/com/subgraph/orchid/BridgeRouter.java
deleted file mode 100644
index f7a2dfa09d3..00000000000
--- a/orchid/src/com/subgraph/orchid/BridgeRouter.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.subgraph.orchid;
-
-import com.subgraph.orchid.data.HexDigest;
-
-public interface BridgeRouter extends Router {
-	void setIdentity(HexDigest identity);
-	void setDescriptor(RouterDescriptor descriptor);
-}
diff --git a/orchid/src/com/subgraph/orchid/Cell.java b/orchid/src/com/subgraph/orchid/Cell.java
deleted file mode 100644
index b5122210c80..00000000000
--- a/orchid/src/com/subgraph/orchid/Cell.java
+++ /dev/null
@@ -1,230 +0,0 @@
-package com.subgraph.orchid;
-
-
-public interface Cell {
-	/** Command constant for a PADDING type cell. */
-	final static int PADDING = 0;
-
-	/** Command constant for a CREATE type cell. */
-	final static int CREATE = 1;
-
-	/** Command constant for a CREATED type cell. */
-	final static int CREATED = 2;
-
-	/** Command constant for a RELAY type cell. */
-	final static int RELAY = 3;
-
-	/** Command constant for a DESTROY type cell. */
-	final static int DESTROY = 4;
-
-	/** Command constant for a CREATE_FAST type cell. */
-	final static int CREATE_FAST = 5;
-
-	/** Command constant for a CREATED_FAST type cell. */
-	final static int CREATED_FAST = 6;
-
-	/** Command constant for a VERSIONS type cell. */
-	final static int VERSIONS = 7;
-
-	/** Command constant for a NETINFO type cell. */
-	final static int NETINFO = 8;
-
-	/** Command constant for a RELAY_EARLY type cell. */
-	final static int RELAY_EARLY = 9;
-	
-	final static int VPADDING = 128;
-	final static int CERTS = 129;
-	final static int AUTH_CHALLENGE = 130;
-	final static int AUTHENTICATE = 131;
-	final static int AUTHORIZE = 132;
-
-	final static int ERROR_NONE = 0;
-	final static int ERROR_PROTOCOL = 1;
-	final static int ERROR_INTERNAL = 2;
-	final static int ERROR_REQUESTED = 3;
-	final static int ERROR_HIBERNATING = 4;
-	final static int ERROR_RESOURCELIMIT = 5;
-	final static int ERROR_CONNECTFAILED = 6;
-	final static int ERROR_OR_IDENTITY = 7;
-	final static int ERROR_OR_CONN_CLOSED = 8;
-	final static int ERROR_FINISHED = 9;
-	final static int ERROR_TIMEOUT = 10;
-	final static int ERROR_DESTROYED = 11;
-	final static int ERROR_NOSUCHSERVICE = 12;
-
-	final static int ADDRESS_TYPE_HOSTNAME = 0x00;
-	final static int ADDRESS_TYPE_IPV4     = 0x04;
-	final static int ADRESS_TYPE_IPV6      = 0x06;
-
-	/**
-	 * The fixed size of a standard cell.
-	 */
-	final static int CELL_LEN = 512;
-
-	/**
-	 * The length of a standard cell header.
-	 */
-	final static int CELL_HEADER_LEN = 3;
-
-	/**
-	 * The header length for a variable length cell (ie: VERSIONS)
-	 */
-	final static int CELL_VAR_HEADER_LEN = 5;
-
-	/**
-	 * The length of the payload space in a standard cell.
-	 */
-	final static int CELL_PAYLOAD_LEN = CELL_LEN - CELL_HEADER_LEN;
-
-	/**
-	 * Return the circuit id field from this cell.
-	 * 
-	 * @return The circuit id field of this cell.
-	 */
-	int getCircuitId();
-
-	/**
-	 * Return the command field from this cell.
-	 *   
-	 * @return The command field of this cell.
-	 */
-	int getCommand();
-
-	/**
-	 * Set the internal pointer to the first byte after the cell header.
-	 */
-	void resetToPayload();
-
-	/**
-	 * Return the next byte from the cell and increment the internal pointer by one byte.
-	 * 
-	 * @return The byte at the current pointer location.
-	 */
-	int getByte();
-
-	/**
-	 * Return the byte at the specified offset into the cell.
-	 * 
-	 * @param index The cell offset.
-	 * @return The byte at the specified offset.
-	 */
-	int getByteAt(int index);
-
-	/**
-	 * Return the next 16-bit big endian value from the cell and increment the internal pointer by two bytes.
-	 * 
-	 * @return The 16-bit short value at the current pointer location.
-	 */
-	int getShort();
-
-	/**
-	 * Return the 16-bit big endian value at the specified offset into the cell.
-	 * 
-	 * @param index The cell offset.
-	 * @return The 16-bit short value at the specified offset.
-	 */
-	int getShortAt(int index);
-
-	/**
-	 * Return the next 32-bit big endian value from the cell and increment the internal pointer by four bytes.
-	 * 
-	 * @return The 32-bit integer value at the current pointer location.
-	 */
-	int getInt();
-
-	/**
-	 * Copy <code>buffer.length</code> bytes from the cell into <code>buffer</code>.  The data is copied starting
-	 * from the current internal pointer location and afterwards the internal pointer is incremented by <code>buffer.length</code>
-	 * bytes.
-	 *  
-	 * @param buffer The array of bytes to copy the cell data into.
-	 */
-	void getByteArray(byte[] buffer);
-
-	/**
-	 * Return the number of bytes already packed (for outgoing cells) or unpacked (for incoming cells).  This is 
-	 * equivalent to the internal pointer position.
-	 * 
-	 * @return The number of bytes already consumed from this cell.
-	 */
-	int cellBytesConsumed();
-
-	/**
-	 * Return the number of bytes remaining between the current internal pointer and the end of the cell.  If fields
-	 * are being added to a new cell for transmission then this value indicates the remaining space in bytes for 
-	 * adding new data.  If fields are being read from a received cell then this value describes the number of bytes 
-	 * which can be read without overflowing the cell.
-	 * 
-	 * @return The number of payload bytes remaining in this cell.
-	 */
-	int cellBytesRemaining();
-
-	/**
-	 * Store a byte at the current pointer location and increment the pointer by one byte.
-	 * 
-	 * @param value The byte value to store.
-	 */
-	void putByte(int value);
-
-	/**
-	 * Store a byte at the specified offset into the cell.
-	 * 
-	 * @param index The offset in bytes into the cell.
-	 * @param value The byte value to store.
-	 */
-	void putByteAt(int index, int value);
-
-	/**
-	 * Store a 16-bit short value in big endian order at the current pointer location and 
-	 * increment the pointer by two bytes.
-	 * 
-	 * @param value The 16-bit short value to store.
-	 */
-	void putShort(int value);
-
-	/**
-	 * Store a 16-bit short value in big endian byte order at the specified offset into the cell 
-	 * and increment the pointer by two bytes.
-	 * 
-	 * @param index The offset in bytes into the cell.
-	 * @param value The 16-bit short value to store.
-	 */
-	void putShortAt(int index, int value);
-
-	/**
-	 * Store a 32-bit integer value in big endian order at the current pointer location and
-	 * increment the pointer by 4 bytes.
-	 * 
-	 * @param value The 32-bit integer value to store.
-	 */
-	void putInt(int value);
-
-	/**
-	 * Store the entire array <code>data</code> at the current pointer location and increment
-	 * the pointer by <code>data.length</code> bytes.
-	 * 
-	 * @param data The array of bytes to store in the cell.
-	 */
-	void putByteArray(byte[] data);
-
-	/**
-	 * Store <code>length</code> bytes of the byte array <code>data</code> starting from
-	 * <code>offset</code> into the array at the current pointer location and increment 
-	 * the pointer by <code>length</code> bytes.
-	 * 
-	 * @param data The source array of bytes.
-	 * @param offset The offset into the source array.
-	 * @param length The number of bytes from the source array to store.
-	 */
-	void putByteArray(byte[] data, int offset, int length);
-
-	/**
-	 * Return the entire cell data as a raw array of bytes.  For all cells except
-	 * <code>VERSIONS</code>, this array will be exactly <code>CELL_LEN</code> bytes long.
-	 * 
-	 * @return The cell data as an array of bytes.
-	 */
-	byte[] getCellBytes();
-
-	void putString(String string);
-}
diff --git a/orchid/src/com/subgraph/orchid/Circuit.java b/orchid/src/com/subgraph/orchid/Circuit.java
deleted file mode 100644
index 0a1341fec6e..00000000000
--- a/orchid/src/com/subgraph/orchid/Circuit.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.subgraph.orchid;
-
-import java.util.List;
-
-/**
- * A Circuit represents a logical path through multiple ORs.  Circuits are described in
- * section 5 of tor-spec.txt.
- *
- */
-public interface Circuit {
-	
-	/**
-	 * Return <code>true</code> if the circuit is presently in the connected state or
-	 * <code>false</code> otherwise.
-	 * 
-	 * @return Returns <code>true</code> if the circuit is presently connected, or 
-	 *                 <code>false</code> otherwise.
-	 */
-	boolean isConnected();
-	
-	boolean isPending();
-	
-	boolean isClean();
-	
-	boolean isMarkedForClose();
-	
-	int getSecondsDirty();
-	
-	/**
-	 * Returns the entry router <code>Connection</code> object of this Circuit.  Throws
-	 * a TorException if the circuit is not currently open.
-	 *  
-	 * @return The Connection object for the network connection to the entry router of this 
-	 *         circuit.
-	 * @throws TorException If this circuit is not currently connected.
-	 */
-	Connection getConnection();
-	
-	/**
-	 * Returns the curcuit id value for this circuit.
-	 * 
-	 * @return The circuit id value for this circuit.
-	 */
-	int getCircuitId();
-	
-	/**
-	 * Create a new relay cell which is configured for delivery to the specified
-	 * circuit <code>targetNode</code> with command value <code>relayCommand</code>
-	 * and a stream id value of <code>streamId</code>.  The returned <code>RelayCell</code>
-	 * can then be used to populate the payload of the cell before delivering it.
-	 * 
-	 * @param relayCommand The command value to send in the relay cell header.
-	 * @param streamId The stream id value to send in the relay cell header.
-	 * @param targetNode The target circuit node to encrypt this cell for.
-	 * @return A newly created relay cell object.
-	 */
-	RelayCell createRelayCell(int relayCommand, int streamId, CircuitNode targetNode);
-	
-	/**
-	 * Returns the next relay response cell received on this circuit.  If no response is
-	 * received within <code>CIRCUIT_RELAY_RESPONSE_TIMEOUT</code> milliseconds, <code>null</code>
-	 * is returned.
-	 * 
-	 * @return The next relay response cell received on this circuit or <code>null</code> if
-	 *         a timeout is reached before the next relay cell arrives.
-	 */
-	RelayCell receiveRelayCell();
-	
-	/**
-	 * Encrypt and deliver the relay cell <code>cell</code>.
-	 * 
-	 * @param cell The relay cell to deliver over this circuit.
-	 */
-	void sendRelayCell(RelayCell cell);
-	
-	/**
-	 * Return the last node or 'hop' in this circuit.
-	 * 
-	 * @return The final 'hop' or node of this circuit.
-	 */
-	CircuitNode getFinalCircuitNode();
-
-
-	void destroyCircuit();
-
-	void deliverRelayCell(Cell cell);
-
-	void deliverControlCell(Cell cell);
-	
-	List<Stream> getActiveStreams();
-
-	void markForClose();
-		
-	void appendNode(CircuitNode node);
-}
diff --git a/orchid/src/com/subgraph/orchid/CircuitBuildHandler.java b/orchid/src/com/subgraph/orchid/CircuitBuildHandler.java
deleted file mode 100644
index 40f6d3bb059..00000000000
--- a/orchid/src/com/subgraph/orchid/CircuitBuildHandler.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.subgraph.orchid;
-
-/**
- * This callback interface is used for reporting progress when
- * opening a new circuit.  An instance of this interface is passed
- * to the {@link Circuit#openCircuit(java.util.List, CircuitBuildHandler)} 
- * method.
- * 
- * The normal sequence of callbacks which are fired when a circuit is opened
- * successfully is {@link #connectionCompleted(Connection)} for the initial 
- * connection to the entry router, followed by one or more 
- * {@link #nodeAdded(CircuitNode)} as the circuit is extended with new nodes.
- * When all requested nodes in the path have been added successfully to the
- * circuit {@link #circuitBuildCompleted(Circuit)} is called and passed the
- * newly constructed circuit.
- * 
- * @see Circuit#openCircuit()
- * 
- */
-public interface CircuitBuildHandler {
-	/**
-	 * Called when a network connection to the entry node has completed 
-	 * successfully or if a network connection to the specified entry router
-	 * already exists.
-	 * 
-	 * @param connection The completed connection instance.
-	 */
-	void connectionCompleted(Connection connection);
-
-	/**
-	 * The circuit build has failed because the network connection to the
-	 * entry node failed.  No further callback methods will be called after
-	 * this failure has been reported.
-	 * 
-	 * @param reason A description of the reason for failing to connect to
-	 *               the entry node.
-	 */
-	void connectionFailed(String reason);
-
-	/**
-	 * A node or 'hop' has been added to the circuit which is being created.
-	 * 
-	 * @param node The newly added circuit node.
-	 */
-	void nodeAdded(CircuitNode node);
-
-	/**
-	 * The circuit has been successfully built and is ready for use.
-	 * 
-	 * @param circuit The newly constructed circuit.
-	 */
-	void circuitBuildCompleted(Circuit circuit);
-
-	/**
-	 * Called if the circuit build fails after connecting to the entry node.
-	 * 
-	 * @param reason A description of the reason the circuit build has failed.
-	 */
-	void circuitBuildFailed(String reason);
-}
diff --git a/orchid/src/com/subgraph/orchid/CircuitManager.java b/orchid/src/com/subgraph/orchid/CircuitManager.java
deleted file mode 100644
index ee4fbc875cd..00000000000
--- a/orchid/src/com/subgraph/orchid/CircuitManager.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.subgraph.orchid;
-
-import java.util.List;
-import java.util.concurrent.TimeoutException;
-
-import com.subgraph.orchid.data.IPv4Address;
-
-
-public interface CircuitManager {
-
-	static int DIRECTORY_PURPOSE_CONSENSUS = 1;
-	static int DIRECTORY_PURPOSE_CERTIFICATES = 2;
-	static int DIRECTORY_PURPOSE_DESCRIPTORS = 3;
-	
-	/**
-	 * Begin automatically building new circuits in the background.
-	 */
-	void startBuildingCircuits();
-	void stopBuildingCircuits(boolean killCircuits);
-	/**
-	 * Attempt to open an exit stream to the specified destination <code>hostname</code> and
-	 * <code>port</code>.
-	 * 
-	 * @param hostname The name of the host to open an exit connection to.
-	 * @param port The port to open an exit connection to.
-	 * @return The status response result of attempting to open the exit connection.
-	 */
-	Stream openExitStreamTo(String hostname, int port) throws InterruptedException, TimeoutException, OpenFailedException;
-
-	/**
-	 * Attempt to open an exit stream to the destination specified by <code>address</code> and
-	 * <code>port</code>.
-	 * 
-	 * @param address The address to open an exit connection to.
-	 * @param port The port to open an exit connection to.
-	 * @return The status response result of attempting the open the exit connection.
-	 */
-	Stream openExitStreamTo(IPv4Address address, int port) throws InterruptedException, TimeoutException, OpenFailedException;
-	
-	
-	Stream openDirectoryStream(int purpose) throws InterruptedException, TimeoutException, OpenFailedException;
-	
-	Stream openDirectoryStream() throws InterruptedException, TimeoutException, OpenFailedException;
-	
-	DirectoryCircuit openDirectoryCircuit() throws OpenFailedException;
-	Circuit getCleanInternalCircuit() throws InterruptedException;
-	
-	ExitCircuit openExitCircuitTo(List<Router> path) throws OpenFailedException;
-	InternalCircuit openInternalCircuitTo(List<Router> path) throws OpenFailedException;
-	DirectoryCircuit openDirectoryCircuitTo(List<Router> path) throws OpenFailedException;
-}
diff --git a/orchid/src/com/subgraph/orchid/CircuitNode.java b/orchid/src/com/subgraph/orchid/CircuitNode.java
deleted file mode 100644
index aa09b88eee4..00000000000
--- a/orchid/src/com/subgraph/orchid/CircuitNode.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.subgraph.orchid;
-
-
-
-/**
- * Represents the state of a single onion router hop in a connected or connecting {@link Circuit}
- */
-public interface CircuitNode {
-	/**
-	 * Return the {@link Router} associated with this node.
-	 *
-	 * @return The {@link Router} for this hop of the circuit chain.
-	 */
-	Router getRouter();
-
-	/**
-	 * Update the 'forward' cryptographic digest state for this
-	 * node with the contents of <code>cell</code>
-	 * 
-	 * @param cell The {@link RelayCell} to add to the digest.
-	 */
-	void updateForwardDigest(RelayCell cell);
-
-	/**
-	 * Return the current 'forward' running digest value for this 
-	 * node as an array of <code>TOR_DIGEST_SIZE</code> bytes.
-	 * 
-	 * @return The current 'forward' running digest value for this node.
-	 */
-	byte[] getForwardDigestBytes();
-
-	/**
-	 * Encrypt a {@link RelayCell} for this node with the current
-	 * 'forward' cipher state.
-	 * 
-	 * @param cell The {@link RelayCell} to encrypt.
-	 */
-	void encryptForwardCell(RelayCell cell);
-
-	/**
-	 * Return the {@link CircuitNode} which immediately preceeds this
-	 * one in the circuit node chain or <code>null</code> if this is
-	 * the first hop.
-	 * 
-	 * @return The previous {@link CircuitNode} in the chain or <code>
-	 *         null</code> if this is the first node.
-	 */
-	CircuitNode getPreviousNode();
-
-	/**
-	 * Return immediately if the packaging window for this node is open (ie: greater than 0), otherwise
-	 * block until the circuit is destroyed or the window is incremented by receiving a RELAY_SENDME cell
-	 * from this node.
-	 */
-	void waitForSendWindow();
-
-	/**
-	 * If the packaging window for this node is open (ie: greater than 0) this method
-	 * decrements the packaging window by 1 and returns immediately, otherwise it will
-	 * block until the circuit is destroyed or the window is incremented by receiving 
-	 * a RELAY_SENDME cell from this node.  This method will always decrement the packaging
-	 * window before returning unless the circuit has been destroyed. 
-	 */
-	void waitForSendWindowAndDecrement();
-
-	/**
-	 * This method is called to signal that a RELAY_SENDME cell has been received from this
-	 * node and the packaging window should be incremented.  This will also wake up any threads
-	 * that are waiting for the packaging window to open.
-	 */
-	void incrementSendWindow();
-
-	/**
-	 * This method is called when a RELAY_DATA cell is received from this node to decrement
-	 * the deliver window counter.
-	 */
-	void decrementDeliverWindow();
-
-	/**
-	 * Examines the delivery window and determines if it would be an appropriate time to
-	 * send a RELAY_SENDME cell.  If this method returns true, it increments the delivery
-	 * window assuming that a RELAY_SENDME cell will be transmitted.
-	 * 
-	 * @return Returns true if the deliver window is small enough that sending a RELAY_SENDME
-	 * cell would be appropriate.
-	 */
-	boolean considerSendingSendme();
-	
-	boolean decryptBackwardCell(Cell cell);
-}
diff --git a/orchid/src/com/subgraph/orchid/Connection.java b/orchid/src/com/subgraph/orchid/Connection.java
deleted file mode 100644
index 54f0dfed395..00000000000
--- a/orchid/src/com/subgraph/orchid/Connection.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.subgraph.orchid;
-
-
-/**
- * A network connection to a Tor onion router.   
- */
-public interface Connection {
-	/**
-	 * Return the {@link Router} associated with this connection.
-	 * 
-	 * @return The entry router this connection represents.
-	 */
-	Router getRouter();
-
-	/**
-	 * Return <code>true</code> if the socket for this connection has been closed.  Otherwise, <code>false</code>.
-	 * 
-	 * @return <code>true</code> if this connection is closed or <code>false</code> otherwise.
-	 */
-	boolean isClosed();
-	/**
-	 * Send a protocol {@link Cell} on this connection.
-	 * 
-	 * @param cell The {@link Cell} to transfer.
-	 * @throws ConnectionIOException If the cell could not be send because the connection is not connected
-	 *                                   or if an error occured while sending the cell data.
-	 */
-	void sendCell(Cell cell) throws ConnectionIOException;
-	
-	/**
-	 * Remove a Circuit which has been bound to this Connection by a previous call to {@link #bindCircuit(Circuit) bindCircuit}.  
-	 * After removing a Circuit, any further received incoming cells for the Circuit will be discarded.
-	 * 
-	 * @param circuit The Circuit to remove.
-	 */
-	void removeCircuit(Circuit circuit);
-	
-	/**
-	 * Choose an available circuit id value and bind this Circuit to that id value, returning the id value.  
-	 * Once bound, any incoming relay cells will be delivered to the Circuit with {@link Circuit#deliverRelayCell(Cell)}
-	 * and other cells will be delivered with {@link Circuit#deliverControlCell(Cell)}.
-	 * 
-	 * @param circuit The Circuit to bind to this connection.
-	 * @return the circuit id value for this binding.
-	 */
-	int bindCircuit(Circuit circuit);
-}
diff --git a/orchid/src/com/subgraph/orchid/ConnectionCache.java b/orchid/src/com/subgraph/orchid/ConnectionCache.java
deleted file mode 100644
index 3c53760781a..00000000000
--- a/orchid/src/com/subgraph/orchid/ConnectionCache.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.subgraph.orchid;
-
-
-public interface ConnectionCache {
-	/**
-	 * Returns a completed connection to the specified router.  If an open connection 
-	 * to the requested router already exists it is returned, otherwise a new connection
-	 * is opened. 
-	 * 
-	 * @param router The router to which a connection is requested.
-	 * @param isDirectoryConnection Is this going to be used as a directory connection.
-	 * @return a completed connection to the specified router.
-	 * @throws InterruptedException if thread is interrupted while waiting for connection to complete.
-	 * @throws ConnectionTimeoutException if timeout expires before connection completes. 
-	 * @throws ConnectionFailedException if connection fails due to I/O error
-	 * @throws ConnectionHandshakeException if connection fails because an error occurred during handshake phase
-	 */
-	Connection getConnectionTo(Router router, boolean isDirectoryConnection) throws InterruptedException, ConnectionTimeoutException, ConnectionFailedException, ConnectionHandshakeException;
-	
-	void close();
-
-	boolean isClosed();
-}
diff --git a/orchid/src/com/subgraph/orchid/ConnectionFailedException.java b/orchid/src/com/subgraph/orchid/ConnectionFailedException.java
deleted file mode 100644
index b7f25c69255..00000000000
--- a/orchid/src/com/subgraph/orchid/ConnectionFailedException.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.subgraph.orchid;
-
-public class ConnectionFailedException extends ConnectionIOException {
-
-	private static final long serialVersionUID = -4484347156587613574L;
-
-	public ConnectionFailedException(String message) {
-		super(message);
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/ConnectionHandshakeException.java b/orchid/src/com/subgraph/orchid/ConnectionHandshakeException.java
deleted file mode 100644
index 5e05931985a..00000000000
--- a/orchid/src/com/subgraph/orchid/ConnectionHandshakeException.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.subgraph.orchid;
-
-public class ConnectionHandshakeException extends ConnectionIOException {
-	
-	private static final long serialVersionUID = -2544633445932967966L;
-	
-	public ConnectionHandshakeException(String message) {
-		super(message);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/ConnectionIOException.java b/orchid/src/com/subgraph/orchid/ConnectionIOException.java
deleted file mode 100644
index a80d0fd42b1..00000000000
--- a/orchid/src/com/subgraph/orchid/ConnectionIOException.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.subgraph.orchid;
-
-public class ConnectionIOException extends Exception {
-
-	private static final long serialVersionUID = -5537650738995969203L;
-	
-	public ConnectionIOException() {
-		super();
-	}
-
-	public ConnectionIOException(String message) {
-		super(message);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/ConnectionTimeoutException.java b/orchid/src/com/subgraph/orchid/ConnectionTimeoutException.java
deleted file mode 100644
index 7a539b65685..00000000000
--- a/orchid/src/com/subgraph/orchid/ConnectionTimeoutException.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.subgraph.orchid;
-
-public class ConnectionTimeoutException extends ConnectionIOException {
-
-	private static final long serialVersionUID = -6098661610150140151L;
-
-	public ConnectionTimeoutException() {
-		super();
-	}
-
-	public ConnectionTimeoutException(String message) {
-		super(message);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/ConsensusDocument.java b/orchid/src/com/subgraph/orchid/ConsensusDocument.java
deleted file mode 100644
index ce31947fc32..00000000000
--- a/orchid/src/com/subgraph/orchid/ConsensusDocument.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.subgraph.orchid;
-
-import java.util.List;
-import java.util.Set;
-
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.Timestamp;
-
-public interface ConsensusDocument extends Document {
-	enum ConsensusFlavor { NS, MICRODESC };
-	enum SignatureStatus { STATUS_VERIFIED, STATUS_FAILED, STATUS_NEED_CERTS };
-	
-	interface RequiredCertificate {
-		int getDownloadFailureCount();
-		void incrementDownloadFailureCount();
-		HexDigest getAuthorityIdentity();
-		HexDigest getSigningKey();
-	}
-	
-	ConsensusFlavor getFlavor();
-	Timestamp getValidAfterTime();
-	Timestamp getFreshUntilTime();
-	Timestamp getValidUntilTime();
-	int getConsensusMethod();
-	int getVoteSeconds();
-	int getDistSeconds();
-	Set<String> getClientVersions();
-	Set<String> getServerVersions();
-	boolean isLive();
-	List<RouterStatus> getRouterStatusEntries();
-	
-	SignatureStatus verifySignatures();
-	Set<RequiredCertificate> getRequiredCertificates();
-	
-	HexDigest getSigningHash();
-	HexDigest getSigningHash256();
-	
-	int getCircWindowParameter();
-	int getWeightScaleParameter();
-	
-	int getBandwidthWeight(String tag);
-	
-	boolean getUseNTorHandshake();
-}
diff --git a/orchid/src/com/subgraph/orchid/Descriptor.java b/orchid/src/com/subgraph/orchid/Descriptor.java
deleted file mode 100644
index 4fa1cb0715c..00000000000
--- a/orchid/src/com/subgraph/orchid/Descriptor.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.subgraph.orchid;
-
-import java.util.Set;
-
-import com.subgraph.orchid.crypto.TorPublicKey;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.IPv4Address;
-
-public interface Descriptor extends Document {
-	enum CacheLocation { NOT_CACHED, CACHED_CACHEFILE, CACHED_JOURNAL }
-
-	HexDigest getDescriptorDigest();
-	void setLastListed(long timestamp);
-	long getLastListed();
-	void setCacheLocation(CacheLocation location);
-	CacheLocation getCacheLocation();
-	int getBodyLength();
-	
-	/**
-	 * Return the public key used to encrypt EXTEND cells while establishing
-	 * a circuit through this router.
-	 * 
-	 * @return The onion routing protocol key for this router.
-	 */
-	TorPublicKey getOnionKey();
-	byte[] getNTorOnionKey();
-	
-	/**
-	 * Return the IPv4 address of this router.
-	 * 
-	 * @return The IPv4 address of this router.
-	 */
-	IPv4Address getAddress();
-	
-	/**
-	 * Return the port on which this node accepts TLS connections
-	 * for the main OR protocol, or 0 if no router service is advertised.
-	 * 
-	 * @return The onion routing port, or 0 if not a router.
-	 */
-	int getRouterPort();
-	Set<String> getFamilyMembers();
-	
-	/**
-	 * Return true if the exit policy of this router permits connections
-	 * to the specified destination endpoint.
-	 * 
-	 * @param address The IPv4 address of the destination.
-	 * @param port The destination port.
-	 * 
-	 * @return True if an exit connection to the specified destination is allowed
-	 *         or false otherwise.
-	 */
-	boolean exitPolicyAccepts(IPv4Address address, int port);
-	
-	/**
-	 * Return true if the exit policy of this router accepts most connections
-	 * to the specified destination port.
-	 *
-	 * @param port The destination port.
-	 * @return True if an exit connection to the specified destination port is generally allowed
-	 *         or false otherwise.
-	 */
-	boolean exitPolicyAccepts(int port);
-}
diff --git a/orchid/src/com/subgraph/orchid/Directory.java b/orchid/src/com/subgraph/orchid/Directory.java
deleted file mode 100644
index 5370e884190..00000000000
--- a/orchid/src/com/subgraph/orchid/Directory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.subgraph.orchid;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import com.subgraph.orchid.ConsensusDocument.RequiredCertificate;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.events.EventHandler;
-
-/**
- * 
- * Main interface for accessing directory information and interacting
- * with directory authorities and caches.
- *
- */
-public interface Directory {
-	boolean haveMinimumRouterInfo();
-	void loadFromStore();
-	void close();
-	void waitUntilLoaded();
-	void storeCertificates();
-	
-	Collection<DirectoryServer> getDirectoryAuthorities();
-	DirectoryServer getRandomDirectoryAuthority();
-	void addCertificate(KeyCertificate certificate);
-	Set<RequiredCertificate> getRequiredCertificates();
-	void addRouterMicrodescriptors(List<RouterMicrodescriptor> microdescriptors);
-	void addRouterDescriptors(List<RouterDescriptor> descriptors);
-	void addConsensusDocument(ConsensusDocument consensus, boolean fromCache);
-	ConsensusDocument getCurrentConsensusDocument();
-	boolean hasPendingConsensus();
-	void registerConsensusChangedHandler(EventHandler handler);
-	void unregisterConsensusChangedHandler(EventHandler handler);
-	Router getRouterByName(String name);
-	Router getRouterByIdentity(HexDigest identity);
-	List<Router> getRouterListByNames(List<String> names);
-	List<Router> getRoutersWithDownloadableDescriptors();
-	List<Router> getAllRouters();
-	
-	RouterMicrodescriptor getMicrodescriptorFromCache(HexDigest descriptorDigest);
-	RouterDescriptor getBasicDescriptorFromCache(HexDigest descriptorDigest);
-	
-	GuardEntry createGuardEntryFor(Router router);
-	List<GuardEntry> getGuardEntries();
-	void removeGuardEntry(GuardEntry entry);
-	void addGuardEntry(GuardEntry entry);
-}
diff --git a/orchid/src/com/subgraph/orchid/DirectoryCircuit.java b/orchid/src/com/subgraph/orchid/DirectoryCircuit.java
deleted file mode 100644
index e99f6863f86..00000000000
--- a/orchid/src/com/subgraph/orchid/DirectoryCircuit.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.subgraph.orchid;
-
-import java.util.concurrent.TimeoutException;
-
-public interface DirectoryCircuit extends Circuit {
-	/**
-	 * Open an anonymous connection to the directory service running on the
-	 * final node in this circuit.
-	 * 
-	 * @param timeout in milliseconds
-	 * @param autoclose if set to true, closing stream also marks this circuit for close
-	 * 
-	 * @return The status response returned by trying to open the stream.
-	 */
-	Stream openDirectoryStream(long timeout, boolean autoclose) throws InterruptedException, TimeoutException, StreamConnectFailedException;
-}
diff --git a/orchid/src/com/subgraph/orchid/DirectoryDownloader.java b/orchid/src/com/subgraph/orchid/DirectoryDownloader.java
deleted file mode 100644
index 5133212feb1..00000000000
--- a/orchid/src/com/subgraph/orchid/DirectoryDownloader.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.subgraph.orchid;
-
-import java.util.List;
-import java.util.Set;
-
-import com.subgraph.orchid.ConsensusDocument.RequiredCertificate;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.directory.downloader.DirectoryRequestFailedException;
-
-public interface DirectoryDownloader {
-	void start(Directory directory);
-	void stop();
-	
-	RouterDescriptor downloadBridgeDescriptor(Router bridge) throws DirectoryRequestFailedException;
-	
-	ConsensusDocument downloadCurrentConsensus(boolean useMicrodescriptors) throws DirectoryRequestFailedException;
-	ConsensusDocument downloadCurrentConsensus(boolean useMicrodescriptors, DirectoryCircuit circuit) throws DirectoryRequestFailedException;
-	
-	List<KeyCertificate> downloadKeyCertificates(Set<RequiredCertificate> required) throws DirectoryRequestFailedException;
-	List<KeyCertificate> downloadKeyCertificates(Set<RequiredCertificate> required, DirectoryCircuit circuit) throws DirectoryRequestFailedException;
-	
-	List<RouterDescriptor> downloadRouterDescriptors(Set<HexDigest> fingerprints) throws DirectoryRequestFailedException;
-	List<RouterDescriptor> downloadRouterDescriptors(Set<HexDigest> fingerprints, DirectoryCircuit circuit) throws DirectoryRequestFailedException;
-	
-	List<RouterMicrodescriptor> downloadRouterMicrodescriptors(Set<HexDigest> fingerprints) throws DirectoryRequestFailedException;
-	List<RouterMicrodescriptor> downloadRouterMicrodescriptors(Set<HexDigest> fingerprints, DirectoryCircuit circuit) throws DirectoryRequestFailedException;
-}
diff --git a/orchid/src/com/subgraph/orchid/DirectoryServer.java b/orchid/src/com/subgraph/orchid/DirectoryServer.java
deleted file mode 100644
index 7d443509f8e..00000000000
--- a/orchid/src/com/subgraph/orchid/DirectoryServer.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.subgraph.orchid;
-
-import java.util.List;
-
-import com.subgraph.orchid.data.HexDigest;
-
-/**
- * Represents a directory authority server or a directory cache.
- */
-public interface DirectoryServer extends Router {
-	int getDirectoryPort();
-	boolean isV2Authority();
-	boolean isV3Authority();
-	HexDigest getV3Identity();
-	boolean isHiddenServiceAuthority();
-	boolean isBridgeAuthority();
-	boolean isExtraInfoCache();
-	
-	KeyCertificate getCertificateByFingerprint(HexDigest fingerprint);
-	List<KeyCertificate> getCertificates();
-	void addCertificate(KeyCertificate certificate);
-}
diff --git a/orchid/src/com/subgraph/orchid/DirectoryStore.java b/orchid/src/com/subgraph/orchid/DirectoryStore.java
deleted file mode 100644
index fa9e02b063c..00000000000
--- a/orchid/src/com/subgraph/orchid/DirectoryStore.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.subgraph.orchid;
-
-import java.nio.ByteBuffer;
-import java.util.List;
-
-public interface DirectoryStore {
-	enum CacheFile {
-		CERTIFICATES("certificates"),
-		CONSENSUS("consensus"),
-		CONSENSUS_MICRODESC("consensus-microdesc"),
-		MICRODESCRIPTOR_CACHE("cached-microdescs"),
-		MICRODESCRIPTOR_JOURNAL("cached-microdescs.new"),
-		DESCRIPTOR_CACHE("cached-descriptors"),
-		DESCRIPTOR_JOURNAL("cached-descriptors.new"),
-		STATE("state");
-
-		final private String filename;
-
-		CacheFile(String filename) {
-			this.filename = filename;
-		}
-
-		public String getFilename() {
-			return filename;
-		}
-	}
-
-	ByteBuffer loadCacheFile(CacheFile cacheFile);
-	void writeData(CacheFile cacheFile, ByteBuffer data);
-	void writeDocument(CacheFile cacheFile, Document document);
-	void writeDocumentList(CacheFile cacheFile, List<? extends Document> documents);
-	void appendDocumentList(CacheFile cacheFile, List<? extends Document> documents);
-
-	void removeCacheFile(CacheFile cacheFile);
-	void removeAllCacheFiles();
-}
diff --git a/orchid/src/com/subgraph/orchid/Document.java b/orchid/src/com/subgraph/orchid/Document.java
deleted file mode 100644
index 92e2bfaa7d2..00000000000
--- a/orchid/src/com/subgraph/orchid/Document.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.subgraph.orchid;
-
-import java.nio.ByteBuffer;
-
-public interface Document {
-	ByteBuffer getRawDocumentBytes();
-	String getRawDocumentData();
-	boolean isValidDocument();
-}
diff --git a/orchid/src/com/subgraph/orchid/ExitCircuit.java b/orchid/src/com/subgraph/orchid/ExitCircuit.java
deleted file mode 100644
index 2178f13a7e6..00000000000
--- a/orchid/src/com/subgraph/orchid/ExitCircuit.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.subgraph.orchid;
-
-import java.util.concurrent.TimeoutException;
-
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.data.exitpolicy.ExitTarget;
-
-public interface ExitCircuit extends Circuit {
-	
-	/**
-	 * Open an exit stream from the final node in this circuit to the 
-	 * specified target address and port.
-	 * 
-	 * @param address The network address of the exit target.
-	 * @param port The port of the exit target.
-	 * @return The status response returned by trying to open the stream.
-	 */
-	Stream openExitStream(IPv4Address address, int port, long timeout) throws InterruptedException, TimeoutException, StreamConnectFailedException;
-	
-	/**
-	 * Open an exit stream from the final node in this circuit to the
-	 * specified target hostname and port.
-	 * 
-	 * @param hostname The network hostname of the exit target.
-	 * @param port The port of the exit target.
-	 * @return The status response returned by trying to open the stream.
-	 */
-	Stream openExitStream(String hostname, int port, long timeout) throws InterruptedException, TimeoutException, StreamConnectFailedException;
-	
-	/**
-	 * Return true if the final node of this circuit is believed to be able to connect to
-	 * the specified <code>ExitTarget</code>.  Returns false if the target destination is
-	 * not permitted by the exit policy of the final node in this circuit or if the target
-	 * has been previously recorded to have failed through this circuit.
-	 * 
-	 * @param target The exit destination.
-	 * @return Return true if is likely that the final node of this circuit can connect to the specified exit target.
-	 */
-	boolean canHandleExitTo(ExitTarget target);
-
-	boolean canHandleExitToPort(int port);
-	/**
-	 * Records the specified <code>ExitTarget</code> as a failed connection so that {@link #canHandleExitTo(ExitTarget)} will
-	 * no longer return true for this exit destination.
-	 * 
-	 * @param target The <code>ExitTarget</code> to which a connection has failed through this circuit.
-	 */
-	public void recordFailedExitTarget(ExitTarget target);
-
-}
diff --git a/orchid/src/com/subgraph/orchid/GuardEntry.java b/orchid/src/com/subgraph/orchid/GuardEntry.java
deleted file mode 100644
index efed14059fd..00000000000
--- a/orchid/src/com/subgraph/orchid/GuardEntry.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.subgraph.orchid;
-
-import java.util.Date;
-
-public interface GuardEntry {
-	boolean isAdded();
-	void markAsDown();
-	void clearDownSince();
-	String getNickname();
-	String getIdentity();
-	String getVersion();
-	Date getCreatedTime();
-	Date getDownSince();
-	Date getLastConnectAttempt();
-	Date getUnlistedSince();
-	boolean testCurrentlyUsable();
-	Router getRouterForEntry();
-}
diff --git a/orchid/src/com/subgraph/orchid/HiddenServiceCircuit.java b/orchid/src/com/subgraph/orchid/HiddenServiceCircuit.java
deleted file mode 100644
index 83b057ad4c6..00000000000
--- a/orchid/src/com/subgraph/orchid/HiddenServiceCircuit.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.subgraph.orchid;
-
-import java.util.concurrent.TimeoutException;
-
-
-public interface HiddenServiceCircuit extends Circuit {
-	Stream openStream(int port, long timeout) throws InterruptedException, TimeoutException, StreamConnectFailedException;
-}
diff --git a/orchid/src/com/subgraph/orchid/InternalCircuit.java b/orchid/src/com/subgraph/orchid/InternalCircuit.java
deleted file mode 100644
index 39975f24bc4..00000000000
--- a/orchid/src/com/subgraph/orchid/InternalCircuit.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.subgraph.orchid;
-
-public interface InternalCircuit extends Circuit {
-	DirectoryCircuit cannibalizeToDirectory(Router target);
-	Circuit cannibalizeToIntroductionPoint(Router target);
-	HiddenServiceCircuit connectHiddenService(CircuitNode node);
-}
diff --git a/orchid/src/com/subgraph/orchid/KeyCertificate.java b/orchid/src/com/subgraph/orchid/KeyCertificate.java
deleted file mode 100644
index f15b47bc053..00000000000
--- a/orchid/src/com/subgraph/orchid/KeyCertificate.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.subgraph.orchid;
-
-import com.subgraph.orchid.crypto.TorPublicKey;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.data.Timestamp;
-
-/**
- * This class represents a key certificate document as specified in 
- * dir-spec.txt (section 3.1).  These documents are published by
- * directory authorities and bind a long-term identity key to a
- * more temporary signing key. 
- */
-public interface KeyCertificate extends Document {
-	/**
-	 * Return the network address of this directory authority
-	 * or <code>null</code> if no address was specified in the certificate.
-	 * 
-	 * @return The network address of the directory authority this certificate
-	 *         belongs to, or <code>null</code> if not available.
-	 */
-	IPv4Address getDirectoryAddress();
-	
-	/**
-	 * Return the port on which this directory authority answers 
-	 * directory requests or 0 if no port was specified in the certificate.
-	 * 
-	 * @return The port of this directory authority listens on or 0 if
-	 *         no port was specified in the certificate.
-	 */
-	int getDirectoryPort();
-	
-	/**
-	 * Return fingerprint of the authority identity key as specified in
-	 * the certificate.
-	 * 
-	 * @return The authority identity key fingerprint.
-	 */
-	HexDigest getAuthorityFingerprint();
-	
-	/**
-	 * Return the authority identity public key from the certificate.
-	 * 
-	 * @return The authority identity public key.
-	 */
-	TorPublicKey getAuthorityIdentityKey();
-	
-	/**
-	 * Return the authority signing public key from the certificate.
-	 * 
-	 * @return The authority signing public key.
-	 */
-	TorPublicKey getAuthoritySigningKey();
-	
-	/**
-	 * Return the time when this document and corresponding keys were
-	 * generated.
-	 * 
-	 * @return The time this document was generated and published.
-	 */
-	Timestamp getKeyPublishedTime();
-	
-	/**
-	 * Return the time after which this document and signing key are
-	 * no longer valid.
-	 * 
-	 * @return The expiry time of this document and signing key.
-	 */
-	Timestamp getKeyExpiryTime();
-	
-	/**
-	 * Return <code>true</code> if the current time is past the key
-	 * expiry time of this certificate.
-	 * 
-	 * @return True if this certificate is currently expired.
-	 */
-	boolean isExpired();
-}
diff --git a/orchid/src/com/subgraph/orchid/OpenFailedException.java b/orchid/src/com/subgraph/orchid/OpenFailedException.java
deleted file mode 100644
index 4eb1fc47790..00000000000
--- a/orchid/src/com/subgraph/orchid/OpenFailedException.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.subgraph.orchid;
-
-public class OpenFailedException extends Exception {
-
-	private static final long serialVersionUID = 1989001056577214666L;
-
-	public OpenFailedException() {
-	}
-
-	public OpenFailedException(String message) {
-		super(message);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/RelayCell.java b/orchid/src/com/subgraph/orchid/RelayCell.java
deleted file mode 100644
index 632b9cced5b..00000000000
--- a/orchid/src/com/subgraph/orchid/RelayCell.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.subgraph.orchid;
-
-import java.nio.ByteBuffer;
-
-
-
-public interface RelayCell extends Cell {
-
-	final static int LENGTH_OFFSET = 12;
-	final static int RECOGNIZED_OFFSET = 4;
-	final static int DIGEST_OFFSET = 8;
-	final static int HEADER_SIZE = 14;
-
-	final static int RELAY_BEGIN = 1;
-	final static int RELAY_DATA = 2;
-	final static int RELAY_END = 3;
-	final static int RELAY_CONNECTED = 4;
-	final static int RELAY_SENDME = 5;
-	final static int RELAY_EXTEND = 6;
-	final static int RELAY_EXTENDED = 7;
-	final static int RELAY_TRUNCATE = 8;
-	final static int RELAY_TRUNCATED = 9;
-	final static int RELAY_DROP = 10;
-	final static int RELAY_RESOLVE = 11;
-	final static int RELAY_RESOLVED = 12;
-	final static int RELAY_BEGIN_DIR = 13;
-	final static int RELAY_EXTEND2 = 14;
-	final static int RELAY_EXTENDED2 = 15;
-	
-    final static int RELAY_COMMAND_ESTABLISH_INTRO = 32;
-    final static int RELAY_COMMAND_ESTABLISH_RENDEZVOUS = 33;
-    final static int RELAY_COMMAND_INTRODUCE1 = 34;
-    final static int RELAY_COMMAND_INTRODUCE2 = 35;
-    final static int RELAY_COMMAND_RENDEZVOUS1 = 36;
-    final static int RELAY_COMMAND_RENDEZVOUS2 = 37;
-    final static int RELAY_COMMAND_INTRO_ESTABLISHED = 38;
-    final static int RELAY_COMMAND_RENDEZVOUS_ESTABLISHED = 39;
-    final static int RELAY_COMMAND_INTRODUCE_ACK = 40;
-
-	final static int REASON_MISC = 1;
-	final static int REASON_RESOLVEFAILED = 2;
-	final static int REASON_CONNECTREFUSED = 3;
-	final static int REASON_EXITPOLICY = 4;
-	final static int REASON_DESTROY = 5;
-	final static int REASON_DONE = 6;
-	final static int REASON_TIMEOUT = 7;
-	final static int REASON_NOROUTE = 8;
-	final static int REASON_HIBERNATING = 9;
-	final static int REASON_INTERNAL = 10;
-	final static int REASON_RESOURCELIMIT = 11;
-	final static int REASON_CONNRESET = 12;
-	final static int REASON_TORPROTOCOL = 13;
-	final static int REASON_NOTDIRECTORY = 14;
-
-	int getStreamId();
-	int getRelayCommand();
-	/**
-	 * Return the circuit node this cell was received from for outgoing cells or the destination circuit node
-	 * for outgoing cells.
-	 */
-	CircuitNode getCircuitNode();
-	ByteBuffer getPayloadBuffer();
-	void setLength();
-	void setDigest(byte[] digest);
-}
diff --git a/orchid/src/com/subgraph/orchid/Revision.java b/orchid/src/com/subgraph/orchid/Revision.java
deleted file mode 100644
index 6dc6a5c93a2..00000000000
--- a/orchid/src/com/subgraph/orchid/Revision.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.subgraph.orchid;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-public class Revision {
-	private final static String REVISION_FILE_PATH = "/build-revision";
-	
-	public static String getBuildRevision() {
-		final InputStream input = tryResourceOpen();
-		if(input == null) {
-			return "";
-		}
-		try {
-			return readFirstLine(input);
-		} catch (IOException e) {
-			return "";
-		}
-	}
-	
-	private static InputStream tryResourceOpen() {
-		return Revision.class.getResourceAsStream(REVISION_FILE_PATH);
-	}
-
-	private static String readFirstLine(InputStream input) throws IOException {
-		try {
-			final BufferedReader reader = new BufferedReader(new InputStreamReader(input));
-			return reader.readLine();
-		} finally {
-			input.close();
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/Router.java b/orchid/src/com/subgraph/orchid/Router.java
deleted file mode 100644
index fcccd926c7d..00000000000
--- a/orchid/src/com/subgraph/orchid/Router.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.subgraph.orchid;
-
-import java.util.Set;
-
-import com.subgraph.orchid.crypto.TorPublicKey;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.IPv4Address;
-
-public interface Router {
-
-	String getNickname();
-	String getCountryCode();
-	IPv4Address getAddress();
-	int getOnionPort();
-	int getDirectoryPort();
-	TorPublicKey getIdentityKey();
-	HexDigest getIdentityHash();
-	boolean isDescriptorDownloadable();
-
-	String getVersion();
-	Descriptor getCurrentDescriptor();
-	HexDigest getDescriptorDigest();
-	HexDigest getMicrodescriptorDigest();
-
-	TorPublicKey getOnionKey();
-	byte[] getNTorOnionKey();
-	
-	boolean hasBandwidth();
-	int getEstimatedBandwidth();
-	int getMeasuredBandwidth();
-
-	Set<String> getFamilyMembers();
-	int getAverageBandwidth();
-	int getBurstBandwidth();
-	int getObservedBandwidth();
-	boolean isHibernating();
-	boolean isRunning();
-	boolean isValid();
-	boolean isBadExit();
-	boolean isPossibleGuard();
-	boolean isExit();
-	boolean isFast();
-	boolean isStable();
-	boolean isHSDirectory();
-	boolean exitPolicyAccepts(IPv4Address address, int port);
-	boolean exitPolicyAccepts(int port);
-}
diff --git a/orchid/src/com/subgraph/orchid/RouterDescriptor.java b/orchid/src/com/subgraph/orchid/RouterDescriptor.java
deleted file mode 100644
index 89085e46aa9..00000000000
--- a/orchid/src/com/subgraph/orchid/RouterDescriptor.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package com.subgraph.orchid;
-
-import com.subgraph.orchid.crypto.TorPublicKey;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.Timestamp;
-import com.subgraph.orchid.data.exitpolicy.ExitPolicy;
-
-/**
- * Directory information about a single onion router.  This interface
- * provides access to the fields of a router descriptor document which
- * has been published through to Tor directory system.  
- */
-public interface RouterDescriptor extends Descriptor {
-	/**
-	 * Returns the nickname of this router.
-	 * 
-	 * @return The nickname of this router.
-	 */
-	String getNickname();
-	
-	
-	/**
-	 * Return the port on which this router provides directory related
-	 * HTTP connections, or 0 if this node does not provide directory
-	 * services.
-	 * 
-	 * @return The directory service port, or 0 if not a directory server.
-	 */
-	int getDirectoryPort();
-	
-	/**
-	 * Returns the volume of traffic in bytes per second that this router
-	 * is willing to sustain over long periods.
-	 * 
-	 * @return The average bandwidth of this router in bytes per second.
-	 */
-	int getAverageBandwidth();
-	
-	/**
-	 * Returns the volume of traffic in bytes per second that this router
-	 * is willing to sustain in very short intervals.
-	 * 
-	 * @return The burst bandwidth of this router in bytes per second.
-	 */
-	int getBurstBandwidth();
-	
-	/**
-	 * Returns the volume of traffic in bytes per second that this router
-	 * is estimated to be able to sustain.
-	 * 
-	 * @return The observed bandwidth capacity of this router in bytes per second.
-	 */
-	int getObservedBandwidth();
-	
-	/**
-	 * Return a human-readable string describing the system on which this router
-	 * is running, including possibly the operating system version and Tor 
-	 * implementation version.
-	 * 
-	 * @return A string describing the platform this router is running on.
-	 */
-	String getPlatform();
-	
-	/**
-	 * Return the time this descriptor was generated.
-	 * 
-	 * @return The time this descriptor was generated.
-	 */
-	Timestamp getPublishedTime();
-	
-	/**
-	 * Return a fingerprint of the public key of this router.  The fingerprint
-	 * is an optional field, so this method may return null if the descriptor 
-	 * of the router did not include the 'fingerprint' field.
-	 * 
-	 * @return The fingerprint of this router, or null if no fingerprint is available.
-	 */
-	HexDigest getFingerprint();
-	
-	/**
-	 * Return the number of seconds this router has been running.
-	 * 
-	 * @return The number of seconds this router has been running.
-	 */
-	int getUptime();
-	
-	/**
-	 * Return the long-term identity and signing public key for this
-	 * router.
-	 * 
-	 * @return The long-term identity and signing public key for this router.
-	 */
-	TorPublicKey getIdentityKey();
-	
-	/**
-	 * Return a string which describes how to contact the server's administrator.
-	 * This is an optional field, so this method will return null if the descriptor
-	 * of this router did not include the 'contact' field.
-	 * 
-	 * @return The contact information for this router, or null if not available.
-	 */
-	String getContact();
-	
-	/**
-	 * Return true if this router is currently hibernating and not suitable for
-	 * building new circuits.
-	 * 
-	 * @return True if this router is currently hibernating.
-	 */
-	boolean isHibernating();
-	
-	/**
-	 * Returns true if this router stores and serves hidden service descriptors.
-	 * 
-	 * @return True if this router is a hidden service directory.
-	 */
-	boolean isHiddenServiceDirectory();
-	
-	/**
-	 * Return true if this router is running a version of Tor which supports the
-	 * newer enhanced DNS logic.  If false, this router should be used for reverse
-	 * hostname lookups.
-	 * 
-	 * @return True if this router supports newer enhanced DNS logic.
-	 */
-	boolean supportsEventDNS();
-	
-	/**
-	 * Returns true if this router is a directory cache that provides extra-info
-	 * documents.
-	 * 
-	 * @return True if this router provides an extra-info document directory service.
-	 */
-	boolean cachesExtraInfo();
-	
-	/**
-	 * Return a digest of this router's extra-info document, or null if not 
-	 * available.  This is an optional field and will only be present if the
-	 * 'extra-info-digest' field was present in the original router descriptor.
-	 * 
-	 * @return The digest of the router extra-info-document, or null if not available.
-	 */
-	HexDigest getExtraInfoDigest();
-	
-	/**
-	 * Return true if this router allows single-hop circuits to make exit connections.
-	 * 
-	 * @return True if this router allows single-hop circuits to make exit connections.
-	 */
-	boolean allowsSingleHopExits();
-	
-	/**
-	 * Compare two router descriptors and return true if this router descriptor was published
-	 * at a later time than the <code>other</code> descriptor.
-	 * 
-	 * @param other Another router descriptor to compare.
-	 * @return True if this descriptor was published later than <code>other</code>
-	 */
-	boolean isNewerThan(RouterDescriptor other);
-		
-	ExitPolicy getExitPolicy();
-	
-
-}
diff --git a/orchid/src/com/subgraph/orchid/RouterMicrodescriptor.java b/orchid/src/com/subgraph/orchid/RouterMicrodescriptor.java
deleted file mode 100644
index 818585c66b6..00000000000
--- a/orchid/src/com/subgraph/orchid/RouterMicrodescriptor.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.subgraph.orchid;
-
-
-public interface RouterMicrodescriptor extends Descriptor {
-
-}
diff --git a/orchid/src/com/subgraph/orchid/RouterStatus.java b/orchid/src/com/subgraph/orchid/RouterStatus.java
deleted file mode 100644
index 87c1dd64b8b..00000000000
--- a/orchid/src/com/subgraph/orchid/RouterStatus.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.subgraph.orchid;
-
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.data.Timestamp;
-import com.subgraph.orchid.data.exitpolicy.ExitPorts;
-
-public interface RouterStatus {
-	String getNickname();
-	HexDigest getIdentity();
-	HexDigest getDescriptorDigest();
-	HexDigest getMicrodescriptorDigest();
-	Timestamp getPublicationTime();
-	IPv4Address getAddress();
-	int getRouterPort();
-	boolean isDirectory();
-	int getDirectoryPort();
-	boolean hasFlag(String flag);
-	String getVersion();
-	boolean hasBandwidth();
-	int getEstimatedBandwidth();
-	int getMeasuredBandwidth();
-	ExitPorts getExitPorts();
-}
diff --git a/orchid/src/com/subgraph/orchid/SocksPortListener.java b/orchid/src/com/subgraph/orchid/SocksPortListener.java
deleted file mode 100644
index dd8a4d5a4d1..00000000000
--- a/orchid/src/com/subgraph/orchid/SocksPortListener.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.subgraph.orchid;
-
-public interface SocksPortListener {
-	void addListeningPort(int port);
-	void stop();
-}
diff --git a/orchid/src/com/subgraph/orchid/Stream.java b/orchid/src/com/subgraph/orchid/Stream.java
deleted file mode 100644
index 2a4bc07ed89..00000000000
--- a/orchid/src/com/subgraph/orchid/Stream.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.subgraph.orchid;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public interface Stream {
-	/**
-	 * Returns the {@link Circuit} this stream belongs to.
-	 * 
-	 * @return The {@link Circuit} this stream belongs to.
-	 */
-	Circuit getCircuit();
-
-	/**
-	 * Returns the stream id value of this stream.
-	 * 
-	 * @return The stream id value of this stream.
-	 */
-	int getStreamId();
-
-	
-	CircuitNode getTargetNode();
-
-	/**
-	 * Close this stream.
-	 */
-	void close();
-
-	/**
-	 * Returns an {@link InputStream} for sending data on this stream.
-	 * 
-	 * @return An {@link InputStream} for transferring data on this stream.
-	 */
-	InputStream getInputStream();
-
-	/**
-	 * Returns an {@link OutputStream} for receiving data from this stream.
-	 * 
-	 * @return An {@link OutputStream} for receiving data from this stream.
-	 */
-	OutputStream getOutputStream();
-	
-	/**
-	 * If the circuit and stream level packaging windows are open for this stream
-	 * this method returns immediately, otherwise it blocks until both windows are
-	 * open or the stream is closed.
-	 */
-	void waitForSendWindow();
-}
diff --git a/orchid/src/com/subgraph/orchid/StreamConnectFailedException.java b/orchid/src/com/subgraph/orchid/StreamConnectFailedException.java
deleted file mode 100644
index 4c944a86750..00000000000
--- a/orchid/src/com/subgraph/orchid/StreamConnectFailedException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.subgraph.orchid;
-
-
-public class StreamConnectFailedException extends Exception {
-
-	private static final long serialVersionUID = 8103571310659595097L;
-	private final int reason;
-	
-	public StreamConnectFailedException(int reason) {
-		this.reason = reason;
-	}
-	
-	public int getReason() {
-		return reason;
-	}
-	
-	public boolean isReasonRetryable() {
-		return isRetryableReason(reason);
-	}
-
-	/* Copied from edge_reason_is_retriable() since this is not specified */
-	private static boolean isRetryableReason(int reasonCode) {
-		switch(reasonCode) {
-		case RelayCell.REASON_HIBERNATING:
-		case RelayCell.REASON_RESOURCELIMIT:
-		case RelayCell.REASON_RESOLVEFAILED:
-		case RelayCell.REASON_EXITPOLICY:
-		case RelayCell.REASON_MISC:
-		case RelayCell.REASON_NOROUTE:
-			return true;
-		default:
-			return false;
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/Threading.java b/orchid/src/com/subgraph/orchid/Threading.java
deleted file mode 100644
index 39c10844eed..00000000000
--- a/orchid/src/com/subgraph/orchid/Threading.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.subgraph.orchid;
-
-import com.google.common.util.concurrent.CycleDetectingLockFactory;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * Created by android on 8/22/14.
- */
-public class Threading {
-	static {
-		// Default policy goes here. If you want to change this, use one of the static methods before
-		// instantiating any orchid objects. The policy change will take effect only on new objects
-		// from that point onwards.
-		throwOnLockCycles();
-	}
-
-	private static CycleDetectingLockFactory.Policy policy;
-	public static CycleDetectingLockFactory factory;
-
-	public static ReentrantLock lock(String name) {
-		return factory.newReentrantLock(name);
-	}
-
-	public static void warnOnLockCycles() {
-		setPolicy(CycleDetectingLockFactory.Policies.WARN);
-	}
-
-	public static void throwOnLockCycles() {
-		setPolicy(CycleDetectingLockFactory.Policies.THROW);
-	}
-
-	public static void ignoreLockCycles() {
-		setPolicy(CycleDetectingLockFactory.Policies.DISABLED);
-	}
-
-	public static void setPolicy(CycleDetectingLockFactory.Policy policy) {
-		Threading.policy = policy;
-		factory = CycleDetectingLockFactory.newInstance(policy);
-	}
-
-	public static CycleDetectingLockFactory.Policy getPolicy() {
-		return policy;
-	}
-
-	public static ExecutorService newPool(final String name) {
-		ThreadFactory factory = new ThreadFactoryBuilder()
-				.setDaemon(true)
-				.setNameFormat(name + "-%d").build();
-		return Executors.newCachedThreadPool(factory);
-	}
-
-	public static ScheduledExecutorService newSingleThreadScheduledPool(final String name) {
-		ThreadFactory factory = new ThreadFactoryBuilder()
-				.setDaemon(true)
-				.setNameFormat(name + "-%d").build();
-		return Executors.newSingleThreadScheduledExecutor(factory);
-	}
-
-	public static ScheduledExecutorService newScheduledPool(final String name) {
-		ThreadFactory factory = new ThreadFactoryBuilder()
-				.setDaemon(true)
-				.setNameFormat(name + "-%d").build();
-		return Executors.newScheduledThreadPool(1, factory);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/Tor.java b/orchid/src/com/subgraph/orchid/Tor.java
deleted file mode 100644
index 566ffe8050c..00000000000
--- a/orchid/src/com/subgraph/orchid/Tor.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.subgraph.orchid;
-
-import java.lang.reflect.Proxy;
-import java.nio.charset.Charset;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.circuits.CircuitManagerImpl;
-import com.subgraph.orchid.circuits.TorInitializationTracker;
-import com.subgraph.orchid.config.TorConfigProxy;
-import com.subgraph.orchid.connections.ConnectionCacheImpl;
-import com.subgraph.orchid.directory.DirectoryImpl;
-import com.subgraph.orchid.directory.downloader.DirectoryDownloaderImpl;
-import com.subgraph.orchid.socks.SocksPortListenerImpl;
-
-/**
- * The <code>Tor</code> class is a collection of static methods for instantiating
- * various subsystem modules.
- */
-public class Tor {
-	private final static Logger logger = Logger.getLogger(Tor.class.getName());
-	
-	public final static int BOOTSTRAP_STATUS_STARTING = 0;
-	public final static int BOOTSTRAP_STATUS_CONN_DIR = 5;
-	public final static int BOOTSTRAP_STATUS_HANDSHAKE_DIR = 10;
-	public final static int BOOTSTRAP_STATUS_ONEHOP_CREATE = 15;
-	public final static int BOOTSTRAP_STATUS_REQUESTING_STATUS = 20;
-	public final static int BOOTSTRAP_STATUS_LOADING_STATUS = 25;
-	public final static int BOOTSTRAP_STATUS_REQUESTING_KEYS = 35;
-	public final static int BOOTSTRAP_STATUS_LOADING_KEYS = 40;
-	public final static int BOOTSTRAP_STATUS_REQUESTING_DESCRIPTORS = 45;
-	public final static int BOOTSTRAP_STATUS_LOADING_DESCRIPTORS = 50;
-	public final static int BOOTSTRAP_STATUS_CONN_OR = 80;
-	public final static int BOOTSTRAP_STATUS_HANDSHAKE_OR = 85;
-	public final static int BOOTSTRAP_STATUS_CIRCUIT_CREATE = 90;
-	public final static int BOOTSTRAP_STATUS_DONE = 100;
-	
-	
-	private final static String implementation = "Orchid";
-	private final static String version = "1.0.0";
-	
-	private final static Charset defaultCharset = createDefaultCharset();
-
-	private static Charset createDefaultCharset() {
-		return Charset.forName("ISO-8859-1");
-	}
-
-	public static Charset getDefaultCharset() {
-		return defaultCharset;
-	}
-
-	public static String getBuildRevision() {
-		return Revision.getBuildRevision();
-	}
-	
-	public static String getImplementation() {
-		return implementation;
-	}
-	
-	public static String getFullVersion() {
-		final String revision = getBuildRevision();
-		if(revision == null || revision.isEmpty()) {
-			return getVersion();
-		} else {
-			return getVersion() + "." + revision;
-		}
-	}
-
-	/**
-	 * Return a string describing the version of this software.
-	 * 
-	 * @return A string representation of the software version.
-	 */
-	public static String getVersion() {
-		return version;
-	}
-
-	/**
-	 * Determine if running on Android by inspecting java.runtime.name property.
-	 * 
-	 * @return True if running on Android.
-	 */
-	public static boolean isAndroidRuntime() {
-		final String runtime = System.getProperty("java.runtime.name");
-		return runtime != null && runtime.equals("Android Runtime");
-	}
-	
-	/**
-	 * Create and return a new <code>TorConfig</code> instance.
-	 * 
-	 * @param logManager This is a required dependency.  You must create a <code>LogManager</code>
-	 *                   before calling this method to create a <code>TorConfig</code>
-	 * @return A new <code>TorConfig</code> instance.
-	 * @see TorConfig
-	 */
-	static public TorConfig createConfig() {
-		final TorConfig config = (TorConfig) Proxy.newProxyInstance(TorConfigProxy.class.getClassLoader(), new Class[] { TorConfig.class }, new TorConfigProxy());
-		if(isAndroidRuntime()) {
-			logger.warning("Android Runtime detected, disabling V2 Link protocol");
-			config.setHandshakeV2Enabled(false);
-		}
-		return config;
-	}
-
-	static public TorInitializationTracker createInitalizationTracker() {
-		return new TorInitializationTracker();
-	}
-
-	/**
-	 * Create and return a new <code>Directory</code> instance.
-	 * 
-	 * @param logManager This is a required dependency.  You must create a <code>LogManager</code> 
-	 *                   before creating a <code>Directory</code>. 
-	 * @param config This is a required dependency. You must create a <code>TorConfig</code> before
-	 *               calling this method to create a <code>Directory</code>
-	 * @return A new <code>Directory</code> instance.
-	 * @see Directory
-	 */
-	static public Directory createDirectory(TorConfig config, DirectoryStore customDirectoryStore) {
-		return new DirectoryImpl(config, customDirectoryStore);
-	}
-
-	static public ConnectionCache createConnectionCache(TorConfig config, TorInitializationTracker tracker) {
-		return new ConnectionCacheImpl(config, tracker);
-	}
-	/**
-	 * Create and return a new <code>CircuitManager</code> instance.
-	 * 
-	 * @return A new <code>CircuitManager</code> instance.
-	 * @see CircuitManager
-	 */
-	static public CircuitManager createCircuitManager(TorConfig config, DirectoryDownloaderImpl directoryDownloader, Directory directory, ConnectionCache connectionCache, TorInitializationTracker tracker) {
-		return new CircuitManagerImpl(config, directoryDownloader, directory, connectionCache, tracker);
-	}
-
-	/**
-	 * Create and return a new <code>SocksPortListener</code> instance.
-	 * 
-	 * @param logManager This is a required dependency.  You must create a <code>LogManager</code>
-	 *                   before calling this method to create a <code>SocksPortListener</code>.
-	 * @param circuitManager This is a required dependency.  You must create a <code>CircuitManager</code>
-	 *                       before calling this method to create a <code>SocksPortListener</code>.
-	 * @return A new <code>SocksPortListener</code> instance.
-	 * @see SocksPortListener
-	 */
-	static public SocksPortListener createSocksPortListener(TorConfig config, CircuitManager circuitManager) {
-		return new SocksPortListenerImpl(config, circuitManager);
-	}
-
-	/**
-	 * Create and return a new <code>DirectoryDownloader</code> instance.
-	 *
-	 * @param logManager This is a required dependency.  You must create a <code>LogManager</code>
-	 *                   before calling this method to create a <code>DirectoryDownloader</code>.
-
-	 * @param directory This is a required dependency.  You must create a <code>Directory</code>
-	 *                  before calling this method to create a <code>DirectoryDownloader</code>
-	 *                  
-	 * @param circuitManager This is a required dependency.  You must create a <code>CircuitManager</code>
-	 *                       before calling this method to create a <code>DirectoryDownloader</code>.
-	 *                       
-	 * @return A new <code>DirectoryDownloader</code> instance.
-	 * @see DirectoryDownloaderImpl
-	 */
-	static public DirectoryDownloaderImpl createDirectoryDownloader(TorConfig config, TorInitializationTracker initializationTracker) {
-		return new DirectoryDownloaderImpl(config, initializationTracker);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/TorClient.java b/orchid/src/com/subgraph/orchid/TorClient.java
deleted file mode 100644
index c87ae135997..00000000000
--- a/orchid/src/com/subgraph/orchid/TorClient.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package com.subgraph.orchid;
-
-import java.security.NoSuchAlgorithmException;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.crypto.Cipher;
-import javax.net.SocketFactory;
-
-import com.subgraph.orchid.circuits.TorInitializationTracker;
-import com.subgraph.orchid.crypto.PRNGFixes;
-import com.subgraph.orchid.dashboard.Dashboard;
-import com.subgraph.orchid.directory.downloader.DirectoryDownloaderImpl;
-import com.subgraph.orchid.sockets.OrchidSocketFactory;
-
-/**
- * This class is the main entry-point for running a Tor proxy
- * or client.
- */
-public class TorClient {
-	private final static Logger logger = Logger.getLogger(TorClient.class.getName());
-	private final TorConfig config;
-	private final Directory directory;
-	private final TorInitializationTracker initializationTracker;
-	private final ConnectionCache connectionCache;
-	private final CircuitManager circuitManager;
-	private final SocksPortListener socksListener;
-	private final DirectoryDownloaderImpl directoryDownloader;
-	private final Dashboard dashboard;
-
-	private boolean isStarted = false;
-	private boolean isStopped = false;
-	
-	private final CountDownLatch readyLatch;
-	
-	public TorClient() {
-		this(null);
-	}
-
-	public TorClient(DirectoryStore customDirectoryStore) {
-		if(Tor.isAndroidRuntime()) {
-			PRNGFixes.apply();
-		}
-		config = Tor.createConfig();
-		directory = Tor.createDirectory(config, customDirectoryStore);
-		initializationTracker = Tor.createInitalizationTracker();
-		initializationTracker.addListener(createReadyFlagInitializationListener());
-		connectionCache = Tor.createConnectionCache(config, initializationTracker);
-		directoryDownloader = Tor.createDirectoryDownloader(config, initializationTracker);
-		circuitManager = Tor.createCircuitManager(config, directoryDownloader, directory, connectionCache, initializationTracker);
-		socksListener = Tor.createSocksPortListener(config, circuitManager);
-		readyLatch = new CountDownLatch(1);
-		dashboard = new Dashboard();
-		dashboard.addRenderables(circuitManager, directoryDownloader, socksListener);
-	}
-
-	public TorConfig getConfig() {
-		return config;
-	}
-
-	public SocketFactory getSocketFactory() {
-		return new OrchidSocketFactory(this);
-	}
-
-	/**
-	 * Start running the Tor client service.
-	 */
-	public synchronized void start() {
-		if(isStarted) {
-			return;
-		}
-		if(isStopped) {
-			throw new IllegalStateException("Cannot restart a TorClient instance.  Create a new instance instead.");
-		}
-		logger.info("Starting Orchid (version: "+ Tor.getFullVersion() +")");
-		verifyUnlimitedStrengthPolicyInstalled();
-		directoryDownloader.start(directory);
-		circuitManager.startBuildingCircuits();
-		if(dashboard.isEnabledByProperty()) {
-			dashboard.startListening();
-		}
-		isStarted = true;
-	}
-	
-	public synchronized void stop() {
-		if(!isStarted || isStopped) {
-			return;
-		}
-		try {
-			socksListener.stop();
-			if(dashboard.isListening()) {
-				dashboard.stopListening();
-			}
-			directoryDownloader.stop();
-			circuitManager.stopBuildingCircuits(true);
-			directory.close();
-			connectionCache.close();
-		} catch (Exception e) {
-			logger.log(Level.WARNING, "Unexpected exception while shutting down TorClient instance: "+ e, e);
-		} finally {
-			isStopped = true;
-		}
-	}
-	
-	public Directory getDirectory() {
-		return directory;
-	}
-	
-	public ConnectionCache getConnectionCache() {
-		return connectionCache;
-	}
-
-	public CircuitManager getCircuitManager() {
-		return circuitManager;
-	}
-
-	public void waitUntilReady() throws InterruptedException {
-		readyLatch.await();
-	}
-
-	public void waitUntilReady(long timeout) throws InterruptedException, TimeoutException {
-		if(!readyLatch.await(timeout, TimeUnit.MILLISECONDS)) {
-			throw new TimeoutException();
-		}
-	}
-	
-	public Stream openExitStreamTo(String hostname, int port) throws InterruptedException, TimeoutException, OpenFailedException {
-		ensureStarted();
-		return circuitManager.openExitStreamTo(hostname, port);
-	}
-	
-	private synchronized void ensureStarted() {
-		if(!isStarted) {
-			throw new IllegalStateException("Must call start() first");
-		}
-	}
-
-	public void enableSocksListener(int port) {
-		socksListener.addListeningPort(port);
-	}
-
-	public void enableSocksListener() {
-		enableSocksListener(9150);
-	}
-	
-	public void enableDashboard() {
-		if(!dashboard.isListening()) {
-			dashboard.startListening();
-		}
-	}
-	
-	public void enableDashboard(int port) {
-		dashboard.setListeningPort(port);
-		enableDashboard();
-	}
-	
-	public void disableDashboard() {
-		if(dashboard.isListening()) {
-			dashboard.stopListening();
-		}
-	}
-
-	public void addInitializationListener(TorInitializationListener listener) {
-		initializationTracker.addListener(listener);
-	}
-
-	public void removeInitializationListener(TorInitializationListener listener) {
-		initializationTracker.removeListener(listener);
-	}
-	
-	private TorInitializationListener createReadyFlagInitializationListener() {
-		return new TorInitializationListener() {
-			public void initializationProgress(String message, int percent) {}
-			public void initializationCompleted() {
-				readyLatch.countDown();
-			}
-		};
-	}
-
-	public static void main(String[] args) {
-		final TorClient client = new TorClient();
-		client.addInitializationListener(createInitalizationListner());
-		client.start();
-		client.enableSocksListener();
-	}
-
-	private static TorInitializationListener createInitalizationListner() {
-		return new TorInitializationListener() {
-			
-			public void initializationProgress(String message, int percent) {
-				System.out.println(">>> [ "+ percent + "% ]: "+ message);
-			}
-			
-			public void initializationCompleted() {
-				System.out.println("Tor is ready to go!");
-			}
-		};
-	}
-	
-	private void verifyUnlimitedStrengthPolicyInstalled() {
-		try {
-			if(Cipher.getMaxAllowedKeyLength("AES") < 256) {
-				final String message = "Unlimited Strength Jurisdiction Policy Files are required but not installed.";
-				logger.severe(message);
-				throw new TorException(message);
-			}
-		} catch (NoSuchAlgorithmException e) {
-			logger.log(Level.SEVERE, "No AES provider found");
-			throw new TorException(e);
-		}  catch (NoSuchMethodError e) {
-			logger.info("Skipped check for Unlimited Strength Jurisdiction Policy Files");
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/TorConfig.java b/orchid/src/com/subgraph/orchid/TorConfig.java
deleted file mode 100644
index 83971330f52..00000000000
--- a/orchid/src/com/subgraph/orchid/TorConfig.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.subgraph.orchid;
-
-import java.io.File;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import com.subgraph.orchid.circuits.hs.HSDescriptorCookie;
-import com.subgraph.orchid.config.TorConfigBridgeLine;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.IPv4Address;
-
-
-public interface TorConfig {
-	
-	@ConfigVar(type=ConfigVarType.PATH, defaultValue="~/.orchid")
-	File getDataDirectory();
-	void setDataDirectory(File directory);
-	
-	@ConfigVar(type=ConfigVarType.INTERVAL, defaultValue="60 seconds")
-	long getCircuitBuildTimeout();
-	void setCircuitBuildTimeout(long time, TimeUnit unit);
-	
-	@ConfigVar(type=ConfigVarType.INTERVAL, defaultValue="0")
-	long getCircuitStreamTimeout();
-	void setCircuitStreamTimeout(long time, TimeUnit unit);
-	
-	@ConfigVar(type=ConfigVarType.INTERVAL, defaultValue="1 hour")
-	long getCircuitIdleTimeout();
-	void setCircuitIdleTimeout(long time, TimeUnit unit);
-	
-	@ConfigVar(type=ConfigVarType.INTERVAL, defaultValue="30 seconds")
-	long getNewCircuitPeriod();
-	void setNewCircuitPeriod(long time, TimeUnit unit);
-	
-	@ConfigVar(type=ConfigVarType.INTERVAL, defaultValue="10 minutes")
-	long getMaxCircuitDirtiness();
-	void setMaxCircuitDirtiness(long time, TimeUnit unit);
-	
-	
-	@ConfigVar(type=ConfigVarType.INTEGER, defaultValue="32")
-	int getMaxClientCircuitsPending();
-	void setMaxClientCircuitsPending(int value);
-	
-	@ConfigVar(type=ConfigVarType.BOOLEAN, defaultValue="true")
-	boolean getEnforceDistinctSubnets();
-	void setEnforceDistinctSubnets(boolean value);
-	
-	@ConfigVar(type=ConfigVarType.INTERVAL, defaultValue="2 minutes")
-	long getSocksTimeout();
-	void setSocksTimeout(long value);
-	
-	@ConfigVar(type=ConfigVarType.INTEGER, defaultValue="3")
-	int getNumEntryGuards();
-	void setNumEntryGuards(int value);
-	
-	@ConfigVar(type=ConfigVarType.BOOLEAN, defaultValue="true")
-	boolean getUseEntryGuards();
-	void setUseEntryGuards(boolean value);
-	
-	@ConfigVar(type=ConfigVarType.PORTLIST, defaultValue="21,22,706,1863,5050,5190,5222,5223,6523,6667,6697,8300")
-	List<Integer> getLongLivedPorts();
-	void setLongLivedPorts(List<Integer> ports);
-
-	@ConfigVar(type=ConfigVarType.STRINGLIST)
-	List<String> getExcludeNodes();
-	void setExcludeNodes(List<String> nodes);
-	
-	@ConfigVar(type=ConfigVarType.STRINGLIST)
-	List<String> getExcludeExitNodes();
-	
-	void setExcludeExitNodes(List<String> nodes);
-	
-	@ConfigVar(type=ConfigVarType.STRINGLIST)
-	List<String> getExitNodes();
-	void setExitNodes(List<String> nodes);
-	
-	@ConfigVar(type=ConfigVarType.STRINGLIST)
-	List<String> getEntryNodes();
-	void setEntryNodes(List<String> nodes);
-	
-	@ConfigVar(type=ConfigVarType.BOOLEAN, defaultValue="false")
-	boolean getStrictNodes();
-	void setStrictNodes(boolean value);
-	
-	@ConfigVar(type=ConfigVarType.BOOLEAN, defaultValue="false")
-	boolean getFascistFirewall();
-	void setFascistFirewall(boolean value);
-	
-	@ConfigVar(type=ConfigVarType.PORTLIST, defaultValue="80,443")
-	List<Integer> getFirewallPorts();
-	void setFirewallPorts(List<Integer> ports);
-	
-	@ConfigVar(type=ConfigVarType.BOOLEAN, defaultValue="false")
-	boolean getSafeSocks();
-	void setSafeSocks(boolean value);
-	
-	@ConfigVar(type=ConfigVarType.BOOLEAN, defaultValue="true")
-	boolean getSafeLogging();
-	void setSafeLogging(boolean value);
-
-	@ConfigVar(type=ConfigVarType.BOOLEAN, defaultValue="true")
-	boolean getWarnUnsafeSocks();
-	void setWarnUnsafeSocks(boolean value);
-
-	@ConfigVar(type=ConfigVarType.BOOLEAN, defaultValue="true")
-	boolean getClientRejectInternalAddress();
-	void setClientRejectInternalAddress(boolean value);
-	
-	@ConfigVar(type=ConfigVarType.BOOLEAN, defaultValue="true")
-	boolean getHandshakeV3Enabled();
-	void setHandshakeV3Enabled(boolean value);
-	
-	@ConfigVar(type=ConfigVarType.BOOLEAN, defaultValue="true")
-	boolean getHandshakeV2Enabled();
-	void setHandshakeV2Enabled(boolean value);
-	
-	@ConfigVar(type=ConfigVarType.HS_AUTH)
-	HSDescriptorCookie getHidServAuth(String key);
-	void addHidServAuth(String key, String value);
-	
-	@ConfigVar(type=ConfigVarType.AUTOBOOL, defaultValue="auto")
-	AutoBoolValue getUseNTorHandshake();
-	void setUseNTorHandshake(AutoBoolValue value);
-	
-	@ConfigVar(type=ConfigVarType.AUTOBOOL, defaultValue="auto")
-	AutoBoolValue getUseMicrodescriptors();
-	void setUseMicrodescriptors(AutoBoolValue value);
-
-	@ConfigVar(type=ConfigVarType.BOOLEAN, defaultValue="false")
-	boolean getUseBridges();
-	void setUseBridges(boolean value);
-	
-	@ConfigVar(type=ConfigVarType.BRIDGE_LINE)
-	List<TorConfigBridgeLine> getBridges();
-	void addBridge(IPv4Address address, int port);
-	void addBridge(IPv4Address address, int port, HexDigest fingerprint);
-	
-	enum ConfigVarType { INTEGER, STRING, HS_AUTH, BOOLEAN, INTERVAL, PORTLIST, STRINGLIST, PATH, AUTOBOOL, BRIDGE_LINE };
-	enum AutoBoolValue { TRUE, FALSE, AUTO }
-	
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.METHOD)
-	@interface ConfigVar {
-		ConfigVarType type();
-		String defaultValue() default "";
-	}
-}
\ No newline at end of file
diff --git a/orchid/src/com/subgraph/orchid/TorException.java b/orchid/src/com/subgraph/orchid/TorException.java
deleted file mode 100644
index fd3406c035a..00000000000
--- a/orchid/src/com/subgraph/orchid/TorException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.subgraph.orchid;
-
-public class TorException extends RuntimeException {
-
-	private static final long serialVersionUID = 2462760291055303580L;
-
-	public TorException() {
-		super();
-	}
-	
-	public TorException(String message) {
-		super(message);
-	}
-	
-	public TorException(String message, Throwable ex) {
-		super(message, ex);
-	}
-	
-	public TorException(Throwable ex) {
-		super(ex);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/TorInitializationListener.java b/orchid/src/com/subgraph/orchid/TorInitializationListener.java
deleted file mode 100644
index e36d3e72dea..00000000000
--- a/orchid/src/com/subgraph/orchid/TorInitializationListener.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.subgraph.orchid;
-
-public interface TorInitializationListener {
-	void initializationProgress(String message, int percent);
-	void initializationCompleted();
-}
diff --git a/orchid/src/com/subgraph/orchid/TorParsingException.java b/orchid/src/com/subgraph/orchid/TorParsingException.java
deleted file mode 100644
index d55e08ce802..00000000000
--- a/orchid/src/com/subgraph/orchid/TorParsingException.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.subgraph.orchid;
-
-
-public class TorParsingException extends TorException {
-	public TorParsingException(String string) {
-		super(string);
-	}
-
-	public TorParsingException(String string, Throwable ex) {
-		super(string, ex);
-	}
-
-	private static final long serialVersionUID = -4997757416476363399L;
-}
diff --git a/orchid/src/com/subgraph/orchid/VoteAuthorityEntry.java b/orchid/src/com/subgraph/orchid/VoteAuthorityEntry.java
deleted file mode 100644
index 5693da6b711..00000000000
--- a/orchid/src/com/subgraph/orchid/VoteAuthorityEntry.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.subgraph.orchid;
-
-import java.util.List;
-
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.directory.consensus.DirectorySignature;
-
-public interface VoteAuthorityEntry {
-	String getNickname();
-	HexDigest getIdentity();
-	String getHostname();
-	IPv4Address getAddress();
-	int getDirectoryPort();
-	int getRouterPort();
-	String getContact();
-	HexDigest getVoteDigest();
-	List<DirectorySignature> getSignatures();
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/CircuitBuildTask.java b/orchid/src/com/subgraph/orchid/circuits/CircuitBuildTask.java
deleted file mode 100644
index 2d699a56c0a..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/CircuitBuildTask.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.CircuitNode;
-import com.subgraph.orchid.Connection;
-import com.subgraph.orchid.ConnectionCache;
-import com.subgraph.orchid.ConnectionFailedException;
-import com.subgraph.orchid.ConnectionHandshakeException;
-import com.subgraph.orchid.ConnectionTimeoutException;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.Tor;
-import com.subgraph.orchid.TorException;
-import com.subgraph.orchid.circuits.path.PathSelectionFailedException;
-
-public class CircuitBuildTask implements Runnable {
-	private final static Logger logger = Logger.getLogger(CircuitBuildTask.class.getName());
-	private final CircuitCreationRequest creationRequest;
-	private final ConnectionCache connectionCache;
-	private final TorInitializationTracker initializationTracker;
-	private final CircuitImpl circuit;
-	private final CircuitExtender extender;
-
-	private Connection connection = null;
-	
-	public CircuitBuildTask(CircuitCreationRequest request, ConnectionCache connectionCache, boolean ntorEnabled) {
-		this(request, connectionCache, ntorEnabled, null);
-	}
-
-	public CircuitBuildTask(CircuitCreationRequest request, ConnectionCache connectionCache, boolean ntorEnabled, TorInitializationTracker initializationTracker) {
-		this.creationRequest = request;
-		this.connectionCache = connectionCache;
-		this.initializationTracker = initializationTracker;
-		this.circuit = request.getCircuit();
-		this.extender = new CircuitExtender(request.getCircuit(), ntorEnabled);
-	}
-
-	public void run() {
-		Router firstRouter = null;
-		try {
-			circuit.notifyCircuitBuildStart();
-			creationRequest.choosePath();
-			if(logger.isLoggable(Level.FINE)) {
-				logger.fine("Opening a new circuit to "+ pathToString(creationRequest));
-			}
-			firstRouter = creationRequest.getPathElement(0);
-			openEntryNodeConnection(firstRouter);
-			buildCircuit(firstRouter);
-			circuit.notifyCircuitBuildCompleted();
-		} catch (ConnectionTimeoutException e) {
-			connectionFailed("Timeout connecting to "+ firstRouter);
-		} catch (ConnectionFailedException e) {
-			connectionFailed("Connection failed to "+ firstRouter + " : " + e.getMessage());
-		} catch (ConnectionHandshakeException e) {
-			connectionFailed("Handshake error connecting to "+ firstRouter + " : " + e.getMessage());
-		} catch (InterruptedException e) {
-			Thread.currentThread().interrupt();
-			circuitBuildFailed("Circuit building thread interrupted");
-		} catch(PathSelectionFailedException e) { 
-			circuitBuildFailed(e.getMessage());
-		} catch (TorException e) {
-			circuitBuildFailed(e.getMessage());
-		} catch(Exception e) {
-			circuitBuildFailed("Unexpected exception: "+ e);
-			logger.log(Level.WARNING, "Unexpected exception while building circuit: "+ e, e);
-		}
-	}
-
-	private String pathToString(CircuitCreationRequest ccr) {
-		final StringBuilder sb = new StringBuilder();
-		sb.append("[");
-		for(Router r: ccr.getPath()) {
-			if(sb.length() > 1)
-				sb.append(",");
-			sb.append(r.getNickname());
-		}
-		sb.append("]");
-		return sb.toString();
-	}
-
-	private void connectionFailed(String message) {
-		creationRequest.connectionFailed(message);
-		circuit.notifyCircuitBuildFailed();
-	}
-	
-	private void circuitBuildFailed(String message) {
-		creationRequest.circuitBuildFailed(message);
-		circuit.notifyCircuitBuildFailed();
-		if(connection != null) {
-			connection.removeCircuit(circuit);
-		}
-	}
-	
-	private void openEntryNodeConnection(Router firstRouter) throws ConnectionTimeoutException, ConnectionFailedException, ConnectionHandshakeException, InterruptedException {
-		connection = connectionCache.getConnectionTo(firstRouter, creationRequest.isDirectoryCircuit());
-		circuit.bindToConnection(connection);
-		creationRequest.connectionCompleted(connection);
-	}
-
-	private void buildCircuit(Router firstRouter) throws TorException {
-		notifyInitialization();
-		final CircuitNode firstNode = extender.createFastTo(firstRouter);
-		creationRequest.nodeAdded(firstNode);
-		
-		for(int i = 1; i < creationRequest.getPathLength(); i++) {
-			final CircuitNode extendedNode = extender.extendTo(creationRequest.getPathElement(i));
-			creationRequest.nodeAdded(extendedNode);
-		}
-		creationRequest.circuitBuildCompleted(circuit);
-		notifyDone();
-	}
-
-	private void notifyInitialization() {
-		if(initializationTracker != null) {
-			final int event = creationRequest.isDirectoryCircuit() ? 
-					Tor.BOOTSTRAP_STATUS_ONEHOP_CREATE : Tor.BOOTSTRAP_STATUS_CIRCUIT_CREATE;
-			initializationTracker.notifyEvent(event);
-		}
-	}
-
-	private void notifyDone() {
-		if(initializationTracker != null && !creationRequest.isDirectoryCircuit()) {
-			initializationTracker.notifyEvent(Tor.BOOTSTRAP_STATUS_DONE);
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/CircuitCreationRequest.java b/orchid/src/com/subgraph/orchid/circuits/CircuitCreationRequest.java
deleted file mode 100644
index 59d0124b36a..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/CircuitCreationRequest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import java.util.Collections;
-import java.util.List;
-
-import com.subgraph.orchid.Circuit;
-import com.subgraph.orchid.CircuitBuildHandler;
-import com.subgraph.orchid.CircuitNode;
-import com.subgraph.orchid.Connection;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.circuits.path.CircuitPathChooser;
-import com.subgraph.orchid.circuits.path.PathSelectionFailedException;
-
-public class CircuitCreationRequest implements CircuitBuildHandler {
-	private final CircuitImpl circuit;
-	private final CircuitPathChooser pathChooser;
-	private final CircuitBuildHandler buildHandler;
-	private final boolean isDirectoryCircuit;
-	
-	private List<Router> path;
-	
-	public CircuitCreationRequest(CircuitPathChooser pathChooser, Circuit circuit, CircuitBuildHandler buildHandler, boolean isDirectoryCircuit) {
-		this.pathChooser = pathChooser;
-		this.circuit = (CircuitImpl) circuit;
-		this.buildHandler = buildHandler;
-		this.path = Collections.emptyList();
-		this.isDirectoryCircuit = isDirectoryCircuit;
-	}
-	
-	void choosePath() throws InterruptedException, PathSelectionFailedException {
-		if(!(circuit instanceof CircuitImpl)) {
-			throw new IllegalArgumentException();
-		}
-		path = ((CircuitImpl)circuit).choosePath(pathChooser);
-
-	}
-
-	CircuitImpl getCircuit() {
-		return circuit;
-	}
-
-	List<Router> getPath() {
-		return path;
-	}
-	
-	int getPathLength() {
-		return path.size();
-	}
-	
-	Router getPathElement(int idx) {
-		return path.get(idx);
-	}
-	
-	CircuitBuildHandler getBuildHandler() {
-		return buildHandler;
-	}
-	
-	boolean isDirectoryCircuit() {
-		return isDirectoryCircuit;
-	}
-
-	public void connectionCompleted(Connection connection) {
-		if(buildHandler != null) {
-			buildHandler.connectionCompleted(connection);
-		}
-	}
-
-	public void connectionFailed(String reason) {
-		if(buildHandler != null) {
-			buildHandler.connectionFailed(reason);
-		}
-	}
-
-	public void nodeAdded(CircuitNode node) {
-		if(buildHandler != null) {
-			buildHandler.nodeAdded(node);
-		}
-	}
-
-	public void circuitBuildCompleted(Circuit circuit) {
-		if(buildHandler != null) {
-			buildHandler.circuitBuildCompleted(circuit);
-		}
-	}
-
-	public void circuitBuildFailed(String reason) {
-		if(buildHandler != null) {
-			buildHandler.circuitBuildFailed(reason);
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/CircuitCreationTask.java b/orchid/src/com/subgraph/orchid/circuits/CircuitCreationTask.java
deleted file mode 100644
index f4afc11c708..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/CircuitCreationTask.java
+++ /dev/null
@@ -1,297 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.Circuit;
-import com.subgraph.orchid.CircuitBuildHandler;
-import com.subgraph.orchid.CircuitNode;
-import com.subgraph.orchid.Connection;
-import com.subgraph.orchid.ConnectionCache;
-import com.subgraph.orchid.Directory;
-import com.subgraph.orchid.ExitCircuit;
-import com.subgraph.orchid.InternalCircuit;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.Threading;
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.circuits.CircuitManagerImpl.CircuitFilter;
-import com.subgraph.orchid.circuits.path.CircuitPathChooser;
-import com.subgraph.orchid.data.exitpolicy.ExitTarget;
-
-public class CircuitCreationTask implements Runnable {
-	private final static Logger logger = Logger.getLogger(CircuitCreationTask.class.getName());
-	private final static int MAX_CIRCUIT_DIRTINESS = 300; // seconds
-	private final static int MAX_PENDING_CIRCUITS = 4;
-
-	private final TorConfig config;
-	private final Directory directory;
-	private final ConnectionCache connectionCache;
-	private final CircuitManagerImpl circuitManager;
-	private final TorInitializationTracker initializationTracker;
-	private final CircuitPathChooser pathChooser;
-	private final Executor executor;
-	private final CircuitBuildHandler buildHandler;
-	private final CircuitBuildHandler internalBuildHandler;
-	// To avoid obnoxiously printing a warning every second
-	private int notEnoughDirectoryInformationWarningCounter = 0;
-	
-	private final CircuitPredictor predictor;
-	
-	private final AtomicLong lastNewCircuit;
-
-	CircuitCreationTask(TorConfig config, Directory directory, ConnectionCache connectionCache, CircuitPathChooser pathChooser, CircuitManagerImpl circuitManager, TorInitializationTracker initializationTracker) {
-		this.config = config;
-		this.directory = directory;
-		this.connectionCache = connectionCache;
-		this.circuitManager = circuitManager;
-		this.initializationTracker = initializationTracker;
-		this.pathChooser = pathChooser;
-		this.executor = Threading.newPool("CircuitCreationTask worker");
-		this.buildHandler = createCircuitBuildHandler();
-		this.internalBuildHandler = createInternalCircuitBuildHandler();
-		this.predictor = new CircuitPredictor();
-		this.lastNewCircuit = new AtomicLong();
-	}
-
-	CircuitPredictor getCircuitPredictor() {
-		return predictor;
-	}
-
-	public void run() {
-		expireOldCircuits();
-		assignPendingStreamsToActiveCircuits();
-		checkExpiredPendingCircuits();
-		checkCircuitsForCreation();		
-	}
-
-	void predictPort(int port) {
-		predictor.addExitPortRequest(port);
-	}
-
-	private void assignPendingStreamsToActiveCircuits() {
-		final List<StreamExitRequest> pendingExitStreams = circuitManager.getPendingExitStreams();
-		if(pendingExitStreams.isEmpty())
-			return;
-
-		for(ExitCircuit c: circuitManager.getRandomlyOrderedListOfExitCircuits()) {
-			final Iterator<StreamExitRequest> it = pendingExitStreams.iterator();
-			while(it.hasNext()) {
-				if(attemptHandleStreamRequest(c, it.next()))
-					it.remove();
-			}
-		}
-	}
-
-	private boolean attemptHandleStreamRequest(ExitCircuit c, StreamExitRequest request) {
-		if(c.canHandleExitTo(request)) {
-			if(request.reserveRequest()) {
-				launchExitStreamTask(c, request);
-			}
-			// else request is reserved meaning another circuit is already trying to handle it
-			return true;
-		}
-		return false;
-	}
-
-	private void launchExitStreamTask(ExitCircuit circuit, StreamExitRequest exitRequest) {
-		final OpenExitStreamTask task = new OpenExitStreamTask(circuit, exitRequest);
-		executor.execute(task);
-	}
-
-	private void expireOldCircuits() {
-		final Set<Circuit> circuits = circuitManager.getCircuitsByFilter(new CircuitFilter() {
-
-			public boolean filter(Circuit circuit) {
-				return !circuit.isMarkedForClose() && circuit.getSecondsDirty() > MAX_CIRCUIT_DIRTINESS;
-			}
-		});
-		for(Circuit c: circuits) {
-			logger.fine("Closing idle dirty circuit: "+ c);
-			((CircuitImpl)c).markForClose();
-		}
-	}
-	private void checkExpiredPendingCircuits() {
-		// TODO Auto-generated method stub
-	}
-
-	private void checkCircuitsForCreation() {
-
-		if(!directory.haveMinimumRouterInfo()) {
-			if(notEnoughDirectoryInformationWarningCounter % 20 == 0)
-				logger.info("Cannot build circuits because we don't have enough directory information");
-			notEnoughDirectoryInformationWarningCounter++;
-			return;
-		}
-
-
-		if(lastNewCircuit.get() != 0) {
-			final long now = System.currentTimeMillis();
-			if((now - lastNewCircuit.get()) < config.getNewCircuitPeriod()) {
-				// return;
-			}
-		}
-		
-		buildCircuitIfNeeded();
-		maybeBuildInternalCircuit();
-	}
-
-	private void buildCircuitIfNeeded() {
-		if (connectionCache.isClosed()) {
-			logger.warning("Not building circuits, because connection cache is closed");
-			return;
-		}
-
-		final List<StreamExitRequest> pendingExitStreams = circuitManager.getPendingExitStreams();
-		final List<PredictedPortTarget> predictedPorts = predictor.getPredictedPortTargets();
-		final List<ExitTarget> exitTargets = new ArrayList<ExitTarget>();
-		for(StreamExitRequest streamRequest: pendingExitStreams) {
-			if(!streamRequest.isReserved() && countCircuitsSupportingTarget(streamRequest, false) == 0) {
-				exitTargets.add(streamRequest);
-			}
-		}
-		for(PredictedPortTarget ppt: predictedPorts) {
-			if(countCircuitsSupportingTarget(ppt, true) < 2) {
-				exitTargets.add(ppt);
-			}
-		}
-		buildCircuitToHandleExitTargets(exitTargets);
-	}
-
-	private void maybeBuildInternalCircuit() {
-		final int needed = circuitManager.getNeededCleanCircuitCount(predictor.isInternalPredicted());
-		
-		if(needed > 0) {
-			launchBuildTaskForInternalCircuit();
-		}
-	}
-	
-	private void launchBuildTaskForInternalCircuit() {
-		logger.fine("Launching new internal circuit");
-		final InternalCircuitImpl circuit = new InternalCircuitImpl(circuitManager);
-		final CircuitCreationRequest request = new CircuitCreationRequest(pathChooser, circuit, internalBuildHandler, false);
-		final CircuitBuildTask task = new CircuitBuildTask(request, connectionCache, circuitManager.isNtorEnabled());
-		executor.execute(task);
-		circuitManager.incrementPendingInternalCircuitCount();
-	}
-	
-	private int countCircuitsSupportingTarget(final ExitTarget target, final boolean needClean) {
-		final CircuitFilter filter = new CircuitFilter() {
-			public boolean filter(Circuit circuit) {
-				if(!(circuit instanceof ExitCircuit)) {
-					return false;
-				}
-				final ExitCircuit ec = (ExitCircuit) circuit;
-				final boolean pendingOrConnected = circuit.isPending() || circuit.isConnected();
-				final boolean isCleanIfNeeded = !(needClean && !circuit.isClean());
-				return pendingOrConnected && isCleanIfNeeded && ec.canHandleExitTo(target);
-			}
-		};
-		return circuitManager.getCircuitsByFilter(filter).size();
-	}
-
-	private void buildCircuitToHandleExitTargets(List<ExitTarget> exitTargets) {
-		if(exitTargets.isEmpty()) {
-			return;
-		}
-		if(!directory.haveMinimumRouterInfo()) 
-			return;
-		if(circuitManager.getPendingCircuitCount() >= MAX_PENDING_CIRCUITS)
-			return;
-
-		if(logger.isLoggable(Level.FINE)) { 
-			logger.fine("Building new circuit to handle "+ exitTargets.size() +" pending streams and predicted ports");
-		}
-
-		launchBuildTaskForTargets(exitTargets);
-	}
-
-	private void launchBuildTaskForTargets(List<ExitTarget> exitTargets) {
-		final Router exitRouter = pathChooser.chooseExitNodeForTargets(exitTargets);
-		if(exitRouter == null) {
-			logger.warning("Failed to select suitable exit node for targets");
-			return;
-		}
-		
-		final Circuit circuit = circuitManager.createNewExitCircuit(exitRouter);
-		final CircuitCreationRequest request = new CircuitCreationRequest(pathChooser, circuit, buildHandler, false);
-		final CircuitBuildTask task = new  CircuitBuildTask(request, connectionCache, circuitManager.isNtorEnabled(), initializationTracker);
-		executor.execute(task);
-	}
-
-	private CircuitBuildHandler createCircuitBuildHandler() {
-		return new CircuitBuildHandler() {
-
-			public void circuitBuildCompleted(Circuit circuit) {
-				logger.fine("Circuit completed to: "+ circuit);
-				circuitOpenedHandler(circuit);
-				lastNewCircuit.set(System.currentTimeMillis());
-			}
-
-			public void circuitBuildFailed(String reason) {
-				logger.fine("Circuit build failed: "+ reason);
-				buildCircuitIfNeeded();
-			}
-
-			public void connectionCompleted(Connection connection) {
-				logger.finer("Circuit connection completed to "+ connection);
-			}
-
-			public void connectionFailed(String reason) {
-				logger.fine("Circuit connection failed: "+ reason);
-				buildCircuitIfNeeded();
-			}
-
-			public void nodeAdded(CircuitNode node) {
-				logger.finer("Node added to circuit: "+ node);
-			}	
-		};
-	}
-
-	private void circuitOpenedHandler(Circuit circuit) {
-		if(!(circuit instanceof ExitCircuit)) {
-			return;
-		}
-		final ExitCircuit ec = (ExitCircuit) circuit;
-		final List<StreamExitRequest> pendingExitStreams = circuitManager.getPendingExitStreams();
-		for(StreamExitRequest req: pendingExitStreams) {
-			if(ec.canHandleExitTo(req) && req.reserveRequest()) {
-				launchExitStreamTask(ec, req);
-			}
-		}
-	}
-	
-	private CircuitBuildHandler createInternalCircuitBuildHandler() {
-		return new CircuitBuildHandler() {
-			
-			public void nodeAdded(CircuitNode node) {
-				logger.finer("Node added to internal circuit: "+ node);
-			}
-			
-			public void connectionFailed(String reason) {
-				logger.fine("Circuit connection failed: "+ reason);
-				circuitManager.decrementPendingInternalCircuitCount();
-			}
-			
-			public void connectionCompleted(Connection connection) {
-				logger.finer("Circuit connection completed to "+ connection);
-			}
-			
-			public void circuitBuildFailed(String reason) {
-				logger.fine("Circuit build failed: "+ reason);
-				circuitManager.decrementPendingInternalCircuitCount();
-			}
-			
-			public void circuitBuildCompleted(Circuit circuit) {
-				logger.fine("Internal circuit build completed: "+ circuit);
-				lastNewCircuit.set(System.currentTimeMillis());
-				circuitManager.addCleanInternalCircuit((InternalCircuit) circuit);
-			}
-		};
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/CircuitExtender.java b/orchid/src/com/subgraph/orchid/circuits/CircuitExtender.java
deleted file mode 100644
index b6fd1e1919f..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/CircuitExtender.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.Cell;
-import com.subgraph.orchid.CircuitNode;
-import com.subgraph.orchid.RelayCell;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.TorException;
-import com.subgraph.orchid.circuits.cells.CellImpl;
-import com.subgraph.orchid.circuits.cells.RelayCellImpl;
-import com.subgraph.orchid.crypto.TorCreateFastKeyAgreement;
-import com.subgraph.orchid.crypto.TorKeyAgreement;
-import com.subgraph.orchid.crypto.TorMessageDigest;
-import com.subgraph.orchid.crypto.TorStreamCipher;
-
-public class CircuitExtender {
-	private final static Logger logger = Logger.getLogger(CircuitExtender.class.getName());
-	
-	private final static int DH_BYTES = 1024 / 8;
-	private final static int PKCS1_OAEP_PADDING_OVERHEAD = 42;
-	private final static int CIPHER_KEY_LEN = TorStreamCipher.KEY_LEN;
-	final static int TAP_ONIONSKIN_LEN = PKCS1_OAEP_PADDING_OVERHEAD + CIPHER_KEY_LEN + DH_BYTES;
-	final static int TAP_ONIONSKIN_REPLY_LEN = DH_BYTES + TorMessageDigest.TOR_DIGEST_SIZE;
-	
-	
-	private final CircuitImpl circuit;
-	private final boolean ntorEnabled;
-	
-	
-	CircuitExtender(CircuitImpl circuit, boolean ntorEnabled) {
-		this.circuit = circuit;
-		this.ntorEnabled = ntorEnabled;
-	}
-	
-	
-	CircuitNode createFastTo(Router targetRouter) {
-		logger.fine("Creating 'fast' to "+ targetRouter);
-		final TorCreateFastKeyAgreement kex = new TorCreateFastKeyAgreement();
-		sendCreateFastCell(kex);
-		return receiveAndProcessCreateFastResponse(targetRouter, kex);
-	}
-
-	private void sendCreateFastCell(TorCreateFastKeyAgreement kex) {
-		final Cell cell = CellImpl.createCell(circuit.getCircuitId(), Cell.CREATE_FAST);
-		cell.putByteArray(kex.createOnionSkin());
-		circuit.sendCell(cell);
-	}
-	
-	private CircuitNode receiveAndProcessCreateFastResponse(Router targetRouter, TorKeyAgreement kex) {
-		final Cell cell = circuit.receiveControlCellResponse();
-		if(cell == null) {
-			throw new TorException("Timeout building circuit waiting for CREATE_FAST response from "+ targetRouter);
-		}
-
-		return processCreatedFastCell(targetRouter, cell, kex);
-	}
-	
-	private CircuitNode processCreatedFastCell(Router targetRouter, Cell cell, TorKeyAgreement kex) {
-		final byte[] payload = new byte[TorMessageDigest.TOR_DIGEST_SIZE * 2];
-		final byte[] keyMaterial = new byte[CircuitNodeCryptoState.KEY_MATERIAL_SIZE];
-		final byte[] verifyHash = new byte[TorMessageDigest.TOR_DIGEST_SIZE];
-		cell.getByteArray(payload);
-		if(!kex.deriveKeysFromHandshakeResponse(payload, keyMaterial, verifyHash)) {
-			// XXX
-			return null;
-		}
-		final CircuitNode node = CircuitNodeImpl.createFirstHop(targetRouter, keyMaterial, verifyHash);
-		circuit.appendNode(node);
-		return node;
-	}
-	
-	CircuitNode extendTo(Router targetRouter) {
-		if(circuit.getCircuitLength() == 0) {
-			throw new TorException("Cannot EXTEND an empty circuit");
-		}
-		
-		if(useNtor(targetRouter)) {
-			final NTorCircuitExtender nce = new NTorCircuitExtender(this, targetRouter);
-			return nce.extendTo();
-		} else {
-			final TapCircuitExtender tce = new TapCircuitExtender(this, targetRouter);
-			return tce.extendTo();
-		}
-	}
-
-	private boolean useNtor(Router targetRouter) {
-		return ntorEnabled && targetRouter.getNTorOnionKey() != null;
-	}
-	
-	private void logProtocolViolation(String sourceName, Router targetRouter) {
-		final String version = (targetRouter == null) ? "(none)" : targetRouter.getVersion();
-		final String targetName = (targetRouter == null) ? "(none)" : targetRouter.getNickname();
-		logger.warning("Protocol error extending circuit from ("+ sourceName +") to ("+ targetName +") [version: "+ version +"]");
-	}
-
-	private String nodeToName(CircuitNode node) {
-		if(node == null || node.getRouter() == null) {
-			return "(null)";
-		}
-		final Router router = node.getRouter();
-		return router.getNickname();
-	}
-
-
-	public void sendRelayCell(RelayCell cell) {
-		circuit.sendRelayCell(cell);
-	}
-
-
-	public RelayCell receiveRelayResponse(int expectedCommand, Router extendTarget) {
-		final RelayCell cell = circuit.receiveRelayCell();
-		if(cell == null) {
-			throw new TorException("Timeout building circuit");
-		}
-		final int command = cell.getRelayCommand();
-		if(command == RelayCell.RELAY_TRUNCATED) {
-			final int code = cell.getByte() & 0xFF;
-			final String msg = CellImpl.errorToDescription(code);
-			final String source = nodeToName(cell.getCircuitNode());
-			if(code == Cell.ERROR_PROTOCOL) {
-				logProtocolViolation(source, extendTarget);
-			}
-			throw new TorException("Error from ("+ source +") while extending to ("+ extendTarget.getNickname() + "): "+ msg);
-		} else if(command != expectedCommand) {
-			final String expected = RelayCellImpl.commandToDescription(expectedCommand);
-			final String received = RelayCellImpl.commandToDescription(command);
-			throw new TorException("Received incorrect extend response, expecting "+ expected + " but received "+ received);
-		} else {
-			return cell;
-		}
-	}
-
-
-	public CircuitNode createNewNode(Router r, byte[] keyMaterial, byte[] verifyDigest) {
-		final CircuitNode node = CircuitNodeImpl.createNode(r, circuit.getFinalCircuitNode(), keyMaterial, verifyDigest);
-		logger.fine("Adding new circuit node for "+ r.getNickname());
-		circuit.appendNode(node);
-		return node;
-
-	}
-
-	public RelayCell createRelayCell(int command) {
-		return new RelayCellImpl(circuit.getFinalCircuitNode(), circuit.getCircuitId(), 0, command, true);
-	}
-	
-	Router getFinalRouter() {
-		final CircuitNode node = circuit.getFinalCircuitNode();
-		if(node != null) {
-			return node.getRouter();
-		} else {
-			return null;
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/CircuitIO.java b/orchid/src/com/subgraph/orchid/circuits/CircuitIO.java
deleted file mode 100644
index 11d765d4c16..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/CircuitIO.java
+++ /dev/null
@@ -1,351 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.Cell;
-import com.subgraph.orchid.CircuitNode;
-import com.subgraph.orchid.Connection;
-import com.subgraph.orchid.ConnectionIOException;
-import com.subgraph.orchid.RelayCell;
-import com.subgraph.orchid.Stream;
-import com.subgraph.orchid.Threading;
-import com.subgraph.orchid.TorException;
-import com.subgraph.orchid.circuits.cells.CellImpl;
-import com.subgraph.orchid.circuits.cells.RelayCellImpl;
-import com.subgraph.orchid.dashboard.DashboardRenderable;
-import com.subgraph.orchid.dashboard.DashboardRenderer;
-
-public class CircuitIO implements DashboardRenderable {
-	private static final Logger logger = Logger.getLogger(CircuitIO.class.getName());
-	private final static long CIRCUIT_BUILD_TIMEOUT_MS = 30 * 1000;
-	private final static long CIRCUIT_RELAY_RESPONSE_TIMEOUT = 20 * 1000;
-
-	private final CircuitImpl circuit;
-	private final Connection connection;
-	private final int circuitId;
-	
-	private final BlockingQueue<RelayCell> relayCellResponseQueue;
-	private final BlockingQueue<Cell> controlCellResponseQueue;
-	private final Map<Integer, StreamImpl> streamMap;
-	private final ReentrantLock streamLock = Threading.lock("stream");
-	private final ReentrantLock relaySendLock = Threading.lock("relaySend");
-
-	private boolean isMarkedForClose;
-	private boolean isClosed;
-	
-	CircuitIO(CircuitImpl circuit, Connection connection, int circuitId) {
-		this.circuit = circuit;
-		this.connection = connection;
-		this.circuitId = circuitId;
-		
-		this.relayCellResponseQueue = new LinkedBlockingQueue<RelayCell>();
-		this.controlCellResponseQueue = new LinkedBlockingQueue<Cell>();
-		this.streamMap = new HashMap<Integer, StreamImpl>();
-	}
-	
-	Connection getConnection() {
-		return connection;
-	}
-	
-	int getCircuitId() {
-		return circuitId;
-	}
-
-	RelayCell dequeueRelayResponseCell() {
-		try {
-			final long timeout = getReceiveTimeout();
-			return relayCellResponseQueue.poll(timeout, TimeUnit.MILLISECONDS);
-		} catch (InterruptedException e) {
-			Thread.currentThread().interrupt();
-			return null;
-		}
-	}
-
-	private RelayCell decryptRelayCell(Cell cell) {
-		for(CircuitNode node: circuit.getNodeList()) {
-			if(node.decryptBackwardCell(cell)) {
-				return RelayCellImpl.createFromCell(node, cell);
-			}
-		}
-		destroyCircuit();
-		throw new TorException("Could not decrypt relay cell");
-	}
-
-	// Return null on timeout
-	Cell receiveControlCellResponse() {
-		try {
-			final long timeout = getReceiveTimeout();
-			return controlCellResponseQueue.poll(timeout, TimeUnit.MILLISECONDS);
-		} catch (InterruptedException e) {
-			Thread.currentThread().interrupt();
-			return null;
-		}
-	}
-
-	
-	private long getReceiveTimeout() {
-		if(circuit.getStatus().isBuilding())
-			return remainingBuildTime();
-		else
-			return CIRCUIT_RELAY_RESPONSE_TIMEOUT;
-	}
-
-	private long remainingBuildTime() {
-		final long elapsed = circuit.getStatus().getMillisecondsElapsedSinceCreated();
-		if(elapsed == 0 || elapsed >= CIRCUIT_BUILD_TIMEOUT_MS)
-			return 0;
-		return CIRCUIT_BUILD_TIMEOUT_MS - elapsed;
-	}
-
-	/*
-	 * This is called by the cell reading thread in ConnectionImpl to deliver control cells 
-	 * associated with this circuit (CREATED, CREATED_FAST, or DESTROY).
-	 */
-	void deliverControlCell(Cell cell) {
-		if(cell.getCommand() == Cell.DESTROY) {
-			processDestroyCell(cell.getByte());
-		} else {
-			controlCellResponseQueue.add(cell);
-		}
-	}
-	
-	private void processDestroyCell(int reason) {
-		logger.fine("DESTROY cell received ("+ CellImpl.errorToDescription(reason) +") on "+ circuit);
-		destroyCircuit();
-	}
-
-	/* This is called by the cell reading thread in ConnectionImpl to deliver RELAY cells. */
-	void deliverRelayCell(Cell cell) {
-		circuit.getStatus().updateDirtyTimestamp();
-		final RelayCell relayCell = decryptRelayCell(cell);
-		logRelayCell("Dispatching: ", relayCell);
-		switch(relayCell.getRelayCommand()) {
-		case RelayCell.RELAY_EXTENDED:
-		case RelayCell.RELAY_EXTENDED2:
-		case RelayCell.RELAY_RESOLVED:
-		case RelayCell.RELAY_TRUNCATED:
-		case RelayCell.RELAY_COMMAND_RENDEZVOUS_ESTABLISHED:
-		case RelayCell.RELAY_COMMAND_INTRODUCE_ACK:
-		case RelayCell.RELAY_COMMAND_RENDEZVOUS2:
-			relayCellResponseQueue.add(relayCell);
-			break;	
-		case RelayCell.RELAY_DATA:
-		case RelayCell.RELAY_END:
-		case RelayCell.RELAY_CONNECTED:
-			processRelayDataCell(relayCell);
-			break;
-
-		case RelayCell.RELAY_SENDME:
-			if(relayCell.getStreamId() != 0)
-				processRelayDataCell(relayCell);
-			else
-				processCircuitSendme(relayCell);
-			break;
-		case RelayCell.RELAY_BEGIN:
-		case RelayCell.RELAY_BEGIN_DIR:
-		case RelayCell.RELAY_EXTEND:
-		case RelayCell.RELAY_RESOLVE:
-		case RelayCell.RELAY_TRUNCATE:
-			destroyCircuit();
-			throw new TorException("Unexpected 'forward' direction relay cell type: "+ relayCell.getRelayCommand());
-		}
-	}
-
-	/* Runs in the context of the connection cell reading thread */
-	private void processRelayDataCell(RelayCell cell) {
-		if(cell.getRelayCommand() == RelayCell.RELAY_DATA) {
-			cell.getCircuitNode().decrementDeliverWindow();
-			if(cell.getCircuitNode().considerSendingSendme()) {
-				final RelayCell sendme = createRelayCell(RelayCell.RELAY_SENDME, 0, cell.getCircuitNode());
-				sendRelayCellTo(sendme, sendme.getCircuitNode());
-			}
-		}
-
-		streamLock.lock();
-		try {
-			final StreamImpl stream = streamMap.get(cell.getStreamId());
-			// It's not unusual for the stream to not be found.  For example, if a RELAY_CONNECTED arrives after
-			// the client has stopped waiting for it, the stream will never be tracked and eventually the edge node
-			// will send a RELAY_END for this stream.
-			if(stream != null) {
-				stream.addInputCell(cell);
-			}
-		} finally {
-			streamLock.unlock();
-		}
-	}
-	
-	RelayCell createRelayCell(int relayCommand, int streamId, CircuitNode targetNode) {
-		return new RelayCellImpl(targetNode, circuitId, streamId, relayCommand);
-	}
-
-	void sendRelayCellTo(RelayCell cell, CircuitNode targetNode) {
-		relaySendLock.lock();
-		try {
-			logRelayCell("Sending:     ", cell);
-			cell.setLength();
-			targetNode.updateForwardDigest(cell);
-			cell.setDigest(targetNode.getForwardDigestBytes());
-
-			for(CircuitNode node = targetNode; node != null; node = node.getPreviousNode())
-				node.encryptForwardCell(cell);
-
-			if(cell.getRelayCommand() == RelayCell.RELAY_DATA) 
-				targetNode.waitForSendWindowAndDecrement();
-			
-			sendCell(cell);
-		} finally {
-			relaySendLock.unlock();
-		}
-	}
-	
-	
-	private void logRelayCell(String message, RelayCell cell) {
-		final Level level = getLogLevelForCell(cell);
-		if(!logger.isLoggable(level)) {
-			return;
-		}
-		logger.log(level, message + cell);
-	}
-	
-	private Level getLogLevelForCell(RelayCell cell) {
-		switch(cell.getRelayCommand()) {
-		case RelayCell.RELAY_DATA:
-		case RelayCell.RELAY_SENDME:
-			return Level.FINEST;
-		default:
-			return Level.FINER;
-		}
-	}
-	
-	void sendCell(Cell cell) {
-		final CircuitStatus status = circuit.getStatus();
-		if(!(status.isConnected() || status.isBuilding()))
-			return;
-		try {
-			status.updateDirtyTimestamp();
-			connection.sendCell(cell);
-		} catch (ConnectionIOException e) {
-			destroyCircuit();
-		}
-	}
-
-	void markForClose() {
-		boolean shouldClose;
-		streamLock.lock();
-		try {
-			if(isMarkedForClose) {
-				return;
-			}
-			isMarkedForClose = true;
-			shouldClose = streamMap.isEmpty();
-		} finally {
-			streamLock.unlock();
-		}
-		if(shouldClose)
-			closeCircuit();
-	}
-
-	boolean isMarkedForClose() {
-		streamLock.lock();
-		try {
-			return isMarkedForClose;
-		} finally {
-			streamLock.unlock();
-		}
-	}
-
-	private void closeCircuit() {
-		logger.fine("Closing circuit "+ circuit);
-		sendDestroyCell(Cell.ERROR_NONE);
-		connection.removeCircuit(circuit);
-		circuit.setStateDestroyed();
-		isClosed = true;
-	}
-
-	void sendDestroyCell(int reason) {
-		Cell destroy = CellImpl.createCell(circuitId, Cell.DESTROY);
-		destroy.putByte(reason);
-		try {
-			connection.sendCell(destroy);
-		} catch (ConnectionIOException e) {
-			logger.warning("Connection IO error sending DESTROY cell: "+ e.getMessage());
-		}
-	}
-
-	private void processCircuitSendme(RelayCell cell) {
-		cell.getCircuitNode().incrementSendWindow();
-	}
-
-	void destroyCircuit() {
-		streamLock.lock();
-		try {
-			if(isClosed) {
-				return;
-			}
-			circuit.setStateDestroyed();
-			connection.removeCircuit(circuit);
-			final List<StreamImpl> tmpList = new ArrayList<StreamImpl>(streamMap.values());
-			for(StreamImpl s: tmpList) {
-				s.close();
-			}
-			isClosed = true;
-		} finally {
-			streamLock.unlock();
-		}
-	}
-	
-	StreamImpl createNewStream(boolean autoclose) {
-		streamLock.lock();
-		try {
-			final int streamId = circuit.getStatus().nextStreamId();
-			final StreamImpl stream = new StreamImpl(circuit, circuit.getFinalCircuitNode(), streamId, autoclose);
-			streamMap.put(streamId, stream);
-			return stream;
-		} finally {
-			streamLock.unlock();
-		}
-	}
-
-	void removeStream(StreamImpl stream) {
-		boolean shouldClose;
-		streamLock.lock();
-		try {
-			streamMap.remove(stream.getStreamId());
-			shouldClose = streamMap.isEmpty() && isMarkedForClose;
-		} finally {
-			streamLock.unlock();
-		}
-		if(shouldClose)
-			closeCircuit();
-	}
-	
-	List<Stream> getActiveStreams() {
-		streamLock.lock();
-		try {
-			return new ArrayList<Stream>(streamMap.values());
-		} finally {
-			streamLock.unlock();
-		}
-	}
-
-	public void dashboardRender(DashboardRenderer renderer, PrintWriter writer, int flags) throws IOException {
-		if((flags & DASHBOARD_STREAMS) == 0) {
-			return;
-		}
-		for(Stream s: getActiveStreams()) {
-			renderer.renderComponent(writer, flags, s);
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/CircuitImpl.java b/orchid/src/com/subgraph/orchid/circuits/CircuitImpl.java
deleted file mode 100644
index 057afbe32c3..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/CircuitImpl.java
+++ /dev/null
@@ -1,289 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.TimeoutException;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.Cell;
-import com.subgraph.orchid.Circuit;
-import com.subgraph.orchid.CircuitNode;
-import com.subgraph.orchid.Connection;
-import com.subgraph.orchid.DirectoryCircuit;
-import com.subgraph.orchid.ExitCircuit;
-import com.subgraph.orchid.InternalCircuit;
-import com.subgraph.orchid.RelayCell;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.Stream;
-import com.subgraph.orchid.StreamConnectFailedException;
-import com.subgraph.orchid.TorException;
-import com.subgraph.orchid.circuits.path.CircuitPathChooser;
-import com.subgraph.orchid.circuits.path.PathSelectionFailedException;
-import com.subgraph.orchid.dashboard.DashboardRenderable;
-import com.subgraph.orchid.dashboard.DashboardRenderer;
-
-/**
- * This class represents an established circuit through the Tor network.
- *
- */
-public abstract class CircuitImpl implements Circuit, DashboardRenderable {
-	protected final static Logger logger = Logger.getLogger(CircuitImpl.class.getName());
-	
-	static ExitCircuit createExitCircuit(CircuitManagerImpl circuitManager, Router exitRouter) {
-		return new ExitCircuitImpl(circuitManager, exitRouter);
-	}
-	
-	static ExitCircuit createExitCircuitTo(CircuitManagerImpl circuitManager, List<Router> prechosenPath) {
-		return new ExitCircuitImpl(circuitManager, prechosenPath);
-	}
-	
-	static DirectoryCircuit createDirectoryCircuit(CircuitManagerImpl circuitManager) {
-		return new DirectoryCircuitImpl(circuitManager, null);
-	}
-	
-	static DirectoryCircuit createDirectoryCircuitTo(CircuitManagerImpl circuitManager, List<Router> prechosenPath) {
-		return new DirectoryCircuitImpl(circuitManager, prechosenPath);
-	}
-	
-	static InternalCircuit createInternalCircuitTo(CircuitManagerImpl circuitManager, List<Router> prechosenPath) {
-		return new InternalCircuitImpl(circuitManager, prechosenPath);
-	}
-
-	private final CircuitManagerImpl circuitManager;
-	protected final List<Router> prechosenPath;
-	
-	private final List<CircuitNode> nodeList;
-	private final CircuitStatus status;
-
-	private CircuitIO io;
-
-
-	
-		
-	
-	
-	protected CircuitImpl(CircuitManagerImpl circuitManager) {
-		this(circuitManager, null);
-	}
-	
-	protected CircuitImpl(CircuitManagerImpl circuitManager, List<Router> prechosenPath) {
-		nodeList = new ArrayList<CircuitNode>();
-		this.circuitManager = circuitManager;
-		this.prechosenPath = prechosenPath;
-		status = new CircuitStatus();
-	}
-
-	List<Router> choosePath(CircuitPathChooser pathChooser) throws InterruptedException, PathSelectionFailedException {
-		if(prechosenPath != null) {
-			return new ArrayList<Router>(prechosenPath);
-		} else {
-			return choosePathForCircuit(pathChooser);
-		}
-	}
-
-	protected abstract List<Router> choosePathForCircuit(CircuitPathChooser pathChooser) throws InterruptedException, PathSelectionFailedException;
-
-	void bindToConnection(Connection connection) {
-		if(io != null) {
-			throw new IllegalStateException("Circuit already bound to a connection");
-		}
-		final int id = connection.bindCircuit(this);
-		io = new CircuitIO(this, connection, id);
-	}
-
-	public void markForClose() {
-		if(io != null) {
-			io.markForClose();
-		}
-	}
-
-	public boolean isMarkedForClose() {
-		if(io == null) {
-			return false;
-		} else {
-			return io.isMarkedForClose();
-		}
-	}
-	
-	CircuitStatus getStatus() {
-		return status;
-	}
-	
-	public boolean isConnected() {
-		return status.isConnected();
-	}
-
-	public boolean isPending() {
-		return status.isBuilding();
-	}
-	
-	public boolean isClean() {
-		return !status.isDirty();
-	}
-	
-	public int getSecondsDirty() {
-		return (int) (status.getMillisecondsDirty() / 1000);
-	}
-
-	void notifyCircuitBuildStart() {
-		if(!status.isUnconnected()) {
-			throw new IllegalStateException("Can only connect UNCONNECTED circuits");
-		}
-		status.updateCreatedTimestamp();
-		status.setStateBuilding();
-		circuitManager.addActiveCircuit(this);
-	}
-	
-	void notifyCircuitBuildFailed() {
-		status.setStateFailed();
-		circuitManager.removeActiveCircuit(this);
-	}
-	
-	void notifyCircuitBuildCompleted() {
-		status.setStateOpen();
-		status.updateCreatedTimestamp();
-	}
-	
-	public Connection getConnection() {
-		if(!isConnected())
-			throw new TorException("Circuit is not connected.");
-		return io.getConnection();
-	}
-
-	public int getCircuitId() {
-		if(io == null) {
-			return 0;
-		} else {
-			return io.getCircuitId();
-		}
-	}
-
-	public void sendRelayCell(RelayCell cell) {
-		io.sendRelayCellTo(cell, cell.getCircuitNode());
-	}
-
-	public void sendRelayCellToFinalNode(RelayCell cell) {
-		io.sendRelayCellTo(cell, getFinalCircuitNode());
-	}
-
-	public void appendNode(CircuitNode node) {
-		nodeList.add(node);
-	}
-
-	List<CircuitNode> getNodeList() {
-		return nodeList;
-	}
-
-	int getCircuitLength() {
-		return nodeList.size();
-	}
-
-	public CircuitNode getFinalCircuitNode() {
-		if(nodeList.isEmpty())
-			throw new TorException("getFinalCircuitNode() called on empty circuit");
-		return nodeList.get( getCircuitLength() - 1);
-	}
-
-	public RelayCell createRelayCell(int relayCommand, int streamId, CircuitNode targetNode) {
-		return io.createRelayCell(relayCommand, streamId, targetNode);
-	}
-
-	public RelayCell receiveRelayCell() {
-		return io.dequeueRelayResponseCell();
-	}
-
-	void sendCell(Cell cell) {
-		io.sendCell(cell);
-	}
-	
-	Cell receiveControlCellResponse() {
-		return io.receiveControlCellResponse();
-	}
-
-	/*
-	 * This is called by the cell reading thread in ConnectionImpl to deliver control cells 
-	 * associated with this circuit (CREATED or CREATED_FAST).
-	 */
-	public void deliverControlCell(Cell cell) {
-		io.deliverControlCell(cell);
-	}
-
-	/* This is called by the cell reading thread in ConnectionImpl to deliver RELAY cells. */
-	public void deliverRelayCell(Cell cell) {
-		io.deliverRelayCell(cell);
-	}
-
-	protected StreamImpl createNewStream(boolean autoclose) {
-		return io.createNewStream(autoclose);
-	}
-	protected StreamImpl createNewStream() {
-		return createNewStream(false);
-	}
-
-	void setStateDestroyed() {
-		status.setStateDestroyed();
-		circuitManager.removeActiveCircuit(this);
-	}
-
-	public void destroyCircuit() {
-		// We might not have bound this circuit yet
-		if (io != null) {
-			io.destroyCircuit();
-		}
-		circuitManager.removeActiveCircuit(this);
-	}
-
-
-	public void removeStream(StreamImpl stream) {
-		io.removeStream(stream);
-	}
-
-	protected Stream processStreamOpenException(Exception e) throws InterruptedException, TimeoutException, StreamConnectFailedException {
-		if(e instanceof InterruptedException) {
-			throw (InterruptedException) e;
-		} else if(e instanceof TimeoutException) {
-			throw(TimeoutException) e;
-		} else if(e instanceof StreamConnectFailedException) {
-			throw(StreamConnectFailedException) e;
-		} else {
-			throw new IllegalStateException();
-		}
-	}
-	
-	protected abstract String getCircuitTypeLabel();
-	
-	public String toString() {
-		return "  Circuit ("+ getCircuitTypeLabel() + ") id="+ getCircuitId() +" state=" + status.getStateAsString() +" "+ pathToString();
-	}
-
-	
-	protected String pathToString() {
-		final StringBuilder sb = new StringBuilder();
-		sb.append("[");
-		for(CircuitNode node: nodeList) {
-			if(sb.length() > 1)
-				sb.append(",");
-			sb.append(node.toString());
-		}
-		sb.append("]");
-		return sb.toString();
-	}
-
-	public List<Stream> getActiveStreams() {
-		if(io == null) {
-			return Collections.emptyList();
-		} else {
-			return io.getActiveStreams();
-		}
-	}
-
-	public void dashboardRender(DashboardRenderer renderer, PrintWriter writer, int flags) throws IOException {
-		if(io != null) {
-			writer.println(toString());
-			renderer.renderComponent(writer, flags, io);
-		}
-	}	
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/CircuitManagerImpl.java b/orchid/src/com/subgraph/orchid/circuits/CircuitManagerImpl.java
deleted file mode 100644
index 9b68cd0b9bd..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/CircuitManagerImpl.java
+++ /dev/null
@@ -1,443 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.InetAddress;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Queue;
-import java.util.Set;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.locks.ReentrantLock;
-
-import com.subgraph.orchid.Circuit;
-import com.subgraph.orchid.CircuitBuildHandler;
-import com.subgraph.orchid.CircuitManager;
-import com.subgraph.orchid.CircuitNode;
-import com.subgraph.orchid.Connection;
-import com.subgraph.orchid.ConnectionCache;
-import com.subgraph.orchid.ConsensusDocument;
-import com.subgraph.orchid.Directory;
-import com.subgraph.orchid.DirectoryCircuit;
-import com.subgraph.orchid.ExitCircuit;
-import com.subgraph.orchid.InternalCircuit;
-import com.subgraph.orchid.OpenFailedException;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.Stream;
-import com.subgraph.orchid.StreamConnectFailedException;
-import com.subgraph.orchid.Threading;
-import com.subgraph.orchid.Tor;
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.circuits.guards.EntryGuards;
-import com.subgraph.orchid.circuits.hs.HiddenServiceManager;
-import com.subgraph.orchid.circuits.path.CircuitPathChooser;
-import com.subgraph.orchid.crypto.TorRandom;
-import com.subgraph.orchid.dashboard.DashboardRenderable;
-import com.subgraph.orchid.dashboard.DashboardRenderer;
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.directory.downloader.DirectoryDownloaderImpl;
-
-public class CircuitManagerImpl implements CircuitManager, DashboardRenderable {
-	private final static int OPEN_DIRECTORY_STREAM_RETRY_COUNT = 5;
-	private final static int OPEN_DIRECTORY_STREAM_TIMEOUT = 10 * 1000;
-	
-	interface CircuitFilter {
-		boolean filter(Circuit circuit);
-	}
-
-	private final TorConfig config;
-	private final Directory directory;
-	private final ConnectionCache connectionCache;
-	private final Set<CircuitImpl> activeCircuits;
-	private final Queue<InternalCircuit> cleanInternalCircuits;
-	private int requestedInternalCircuitCount = 0;
-	private int pendingInternalCircuitCount = 0;
-	private final TorRandom random;
-	private final PendingExitStreams pendingExitStreams;
-	private final ScheduledExecutorService scheduledExecutor = Threading.newSingleThreadScheduledPool("CircuitManager worker");
-	private final CircuitCreationTask circuitCreationTask;
-	private final TorInitializationTracker initializationTracker;
-	private final CircuitPathChooser pathChooser;
-	private final HiddenServiceManager hiddenServiceManager;
-	private final ReentrantLock lock = Threading.lock("circuitManager");
-
-	private boolean isBuilding = false;
-
-	public CircuitManagerImpl(TorConfig config, DirectoryDownloaderImpl directoryDownloader, Directory directory, ConnectionCache connectionCache, TorInitializationTracker initializationTracker) {
-		this.config = config;
-		this.directory = directory;
-		this.connectionCache = connectionCache;
-		this.pathChooser = CircuitPathChooser.create(config, directory);
-		if(config.getUseEntryGuards() || config.getUseBridges()) {
-			this.pathChooser.enableEntryGuards(new EntryGuards(config, connectionCache, directoryDownloader, directory));
-		}
-		this.pendingExitStreams = new PendingExitStreams(config);
-		this.circuitCreationTask = new CircuitCreationTask(config, directory, connectionCache, pathChooser, this, initializationTracker);
-		this.activeCircuits = new HashSet<CircuitImpl>();
-		this.cleanInternalCircuits = new LinkedList<InternalCircuit>();
-		this.random = new TorRandom();
-		
-		this.initializationTracker = initializationTracker;
-		this.hiddenServiceManager = new HiddenServiceManager(config, directory, this);
-		
-		directoryDownloader.setCircuitManager(this);
-	}
-
-	public void startBuildingCircuits() {
-		lock.lock();
-		try {
-			isBuilding = true;
-			scheduledExecutor.scheduleAtFixedRate(circuitCreationTask, 0, 1000, TimeUnit.MILLISECONDS);
-		} finally {
-			lock.unlock();
-		}
-	}
-
-	public void stopBuildingCircuits(boolean killCircuits) {
-		lock.lock();
-		try {
-			isBuilding = false;
-			scheduledExecutor.shutdownNow();
-		} finally {
-			lock.unlock();
-		}
-
-		if (killCircuits) {
-			ArrayList<CircuitImpl> circuits;
-			synchronized (activeCircuits) {
-				circuits = new ArrayList<CircuitImpl>(activeCircuits);
-			}
-			for (CircuitImpl c : circuits) {
-				c.destroyCircuit();
-			}
-		}
-	}
-
-	public ExitCircuit createNewExitCircuit(Router exitRouter) {
-		return CircuitImpl.createExitCircuit(this, exitRouter);
-	}
-
-	void addActiveCircuit(CircuitImpl circuit) {
-		synchronized (activeCircuits) {
-			activeCircuits.add(circuit);
-			activeCircuits.notifyAll();
-		}
-
-		boolean doDestroy;
-		lock.lock();
-		try {
-			doDestroy = !isBuilding;
-		} finally {
-			lock.unlock();
-		}
-
-		if (doDestroy) {
-			// we were asked to stop since this circuit was started
-			circuit.destroyCircuit();
-		}
-	}
-	
-	void removeActiveCircuit(CircuitImpl circuit) {
-		synchronized (activeCircuits) {
-			activeCircuits.remove(circuit);
-		}
-	}
-
-	int getActiveCircuitCount() {
-		synchronized (activeCircuits) {
-			return activeCircuits.size();
-		}
-	}
-
-	Set<Circuit> getPendingCircuits() {
-		return getCircuitsByFilter(new CircuitFilter() {
-			public boolean filter(Circuit circuit) {
-				return circuit.isPending();
-			}
-		});
-	}
-
-	int getPendingCircuitCount() {
-		lock.lock();
-		try {
-			return getPendingCircuits().size();
-		} finally {
-			lock.unlock();
-		}
-	}
-	
-	Set<Circuit> getCircuitsByFilter(CircuitFilter filter) {
-		final Set<Circuit> result = new HashSet<Circuit>();
-		final Set<CircuitImpl> circuits = new HashSet<CircuitImpl>();
-
-		synchronized (activeCircuits) {
-			// the filter might lock additional objects, causing a deadlock, so don't
-			// call it inside the monitor
-			circuits.addAll(activeCircuits);
-		}
-
-		for(CircuitImpl c: circuits) {
-			if(filter == null || filter.filter(c)) {
-				result.add(c);
-			}
-		}
-		return result;
-	}
-
-	List<ExitCircuit> getRandomlyOrderedListOfExitCircuits() {
-		final Set<Circuit> notDirectory = getCircuitsByFilter(new CircuitFilter() {
-			
-			public boolean filter(Circuit circuit) {
-				final boolean exitType = circuit instanceof ExitCircuit;
-				return exitType && !circuit.isMarkedForClose() && circuit.isConnected();
-			}
-		});
-		final ArrayList<ExitCircuit> ac = new ArrayList<ExitCircuit>();
-		for(Circuit c: notDirectory) {
-			if(c instanceof ExitCircuit) {
-				ac.add((ExitCircuit) c);
-			}
-		}
-		final int sz = ac.size();
-		for(int i = 0; i < sz; i++) {
-			final ExitCircuit tmp = ac.get(i);
-			final int swapIdx = random.nextInt(sz);
-			ac.set(i, ac.get(swapIdx));
-			ac.set(swapIdx, tmp);
-		}
-		return ac;
-	}
-
-	public Stream openExitStreamTo(String hostname, int port)
-			throws InterruptedException, TimeoutException, OpenFailedException {
-		if(hostname.endsWith(".onion")) {
-			return hiddenServiceManager.getStreamTo(hostname, port);
-		}
-		validateHostname(hostname);
-		circuitCreationTask.predictPort(port);
-		return pendingExitStreams.openExitStream(hostname, port);
-	}
-
-	private void validateHostname(String hostname) throws OpenFailedException {
-		maybeRejectInternalAddress(hostname);
-		if(hostname.toLowerCase().endsWith(".onion")) {
-			throw new OpenFailedException("Hidden services not supported");
-		} else if(hostname.toLowerCase().endsWith(".exit")) {
-			throw new OpenFailedException(".exit addresses are not supported");
-		}
-	}
-	
-	private void maybeRejectInternalAddress(String hostname) throws OpenFailedException {
-		if(IPv4Address.isValidIPv4AddressString(hostname)) {
-			maybeRejectInternalAddress(IPv4Address.createFromString(hostname));
-		}
-	}
-	
-	private void maybeRejectInternalAddress(IPv4Address address) throws OpenFailedException {
-		final InetAddress inetAddress = address.toInetAddress();
-		if(inetAddress.isSiteLocalAddress() && config.getClientRejectInternalAddress()) {
-			throw new OpenFailedException("Rejecting stream target with internal address: "+ address);
-		}
-	}
-	public Stream openExitStreamTo(IPv4Address address, int port)
-			throws InterruptedException, TimeoutException, OpenFailedException {
-		maybeRejectInternalAddress(address);
-		circuitCreationTask.predictPort(port);
-		return pendingExitStreams.openExitStream(address, port);
-	}
-
-	public List<StreamExitRequest> getPendingExitStreams() {
-		return pendingExitStreams.getUnreservedPendingRequests();
-	}
-
-	public Stream openDirectoryStream() throws OpenFailedException, InterruptedException, TimeoutException {
-		return openDirectoryStream(0);
-	}
-
-	public Stream openDirectoryStream(int purpose) throws OpenFailedException, InterruptedException {
-		final int requestEventCode = purposeToEventCode(purpose, false);
-		final int loadingEventCode = purposeToEventCode(purpose, true);
-		
-		int failCount = 0;
-		while(failCount < OPEN_DIRECTORY_STREAM_RETRY_COUNT) {
-			final DirectoryCircuit circuit = openDirectoryCircuit();
-			if(requestEventCode > 0) {
-				initializationTracker.notifyEvent(requestEventCode);
-			}
-			try {
-				final Stream stream = circuit.openDirectoryStream(OPEN_DIRECTORY_STREAM_TIMEOUT, true);
-				if(loadingEventCode > 0) {
-					initializationTracker.notifyEvent(loadingEventCode);
-				}
-				return stream;
-			} catch (StreamConnectFailedException e) {
-				circuit.markForClose();
-				failCount += 1;
-			} catch (TimeoutException e) {
-				circuit.markForClose();
-			}
-		}
-		throw new OpenFailedException("Retry count exceeded opening directory stream");
-	}
-
-	public DirectoryCircuit openDirectoryCircuit() throws OpenFailedException {
-		int failCount = 0;
-		while(failCount < OPEN_DIRECTORY_STREAM_RETRY_COUNT) {
-			final DirectoryCircuit circuit = CircuitImpl.createDirectoryCircuit(this);
-			if(tryOpenCircuit(circuit, true, true)) {
-				return circuit;
-			}
-			failCount += 1;
-		}
-		throw new OpenFailedException("Could not create circuit for directory stream");
-	}
-	
-	private int purposeToEventCode(int purpose, boolean getLoadingEvent) {
-		switch(purpose) {
-		case DIRECTORY_PURPOSE_CONSENSUS:
-			return getLoadingEvent ? Tor.BOOTSTRAP_STATUS_LOADING_STATUS : Tor.BOOTSTRAP_STATUS_REQUESTING_STATUS;
-		case DIRECTORY_PURPOSE_CERTIFICATES:
-			 return getLoadingEvent ? Tor.BOOTSTRAP_STATUS_LOADING_KEYS : Tor.BOOTSTRAP_STATUS_REQUESTING_KEYS;
-		case DIRECTORY_PURPOSE_DESCRIPTORS:
-			return getLoadingEvent ? Tor.BOOTSTRAP_STATUS_LOADING_DESCRIPTORS : Tor.BOOTSTRAP_STATUS_REQUESTING_DESCRIPTORS;
-		default:
-			return 0;
-		}
-	}
-
-	private static class DirectoryCircuitResult implements CircuitBuildHandler {
-
-		private boolean isFailed;
-		
-		public void connectionCompleted(Connection connection) {}
-		public void nodeAdded(CircuitNode node) {}
-		public void circuitBuildCompleted(Circuit circuit) {}
-		
-		public void connectionFailed(String reason) {
-			isFailed = true;
-		}
-
-		public void circuitBuildFailed(String reason) {
-			isFailed = true;
-		}
-		
-		boolean isSuccessful() {
-			return !isFailed;
-		}
-	}
-
-	public void dashboardRender(DashboardRenderer renderer, PrintWriter writer, int flags) throws IOException {
-		if((flags & DASHBOARD_CIRCUITS) == 0) {
-			return;
-		}
-		renderer.renderComponent(writer, flags, connectionCache);
-		renderer.renderComponent(writer, flags, circuitCreationTask.getCircuitPredictor());
-		writer.println("[Circuit Manager]");
-		writer.println();
-		for(Circuit c: getCircuitsByFilter(null)) {
-			renderer.renderComponent(writer, flags, c);
-		}
-	}
-
-	public InternalCircuit getCleanInternalCircuit() throws InterruptedException {
-		synchronized(cleanInternalCircuits) {
-			try {
-				requestedInternalCircuitCount += 1;
-				while(cleanInternalCircuits.isEmpty()) {
-					cleanInternalCircuits.wait();
-				}
-				return cleanInternalCircuits.remove();
-			} finally {
-				requestedInternalCircuitCount -= 1;
-			}
-		}
-	}
-
-	int getNeededCleanCircuitCount(boolean isPredicted) {
-		synchronized (cleanInternalCircuits) {
-			final int predictedCount = (isPredicted) ? 2 : 0;
-			final int needed = Math.max(requestedInternalCircuitCount, predictedCount) - (pendingInternalCircuitCount + cleanInternalCircuits.size());
-			if(needed < 0) {
-				return 0;
-			} else {
-				return needed;
-			}
-		}
-	}
-	
-	void incrementPendingInternalCircuitCount() {
-		synchronized (cleanInternalCircuits) {
-			pendingInternalCircuitCount += 1;
-		}
-	}
-	
-	void decrementPendingInternalCircuitCount() {
-		synchronized (cleanInternalCircuits) {
-			pendingInternalCircuitCount -= 1;
-		}
-	}
-
-	void addCleanInternalCircuit(InternalCircuit circuit) {
-		synchronized(cleanInternalCircuits) {
-			pendingInternalCircuitCount -= 1;
-			cleanInternalCircuits.add(circuit);
-			cleanInternalCircuits.notifyAll();
-		}
-	}
-
-	boolean isNtorEnabled() {
-		switch(config.getUseNTorHandshake()) {
-		case AUTO:
-			return isNtorEnabledInConsensus();
-		case FALSE:
-			return false;
-		case TRUE:
-			return true;
-		default:
-			throw new IllegalArgumentException("getUseNTorHandshake() returned "+ config.getUseNTorHandshake());
-		}
-	}
-	
-	boolean isNtorEnabledInConsensus() {
-		ConsensusDocument consensus = directory.getCurrentConsensusDocument();
-		return (consensus != null) && (consensus.getUseNTorHandshake());
-	}
-
-	public DirectoryCircuit openDirectoryCircuitTo(List<Router> path) throws OpenFailedException {
-		final DirectoryCircuit circuit = CircuitImpl.createDirectoryCircuitTo(this, path);
-		if(!tryOpenCircuit(circuit, true, false)) {
-			throw new OpenFailedException("Could not create directory circuit for path");
-		}
-		return circuit;
-	}
-
-	public ExitCircuit openExitCircuitTo(List<Router> path)	throws OpenFailedException {
-		final ExitCircuit circuit = CircuitImpl.createExitCircuitTo(this, path);
-		if(!tryOpenCircuit(circuit, false, false)) {
-			throw new OpenFailedException("Could not create exit circuit for path");
-		}
-		return circuit;
-	}
-
-	public InternalCircuit openInternalCircuitTo(List<Router> path) throws OpenFailedException {
-		final InternalCircuit circuit = CircuitImpl.createInternalCircuitTo(this, path);
-		if(!tryOpenCircuit(circuit, false, false)) {
-			throw new OpenFailedException("Could not create internal circuit for path");
-		}
-		return circuit;
-	}
-	
-	private boolean tryOpenCircuit(Circuit circuit, boolean isDirectory, boolean trackInitialization) {
-		final DirectoryCircuitResult result = new DirectoryCircuitResult();
-		final CircuitCreationRequest req = new CircuitCreationRequest(pathChooser, circuit, result, isDirectory);
-		final CircuitBuildTask task = new CircuitBuildTask(req, connectionCache, isNtorEnabled(), (trackInitialization) ? (initializationTracker) : (null));
-		task.run();
-		return result.isSuccessful();
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/CircuitNodeCryptoState.java b/orchid/src/com/subgraph/orchid/circuits/CircuitNodeCryptoState.java
deleted file mode 100644
index 37cb58e9d2e..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/CircuitNodeCryptoState.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import com.subgraph.orchid.Cell;
-import com.subgraph.orchid.RelayCell;
-import com.subgraph.orchid.crypto.TorMessageDigest;
-import com.subgraph.orchid.crypto.TorStreamCipher;
-import com.subgraph.orchid.data.HexDigest;
-
-public class CircuitNodeCryptoState {
-	public final static int KEY_MATERIAL_SIZE = TorMessageDigest.TOR_DIGEST_SIZE * 2 + TorStreamCipher.KEY_LEN * 2;
-	
-	public static CircuitNodeCryptoState createFromKeyMaterial(byte[] keyMaterial, byte[] verifyDigest) {
-		return new CircuitNodeCryptoState(keyMaterial, verifyDigest);
-	}
-	
-	private final HexDigest checksumDigest;
-	private final TorMessageDigest forwardDigest;
-	private final TorMessageDigest backwardDigest;
-	private final TorStreamCipher forwardCipher;
-	private final TorStreamCipher backwardCipher;
-	
-	static private byte[] extractDigestBytes(byte[] keyMaterial, int offset) {
-		final byte[] digestBytes = new byte[TorMessageDigest.TOR_DIGEST_SIZE];
-		System.arraycopy(keyMaterial, offset, digestBytes, 0, TorMessageDigest.TOR_DIGEST_SIZE);
-		return digestBytes;
-	}
-	
-	static private byte[] extractCipherKey(byte[] keyMaterial, int offset) {
-		final byte[] keyBytes = new byte[TorStreamCipher.KEY_LEN];
-		System.arraycopy(keyMaterial, offset, keyBytes, 0, TorStreamCipher.KEY_LEN);
-		return keyBytes;
-	}
-	
-	private CircuitNodeCryptoState(byte[] keyMaterial, byte[] verifyDigest) {
-		checksumDigest = HexDigest.createFromDigestBytes(verifyDigest);
-		int offset = 0;
-		
-		forwardDigest = new TorMessageDigest();
-		forwardDigest.update(extractDigestBytes(keyMaterial, offset));
-		offset += TorMessageDigest.TOR_DIGEST_SIZE;
-
-		backwardDigest = new TorMessageDigest();
-		backwardDigest.update(extractDigestBytes(keyMaterial, offset));
-		offset += TorMessageDigest.TOR_DIGEST_SIZE;
-		
-		forwardCipher = TorStreamCipher.createFromKeyBytes(extractCipherKey(keyMaterial, offset));
-		offset += TorStreamCipher.KEY_LEN;
-		
-		backwardCipher = TorStreamCipher.createFromKeyBytes(extractCipherKey(keyMaterial, offset));
-	}
-	
-	boolean verifyPacketDigest(HexDigest packetDigest) {
-		return checksumDigest.equals(packetDigest);
-	}
-	
-	void encryptForwardCell(Cell cell) {
-		forwardCipher.encrypt(cell.getCellBytes(), Cell.CELL_HEADER_LEN, Cell.CELL_PAYLOAD_LEN);
-	}
-	
-	boolean decryptBackwardCell(Cell cell) {
-		backwardCipher.encrypt(cell.getCellBytes(), Cell.CELL_HEADER_LEN, Cell.CELL_PAYLOAD_LEN);
-		return isRecognizedCell(cell);
-	}
-	
-	void updateForwardDigest(Cell cell) {
-		forwardDigest.update(cell.getCellBytes(), Cell.CELL_HEADER_LEN, Cell.CELL_PAYLOAD_LEN);
-	}
-	
-	byte[] getForwardDigestBytes() {
-		return forwardDigest.getDigestBytes();
-	}
-	
-	private boolean isRecognizedCell(Cell cell) {
-		if(cell.getShortAt(RelayCell.RECOGNIZED_OFFSET) != 0) 
-			return false;
-	
-		final byte[] digest = extractRelayDigest(cell);
-		final byte[] peek = backwardDigest.peekDigest(cell.getCellBytes(), Cell.CELL_HEADER_LEN, Cell.CELL_PAYLOAD_LEN);
-		for(int i = 0; i < 4; i++) 
-			if(digest[i] != peek[i]) {
-				replaceRelayDigest(cell, digest);
-				return false;
-			}
-		backwardDigest.update(cell.getCellBytes(), Cell.CELL_HEADER_LEN, Cell.CELL_PAYLOAD_LEN);
-		replaceRelayDigest(cell, digest);
-		return true;		
-	}
-	
-	private byte[] extractRelayDigest(Cell cell) {
-		final byte[] digest = new byte[4];
-		for(int i = 0; i < 4; i++) {
-			digest[i] = (byte) cell.getByteAt(i + RelayCell.DIGEST_OFFSET);
-			cell.putByteAt(i + RelayCell.DIGEST_OFFSET, 0);
-		}
-		return digest;
-	}
-	
-	private void replaceRelayDigest(Cell cell, byte[] digest) {
-		for(int i = 0; i < 4; i++)
-			cell.putByteAt(i + RelayCell.DIGEST_OFFSET, digest[i] & 0xFF);	
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/CircuitNodeImpl.java b/orchid/src/com/subgraph/orchid/circuits/CircuitNodeImpl.java
deleted file mode 100644
index c2e990f6734..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/CircuitNodeImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import com.subgraph.orchid.Cell;
-import com.subgraph.orchid.CircuitNode;
-import com.subgraph.orchid.RelayCell;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.TorException;
-
-public class CircuitNodeImpl implements CircuitNode {
-	
-	public static CircuitNode createAnonymous(CircuitNode previous, byte[] keyMaterial, byte[] verifyDigest) {
-		return createNode(null, previous, keyMaterial, verifyDigest);
-	}
-	
-	public static CircuitNode createFirstHop(Router r, byte[] keyMaterial, byte[] verifyDigest) {
-		return createNode(r, null, keyMaterial, verifyDigest);
-	}
-	
-	public static CircuitNode createNode(Router r, CircuitNode previous, byte[] keyMaterial, byte[] verifyDigest) {
-		final CircuitNodeCryptoState cs = CircuitNodeCryptoState.createFromKeyMaterial(keyMaterial, verifyDigest);
-		return new CircuitNodeImpl(r, previous, cs);
-	}
-
-	private final static int CIRCWINDOW_START = 1000;
-	private final static int CIRCWINDOW_INCREMENT = 100;
-
-	private final Router router;
-	private final CircuitNodeCryptoState cryptoState;
-	private final CircuitNode previousNode;
-
-	private final Object windowLock;
-	private int packageWindow;
-	private int deliverWindow;
-	
-	private CircuitNodeImpl(Router router, CircuitNode previous, CircuitNodeCryptoState cryptoState) {
-		previousNode = previous;
-		this.router = router;
-		this.cryptoState = cryptoState;
-		windowLock = new Object();
-		packageWindow = CIRCWINDOW_START;
-		deliverWindow = CIRCWINDOW_START;
-	}
-
-	public Router getRouter() {
-		return router;
-	}
-
-	public CircuitNode getPreviousNode() {
-		return previousNode;
-	}
-
-	public void encryptForwardCell(RelayCell cell) {
-		cryptoState.encryptForwardCell(cell);
-	}
-
-	public boolean decryptBackwardCell(Cell cell) {
-		return cryptoState.decryptBackwardCell(cell);
-	}
-
-	public void updateForwardDigest(RelayCell cell) {
-		cryptoState.updateForwardDigest(cell);
-	}
-
-	public byte[] getForwardDigestBytes() {
-		return cryptoState.getForwardDigestBytes();
-	}
-
-	public String toString() {
-		if(router != null) {
-			return "|"+ router.getNickname() + "|";
-		} else {
-			return "|()|";
-		}
-	}
-
-	public void decrementDeliverWindow() {
-		synchronized(windowLock) {
-			deliverWindow--;
-		}
-	}
-
-	public boolean considerSendingSendme() {
-		synchronized(windowLock) {
-			if(deliverWindow <= (CIRCWINDOW_START - CIRCWINDOW_INCREMENT)) {
-				deliverWindow += CIRCWINDOW_INCREMENT;
-				return true;
-			}
-			return false;
-		}
-	}
-
-	public void waitForSendWindow() {
-		waitForSendWindow(false);
-	}
-
-	public void waitForSendWindowAndDecrement() {
-		waitForSendWindow(true);
-	}
-
-	private void waitForSendWindow(boolean decrement) {
-		synchronized(windowLock) {
-			while(packageWindow == 0) {
-				try {
-					windowLock.wait();
-				} catch (InterruptedException e) {
-					throw new TorException("Thread interrupted while waiting for circuit send window");
-				}
-			}
-			if(decrement)
-				packageWindow--;
-		}
-	}
-
-	public void incrementSendWindow() {
-		synchronized(windowLock) {
-			packageWindow += CIRCWINDOW_INCREMENT;
-			windowLock.notifyAll();
-		}
-		
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/CircuitPredictor.java b/orchid/src/com/subgraph/orchid/circuits/CircuitPredictor.java
deleted file mode 100644
index 21ed2ac6db7..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/CircuitPredictor.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import com.subgraph.orchid.dashboard.DashboardRenderable;
-import com.subgraph.orchid.dashboard.DashboardRenderer;
-
-public class CircuitPredictor implements DashboardRenderable {
-
-	private final static Integer INTERNAL_CIRCUIT_PORT_VALUE = 0;
-	private final static long TIMEOUT_MS = 60 * 60 * 1000; // One hour
-	
-	private final Map<Integer, Long> portsSeen;
-		
-	public CircuitPredictor() {
-		portsSeen = new HashMap<Integer,Long>();
-		addExitPortRequest(80);
-		addInternalRequest();
-	}
-	
-	void addExitPortRequest(int port) {
-		synchronized (portsSeen) {
-			portsSeen.put(port, System.currentTimeMillis());
-		}
-	}
-	
-	void addInternalRequest() {
-		addExitPortRequest(INTERNAL_CIRCUIT_PORT_VALUE);
-	}
-	
-	
-	private boolean isEntryExpired(Entry<Integer, Long> e, long now) {
-		return (now - e.getValue()) > TIMEOUT_MS;
-	}
-	
-	private void removeExpiredPorts() {
-		final long now = System.currentTimeMillis();
-		final Iterator<Entry<Integer, Long>> it = portsSeen.entrySet().iterator();
-		while(it.hasNext()) {
-			if(isEntryExpired(it.next(), now)) {
-				it.remove();
-			}
-		}
-	}
-	
-	boolean isInternalPredicted() {
-		synchronized (portsSeen) {
-			removeExpiredPorts();
-			return  portsSeen.containsKey(INTERNAL_CIRCUIT_PORT_VALUE);
-		}
-	}
-
-	Set<Integer> getPredictedPorts() {
-		synchronized (portsSeen) {
-			removeExpiredPorts();
-			final Set<Integer> result = new HashSet<Integer>(portsSeen.keySet());
-			result.remove(INTERNAL_CIRCUIT_PORT_VALUE);
-			return result;
-		}
-	}
-
-	List<PredictedPortTarget> getPredictedPortTargets() {
-		final List<PredictedPortTarget> targets = new ArrayList<PredictedPortTarget>();
-		for(int p: getPredictedPorts()) {
-			targets.add(new PredictedPortTarget(p));
-		}
-		return targets;
-	}
-
-	public void dashboardRender(DashboardRenderer renderer, PrintWriter writer, int flags)
-			throws IOException {
-		
-		if((flags & DASHBOARD_PREDICTED_PORTS) == 0) {
-			return;
-		}
-		writer.println("[Predicted Ports] ");
-		for(int port : portsSeen.keySet()) {
-			writer.write(" "+ port);
-			Long lastSeen = portsSeen.get(port);
-			if(lastSeen != null) {
-				long now = System.currentTimeMillis();
-				long ms = now - lastSeen;
-				writer.write(" (last seen "+ TimeUnit.MINUTES.convert(ms, TimeUnit.MILLISECONDS) +" minutes ago)");
-			}
-			writer.println();
-		}
-		writer.println();
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/CircuitStatus.java b/orchid/src/com/subgraph/orchid/circuits/CircuitStatus.java
deleted file mode 100644
index a9a994f31e6..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/CircuitStatus.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import com.subgraph.orchid.crypto.TorRandom;
-
-public class CircuitStatus {
-
-	enum CircuitState {
-		UNCONNECTED("Unconnected"),
-		BUILDING("Building"),
-		FAILED("Failed"),
-		OPEN("Open"),
-		DESTROYED("Destroyed");
-		String name;
-		CircuitState(String name) { this.name = name; }
-		public String toString() { return name; }
-	}
-
-	private long timestampCreated;
-	private long timestampDirty;
-	private int currentStreamId;
-	private Object streamIdLock = new Object();
-	private volatile CircuitState state = CircuitState.UNCONNECTED;
-
-	CircuitStatus() {
-		initializeCurrentStreamId();
-	}
-
-	private void initializeCurrentStreamId() {
-		final TorRandom random = new TorRandom();
-		currentStreamId = random.nextInt(0xFFFF) + 1;
-	}
-
-	synchronized void updateCreatedTimestamp() {
-		timestampCreated = System.currentTimeMillis();
-		timestampDirty = 0;
-	}
-
-	synchronized void updateDirtyTimestamp() {
-		if(timestampDirty == 0 && state != CircuitState.BUILDING) {
-			timestampDirty = System.currentTimeMillis();
-		}
-	}
-
-	synchronized long getMillisecondsElapsedSinceCreated() {
-		return millisecondsElapsedSince(timestampCreated);
-	}
-
-	synchronized long getMillisecondsDirty() {
-		return millisecondsElapsedSince(timestampDirty);
-	}
-
-	private static long millisecondsElapsedSince(long then) {
-		if(then == 0) {
-			return 0;
-		}
-		final long now = System.currentTimeMillis();
-		return now - then;
-	}
-
-	synchronized boolean isDirty() {
-		return timestampDirty != 0;
-	}
-
-	void setStateBuilding() {
-		state = CircuitState.BUILDING;
-	}
-
-	void setStateFailed() {
-		state = CircuitState.FAILED;
-	}
-
-	void setStateOpen() {
-		state = CircuitState.OPEN;
-	}
-
-	void setStateDestroyed() {
-		state = CircuitState.DESTROYED;
-	}
-
-	boolean isBuilding() {
-		return state == CircuitState.BUILDING;
-	}
-
-	boolean isConnected() {
-		return state == CircuitState.OPEN;
-	}
-
-	boolean isUnconnected() {
-		return state == CircuitState.UNCONNECTED;
-	}
-
-	String getStateAsString() {
-		if(state == CircuitState.OPEN) {
-			return state.toString() + " ["+ getDirtyString() + "]";
-		}
-		return state.toString();
-	}
-
-	private String getDirtyString() {
-		if(!isDirty()) {
-			return "Clean";
-		} else {
-			return "Dirty "+ (getMillisecondsDirty() / 1000) +"s"; 
-		}
-	}
-	int nextStreamId() {
-		synchronized(streamIdLock) {
-			currentStreamId++;
-			if(currentStreamId > 0xFFFF)
-				currentStreamId = 1;
-			return currentStreamId;
-		}
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/DirectoryCircuitImpl.java b/orchid/src/com/subgraph/orchid/circuits/DirectoryCircuitImpl.java
deleted file mode 100644
index 646930fb81e..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/DirectoryCircuitImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import java.util.List;
-import java.util.concurrent.TimeoutException;
-
-import com.subgraph.orchid.DirectoryCircuit;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.Stream;
-import com.subgraph.orchid.StreamConnectFailedException;
-import com.subgraph.orchid.circuits.path.CircuitPathChooser;
-import com.subgraph.orchid.circuits.path.PathSelectionFailedException;
-
-public class DirectoryCircuitImpl extends CircuitImpl implements DirectoryCircuit {
-	
-	protected DirectoryCircuitImpl(CircuitManagerImpl circuitManager, List<Router> prechosenPath) {
-		super(circuitManager, prechosenPath);
-	}
-	
-	public Stream openDirectoryStream(long timeout, boolean autoclose) throws InterruptedException, TimeoutException, StreamConnectFailedException {
-		final StreamImpl stream = createNewStream(autoclose);
-		try {
-			stream.openDirectory(timeout);
-			return stream;
-		} catch (Exception e) {
-			removeStream(stream);
-			return processStreamOpenException(e);
-		}
-	}
-
-	@Override
-	protected List<Router> choosePathForCircuit(CircuitPathChooser pathChooser) throws InterruptedException, PathSelectionFailedException {
-		if(prechosenPath != null) {
-			return prechosenPath;
-		}
-		return pathChooser.chooseDirectoryPath();
-	}
-
-	@Override
-	protected String getCircuitTypeLabel() {
-		return "Directory";
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/ExitCircuitImpl.java b/orchid/src/com/subgraph/orchid/circuits/ExitCircuitImpl.java
deleted file mode 100644
index e431ddf3582..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/ExitCircuitImpl.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeoutException;
-
-import com.subgraph.orchid.ExitCircuit;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.Stream;
-import com.subgraph.orchid.StreamConnectFailedException;
-import com.subgraph.orchid.circuits.path.CircuitPathChooser;
-import com.subgraph.orchid.circuits.path.PathSelectionFailedException;
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.data.exitpolicy.ExitTarget;
-
-public class ExitCircuitImpl extends CircuitImpl implements ExitCircuit {
-	
-	private final Router exitRouter;
-	private final Set<ExitTarget> failedExitRequests;
-
-	ExitCircuitImpl(CircuitManagerImpl circuitManager, List<Router> prechosenPath) {
-		super(circuitManager, prechosenPath);
-		this.exitRouter = prechosenPath.get(prechosenPath.size() - 1);
-		this.failedExitRequests = new HashSet<ExitTarget>();
-	}
-
-	ExitCircuitImpl(CircuitManagerImpl circuitManager, Router exitRouter) {
-		super(circuitManager);
-		this.exitRouter = exitRouter;
-		this.failedExitRequests = new HashSet<ExitTarget>();
-	}
-	
-	public Stream openExitStream(IPv4Address address, int port, long timeout) throws InterruptedException, TimeoutException, StreamConnectFailedException {
-		return openExitStream(address.toString(), port, timeout);
-	}
-
-	public Stream openExitStream(String target, int port, long timeout) throws InterruptedException, TimeoutException, StreamConnectFailedException {
-		final StreamImpl stream = createNewStream();
-		try {
-			stream.openExit(target, port, timeout);
-			return stream;
-		} catch (Exception e) {
-			removeStream(stream);
-			return processStreamOpenException(e);
-		}
-	}
-	
-	public void recordFailedExitTarget(ExitTarget target) {
-		synchronized(failedExitRequests) {
-			failedExitRequests.add(target);
-		}
-	}
-
-	public boolean canHandleExitTo(ExitTarget target) {
-		synchronized(failedExitRequests) {
-			if(failedExitRequests.contains(target)) {
-				return false;
-			}
-		}
-		
-		if(isMarkedForClose()) {
-			return false;
-		}
-
-		if(target.isAddressTarget()) {
-			return exitRouter.exitPolicyAccepts(target.getAddress(), target.getPort());
-		} else {
-			return exitRouter.exitPolicyAccepts(target.getPort());
-		}
-	}
-	
-	public boolean canHandleExitToPort(int port) {
-		return exitRouter.exitPolicyAccepts(port);
-	}
-
-	
-	@Override
-	protected List<Router> choosePathForCircuit(CircuitPathChooser pathChooser) throws InterruptedException, PathSelectionFailedException {
-		return pathChooser.choosePathWithExit(exitRouter);
-	}
-	
-	@Override
-	protected String getCircuitTypeLabel() {
-		return "Exit";
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/InternalCircuitImpl.java b/orchid/src/com/subgraph/orchid/circuits/InternalCircuitImpl.java
deleted file mode 100644
index 06bcbe04ff1..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/InternalCircuitImpl.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import java.util.List;
-import java.util.concurrent.TimeoutException;
-
-import com.subgraph.orchid.Circuit;
-import com.subgraph.orchid.CircuitNode;
-import com.subgraph.orchid.DirectoryCircuit;
-import com.subgraph.orchid.HiddenServiceCircuit;
-import com.subgraph.orchid.InternalCircuit;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.Stream;
-import com.subgraph.orchid.StreamConnectFailedException;
-import com.subgraph.orchid.circuits.path.CircuitPathChooser;
-import com.subgraph.orchid.circuits.path.PathSelectionFailedException;
-
-public class InternalCircuitImpl extends CircuitImpl implements InternalCircuit, DirectoryCircuit, HiddenServiceCircuit {
-
-	private enum InternalType { UNUSED, HS_INTRODUCTION, HS_DIRECTORY, HS_CIRCUIT }
-	
-	private InternalType type;
-	private boolean ntorEnabled;
-	
-	InternalCircuitImpl(CircuitManagerImpl circuitManager, List<Router> prechosenPath) {
-		super(circuitManager, prechosenPath);
-		this.type = InternalType.UNUSED;
-		this.ntorEnabled = circuitManager.isNtorEnabled();
-	}
-	
-	protected InternalCircuitImpl(CircuitManagerImpl circuitManager) {
-		this(circuitManager, null);
-	}
-	
-	@Override
-	protected List<Router> choosePathForCircuit(CircuitPathChooser pathChooser)
-			throws InterruptedException, PathSelectionFailedException {
-		return pathChooser.chooseInternalPath();
-	}
-	
-
-	public Circuit cannibalizeToIntroductionPoint(Router target) {
-		cannibalizeTo(target);
-		type = InternalType.HS_INTRODUCTION;
-		return this;
-	}
-
-	private void cannibalizeTo(Router target) {
-		if(type != InternalType.UNUSED) {
-			throw new IllegalStateException("Cannot cannibalize internal circuit with type "+ type);
-			
-		}
-		final CircuitExtender extender = new CircuitExtender(this, ntorEnabled);
-		extender.extendTo(target);
-	}
-	
-	public Stream openDirectoryStream(long timeout, boolean autoclose) throws InterruptedException, TimeoutException, StreamConnectFailedException {
-		if(type != InternalType.HS_DIRECTORY) {
-			throw new IllegalStateException("Cannot open directory stream on internal circuit with type "+ type);
-		}
-		final StreamImpl stream = createNewStream();
-		try {
-			stream.openDirectory(timeout);
-			return stream;
-		} catch (Exception e) {
-			removeStream(stream);
-			return processStreamOpenException(e);
-		}
-	}
-
-	
-	public DirectoryCircuit cannibalizeToDirectory(Router target) {
-		cannibalizeTo(target);
-		type = InternalType.HS_DIRECTORY;
-		return this;
-	}
-
-
-	public HiddenServiceCircuit connectHiddenService(CircuitNode node) {
-		if(type != InternalType.UNUSED) {
-			throw new IllegalStateException("Cannot connect hidden service from internal circuit type "+ type);
-		}
-		appendNode(node);
-		type = InternalType.HS_CIRCUIT;
-		return this;
-	}
-
-	public Stream openStream(int port, long timeout) 
-			throws InterruptedException, TimeoutException, StreamConnectFailedException {
-		if(type != InternalType.HS_CIRCUIT) {
-			throw new IllegalStateException("Cannot open stream to hidden service from internal circuit type "+ type);
-		}
-		final StreamImpl stream = createNewStream();
-		try {
-			stream.openExit("", port, timeout);
-			return stream;
-		} catch (Exception e) {
-			removeStream(stream);
-			return processStreamOpenException(e);
-		}
-	}
-
-
-	@Override
-	protected String getCircuitTypeLabel() {
-		switch(type) {
-		case HS_CIRCUIT:
-			return "Hidden Service";
-		case HS_DIRECTORY:
-			return "HS Directory";
-		case HS_INTRODUCTION:
-			return "HS Introduction";
-		case UNUSED:
-			return "Internal";
-		default:
-			return "(null)";
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/NTorCircuitExtender.java b/orchid/src/com/subgraph/orchid/circuits/NTorCircuitExtender.java
deleted file mode 100644
index 45c705c1a1f..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/NTorCircuitExtender.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.CircuitNode;
-import com.subgraph.orchid.RelayCell;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.TorException;
-import com.subgraph.orchid.crypto.TorMessageDigest;
-import com.subgraph.orchid.crypto.TorNTorKeyAgreement;
-
-public class NTorCircuitExtender {
-	private final static Logger logger = Logger.getLogger(NTorCircuitExtender.class.getName());
-	
-	private final CircuitExtender extender;
-	private final Router router;
-	private final TorNTorKeyAgreement kex;
-	
-	public NTorCircuitExtender(CircuitExtender extender, Router router) {
-		this.extender = extender;
-		this.router = router;
-		this.kex = new TorNTorKeyAgreement(router.getIdentityHash(), router.getNTorOnionKey());
-	}
-
-	CircuitNode extendTo() {
-		final byte[] onion = kex.createOnionSkin();
-		if(finalRouterSupportsExtend2()) {
-			logger.fine("Extending circuit to "+ router.getNickname() + " with NTor inside RELAY_EXTEND2");
-			return extendWithExtend2(onion);
-		} else {
-			logger.fine("Extending circuit to "+ router.getNickname() + " with NTor inside RELAY_EXTEND");
-			return extendWithTunneledExtend(onion);
-		}
-	}
-	
-	private CircuitNode extendWithExtend2(byte[] onion) {
-		final RelayCell cell = createExtend2Cell(onion);
-		extender.sendRelayCell(cell);
-		final RelayCell response = extender.receiveRelayResponse(RelayCell.RELAY_EXTENDED2, router);
-		return processExtended2(response);
-	}
-	
-	private CircuitNode extendWithTunneledExtend(byte[] onion) {
-		final RelayCell cell = createExtendCell(onion, kex.getNtorCreateMagic());
-		extender.sendRelayCell(cell);
-		final RelayCell response = extender.receiveRelayResponse(RelayCell.RELAY_EXTENDED, router);
-		return processExtended(response);
-	}
-	
-	private boolean finalRouterSupportsExtend2() {
-		return extender.getFinalRouter().getNTorOnionKey() != null;
-	}
-	
-	private RelayCell createExtend2Cell(byte[] ntorOnionskin) {
-		final RelayCell cell = extender.createRelayCell(RelayCell.RELAY_EXTEND2);
-
-		cell.putByte(2);
-			
-		cell.putByte(0);
-		cell.putByte(6);
-		cell.putByteArray(router.getAddress().getAddressDataBytes());
-		cell.putShort(router.getOnionPort());
-			
-		cell.putByte(2);
-		cell.putByte(20);
-		cell.putByteArray(router.getIdentityHash().getRawBytes());
-			
-		cell.putShort(0x0002);
-		cell.putShort(ntorOnionskin.length);
-		cell.putByteArray(ntorOnionskin);
-		return cell;
-	}
-	
-	private RelayCell createExtendCell(byte[] ntorOnionskin, byte[] ntorMagic) {
-		final RelayCell cell = extender.createRelayCell(RelayCell.RELAY_EXTEND);
-		cell.putByteArray(router.getAddress().getAddressDataBytes());
-		cell.putShort(router.getOnionPort());
-		final int paddingLength = CircuitExtender.TAP_ONIONSKIN_LEN - (ntorOnionskin.length + ntorMagic.length);
-		final byte[] padding = new byte[paddingLength];
-		cell.putByteArray(ntorMagic);
-		cell.putByteArray(ntorOnionskin);
-		cell.putByteArray(padding);
-		cell.putByteArray(router.getIdentityHash().getRawBytes());
-		return cell;
-	}
-	
-	private CircuitNode processExtended(RelayCell cell) {
-		byte[] payload = new byte[CircuitExtender.TAP_ONIONSKIN_REPLY_LEN];
-		cell.getByteArray(payload);
-		
-		return processPayload(payload);
-	}
-	
-
-	private CircuitNode processExtended2(RelayCell cell) {
-		final int payloadLength = cell.getShort();
-		if(payloadLength > cell.cellBytesRemaining()) {
-			throw new TorException("Incorrect payload length value in RELAY_EXTENED2 cell");
-		}
-		byte[] payload = new byte[payloadLength];
-		cell.getByteArray(payload);
-
-		return processPayload(payload);
-	}
-	
-	private CircuitNode processPayload(byte[] payload) {
-		final byte[] keyMaterial = new byte[CircuitNodeCryptoState.KEY_MATERIAL_SIZE];
-		final byte[] verifyDigest = new byte[TorMessageDigest.TOR_DIGEST_SIZE];
-		if(!kex.deriveKeysFromHandshakeResponse(payload, keyMaterial, verifyDigest)) {
-			return null;
-		}
-		return extender.createNewNode(router, keyMaterial, verifyDigest);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/OpenExitStreamTask.java b/orchid/src/com/subgraph/orchid/circuits/OpenExitStreamTask.java
deleted file mode 100644
index 3ea3d17e35f..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/OpenExitStreamTask.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import java.util.concurrent.TimeoutException;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.ExitCircuit;
-import com.subgraph.orchid.Stream;
-import com.subgraph.orchid.StreamConnectFailedException;
-
-public class OpenExitStreamTask implements Runnable {
-	private final static Logger logger = Logger.getLogger(OpenExitStreamTask.class.getName());
-	private final ExitCircuit circuit;
-	private final StreamExitRequest exitRequest;
-
-	OpenExitStreamTask(ExitCircuit circuit, StreamExitRequest exitRequest) {
-		this.circuit = circuit;
-		this.exitRequest = exitRequest;
-	}
-
-	public void run() {
-		logger.fine("Attempting to open stream to "+ exitRequest);
-		try {
-			exitRequest.setCompletedSuccessfully(tryOpenExitStream());
-		} catch (InterruptedException e) {
-			Thread.currentThread().interrupt();
-			exitRequest.setInterrupted();
-		} catch (TimeoutException e) {
-			circuit.markForClose();
-			exitRequest.setCompletedTimeout();
-		} catch (StreamConnectFailedException e) {
-			if(!e.isReasonRetryable()) {
-				exitRequest.setExitFailed();
-				circuit.recordFailedExitTarget(exitRequest);
-			} else {
-				circuit.markForClose();
-				exitRequest.setStreamOpenFailure(e.getReason());
-			}
-			
-		}
-	}
-
-	private Stream tryOpenExitStream() throws InterruptedException, TimeoutException, StreamConnectFailedException {
-		if(exitRequest.isAddressTarget()) {
-			return circuit.openExitStream(exitRequest.getAddress(), exitRequest.getPort(), exitRequest.getStreamTimeout());
-		} else {
-			return circuit.openExitStream(exitRequest.getHostname(), exitRequest.getPort(), exitRequest.getStreamTimeout());
-		}
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/PendingExitStreams.java b/orchid/src/com/subgraph/orchid/circuits/PendingExitStreams.java
deleted file mode 100644
index f10fb264bef..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/PendingExitStreams.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeoutException;
-
-import com.subgraph.orchid.OpenFailedException;
-import com.subgraph.orchid.Stream;
-import com.subgraph.orchid.StreamConnectFailedException;
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.data.IPv4Address;
-
-public class PendingExitStreams {
-	
-	private final Set<StreamExitRequest> pendingRequests;
-	private final Object lock = new Object();
-	private final TorConfig config;
-
-	PendingExitStreams(TorConfig config) {
-		this.config = config;
-		pendingRequests = new HashSet<StreamExitRequest>();
-	}
-	
-	Stream openExitStream(IPv4Address address, int port) throws InterruptedException, OpenFailedException {
-		final StreamExitRequest request = new StreamExitRequest(lock, address, port);
-		return openExitStreamByRequest(request);
-	}
-	
-	Stream openExitStream(String hostname, int port) throws InterruptedException, OpenFailedException {
-		final StreamExitRequest request =  new StreamExitRequest(lock, hostname, port);
-		return openExitStreamByRequest(request);
-	}
-	
-	private Stream openExitStreamByRequest(StreamExitRequest request) throws InterruptedException, OpenFailedException {
-		if(config.getCircuitStreamTimeout() != 0) {
-			request.setStreamTimeout(config.getCircuitStreamTimeout());
-		}
-		
-		synchronized(lock) {
-			pendingRequests.add(request);
-			try {
-				return handleRequest(request);
-			} finally {
-				pendingRequests.remove(request);
-			}
-		}
-	}
-	
-	private Stream handleRequest(StreamExitRequest request) throws InterruptedException, OpenFailedException {
-		while(true) {
-			while(!request.isCompleted()) {
-				lock.wait();
-			}
-			try {
-				return request.getStream();
-			} catch (TimeoutException e) {
-				request.resetForRetry();
-			} catch (StreamConnectFailedException e) {
-				request.resetForRetry();
-			}
-		}
-	}
-	
-	List<StreamExitRequest> getUnreservedPendingRequests() {
-		final List<StreamExitRequest> result = new ArrayList<StreamExitRequest>();
-		synchronized (lock) {
-			for(StreamExitRequest request: pendingRequests) {
-				if(!request.isReserved()) {
-					result.add(request);
-				}
-			}
-		}
-		return result;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/PredictedPortTarget.java b/orchid/src/com/subgraph/orchid/circuits/PredictedPortTarget.java
deleted file mode 100644
index 62a1ac712d5..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/PredictedPortTarget.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.data.exitpolicy.ExitTarget;
-
-public class PredictedPortTarget implements ExitTarget {
-	
-	final int port;
-
-	public PredictedPortTarget(int port) {
-		this.port = port;
-	}
-
-	public boolean isAddressTarget() {
-		return false;
-	}
-
-	public IPv4Address getAddress() {
-		return new IPv4Address(0);
-	}
-
-	public String getHostname() {
-		return "";
-	}
-
-	public int getPort() {
-		return port;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/StreamExitRequest.java b/orchid/src/com/subgraph/orchid/circuits/StreamExitRequest.java
deleted file mode 100644
index b2913c6ae56..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/StreamExitRequest.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package com.subgraph.orchid.circuits;
- 
-import java.util.concurrent.TimeoutException;
-
-import com.subgraph.orchid.OpenFailedException;
-import com.subgraph.orchid.Stream;
-import com.subgraph.orchid.StreamConnectFailedException;
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.data.exitpolicy.ExitTarget;
-import com.subgraph.orchid.misc.GuardedBy;
-
-public class StreamExitRequest implements ExitTarget {
-	
-	private enum CompletionStatus {NOT_COMPLETED, SUCCESS, TIMEOUT, STREAM_OPEN_FAILURE, EXIT_FAILURE, INTERRUPTED};
-	
-	private final boolean isAddress;
-	private final IPv4Address address;
-	private final String hostname;
-	private final int port;
-	private final Object requestCompletionLock;
-	
-	@GuardedBy("requestCompletionLock") private CompletionStatus completionStatus;	
-	@GuardedBy("requestCompletionLock") private Stream stream;
-	@GuardedBy("requestCompletionLock") private int streamOpenFailReason;
-	
-	@GuardedBy("this") private boolean isReserved;
-	@GuardedBy("this") private int retryCount;
-	@GuardedBy("this") private long specificTimeout;
-
-	StreamExitRequest(Object requestCompletionLock, IPv4Address address, int port) {
-		this(requestCompletionLock, true, "", address, port);
-	}
-
-	StreamExitRequest(Object requestCompletionLock, String hostname, int port) {
-		this(requestCompletionLock, false, hostname, null, port);
-	}
-	
-	private StreamExitRequest(Object requestCompletionLock, boolean isAddress, String hostname, IPv4Address address, int port) {
-		this.requestCompletionLock = requestCompletionLock;
-		this.isAddress = isAddress;
-		this.hostname = hostname;
-		this.address = address;
-		this.port = port;
-		this.completionStatus = CompletionStatus.NOT_COMPLETED;
-	}
-
-	public boolean isAddressTarget() {
-		return isAddress;
-	}
-
-	public IPv4Address getAddress() {
-		return address;
-	}
-
-	public String getHostname() {
-		return hostname;
-	}
-
-	public int getPort() {
-		return port;
-	}
-
-	public synchronized void setStreamTimeout(long timeout) {
-		specificTimeout = timeout;
-	}
-	
-	public synchronized long getStreamTimeout() {
-		if(specificTimeout > 0) {
-			return specificTimeout;
-		} else if(retryCount < 2) {
-			return 10 * 1000;
-		} else {
-			return 15 * 1000;
-		}
-	}
-
-	void setCompletedTimeout() {
-		synchronized (requestCompletionLock) {
-			newStatus(CompletionStatus.TIMEOUT);
-		}
-	}
-	
-	void setExitFailed() {
-		synchronized (requestCompletionLock) {
-			newStatus(CompletionStatus.EXIT_FAILURE);
-		}
-	}
-	
-	void setStreamOpenFailure(int reason) {
-		synchronized (requestCompletionLock) {
-			streamOpenFailReason = reason;
-			newStatus(CompletionStatus.STREAM_OPEN_FAILURE);
-		}
-	}
-	
-	void setCompletedSuccessfully(Stream stream) {
-		synchronized (requestCompletionLock) {
-			this.stream = stream;
-			newStatus(CompletionStatus.SUCCESS);
-		}
-	}
-	
-	void setInterrupted() {
-		synchronized (requestCompletionLock) {
-			newStatus(CompletionStatus.INTERRUPTED);	
-		}
-	}
-
-	private void newStatus(CompletionStatus newStatus) {
-		if(completionStatus != CompletionStatus.NOT_COMPLETED) {
-			throw new IllegalStateException("Attempt to set completion state to " + newStatus +" while status is "+ completionStatus);
-		}
-		completionStatus = newStatus;
-		requestCompletionLock.notifyAll();
-	}
-
-	
-	Stream getStream() throws OpenFailedException, TimeoutException, StreamConnectFailedException, InterruptedException {
-		synchronized(requestCompletionLock) {
-			switch(completionStatus) {
-			case NOT_COMPLETED:
-				throw new IllegalStateException("Request not completed");
-			case EXIT_FAILURE:
-				throw new OpenFailedException("Failure at exit node");
-			case TIMEOUT:
-				throw new TimeoutException();
-			case STREAM_OPEN_FAILURE:
-				throw new StreamConnectFailedException(streamOpenFailReason);
-			case INTERRUPTED:
-				throw new InterruptedException();
-			case SUCCESS:
-				return stream;
-			default:
-				throw new IllegalStateException("Unknown completion status");
-			}
-		}
-	}
-
-	synchronized void resetForRetry() {
-		synchronized (requestCompletionLock) {
-			streamOpenFailReason = 0;
-			completionStatus = CompletionStatus.NOT_COMPLETED;
-		}
-		retryCount += 1;
-		isReserved = false;
-	}
-
-	boolean isCompleted() {
-		synchronized (requestCompletionLock) {
-			return completionStatus != CompletionStatus.NOT_COMPLETED;
-		}
-	}
-	
-	synchronized boolean reserveRequest() {
-		if(isReserved) return false;
-		isReserved = true;
-		return true;
-	}
-	
-	synchronized boolean isReserved() {
-		return isReserved;
-	}
-	
-	public String toString() {
-		if(isAddress)
-			return address + ":"+ port;
-		else
-			return hostname + ":"+ port;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/StreamImpl.java b/orchid/src/com/subgraph/orchid/circuits/StreamImpl.java
deleted file mode 100644
index 461409b0a1f..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/StreamImpl.java
+++ /dev/null
@@ -1,219 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.util.concurrent.TimeoutException;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.Circuit;
-import com.subgraph.orchid.CircuitNode;
-import com.subgraph.orchid.RelayCell;
-import com.subgraph.orchid.Stream;
-import com.subgraph.orchid.StreamConnectFailedException;
-import com.subgraph.orchid.TorException;
-import com.subgraph.orchid.circuits.cells.RelayCellImpl;
-import com.subgraph.orchid.dashboard.DashboardRenderable;
-import com.subgraph.orchid.dashboard.DashboardRenderer;
-
-public class StreamImpl implements Stream, DashboardRenderable {
-	private final static Logger logger = Logger.getLogger(StreamImpl.class.getName());
-
-	private final static int STREAMWINDOW_START = 500;
-	private final static int STREAMWINDOW_INCREMENT = 50;
-	private final static int STREAMWINDOW_MAX_UNFLUSHED = 10;
-	
-	private final CircuitImpl circuit;
-	
-	private final int streamId;
-	private final boolean autoclose;
-	
-	private final CircuitNode targetNode;
-	private final TorInputStream inputStream;
-	private final TorOutputStream outputStream;
-	
-	private boolean isClosed;
-	private boolean relayEndReceived;
-	private int relayEndReason;
-	private boolean relayConnectedReceived;
-	private final Object waitConnectLock = new Object();
-	private final Object windowLock = new Object();
-	private int packageWindow;
-	private int deliverWindow;
-
-	private String streamTarget = "";
-	
-	StreamImpl(CircuitImpl circuit, CircuitNode targetNode, int streamId, boolean autoclose) {
-		this.circuit = circuit;
-		this.targetNode = targetNode;
-		this.streamId = streamId;
-		this.autoclose = autoclose;
-		this.inputStream = new TorInputStream(this);
-		this.outputStream = new TorOutputStream(this);
-		packageWindow = STREAMWINDOW_START;
-		deliverWindow = STREAMWINDOW_START;
-	}
-
-	void addInputCell(RelayCell cell) {
-		if(isClosed)
-			return;
-		if(cell.getRelayCommand() == RelayCell.RELAY_END) {
-			synchronized(waitConnectLock) {
-				relayEndReason = cell.getByte();
-				relayEndReceived = true;
-				inputStream.addEndCell(cell);
-				waitConnectLock.notifyAll();
-			}
-		} else if(cell.getRelayCommand() == RelayCell.RELAY_CONNECTED) {
-			synchronized(waitConnectLock) {
-				relayConnectedReceived = true;
-				waitConnectLock.notifyAll();
-			}
-		} else if(cell.getRelayCommand() == RelayCell.RELAY_SENDME) {
-			synchronized(windowLock) {
-				packageWindow += STREAMWINDOW_INCREMENT;
-				windowLock.notifyAll();
-			}
-		}
-		else {
-			inputStream.addInputCell(cell);
-			synchronized(windowLock) { 
-				deliverWindow--;
-				if(deliverWindow < 0)
-					throw new TorException("Stream has negative delivery window");
-			}
-			considerSendingSendme();
-		}
-	}
-
-	private void considerSendingSendme() {
-		synchronized(windowLock) {
-			if(deliverWindow > (STREAMWINDOW_START - STREAMWINDOW_INCREMENT))
-				return;
-
-			if(inputStream.unflushedCellCount() >= STREAMWINDOW_MAX_UNFLUSHED)
-				return;
-
-			final RelayCell sendme = circuit.createRelayCell(RelayCell.RELAY_SENDME, streamId, targetNode);
-			circuit.sendRelayCell(sendme);
-			deliverWindow += STREAMWINDOW_INCREMENT;
-		}
-	}
-
-	public int getStreamId() {
-		return streamId;
-	}
-
-	public Circuit getCircuit() {
-		return circuit;
-	}
-
-	public CircuitNode getTargetNode() {
-		return targetNode;
-	}
-
-	public void close() {
-		if(isClosed)
-			return;
-		
-		logger.fine("Closing stream "+ this);
-		
-		isClosed = true;
-		inputStream.close();
-		outputStream.close();
-		circuit.removeStream(this);
-		if(autoclose) {
-			circuit.markForClose();
-		}
-		
-		if(!relayEndReceived) {
-			final RelayCell cell = new RelayCellImpl(circuit.getFinalCircuitNode(), circuit.getCircuitId(), streamId, RelayCell.RELAY_END);
-			cell.putByte(RelayCell.REASON_DONE);
-			circuit.sendRelayCellToFinalNode(cell);
-		}
-	}
-
-	public void openDirectory(long timeout) throws InterruptedException, TimeoutException, StreamConnectFailedException {
-		streamTarget = "[Directory]";
-		final RelayCell cell = new RelayCellImpl(circuit.getFinalCircuitNode(), circuit.getCircuitId(), streamId, RelayCell.RELAY_BEGIN_DIR);
-		circuit.sendRelayCellToFinalNode(cell);
-		waitForRelayConnected(timeout);
-	}
-
-	void openExit(String target, int port, long timeout) throws InterruptedException, TimeoutException, StreamConnectFailedException {
-		streamTarget = target + ":"+ port;
-		final RelayCell cell = new RelayCellImpl(circuit.getFinalCircuitNode(), circuit.getCircuitId(), streamId, RelayCell.RELAY_BEGIN);
-		cell.putString(target + ":"+ port);
-		circuit.sendRelayCellToFinalNode(cell);
-		waitForRelayConnected(timeout);
-	}
-	
-	private void waitForRelayConnected(long timeout) throws InterruptedException, TimeoutException, StreamConnectFailedException {
-		final long start = System.currentTimeMillis();
-		long elapsed = 0;
-		synchronized(waitConnectLock) {
-			while(!relayConnectedReceived) {
-
-				if(relayEndReceived) {
-					throw new StreamConnectFailedException(relayEndReason);
-				}
-
-				if(elapsed >= timeout) {
-					throw new TimeoutException();
-				}
-
-				waitConnectLock.wait(timeout - elapsed);
-				
-				elapsed = System.currentTimeMillis() - start;
-			}
-		}
-	}
-
-	public InputStream getInputStream() {
-		return inputStream;
-	}
-
-	public OutputStream getOutputStream() {
-		return outputStream;
-	}
-
-	public void waitForSendWindowAndDecrement() {
-		waitForSendWindow(true);
-	}
-
-	public void waitForSendWindow() {
-		waitForSendWindow(false);
-	}
-
-	public void waitForSendWindow(boolean decrement) {
-		synchronized(windowLock) {
-			while(packageWindow == 0) {
-				try {
-					windowLock.wait();
-				} catch (InterruptedException e) {
-					throw new TorException("Thread interrupted while waiting for stream package window");
-				}
-			}
-			if(decrement)
-				packageWindow--;
-		}
-		targetNode.waitForSendWindow();
-	}
-
-	public String toString() {
-		return "[Stream stream_id="+ streamId + " circuit="+ circuit +" target="+ streamTarget +"]";
-	}
-
-	public void dashboardRender(DashboardRenderer renderer, PrintWriter writer, int flags) throws IOException {
-		writer.print("     ");
-		writer.print("[Stream stream_id="+ streamId + " cid="+ circuit.getCircuitId());
-		if(relayConnectedReceived) {
-			writer.print(" sent="+outputStream.getBytesSent() + " recv="+ inputStream.getBytesReceived());
-		} else {
-			writer.print(" (waiting connect)");
-		}
-		writer.print(" target="+ streamTarget);
-		writer.println("]");
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/TapCircuitExtender.java b/orchid/src/com/subgraph/orchid/circuits/TapCircuitExtender.java
deleted file mode 100644
index 078fe4de4fb..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/TapCircuitExtender.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.CircuitNode;
-import com.subgraph.orchid.RelayCell;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.crypto.TorMessageDigest;
-import com.subgraph.orchid.crypto.TorTapKeyAgreement;
-
-public class TapCircuitExtender {
-	private final static Logger logger = Logger.getLogger(TapCircuitExtender.class.getName());
-	
-	private final CircuitExtender extender;
-	private final TorTapKeyAgreement kex;
-	private final Router router;
-	
-	public TapCircuitExtender(CircuitExtender extender, Router router) {
-		this.extender = extender;
-		this.router = router;
-		this.kex = new TorTapKeyAgreement(router.getOnionKey());
-	}
-
-	public CircuitNode extendTo() {
-		logger.fine("Extending to "+ router.getNickname() + " with TAP");
-		final RelayCell cell = createRelayExtendCell();
-		extender.sendRelayCell(cell);
-		final RelayCell response = extender.receiveRelayResponse(RelayCell.RELAY_EXTENDED, router);
-		if(response == null) {
-			return null;
-		}
-		return processExtendResponse(response);
-	}
-
-	private CircuitNode processExtendResponse(RelayCell response) {
-		final byte[] handshakeResponse = new byte[TorTapKeyAgreement.DH_LEN + TorMessageDigest.TOR_DIGEST_SIZE];
-		response.getByteArray(handshakeResponse);
-		
-		final byte[] keyMaterial = new byte[CircuitNodeCryptoState.KEY_MATERIAL_SIZE];
-		final byte[] verifyDigest = new byte[TorMessageDigest.TOR_DIGEST_SIZE];
-		if(!kex.deriveKeysFromHandshakeResponse(handshakeResponse, keyMaterial, verifyDigest)) {
-			return null;
-		}
-		return extender.createNewNode(router, keyMaterial, verifyDigest);
-	}
-
-	private RelayCell createRelayExtendCell() {
-		final RelayCell cell = extender.createRelayCell(RelayCell.RELAY_EXTEND);
-		cell.putByteArray(router.getAddress().getAddressDataBytes());
-		cell.putShort(router.getOnionPort());
-		cell.putByteArray(kex.createOnionSkin());
-		cell.putByteArray(router.getIdentityHash().getRawBytes());
-		return cell;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/TorInitializationTracker.java b/orchid/src/com/subgraph/orchid/circuits/TorInitializationTracker.java
deleted file mode 100644
index c7874f529bc..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/TorInitializationTracker.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import com.subgraph.orchid.Tor;
-import com.subgraph.orchid.TorInitializationListener;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class TorInitializationTracker {
-	private final static Logger logger = Logger.getLogger(TorInitializationTracker.class.getName());
-	private final static Map<Integer, String> messageMap = new HashMap<Integer, String>();
-	
-	static {
-		messageMap.put(Tor.BOOTSTRAP_STATUS_STARTING, "Starting");
-		messageMap.put(Tor.BOOTSTRAP_STATUS_CONN_DIR, "Connecting to directory server");
-		messageMap.put(Tor.BOOTSTRAP_STATUS_HANDSHAKE_DIR, "Finishing handshake with directory server");
-		messageMap.put(Tor.BOOTSTRAP_STATUS_ONEHOP_CREATE, "Establishing an encrypted directory connection");
-		messageMap.put(Tor.BOOTSTRAP_STATUS_REQUESTING_STATUS, "Asking for network status consensus");
-		messageMap.put(Tor.BOOTSTRAP_STATUS_LOADING_STATUS, "Loading network status consensus");
-		messageMap.put(Tor.BOOTSTRAP_STATUS_REQUESTING_KEYS, "Asking for authority key certs");
-		messageMap.put(Tor.BOOTSTRAP_STATUS_LOADING_KEYS, "Loading authority key certs");
-		messageMap.put(Tor.BOOTSTRAP_STATUS_REQUESTING_DESCRIPTORS, "Asking for relay descriptors");
-		messageMap.put(Tor.BOOTSTRAP_STATUS_LOADING_DESCRIPTORS, "Loading relay descriptors");
-		messageMap.put(Tor.BOOTSTRAP_STATUS_CONN_OR, "Connecting to the Tor network");
-		messageMap.put(Tor.BOOTSTRAP_STATUS_HANDSHAKE_OR, "Finished Handshake with first hop");
-		messageMap.put(Tor.BOOTSTRAP_STATUS_CIRCUIT_CREATE, "Establishing a Tor circuit");
-		messageMap.put(Tor.BOOTSTRAP_STATUS_DONE, "Done");
-	}
-	
-	private final List<TorInitializationListener> listeners = new ArrayList<TorInitializationListener>();
-	
-	private final Object stateLock = new Object();
-	private int bootstrapState = Tor.BOOTSTRAP_STATUS_STARTING;
-	
-	
-	public void addListener(TorInitializationListener listener) {
-		synchronized(listeners) {
-			if(!listeners.contains(listener)) {
-				listeners.add(listener);
-			}
-		}
-	}
-	
-	public void removeListener(TorInitializationListener listener) {
-		synchronized(listeners) {
-			listeners.remove(listener);
-		}
-	}
-
-	public int getBootstrapState() {
-		return bootstrapState;
-	}
-
-	public void start() {
-		synchronized (stateLock) {
-			bootstrapState = Tor.BOOTSTRAP_STATUS_STARTING;
-			notifyListeners(Tor.BOOTSTRAP_STATUS_STARTING);
-		}
-	}
-
-	public void notifyEvent(int eventCode) {
-		synchronized(stateLock) {
-			if(eventCode <= bootstrapState || eventCode > 100) {
-				return;
-			}
-			bootstrapState = eventCode;
-			notifyListeners(eventCode);
-		}
-	}
-
-	private void notifyListeners(int code) {
-		final String message = getMessageForCode(code);
-		for(TorInitializationListener listener: getListeners()) {
-			try {
-				listener.initializationProgress(message, code);
-				if(code >= 100) {
-					listener.initializationCompleted();
-				}
-			} catch(Exception e) {
-				logger.log(Level.SEVERE, "Exception occurred in TorInitializationListener callback: "+ e.getMessage(), e);
-			}
-		}
-	}
-
-	private String getMessageForCode(int code) {
-		if(messageMap.containsKey(code)) {
-			return messageMap.get(code);
-		} else {
-			return "Unknown state";
-		}
-	}
-	
-	private List<TorInitializationListener> getListeners() {
-		synchronized (listeners) {
-			return new ArrayList<TorInitializationListener>(listeners);
-		}
-	}
-	
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/TorInputStream.java b/orchid/src/com/subgraph/orchid/circuits/TorInputStream.java
deleted file mode 100644
index a54d7739132..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/TorInputStream.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.util.LinkedList;
-import java.util.Queue;
-
-import com.subgraph.orchid.RelayCell;
-import com.subgraph.orchid.Stream;
-import com.subgraph.orchid.circuits.cells.RelayCellImpl;
-import com.subgraph.orchid.misc.GuardedBy;
-import com.subgraph.orchid.misc.ThreadSafe;
-
-@ThreadSafe
-public class TorInputStream extends InputStream {
-
-	private final static RelayCell CLOSE_SENTINEL = new RelayCellImpl(null, 0, 0, 0);
-	private final static ByteBuffer EMPTY_BUFFER  = ByteBuffer.allocate(0);
-	
-	private final Stream stream;
-	
-	private final Object lock = new Object();
-	
-	/** Queue of RelayCells that have been received on this stream */
-	@GuardedBy("lock") private final Queue<RelayCell> incomingCells;
-	
-	/** Number of unread data bytes in current buffer and in RELAY_DATA cells on queue */
-	@GuardedBy("lock") private int availableBytes;
-	
-	/** Total number of data bytes received in RELAY_DATA cells on this stream */
-	@GuardedBy("lock") private long bytesReceived;
-	
-	/** Bytes of data from the RELAY_DATA cell currently being consumed */
-	@GuardedBy("lock") private ByteBuffer currentBuffer;
-	
-	/** Set when a RELAY_END cell is received */
-	@GuardedBy("lock") private boolean isEOF;
-	
-	/** Set when close() is called on this stream */
-	@GuardedBy("lock") private boolean isClosed;
-	
-	TorInputStream(Stream stream) {
-		this.stream = stream;
-		this.incomingCells = new LinkedList<RelayCell>();
-		this.currentBuffer = EMPTY_BUFFER;
-	}
-
-	long getBytesReceived() {
-		synchronized (lock) {
-			return bytesReceived;
-		}
-	}
-
-	@Override
-	public int read() throws IOException {
-		synchronized (lock) {
-			if(isClosed) {
-				throw new IOException("Stream closed");
-			}
-			refillBufferIfNeeded();
-			if(isEOF) {
-				return -1;
-			}
-			availableBytes -= 1;
-			return currentBuffer.get() & 0xFF;
-		}
-	}
-
-	
-	public int read(byte[] b) throws IOException {
-		return read(b, 0, b.length);
-	}
-
-	public synchronized int read(byte[] b, int off, int len) throws IOException {
-		synchronized (lock) {
-			if(isClosed) {
-				throw new IOException("Stream closed");
-			}
-
-			checkReadArguments(b, off, len);
-
-			if(len == 0) {
-				return 0;
-			}
-			
-			refillBufferIfNeeded();
-			if(isEOF) {
-				return -1;
-			}
-			
-			int bytesRead = 0;
-			int bytesRemaining = len;
-			
-			while(bytesRemaining > 0 && !isEOF) {
-				refillBufferIfNeeded();
-				bytesRead += readFromCurrentBuffer(b, off + bytesRead, len - bytesRead);
-				bytesRemaining = len - bytesRead;
-				if(availableBytes == 0) {
-					return bytesRead;
-				}
-			}
-			return bytesRead;
-		}
-	}
-	
-	@GuardedBy("lock")
-	private int readFromCurrentBuffer(byte[] b, int off, int len) {
-		final int readLength = (currentBuffer.remaining() >= len) ? (len) : (currentBuffer.remaining());
-		currentBuffer.get(b, off, readLength);
-		availableBytes -= readLength;
-		return readLength;
-	}
-
-	private void checkReadArguments(byte[] b, int off, int len) {
-		if(b == null) {
-			throw new NullPointerException();
-		}
-		if( (off < 0) || (off >= b.length) || (len < 0) ||
-				((off + len) > b.length) || ((off + len) < 0)) {
-			throw new IndexOutOfBoundsException();
-		}
-	}
-
-	public int available() {
-		synchronized(lock) {
-			return availableBytes;
-		}
-	}
-
-	public void close() {
-		synchronized (lock) {
-			if(isClosed) {
-				return;
-			}
-			isClosed = true;
-			
-			incomingCells.add(CLOSE_SENTINEL);
-			lock.notifyAll();
-		}
-		stream.close();
-	}
-
-	void addEndCell(RelayCell cell) {
-		synchronized (lock) {
-			if(isClosed) {
-				return;
-			}
-			incomingCells.add(cell);
-			lock.notifyAll();
-		}
-	}
-
-	void addInputCell(RelayCell cell) {
-		synchronized (lock) {
-			if(isClosed) {
-				return;
-			}
-			incomingCells.add(cell);
-			bytesReceived += cell.cellBytesRemaining();
-			availableBytes += cell.cellBytesRemaining();
-			lock.notifyAll();
-		}
-	}
-
-	@GuardedBy("lock")
-	// When this method (or fillBuffer()) returns either isEOF is set or currentBuffer has at least one byte to read
-	private void refillBufferIfNeeded() throws IOException {
-		if(!isEOF) {
-			if(currentBuffer.hasRemaining()) {
-				return;
-			}
-			fillBuffer();
-		}
-	}
-
-	@GuardedBy("lock")
-	private void fillBuffer() throws IOException {
-		while(true) {
-			processIncomingCell(getNextCell());
-			if(isEOF || currentBuffer.hasRemaining()) {
-				return;
-			}
-		}
-	}
-
-	@GuardedBy("lock")
-	private void processIncomingCell(RelayCell nextCell) throws IOException {
-		if(isClosed || nextCell == CLOSE_SENTINEL) {
-			throw new IOException("Input stream closed");
-		}
-		
-		switch(nextCell.getRelayCommand()) {
-		case RelayCell.RELAY_DATA:
-			currentBuffer = nextCell.getPayloadBuffer();
-			break;
-		case RelayCell.RELAY_END:
-			currentBuffer = EMPTY_BUFFER;
-			isEOF = true;
-			break;
-		default:
-			throw new IOException("Unexpected RelayCell command type in TorInputStream queue: "+ nextCell.getRelayCommand());
-		}
-	}
-	
-	@GuardedBy("lock")
-	private RelayCell getNextCell() throws IOException {
-		try {
-			while(incomingCells.isEmpty()) {
-				lock.wait();
-			}
-			return incomingCells.remove();
-		} catch (InterruptedException e) {
-			Thread.currentThread().interrupt();
-			throw new IOException("Read interrupted");
-		}
-	}
-	
-	int unflushedCellCount() {
-		synchronized (lock) {
-			return incomingCells.size();
-		}
-	}
-
-	public String toString() {
-			return "TorInputStream stream="+ stream.getStreamId() +" node="+ stream.getTargetNode();
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/TorOutputStream.java b/orchid/src/com/subgraph/orchid/circuits/TorOutputStream.java
deleted file mode 100644
index 83a54a4d8ef..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/TorOutputStream.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import com.subgraph.orchid.RelayCell;
-import com.subgraph.orchid.circuits.cells.RelayCellImpl;
-
-public class TorOutputStream extends OutputStream {
-
-	private final StreamImpl stream;
-	private RelayCell currentOutputCell;
-	private volatile boolean isClosed;
-	private long bytesSent;
-
-	TorOutputStream(StreamImpl stream) {
-		this.stream = stream;
-		this.bytesSent = 0;
-	}
-
-	private void flushCurrentOutputCell() {
-		if(currentOutputCell != null && currentOutputCell.cellBytesConsumed() > RelayCell.HEADER_SIZE) {
-			stream.waitForSendWindowAndDecrement();
-			stream.getCircuit().sendRelayCell(currentOutputCell);
-			bytesSent += (currentOutputCell.cellBytesConsumed() - RelayCell.HEADER_SIZE);
-		}
-
-		currentOutputCell = new RelayCellImpl(stream.getTargetNode(), stream.getCircuit().getCircuitId(),
-				stream.getStreamId(), RelayCell.RELAY_DATA);
-	}
-
-	long getBytesSent() {
-		return bytesSent;
-	}
-
-	@Override
-	public synchronized void write(int b) throws IOException {
-		checkOpen();
-		if(currentOutputCell == null || currentOutputCell.cellBytesRemaining() == 0)
-			flushCurrentOutputCell();
-		currentOutputCell.putByte(b);		
-	}
-
-	public synchronized void write(byte[] data, int offset, int length) throws IOException {
-		checkOpen();
-		if(currentOutputCell == null || currentOutputCell.cellBytesRemaining() == 0)
-			flushCurrentOutputCell();
-
-		while(length > 0) {
-			if(length < currentOutputCell.cellBytesRemaining()) {
-				currentOutputCell.putByteArray(data, offset, length);
-				return;
-			}
-			final int writeCount = currentOutputCell.cellBytesRemaining();
-			currentOutputCell.putByteArray(data, offset, writeCount);
-			flushCurrentOutputCell();
-			offset += writeCount;
-			length -= writeCount;
-		}
-	}
-
-	private void checkOpen() throws IOException {
-		if(isClosed)
-			throw new IOException("Output stream is closed");
-	}
-
-	public synchronized void flush() {
-		if(isClosed)
-			return;
-		flushCurrentOutputCell();
-	}
-
-	public synchronized void close() {
-		if(isClosed)
-			return;
-		flush();
-		isClosed = true;
-		currentOutputCell = null;
-		stream.close();
-	}
-
-	public String toString() {
-		return "TorOutputStream stream="+ stream.getStreamId() +" node="+ stream.getTargetNode();
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/cells/CellImpl.java b/orchid/src/com/subgraph/orchid/circuits/cells/CellImpl.java
deleted file mode 100644
index 7c7496a8ee6..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/cells/CellImpl.java
+++ /dev/null
@@ -1,215 +0,0 @@
-package com.subgraph.orchid.circuits.cells;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-
-import com.subgraph.orchid.Cell;
-
-public class CellImpl implements Cell {
-
-	public static CellImpl createCell(int circuitId, int command) {
-		return new CellImpl(circuitId, command);
-	}
-
-	public static CellImpl createVarCell(int circuitId, int command, int payloadLength) {
-		return new CellImpl(circuitId, command, payloadLength);
-	}
-
-	public static CellImpl readFromInputStream(InputStream input) throws IOException {
-		final ByteBuffer header = readHeaderFromInputStream(input);
-		final int circuitId = header.getShort() & 0xFFFF;
-		final int command = header.get() & 0xFF;
-		
-		if(command == VERSIONS || command > 127) {
-			return readVarCell(circuitId, command, input);
-		}
-
-		final CellImpl cell = new CellImpl(circuitId, command);
-		readAll(input, cell.getCellBytes(), CELL_HEADER_LEN, CELL_PAYLOAD_LEN);
-
-		return cell;
-	}
-
-	private static ByteBuffer readHeaderFromInputStream(InputStream input) throws IOException {
-		final byte[] cellHeader = new byte[CELL_HEADER_LEN];
-		readAll(input, cellHeader);
-		return ByteBuffer.wrap(cellHeader);
-	}
-
-	private static CellImpl readVarCell(int circuitId, int command, InputStream input) throws IOException {
-		final byte[] lengthField = new byte[2];
-		readAll(input, lengthField);
-		final int length = ((lengthField[0] & 0xFF) << 8) | (lengthField[1] & 0xFF);
-		CellImpl cell = new CellImpl(circuitId, command, length);
-		readAll(input, cell.getCellBytes(), CELL_VAR_HEADER_LEN, length);
-		return cell;
-	}
-
-	private static void readAll(InputStream input, byte[] buffer) throws IOException {
-		readAll(input, buffer, 0, buffer.length);
-	}
-
-	private static void readAll(InputStream input, byte[] buffer, int offset, int length) throws IOException {
-		int bytesRead = 0;
-		while(bytesRead < length) {
-			final int n = input.read(buffer, offset + bytesRead, length - bytesRead);
-			if(n == -1)
-				throw new EOFException();
-			bytesRead += n;
-		}
-	}
-
-	private final int circuitId;
-	private final int command;
-	protected final ByteBuffer cellBuffer;
-
-	/* Variable length cell constructor (ie: VERSIONS cells only) */
-	private CellImpl(int circuitId, int command, int payloadLength) {
-		this.circuitId = circuitId;
-		this.command = command;
-		this.cellBuffer = ByteBuffer.wrap(new byte[CELL_VAR_HEADER_LEN + payloadLength]);
-		cellBuffer.putShort((short)circuitId);
-		cellBuffer.put((byte)command);
-		cellBuffer.putShort((short) payloadLength);
-		cellBuffer.mark();
-	}
-
-	/* Fixed length cell constructor */
-	protected CellImpl(int circuitId, int command) {
-		this.circuitId = circuitId;
-		this.command = command;
-		this.cellBuffer = ByteBuffer.wrap(new byte[CELL_LEN]);
-		cellBuffer.putShort((short) circuitId);
-		cellBuffer.put((byte) command);
-		cellBuffer.mark();
-	}
-
-	protected CellImpl(byte[] rawCell) {
-		this.cellBuffer = ByteBuffer.wrap(rawCell);
-		this.circuitId = cellBuffer.getShort() & 0xFFFF;
-		this.command = cellBuffer.get() & 0xFF;
-		cellBuffer.mark();
-	}
-	
-	public int getCircuitId() {
-		return circuitId;
-	}
-
-	public int getCommand() {
-		return command;
-	}
-
-	public void resetToPayload() {
-		cellBuffer.reset();
-	}
-
-	public int getByte() {
-		return cellBuffer.get() & 0xFF;
-	}
-
-	public int getByteAt(int index) {
-		return cellBuffer.get(index) & 0xFF;
-	}
-
-	public int getShort() {
-		return cellBuffer.getShort() & 0xFFFF;
-	}
-
-	public int getInt() {
-		return cellBuffer.getInt();
-	}
-
-	public int getShortAt(int index) {
-		return cellBuffer.getShort(index) & 0xFFFF;
-	}
-
-	public void getByteArray(byte[] buffer) {
-		cellBuffer.get(buffer);
-	}
-
-	public int cellBytesConsumed() {
-		return cellBuffer.position();
-	}
-
-	public int cellBytesRemaining() {
-		return cellBuffer.remaining();
-	}
-
-	public void putByte(int value) {
-		cellBuffer.put((byte) value);
-	}
-
-	public void putByteAt(int index, int value) {
-		cellBuffer.put(index, (byte) value);
-	}
-
-	public void putShort(int value) {
-		cellBuffer.putShort((short) value);
-	}
-
-	public void putShortAt(int index, int value) {
-		cellBuffer.putShort(index, (short) value);
-	}
-
-	public void putInt(int value) {
-		cellBuffer.putInt(value);
-	}
-
-	public void putString(String string) {
-		final byte[] bytes = new byte[string.length() + 1];
-		for(int i = 0; i < string.length(); i++)
-			bytes[i] = (byte) string.charAt(i);
-		putByteArray(bytes);
-	}
-
-	public void putByteArray(byte[] data) {
-		cellBuffer.put(data);
-	}
-
-	public void putByteArray(byte[] data, int offset, int length) {
-		cellBuffer.put(data, offset, length);
-	}
-
-	public byte[] getCellBytes() {
-		return cellBuffer.array();
-	}
-
-	public String toString() {
-		return "Cell: circuit_id="+ circuitId +" command="+ command +" payload_len="+ cellBuffer.position();
-	}
-
-	public static String errorToDescription(int errorCode) {
-		switch(errorCode) {
-		case ERROR_NONE:
-			return "No error reason given";
-		case ERROR_PROTOCOL:
-			return "Tor protocol violation";
-		case ERROR_INTERNAL:
-			return "Internal error";
-		case ERROR_REQUESTED:
-			return "Response to a TRUNCATE command sent from client";
-		case ERROR_HIBERNATING:
-			return "Not currently operating; trying to save bandwidth.";
-		case ERROR_RESOURCELIMIT:
-			return "Out of memory, sockets, or circuit IDs.";
-		case ERROR_CONNECTFAILED:
-			return "Unable to reach server.";
-		case ERROR_OR_IDENTITY:
-			return "Connected to server, but its OR identity was not as expected.";
-		case ERROR_OR_CONN_CLOSED:
-			return "The OR connection that was carrying this circuit died.";
-		case ERROR_FINISHED:
-			return "The circuit has expired for being dirty or old.";
-		case ERROR_TIMEOUT:
-			return "Circuit construction took too long.";
-		case ERROR_DESTROYED:
-			return "The circuit was destroyed without client TRUNCATE";
-		case ERROR_NOSUCHSERVICE:
-			return "Request for unknown hidden service";
-		default:
-			return "Error code "+ errorCode;
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/cells/RelayCellImpl.java b/orchid/src/com/subgraph/orchid/circuits/cells/RelayCellImpl.java
deleted file mode 100644
index ccb09068b69..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/cells/RelayCellImpl.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.subgraph.orchid.circuits.cells;
-
-import java.nio.ByteBuffer;
-
-import com.subgraph.orchid.Cell;
-import com.subgraph.orchid.CircuitNode;
-import com.subgraph.orchid.RelayCell;
-import com.subgraph.orchid.TorException;
-
-public class RelayCellImpl extends CellImpl implements RelayCell {
-
-	public static RelayCell createFromCell(CircuitNode node, Cell cell) {
-		if(cell.getCommand() != Cell.RELAY)
-			throw new TorException("Attempted to create RelayCell from Cell type: "+ cell.getCommand());
-		return new RelayCellImpl(node, cell.getCellBytes());
-	}
-
-	private final int streamId;
-	private final int relayCommand;
-	private final CircuitNode circuitNode;
-	private final boolean isOutgoing;
-
-	/*
-	 * The payload of each unencrypted RELAY cell consists of:
-     *     Relay command           [1 byte]
-     *     'Recognized'            [2 bytes]
-     *     StreamID                [2 bytes]
-     *     Digest                  [4 bytes]
-     *     Length                  [2 bytes]
-     *     Data                    [CELL_LEN-14 bytes]
-     */
-	
-	 public RelayCellImpl(CircuitNode node, int circuit, int stream, int relayCommand) {
-		 this(node, circuit, stream, relayCommand, false);
-	 }
-	 
-	 public RelayCellImpl(CircuitNode node, int circuit, int stream, int relayCommand, boolean isRelayEarly) {
-		super(circuit, (isRelayEarly) ? (Cell.RELAY_EARLY) : (Cell.RELAY));
-		this.circuitNode = node;
-		this.relayCommand = relayCommand;
-		this.streamId = stream;
-		this.isOutgoing = true;
-		putByte(relayCommand);	// Command
-		putShort(0);			// 'Recognized'
-		putShort(stream);		// Stream
-		putInt(0);				// Digest
-		putShort(0);			// Length	
-	}
-
-	private RelayCellImpl(CircuitNode node, byte[] rawCell) {
-		super(rawCell);
-		this.circuitNode = node;
-		this.relayCommand = getByte();
-		getShort();
-		this.streamId = getShort();
-		this.isOutgoing = false;
-		getInt();
-		int payloadLength = getShort();
-		cellBuffer.mark(); // End of header
-		if(RelayCell.HEADER_SIZE + payloadLength > rawCell.length)
-			throw new TorException("Header length field exceeds total size of cell");
-		cellBuffer.limit(RelayCell.HEADER_SIZE + payloadLength);
-	}
-
-	public int getStreamId() {
-		return streamId;
-	}
-
-	public int getRelayCommand() {
-		return relayCommand;
-	}
-
-	public void setLength() {
-		putShortAt(LENGTH_OFFSET, (short) (cellBytesConsumed() - HEADER_SIZE));
-	}
-
-	public void setDigest(byte[] digest) {
-		for(int i = 0; i < 4; i++)
-			putByteAt(DIGEST_OFFSET + i, digest[i]);
-	}
-
-	public ByteBuffer getPayloadBuffer() {
-		final ByteBuffer dup = cellBuffer.duplicate();
-		dup.reset();
-		return dup.slice();
-	}
-
-	public CircuitNode getCircuitNode() {
-		return circuitNode;
-	}
-
-	public String toString() {
-		if(isOutgoing)
-			return "["+ commandToDescription(relayCommand) +" stream="+ streamId +" payload_len="+ (cellBytesConsumed() - HEADER_SIZE) +" dest="+ circuitNode +"]";
-		else
-			return "["+ commandToString() + " stream="+ streamId + " payload_len="+ cellBuffer.remaining() +" source="+ circuitNode + "]";
-	}
-
-	public String commandToString() {
-		if(relayCommand == RELAY_TRUNCATED) {
-			final int code = getByteAt(HEADER_SIZE);
-			return commandToDescription(relayCommand) + " ("+ CellImpl.errorToDescription(code) +")";
-		} else if(relayCommand == RELAY_END) {
-			final int code = getByteAt(HEADER_SIZE);
-			return commandToDescription(relayCommand) +" ("+ reasonToDescription(code) +")";
-		}
-		else
-			return commandToDescription(relayCommand);
-	}
-
-	public static String reasonToDescription(int reasonCode) {
-		switch(reasonCode) {
-		case REASON_MISC:
-			return "Unlisted reason";
-		case REASON_RESOLVEFAILED:
-			return "Couldn't look up hostname";
-		case REASON_CONNECTREFUSED:
-			return "Remote host refused connection";
-		case REASON_EXITPOLICY:
-			return "OR refuses to connect to host or port";
-		case REASON_DESTROY:
-			return "Circuit is being destroyed";
-		case REASON_DONE:
-			return "Anonymized TCP connection was closed";
-		case REASON_TIMEOUT:
-			return "Connection timed out, or OR timed out while connecting";
-		case REASON_HIBERNATING:
-			return "OR is temporarily hibernating";
-		case REASON_INTERNAL:
-			return "Internal error at the OR";
-		case REASON_RESOURCELIMIT:
-			return "OR has no resources to fulfill request";
-		case REASON_CONNRESET:
-			return "Connection was unexpectedly reset";
-		case REASON_TORPROTOCOL:
-			return "Tor protocol violation";
-		case REASON_NOTDIRECTORY:
-			return "Client sent RELAY_BEGIN_DIR to a non-directory server.";
-		default:
-			return "Reason code "+ reasonCode;
-		}
-	}
-
-	public static String commandToDescription(int command) {
-		switch(command) {
-		case RELAY_BEGIN:
-			return "RELAY_BEGIN";
-		case RELAY_DATA:
-			return "RELAY_DATA";
-		case RELAY_END:
-			return "RELAY_END";
-		case RELAY_CONNECTED:
-			return "RELAY_CONNECTED";
-		case RELAY_SENDME:
-			return "RELAY_SENDME";
-		case RELAY_EXTEND:
-			return "RELAY_EXTEND";
-		case RELAY_EXTENDED:
-			return "RELAY_EXTENDED";
-		case RELAY_TRUNCATE:
-			return "RELAY_TRUNCATE";
-		case RELAY_TRUNCATED:
-			return "RELAY_TRUNCATED";
-		case RELAY_DROP:
-			return "RELAY_DROP";
-		case RELAY_RESOLVE:
-			return "RELAY_RESOLVE";
-		case RELAY_RESOLVED:
-			return "RELAY_RESOLVED";
-		case RELAY_BEGIN_DIR:
-			return "RELAY_BEGIN_DIR";
-		case RELAY_EXTEND2:
-			return "RELAY_EXTEND2";
-		case RELAY_EXTENDED2:
-			return "RELAY_EXTENDED2";
-		default:
-			return "Relay command = "+ command;
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/guards/BridgeRouterImpl.java b/orchid/src/com/subgraph/orchid/circuits/guards/BridgeRouterImpl.java
deleted file mode 100644
index f487ef2be31..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/guards/BridgeRouterImpl.java
+++ /dev/null
@@ -1,226 +0,0 @@
-package com.subgraph.orchid.circuits.guards;
-
-import java.util.Collections;
-import java.util.Set;
-
-import com.subgraph.orchid.BridgeRouter;
-import com.subgraph.orchid.Descriptor;
-import com.subgraph.orchid.RouterDescriptor;
-import com.subgraph.orchid.crypto.TorPublicKey;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.geoip.CountryCodeService;
-
-public class BridgeRouterImpl implements BridgeRouter {
-	private final IPv4Address address;
-	private final int port;
-	
-	private HexDigest identity;
-	private Descriptor descriptor;
-	
-	private volatile String cachedCountryCode;
-	
-	BridgeRouterImpl(IPv4Address address, int port) {
-		this.address = address;
-		this.port = port;
-	}
-	
-	public IPv4Address getAddress() {
-		return address;
-	}
-
-	public HexDigest getIdentity() {
-		return identity;
-	}
-	
-	public void setIdentity(HexDigest identity) {
-		this.identity = identity;
-	}
-
-	public void setDescriptor(RouterDescriptor descriptor) {
-		this.descriptor = descriptor;
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((address == null) ? 0 : address.hashCode());
-		result = prime * result + port;
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (obj == null) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		BridgeRouterImpl other = (BridgeRouterImpl) obj;
-		if (address == null) {
-			if (other.address != null) {
-				return false;
-			}
-		} else if (!address.equals(other.address)) {
-			return false;
-		}
-		if (port != other.port) {
-			return false;
-		}
-		return true;
-	}
-
-	public String getNickname() {
-		return toString();
-	}
-
-	public String getCountryCode() {
-		String cc = cachedCountryCode;
-		if(cc == null) {
-			cc = CountryCodeService.getInstance().getCountryCodeForAddress(getAddress());
-			cachedCountryCode = cc;
-		}
-		return cc;
-	}
-
-	public int getOnionPort() {
-		return port;
-	}
-
-	public int getDirectoryPort() {
-		return 0;
-	}
-
-	public TorPublicKey getIdentityKey() {
-		return null;
-	}
-
-	public HexDigest getIdentityHash() {
-		return identity;
-	}
-
-	public boolean isDescriptorDownloadable() {
-		return false;
-	}
-
-	public String getVersion() {
-		return "";
-	}
-
-	public Descriptor getCurrentDescriptor() {
-		return descriptor;
-	}
-
-	public HexDigest getDescriptorDigest() {
-		return null;
-	}
-
-	public HexDigest getMicrodescriptorDigest() {
-		return null;
-	}
-
-	public TorPublicKey getOnionKey() {
-		if(descriptor != null) {
-			return descriptor.getOnionKey();
-		} else {
-			return null;
-		}
-	}
-
-	public byte[] getNTorOnionKey() {
-		if(descriptor != null) {
-			return descriptor.getNTorOnionKey();
-		} else {
-			return null;
-		}
-	}
-
-	public boolean hasBandwidth() {
-		return false;
-	}
-
-	public int getEstimatedBandwidth() {
-		return 0;
-	}
-
-	public int getMeasuredBandwidth() {
-		return 0;
-	}
-
-	public Set<String> getFamilyMembers() {
-		if(descriptor != null) {
-			return descriptor.getFamilyMembers();
-		} else {
-			return Collections.emptySet();
-		}
-	}
-
-	public int getAverageBandwidth() {
-		return 0;
-	}
-
-	public int getBurstBandwidth() {
-		return 0;
-	}
-
-	public int getObservedBandwidth() {
-		return 0;
-	}
-
-	public boolean isHibernating() {
-		if(descriptor instanceof RouterDescriptor) {
-			return ((RouterDescriptor)descriptor).isHibernating();
-		} else {
-			return false;
-		}
-	}
-
-	public boolean isRunning() {
-		return true;
-	}
-
-	public boolean isValid() {
-		return true;
-	}
-
-	public boolean isBadExit() {
-		return false;
-	}
-
-	public boolean isPossibleGuard() {
-		return true;
-	}
-
-	public boolean isExit() {
-		return false;
-	}
-
-	public boolean isFast() {
-		return true;
-	}
-
-	public boolean isStable() {
-		return true;
-	}
-
-	public boolean isHSDirectory() {
-		return false;
-	}
-
-	public boolean exitPolicyAccepts(IPv4Address address, int port) {
-		return false;
-	}
-
-	public boolean exitPolicyAccepts(int port) {
-		return false;
-	}
-
-	public String toString() {
-		return "[Bridge "+ address + ":"+ port + "]";
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/guards/Bridges.java b/orchid/src/com/subgraph/orchid/circuits/guards/Bridges.java
deleted file mode 100644
index d11cbe991ec..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/guards/Bridges.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package com.subgraph.orchid.circuits.guards;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.BridgeRouter;
-import com.subgraph.orchid.DirectoryDownloader;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.RouterDescriptor;
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.config.TorConfigBridgeLine;
-import com.subgraph.orchid.crypto.TorRandom;
-import com.subgraph.orchid.directory.downloader.DirectoryRequestFailedException;
-
-public class Bridges {
-	private static final Logger logger = Logger.getLogger(Bridges.class.getName());
-	
-	private class DescriptorDownloader implements Runnable {
-
-		private final BridgeRouterImpl target;
-		
-		DescriptorDownloader(BridgeRouterImpl target) {
-			this.target = target;
-		}
-	
-		public void run() {
-			try {
-				downloadDescriptor();
-			} finally {
-				decrementOutstandingTasks();
-			}
-		}
-		
-		private void downloadDescriptor() {
-			logger.fine("Downloading descriptor for bridge: "+ target);
-			try {
-				final RouterDescriptor descriptor = directoryDownloader.downloadBridgeDescriptor(target);
-				if(descriptor != null) {
-					logger.fine("Descriptor received for bridge "+ target +". Adding to list of usable bridges");
-					target.setDescriptor(descriptor);
-					synchronized(lock) {
-						bridgeRouters.add(target);
-						lock.notifyAll();
-					}
-				}
-			} catch (DirectoryRequestFailedException e) {
-				logger.warning("Failed to download descriptor for bridge: "+ e.getMessage());
-			}
-		}
-		
-		private void decrementOutstandingTasks() {
-			if(outstandingDownloadTasks.decrementAndGet() == 0) {
-				logger.fine("Initial descriptor fetch complete");
-				synchronized(lock) {
-					bridgesInitialized = true;
-					lock.notifyAll();
-				}
-			}
-		}
-	}
-
-	private final TorConfig config;
-	private final DirectoryDownloader directoryDownloader;
-	
-	private final Set<BridgeRouterImpl> bridgeRouters;
-	private final TorRandom random;
-	private final Object lock;
-	
-	/** Initialization started */
-	private boolean bridgesInitializing;
-	/** Initialization completed */
-	private boolean bridgesInitialized;
-
-	private AtomicInteger outstandingDownloadTasks;
-	
-	Bridges(TorConfig config, DirectoryDownloader directoryDownloader) {
-		this.config = config;
-		this.directoryDownloader = directoryDownloader;
-		this.bridgeRouters = new HashSet<BridgeRouterImpl>();
-		this.random = new TorRandom();
-		this.lock = new Object();
-		this.outstandingDownloadTasks = new AtomicInteger();
-	}
-
-	BridgeRouter chooseRandomBridge(Set<Router> excluded) throws InterruptedException {
-		
-		synchronized(lock) {
-			if(!bridgesInitialized && !bridgesInitializing) {
-				initializeBridges();
-			}
-			while(!bridgesInitialized && !hasCandidates(excluded)) {
-				lock.wait();
-			}
-			final List<BridgeRouter> candidates = getCandidates(excluded);
-			if(candidates.isEmpty()) {
-				logger.warning("Bridges enabled but no usable bridges configured");
-				return null;
-			}
-			return candidates.get(random.nextInt(candidates.size()));
-		}
-	}
-
-	private boolean hasCandidates(Set<Router> excluded) {
-		return !(getCandidates(excluded).isEmpty());
-	}
-	
-	private List<BridgeRouter> getCandidates(Set<Router> excluded) {
-		if(bridgeRouters.isEmpty()) {
-			return Collections.emptyList();
-		}
-		final List<BridgeRouter> candidates = new ArrayList<BridgeRouter>(bridgeRouters.size());
-		for(BridgeRouter br: bridgeRouters) {
-			if(!excluded.contains(br)) {
-				candidates.add(br);
-			}
-		}
-		return candidates;
-	}
-
-	private void initializeBridges() {
-		logger.fine("Initializing bridges...");
-		synchronized(lock) {
-			if(bridgesInitializing || bridgesInitialized) {
-				return;
-			}
-			if(directoryDownloader == null) {
-				throw new IllegalStateException("Cannot download bridge descriptors because DirectoryDownload instance not initialized");
-			}
-			bridgesInitializing = true;
-			startAllDownloadTasks();
-		}
-	}
-	
-	private List<Runnable> createDownloadTasks() {
-		final List<Runnable> tasks = new ArrayList<Runnable>();
-		for(TorConfigBridgeLine line: config.getBridges()) {
-			tasks.add(new DescriptorDownloader(createBridgeFromLine(line)));
-		}
-		return tasks;
-	}
-	
-	private void startAllDownloadTasks() {
-		final List<Runnable> tasks = createDownloadTasks();
-		outstandingDownloadTasks.set(tasks.size());
-		for(Runnable r: tasks) {
-			final Thread thread = new Thread(r);
-			thread.start();
-		}
-	}
-	
-	private BridgeRouterImpl createBridgeFromLine(TorConfigBridgeLine line) {
-		final BridgeRouterImpl bridge = new BridgeRouterImpl(line.getAddress(), line.getPort());
-		if(line.getFingerprint() != null) {
-			bridge.setIdentity(line.getFingerprint());
-		}
-		return bridge;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/guards/EntryGuards.java b/orchid/src/com/subgraph/orchid/circuits/guards/EntryGuards.java
deleted file mode 100644
index bed49fd265a..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/guards/EntryGuards.java
+++ /dev/null
@@ -1,305 +0,0 @@
-package com.subgraph.orchid.circuits.guards;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.ConnectionCache;
-import com.subgraph.orchid.Directory;
-import com.subgraph.orchid.DirectoryDownloader;
-import com.subgraph.orchid.GuardEntry;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.Threading;
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.circuits.path.CircuitNodeChooser;
-import com.subgraph.orchid.circuits.path.CircuitNodeChooser.WeightRule;
-import com.subgraph.orchid.circuits.path.RouterFilter;
-import com.subgraph.orchid.crypto.TorRandom;
-
-public class EntryGuards {
-	private final static Logger logger = Logger.getLogger(EntryGuards.class.getName());
-	
-	private final static int MIN_USABLE_GUARDS = 2;
-	private final static int NUM_ENTRY_GUARDS = 3;
-	
-	private final TorConfig config;
-	private final TorRandom random;
-	private final CircuitNodeChooser nodeChooser;
-	private final ConnectionCache connectionCache;
-	private final Directory directory;
-	private final Set<GuardEntry> pendingProbes;
-	
-	private final Bridges bridges;
-	private final Object lock;
-	private final Executor executor;
-	
-	public EntryGuards(TorConfig config, ConnectionCache connectionCache, DirectoryDownloader directoryDownloader, Directory directory) {
-		this.config = config;
-		this.random = new TorRandom();
-		this.nodeChooser = new CircuitNodeChooser(config, directory);
-		this.connectionCache = connectionCache;
-		this.directory = directory;
-		this.pendingProbes = new HashSet<GuardEntry>();
-		this.bridges = new Bridges(config, directoryDownloader);
-		this.lock = new Object();
-		this.executor = Threading.newPool("EntryGuards worker");
-	}
-
-	public boolean isUsingBridges() {
-		return config.getUseBridges();
-	}
-
-	public Router chooseRandomGuard(Set<Router> excluded) throws InterruptedException {
-		if(config.getUseBridges()) {
-			return bridges.chooseRandomBridge(excluded);
-		}
-		
-		/*
-		 * path-spec 5.
-		 * 
-		 * When choosing the first hop of a circuit, Tor chooses at random from among the first 
-		 * NumEntryGuards (default 3) usable guards on the list.  If there are not at least 2 
-		 * usable guards on the list, Tor adds routers until there are, or until there are no 
-		 * more usable routers to add.
-		 */
-
-		final List<Router> usableGuards = getMinimumUsableGuards(excluded, MIN_USABLE_GUARDS);
-		final int n = Math.min(usableGuards.size(), NUM_ENTRY_GUARDS);
-		return usableGuards.get(random.nextInt(n));
-	}
-	
-	private List<Router> getMinimumUsableGuards(Set<Router> excluded, int minSize) throws InterruptedException {
-		synchronized(lock) {
-			testStatusOfAllGuards();
-			while(true) {
-				List<Router> usableGuards = getUsableGuardRouters(excluded);
-				if(usableGuards.size() >= minSize) {
-					return usableGuards;
-				} else {
-					maybeChooseNew(usableGuards.size(), minSize, getExcludedForChooseNew(excluded, usableGuards));
-				}
-				lock.wait(5000);
-			}
-		}
-	}
-	
-	void probeConnectionSucceeded(GuardEntry entry) {
-		synchronized (lock) {
-			pendingProbes.remove(entry);
-			if(entry.isAdded()) {
-				retestProbeSucceeded(entry);
-			} else {
-				initialProbeSucceeded(entry);
-			}
-		}
-	}
-	
-	void probeConnectionFailed(GuardEntry entry) {
-		synchronized (lock) {
-			pendingProbes.remove(entry);
-			if(entry.isAdded()) {
-				retestProbeFailed(entry);
-			}
-			lock.notifyAll();
-		}
-	}
-
-	/* all methods below called holding 'lock' */
-	
-	private void retestProbeSucceeded(GuardEntry entry) {
-		entry.clearDownSince();
-	}
-	
-	private void initialProbeSucceeded(GuardEntry entry) {
-		logger.fine("Probe connection to "+ entry.getRouterForEntry() + " succeeded.  Adding it as a new entry guard.");
-		directory.addGuardEntry(entry);
-		retestAllUnreachable();
-	}
-	
-	private void retestProbeFailed(GuardEntry entry) {
-		entry.markAsDown();
-	}
-	
-	/*
-	 * path-spec 5.
-	 * 
-	 * Additionally, Tor retries unreachable guards the first time it adds a new 
-	 * guard to the list, since it is possible that the old guards were only marked 
-	 * as unreachable because the network was unreachable or down.
-
-	 */
-	private void retestAllUnreachable() {
-		for(GuardEntry e: directory.getGuardEntries()) {
-			if(e.getDownSince() != null) {
-				launchEntryProbe(e);
-			}
-		}
-	}
-
-	private void testStatusOfAllGuards() {
-		for(GuardEntry entry: directory.getGuardEntries()) {
-			if(isPermanentlyUnlisted(entry) || isExpired(entry)) {
-				directory.removeGuardEntry(entry);
-			} else if(needsUnreachableTest(entry)) {
-				launchEntryProbe(entry);
-			}
-		}
-	}
-	
-	private List<Router> getUsableGuardRouters(Set<Router> excluded) {
-		List<Router> usableRouters = new ArrayList<Router>();
-		for(GuardEntry entry: directory.getGuardEntries()) {
-			addRouterIfUsableAndNotExcluded(entry, excluded, usableRouters);
-		}
-		return usableRouters;
-	}
-	
-	private void addRouterIfUsableAndNotExcluded(GuardEntry entry, Set<Router> excluded, List<Router> routers) {
-		if(entry.testCurrentlyUsable() && entry.getDownSince() == null) {
-			final Router r = entry.getRouterForEntry();
-			if(r != null && !excluded.contains(r)) {
-				routers.add(r);
-			}
-		}
-	}
-
-	private Set<Router> getExcludedForChooseNew(Set<Router> excluded, List<Router> usable) {
-		final Set<Router> set = new HashSet<Router>();
-		set.addAll(excluded);
-		set.addAll(usable);
-		addPendingInitialConnections(set);
-		return set;
-	}
-
-	private void addPendingInitialConnections(Set<Router> routerSet) {
-		for(GuardEntry entry: pendingProbes) {
-			if(!entry.isAdded()) {
-				Router r = entry.getRouterForEntry();
-				if(r != null) {
-					routerSet.add(r);
-				}
-			}
-		}
-	}
-
-	private void maybeChooseNew(int usableSize, int minSize, Set<Router> excluded) {
-		int sz = usableSize + countPendingInitialProbes();
-		while(sz < minSize) {	
-			Router newGuard = chooseNewGuard(excluded);
-			if(newGuard == null) {
-				logger.warning("Need to add entry guards but no suitable guard routers are available");
-				return;
-			}
-			logger.fine("Testing "+ newGuard + " as a new guard since we only have "+ usableSize + " usable guards");
-			final GuardEntry entry = directory.createGuardEntryFor(newGuard);
-			launchEntryProbe(entry);
-			sz += 1;
-		}
-	}
-
-	private int countPendingInitialProbes() {
-		int count = 0;
-		for(GuardEntry entry: pendingProbes) {
-			if(!entry.isAdded()) {
-				count += 1;
-			}
-		}
-		return count;
-	}
-	
-	private Router chooseNewGuard(final Set<Router> excluded) {
-		return nodeChooser.chooseRandomNode(WeightRule.WEIGHT_FOR_GUARD, new RouterFilter() {
-			public boolean filter(Router router) {
-				return router.isValid() && router.isPossibleGuard() && router.isRunning() && !excluded.contains(router);
-			}
-		});
-	}
-	
-	private void launchEntryProbe(GuardEntry entry) {
-		if(!entry.testCurrentlyUsable() || pendingProbes.contains(entry)) {
-			return;
-		}
-		pendingProbes.add(entry);
-		executor.execute(new GuardProbeTask(connectionCache, this, entry));
-	}
-	
-	/*
-	 * path-spec 5.
-	 * 
-	 * If the guard is excluded because of its status in the networkstatuses for
-	 * over 30 days, Tor removes it from the list entirely, preserving order.
-	 */
-	private boolean isPermanentlyUnlisted(GuardEntry entry) {
-		final Date unlistedSince = entry.getUnlistedSince();
-		if(unlistedSince == null || pendingProbes.contains(entry)) {
-			return false;
-		}
-		final Date now = new Date();
-		final long unlistedTime = now.getTime() - unlistedSince.getTime();
-		return unlistedTime > THIRTY_DAYS; 
-	}
-	
-	/*
-	 * Expire guards after 60 days since creation time.
-	 */
-	private boolean isExpired(GuardEntry entry) {
-		final Date createdAt = entry.getCreatedTime();
-		final Date now = new Date();
-		final long createdAgo = now.getTime() - createdAt.getTime();
-		return createdAgo > SIXTY_DAYS;
-	}
-
-	private boolean needsUnreachableTest(GuardEntry entry) {
-		final Date downSince = entry.getDownSince();
-		if(downSince == null || !entry.testCurrentlyUsable()) {
-			return false;
-		}
-		final Date now = new Date();
-		final Date lastConnect = entry.getLastConnectAttempt();
-		final long timeDown = now.getTime() - downSince.getTime();
-		final long timeSinceLastRetest = (lastConnect == null) ? timeDown : (now.getTime() - lastConnect.getTime());
-		
-		return timeSinceLastRetest > getRetestInterval(timeDown);
-	}
-	
-	private final static long ONE_HOUR = hoursToMs(1);
-	private final static long FOUR_HOURS = hoursToMs(4);
-	private final static long SIX_HOURS = hoursToMs(6);
-	private final static long EIGHTEEN_HOURS = hoursToMs(18);
-	private final static long THIRTYSIX_HOURS = hoursToMs(36);
-	private final static long THREE_DAYS = daysToMs(3);
-	private final static long SEVEN_DAYS = daysToMs(7);
-	private final static long THIRTY_DAYS = daysToMs(30);
-	private final static long SIXTY_DAYS = daysToMs(60);
-	
-	private static long hoursToMs(long n) {
-		return TimeUnit.MILLISECONDS.convert(n, TimeUnit.HOURS);
-	}
-	private static long daysToMs(long n) {
-		return TimeUnit.MILLISECONDS.convert(n, TimeUnit.DAYS);
-	}
-	/*
-	 * path-spec 5.
-	 * 
-	 * If Tor fails to connect to an otherwise usable guard, it retries
-	 * periodically: every hour for six hours, every 4 hours for 3 days, every
-	 * 18 hours for a week, and every 36 hours thereafter. 
-	 */
-	
-	private long getRetestInterval(long timeDown) {
-		if(timeDown < SIX_HOURS) {
-			return ONE_HOUR;
-		} else if(timeDown < THREE_DAYS) {
-			return FOUR_HOURS;
-		} else if(timeDown < SEVEN_DAYS) {
-			return EIGHTEEN_HOURS;
-		} else {
-			return THIRTYSIX_HOURS;
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/guards/GuardProbeTask.java b/orchid/src/com/subgraph/orchid/circuits/guards/GuardProbeTask.java
deleted file mode 100644
index 553638e9742..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/guards/GuardProbeTask.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.subgraph.orchid.circuits.guards;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.ConnectionCache;
-import com.subgraph.orchid.ConnectionIOException;
-import com.subgraph.orchid.GuardEntry;
-import com.subgraph.orchid.Router;
-
-public class GuardProbeTask implements Runnable{
-	private final static Logger logger = Logger.getLogger(GuardProbeTask.class.getName());
-	private final ConnectionCache connectionCache;
-	private final EntryGuards entryGuards;
-	private final GuardEntry entry;
-	
-	public GuardProbeTask(ConnectionCache connectionCache, EntryGuards entryGuards, GuardEntry entry) {
-		this.connectionCache = connectionCache;
-		this.entryGuards = entryGuards;
-		this.entry = entry;
-	}
-	
-	public void run() {
-		final Router router = entry.getRouterForEntry();
-		if(router == null) {
-			entryGuards.probeConnectionFailed(entry);
-			return;
-		}
-		try {
-			connectionCache.getConnectionTo(router, false);
-			entryGuards.probeConnectionSucceeded(entry);
-			return;
-		} catch (ConnectionIOException e) {
-			logger.fine("IO exception probing entry guard "+ router + " : "+ e);
-		} catch (InterruptedException e) {
-			Thread.currentThread().interrupt();
-		} catch(Exception e) {
-			logger.log(Level.WARNING, "Unexpected exception probing entry guard: "+ e, e);
-		}
-		entryGuards.probeConnectionFailed(entry);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/hs/HSAuthentication.java b/orchid/src/com/subgraph/orchid/circuits/hs/HSAuthentication.java
deleted file mode 100644
index 0eba30eff87..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/hs/HSAuthentication.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.subgraph.orchid.circuits.hs;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import com.subgraph.orchid.TorParsingException;
-import com.subgraph.orchid.circuits.hs.HSDescriptorCookie.CookieType;
-import com.subgraph.orchid.crypto.TorMessageDigest;
-import com.subgraph.orchid.crypto.TorStreamCipher;
-
-public class HSAuthentication {
-	private final static int BASIC_ID_LENGTH = 4;
-	private final HSDescriptorCookie cookie;
-	
-	public HSAuthentication(HSDescriptorCookie cookie) {
-		this.cookie = cookie;
-	}
-	
-	public byte[] decryptIntroductionPoints(byte[] content) throws HSAuthenticationException {
-		final ByteBuffer buffer = ByteBuffer.wrap(content);
-		final int firstByte = buffer.get() & 0xFF;
-		if(firstByte == 1) {
-			return decryptIntroductionPointsWithBasicAuth(buffer);
-		} else if(firstByte == 2) {
-			return decryptIntroductionPointsWithStealthAuth(buffer);
-		} else {
-			throw new HSAuthenticationException("Introduction points section begins with unrecognized byte ("+ firstByte +")");
-		}
-	}
-	
-	private static class BasicAuthEntry {
-		final byte[] id;
-		final byte[] skey;
-		BasicAuthEntry(byte[] id, byte[] skey) {
-			this.id = id;
-			this.skey = skey;
-		}
-	}
-	
-	private BasicAuthEntry createEntry(ByteBuffer bb) {
-		final byte[] id = new byte[BASIC_ID_LENGTH];
-		final byte[] skey = new byte[TorStreamCipher.KEY_LEN];
-		bb.get(id);
-		bb.get(skey);
-		return new BasicAuthEntry(id, skey);
-	}
-	
-	private byte[] decryptIntroductionPointsWithBasicAuth(ByteBuffer buffer) throws HSAuthenticationException {
-		if(cookie == null || cookie.getType() != CookieType.COOKIE_BASIC) {
-			throw new TorParsingException("Introduction points encrypted with 'basic' authentication and no cookie available to decrypt");
-		}
-
-		final List<BasicAuthEntry> entries = readBasicEntries(buffer);
-		final byte[] iv = readAuthIV(buffer);
-		final byte[] id = generateAuthId(iv);
-		final byte[] k = findKeyInAuthEntries(entries, id);
-
-		return decryptRemaining(buffer, k, iv);
-	}
-	
-	private List<BasicAuthEntry> readBasicEntries(ByteBuffer b) {
-		final int blockCount = b.get() & 0xFF;
-		final int entryCount = blockCount * 16;
-		final List<BasicAuthEntry> entries = new ArrayList<BasicAuthEntry>(entryCount);
-		for(int i = 0; i < entryCount; i++) {
-			entries.add( createEntry(b) );
-		}
-		return entries;
-	}
-	
-	
-	private byte[] readAuthIV(ByteBuffer b) {
-		final byte[] iv = new byte[16];
-		b.get(iv);
-		return iv;
-	}
-
-	private byte[] generateAuthId(byte[] iv) {
-		final TorMessageDigest md = new TorMessageDigest();
-		md.update(cookie.getValue());
-		md.update(iv);
-		final byte[] digest = md.getDigestBytes();
-		final byte[] id = new byte[BASIC_ID_LENGTH];
-		System.arraycopy(digest, 0, id, 0, BASIC_ID_LENGTH);
-		return id;
-	}
-
-	private byte[] findKeyInAuthEntries(List<BasicAuthEntry> entries, byte[] id) throws HSAuthenticationException {
-		for(BasicAuthEntry e: entries) {
-			if(Arrays.equals(id, e.id)) {
-				return decryptAuthEntry(e);
-			}
-		}
-		throw new HSAuthenticationException("Could not find matching cookie id for basic authentication");
-	}
-	
-	private byte[] decryptAuthEntry(BasicAuthEntry entry) throws HSAuthenticationException {
-		TorStreamCipher cipher = TorStreamCipher.createFromKeyBytes(cookie.getValue());
-		cipher.encrypt(entry.skey);
-		return entry.skey;
-	}
-	
-	private byte[] decryptRemaining(ByteBuffer buffer, byte[] key, byte[] iv) {
-		TorStreamCipher streamCipher = TorStreamCipher.createFromKeyBytesWithIV(key, iv);
-		final byte[] remaining = new byte[buffer.remaining()];
-		buffer.get(remaining);
-		streamCipher.encrypt(remaining);
-		return remaining;
-	}
-	
-	private byte[] decryptIntroductionPointsWithStealthAuth(ByteBuffer buffer) {
-		if(cookie == null || cookie.getType() != CookieType.COOKIE_STEALTH) {
-			throw new TorParsingException("Introduction points encrypted with 'stealth' authentication and no cookie available to descrypt");
-		}
-		final byte[] iv = readAuthIV(buffer);
-		return decryptRemaining(buffer, cookie.getValue(), iv);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/hs/HSAuthenticationException.java b/orchid/src/com/subgraph/orchid/circuits/hs/HSAuthenticationException.java
deleted file mode 100644
index 890fb8d1d96..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/hs/HSAuthenticationException.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.subgraph.orchid.circuits.hs;
-
-public class HSAuthenticationException extends Exception {
-
-	private static final long serialVersionUID = 1L;
-	
-	HSAuthenticationException(String message) {
-		super(message);
-	}
-	
-	HSAuthenticationException(String message, Throwable cause) {
-		super(message, cause);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/hs/HSDescriptor.java b/orchid/src/com/subgraph/orchid/circuits/hs/HSDescriptor.java
deleted file mode 100644
index 9d4e7cc0f90..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/hs/HSDescriptor.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.subgraph.orchid.circuits.hs;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.subgraph.orchid.crypto.TorPublicKey;
-import com.subgraph.orchid.crypto.TorRandom;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.Timestamp;
-
-public class HSDescriptor {
-	private final static long MS_24_HOURS = (24 * 60 * 60 * 1000);
-	private final HiddenService hiddenService;
-	private HexDigest descriptorId;
-	private Timestamp publicationTime;
-	private HexDigest secretIdPart;
-	private TorPublicKey permanentKey;
-	private int[] protocolVersions;
-	private List<IntroductionPoint> introductionPoints;
-	
-	public HSDescriptor(HiddenService hiddenService) {
-		this.hiddenService = hiddenService;
-		introductionPoints = new ArrayList<IntroductionPoint>();
-	}
-
-	HiddenService getHiddenService() {
-		return hiddenService;
-	}
-
-	void setPublicationTime(Timestamp ts) {
-		this.publicationTime = ts;
-	}
-	
-	void setSecretIdPart(HexDigest secretIdPart) {
-		this.secretIdPart = secretIdPart;
-	}
-	
-	void setDescriptorId(HexDigest descriptorId) {
-		this.descriptorId = descriptorId;
-	}
-	
-	void setPermanentKey(TorPublicKey permanentKey) {
-		this.permanentKey = permanentKey;
-	}
-	
-	void setProtocolVersions(int[] protocolVersions) {
-		this.protocolVersions = protocolVersions;
-	}
-
-	void addIntroductionPoint(IntroductionPoint ip) {
-		introductionPoints.add(ip);
-	}
-
-	HexDigest getDescriptorId() {
-		return descriptorId;
-	}
-	
-	int getVersion() {
-		return 2;
-	}
-	
-	TorPublicKey getPermanentKey() {
-		return permanentKey;
-	}
-	
-	HexDigest getSecretIdPart() {
-		return secretIdPart;
-	}
-	
-	Timestamp getPublicationTime() {
-		return publicationTime;
-	}
-	
-	int[] getProtocolVersions() {
-		return protocolVersions;
-	}
-	
-	boolean isExpired() {
-		final long now = System.currentTimeMillis();
-		final long then = publicationTime.getTime();
-		return (now - then) > MS_24_HOURS;
-	}
-
-	List<IntroductionPoint> getIntroductionPoints() {
-		return new ArrayList<IntroductionPoint>(introductionPoints);
-	}
-	
-	List<IntroductionPoint> getShuffledIntroductionPoints() {
-		return shuffle(getIntroductionPoints());
-	}
-	
-	private List<IntroductionPoint> shuffle(List<IntroductionPoint> list) {
-		final TorRandom r = new TorRandom();
-		final int sz = list.size();
-		for(int i = 0; i < sz; i++) {
-			swap(list, i, r.nextInt(sz));
-		}
-		return list;
-	}
-	
-	private void swap(List<IntroductionPoint> list, int a, int b) {
-		if(a == b) {
-			return;
-		}
-		final IntroductionPoint tmp = list.get(a);
-		list.set(a, list.get(b));
-		list.set(b, tmp);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/hs/HSDescriptorCookie.java b/orchid/src/com/subgraph/orchid/circuits/hs/HSDescriptorCookie.java
deleted file mode 100644
index b0a389655a2..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/hs/HSDescriptorCookie.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.subgraph.orchid.circuits.hs;
-
-public class HSDescriptorCookie {
-
-	public enum CookieType { COOKIE_BASIC, COOKIE_STEALTH };
-
-	private final CookieType type;
-	private final byte[] value;
-	
-	public HSDescriptorCookie(CookieType type, byte[] value) {
-		this.type = type;
-		this.value = value;
-	}
-	
-	public byte getAuthTypeByte() {
-		switch(type) {
-		case COOKIE_BASIC:
-			return 1;
-		case COOKIE_STEALTH:
-			return 2;
-		default:
-			throw new IllegalStateException();
-		}
-	}
-
-	public CookieType getType() {
-		return type;
-	}
-
-	public byte[] getValue() {
-		return value;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/hs/HSDescriptorDirectory.java b/orchid/src/com/subgraph/orchid/circuits/hs/HSDescriptorDirectory.java
deleted file mode 100644
index bec763ad2a0..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/hs/HSDescriptorDirectory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.subgraph.orchid.circuits.hs;
-
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.data.HexDigest;
-
-public class HSDescriptorDirectory {
-	
-	private final HexDigest descriptorId;
-	private final Router directory;
-	
-	HSDescriptorDirectory(HexDigest descriptorId, Router directory) {
-		this.descriptorId = descriptorId;
-		this.directory = directory;
-	}
-	
-	Router getDirectory() {
-		return directory;
-	}
-	
-	HexDigest getDescriptorId() {
-		return descriptorId;
-	}
-	
-	public String toString() {
-		return descriptorId + " : " + directory;
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/hs/HSDescriptorDownloader.java b/orchid/src/com/subgraph/orchid/circuits/hs/HSDescriptorDownloader.java
deleted file mode 100644
index 6a9d59ee77f..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/hs/HSDescriptorDownloader.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.subgraph.orchid.circuits.hs;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.concurrent.TimeoutException;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.DirectoryCircuit;
-import com.subgraph.orchid.InternalCircuit;
-import com.subgraph.orchid.OpenFailedException;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.Stream;
-import com.subgraph.orchid.StreamConnectFailedException;
-import com.subgraph.orchid.TorException;
-import com.subgraph.orchid.circuits.CircuitManagerImpl;
-import com.subgraph.orchid.directory.DocumentFieldParserImpl;
-import com.subgraph.orchid.directory.downloader.DirectoryRequestFailedException;
-import com.subgraph.orchid.directory.downloader.HttpConnection;
-import com.subgraph.orchid.directory.parsing.DocumentParsingResultHandler;
-
-public class HSDescriptorDownloader {
-	private final static Logger logger = Logger.getLogger(HSDescriptorDirectory.class.getName());
-
-	private final HiddenService hiddenService;
-	private final CircuitManagerImpl circuitManager;
-	private final List<HSDescriptorDirectory> directories;
-	
-	public HSDescriptorDownloader(HiddenService hiddenService, CircuitManagerImpl circuitManager, List<HSDescriptorDirectory> directories) {
-		this.hiddenService = hiddenService;
-		this.circuitManager = circuitManager;
-		this.directories = directories;
-	}
-
-	
-	public HSDescriptor downloadDescriptor() {
-		for(HSDescriptorDirectory d: directories) {
-			HSDescriptor descriptor = downloadDescriptorFrom(d);
-			if(descriptor != null) {
-				return descriptor;
-			}
-		}
-		// All directories failed
-		return null;
-	}
-	
-	private HSDescriptor downloadDescriptorFrom(HSDescriptorDirectory dd) {
-		logger.fine("Downloading descriptor from "+ dd.getDirectory());
-		
-		Stream stream = null;
-		try {
-			stream = openHSDirectoryStream(dd.getDirectory());
-			HttpConnection http = new HttpConnection(stream);
-			http.sendGetRequest("/tor/rendezvous2/"+ dd.getDescriptorId().toBase32());
-			http.readResponse();
-			if(http.getStatusCode() == 200) {
-				return readDocument(dd, http.getMessageBody());
-			} else {
-				logger.fine("HS descriptor download for "+ hiddenService.getOnionAddressForLogging() + " failed with status "+ http.getStatusCode());
-			}
-		} catch (InterruptedException e) {
-			Thread.currentThread().interrupt();
-			return null;
-		} catch (TimeoutException e) {
-			logger.fine("Timeout downloading HS descriptor from "+ dd.getDirectory());
-			e.printStackTrace();
-			return null;
-		} catch (IOException e) {
-			logger.info("IOException downloading HS descriptor from "+ dd.getDirectory() +" : "+ e);
-			return null;
-		} catch (OpenFailedException e) {
-			logger.info("Failed to open stream to HS directory "+ dd.getDirectory() +" : "+ e.getMessage());
-			return null;
-		} catch (DirectoryRequestFailedException e) {
-			logger.info("Directory request to HS directory "+ dd.getDirectory() + " failed "+ e.getMessage());
-			return null;
-		} finally {
-			if(stream != null) {
-				stream.close();
-				stream.getCircuit().markForClose();
-			}
-		}
-		
-		return null;
-		
-	}
-	
-	private Stream openHSDirectoryStream(Router directory) throws TimeoutException, InterruptedException, OpenFailedException {
-
-		final InternalCircuit circuit = circuitManager.getCleanInternalCircuit();
-		
-		try {
-			final DirectoryCircuit dc = circuit.cannibalizeToDirectory(directory);
-			return dc.openDirectoryStream(10000, true);
-		} catch (StreamConnectFailedException e) {
-			circuit.markForClose();
-			throw new OpenFailedException("Failed to open directory stream");
-		} catch (TorException e) {
-			circuit.markForClose();
-			throw new OpenFailedException("Failed to extend circuit to HS directory: "+ e.getMessage());
-		}
-	}
-
-	private HSDescriptor readDocument(HSDescriptorDirectory dd, ByteBuffer body) {
-		DocumentFieldParserImpl fieldParser = new DocumentFieldParserImpl(body);
-		HSDescriptorParser parser = new HSDescriptorParser(hiddenService, fieldParser, hiddenService.getAuthenticationCookie());
-		DescriptorParseResult result = new DescriptorParseResult(dd);
-		parser.parse(result);
-		return result.getDescriptor();
-	}
-	
-	private static class DescriptorParseResult implements DocumentParsingResultHandler<HSDescriptor> {
-		HSDescriptorDirectory dd;
-		HSDescriptor descriptor;
-		
-		public DescriptorParseResult(HSDescriptorDirectory dd) {
-			this.dd = dd;
-		}
-	
-		HSDescriptor getDescriptor() {
-			return descriptor;
-		}
-		public void documentParsed(HSDescriptor document) {
-			this.descriptor = document;
-		}
-
-		public void documentInvalid(HSDescriptor document, String message) {
-			logger.info("Invalid HS descriptor document received from "+ dd.getDirectory() + " for descriptor "+ dd.getDescriptorId());
-		}
-
-		public void parsingError(String message) {
-			logger.info("Failed to parse HS descriptor document received from "+ dd.getDirectory() + " for descriptor "+ dd.getDescriptorId() + " : " + message);
-		}
-	}
-}
\ No newline at end of file
diff --git a/orchid/src/com/subgraph/orchid/circuits/hs/HSDescriptorKeyword.java b/orchid/src/com/subgraph/orchid/circuits/hs/HSDescriptorKeyword.java
deleted file mode 100644
index c883e86c18d..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/hs/HSDescriptorKeyword.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.subgraph.orchid.circuits.hs;
-
-public enum HSDescriptorKeyword {
-	RENDEZVOUS_SERVICE_DESCRIPTOR("rendezvous-service-descriptor", 1),
-	VERSION("version", 1),
-	PERMANENT_KEY("permanent-key", 0),
-	SECRET_ID_PART("secret-id-part", 1),
-	PUBLICATION_TIME("publication-time", 2),
-	PROTOCOL_VERSIONS("protocol-versions", 2),
-	INTRODUCTION_POINTS("introduction-points", 0),
-	SIGNATURE("signature", 0),
-	UNKNOWN_KEYWORD("KEYWORD NOT FOUND", 0);
-	
-	private final String keyword;
-	private final int argumentCount;
-	
-	HSDescriptorKeyword(String keyword, int argumentCount) {
-		this.keyword = keyword;
-		this.argumentCount = argumentCount;
-	}
-	
-	String getKeyword() {
-		return keyword;
-	}
-	
-	int getArgumentCount() {
-		return argumentCount;
-	}
-	
-	static HSDescriptorKeyword findKeyword(String keyword) {
-		for(HSDescriptorKeyword k: values()) {
-			if(k.getKeyword().equals(keyword)) {
-				return k;
-			}
-		}
-		return UNKNOWN_KEYWORD;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/hs/HSDescriptorParser.java b/orchid/src/com/subgraph/orchid/circuits/hs/HSDescriptorParser.java
deleted file mode 100644
index 08046ed7c93..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/hs/HSDescriptorParser.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.subgraph.orchid.circuits.hs;
-
-import java.nio.ByteBuffer;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.TorParsingException;
-import com.subgraph.orchid.crypto.TorSignature;
-import com.subgraph.orchid.directory.DocumentFieldParserImpl;
-import com.subgraph.orchid.directory.parsing.BasicDocumentParsingResult;
-import com.subgraph.orchid.directory.parsing.DocumentFieldParser;
-import com.subgraph.orchid.directory.parsing.DocumentObject;
-import com.subgraph.orchid.directory.parsing.DocumentParser;
-import com.subgraph.orchid.directory.parsing.DocumentParsingHandler;
-import com.subgraph.orchid.directory.parsing.DocumentParsingResult;
-import com.subgraph.orchid.directory.parsing.DocumentParsingResultHandler;
-import com.subgraph.orchid.encoders.Base64;
-
-public class HSDescriptorParser implements DocumentParser<HSDescriptor>{
-	private static final Logger logger = Logger.getLogger(HSDescriptor.class.getName());
-	
-	private final DocumentFieldParser fieldParser;
-	private final HSDescriptor descriptor;
-	private final HSAuthentication authentication;
-	
-	private DocumentParsingResultHandler<HSDescriptor> resultHandler;
-	
-	public HSDescriptorParser(HiddenService hiddenService, DocumentFieldParser fieldParser) {
-		this(hiddenService, fieldParser, null);
-	}
-
-	public HSDescriptorParser(HiddenService hiddenService, DocumentFieldParser fieldParser, HSDescriptorCookie cookie) {
-		this.fieldParser = fieldParser;
-		this.fieldParser.setHandler(createParsingHandler());
-		this.descriptor = new HSDescriptor(hiddenService);
-		this.authentication = new HSAuthentication(cookie);
-	}
-	
-	private DocumentParsingHandler createParsingHandler() {
-		return new DocumentParsingHandler() {
-			
-			public void parseKeywordLine() {
-				processKeywordLine();
-			}
-			
-			public void endOfDocument() {
-			}
-		};
-	}
-
-	public boolean parse(DocumentParsingResultHandler<HSDescriptor> resultHandler) {
-		this.resultHandler = resultHandler;
-		fieldParser.startSignedEntity();
-		try {
-			fieldParser.processDocument();
-			return true;
-		} catch(TorParsingException e) {
-			resultHandler.parsingError(e.getMessage());
-			return false;
-		}
-	}
-	
-	
-	public DocumentParsingResult<HSDescriptor> parse() {
-		final BasicDocumentParsingResult<HSDescriptor> result = new BasicDocumentParsingResult<HSDescriptor>();
-		parse(result);
-		return result;
-	}
-
-	private void processKeywordLine() {
-		final HSDescriptorKeyword keyword = HSDescriptorKeyword.findKeyword(fieldParser.getCurrentKeyword());
-		if(!keyword.equals(HSDescriptorKeyword.UNKNOWN_KEYWORD)) {
-			processKeyword(keyword);
-		}
-	}
-	
-	private void processKeyword(HSDescriptorKeyword keyword) {
-		switch(keyword) {
-		case RENDEZVOUS_SERVICE_DESCRIPTOR:
-			descriptor.setDescriptorId(fieldParser.parseBase32Digest());
-			break;
-		case VERSION:
-			if(fieldParser.parseInteger() != 2) {
-				throw new TorParsingException("Unexpected Descriptor version");
-			}
-			break;
-			
-		case PERMANENT_KEY:
-			descriptor.setPermanentKey(fieldParser.parsePublicKey());
-			break;
-			
-		case SECRET_ID_PART:
-			descriptor.setSecretIdPart(fieldParser.parseBase32Digest());
-			break;
-			
-		case PUBLICATION_TIME:
-			descriptor.setPublicationTime(fieldParser.parseTimestamp());
-			break;
-			
-		case PROTOCOL_VERSIONS:
-			descriptor.setProtocolVersions(fieldParser.parseIntegerList());
-			break;
-			
-		case INTRODUCTION_POINTS:
-			processIntroductionPoints();
-			break;
-			
-		case SIGNATURE:
-			processSignature();
-			break;
-		case UNKNOWN_KEYWORD:
-			break;
-		}
-	}
-	
-	private void processIntroductionPoints() {
-		final DocumentObject ob = fieldParser.parseObject();
-		final ByteBuffer buffer = createIntroductionPointBuffer(ob);
-		final IntroductionPointParser parser = new IntroductionPointParser(new DocumentFieldParserImpl(buffer));
-		parser.parse(new DocumentParsingResultHandler<IntroductionPoint>() {
-
-			public void documentParsed(IntroductionPoint document) {
-				logger.fine("adding intro point "+ document.getIdentity());
-				descriptor.addIntroductionPoint(document);
-			}
-
-			public void documentInvalid(IntroductionPoint document, String message) {
-				logger.info("Invalid introduction point received");
-			}
-
-			public void parsingError(String message) {
-				logger.info("Error parsing introduction points: "+ message);
-			} 
-		});
-	}
-
-	private ByteBuffer createIntroductionPointBuffer(DocumentObject ob) {
-		final byte[] content = Base64.decode(ob.getContent(false));
-		if(content[0] == 'i') {
-			return ByteBuffer.wrap(content);
-		} else {
-			try {
-				byte[] decrypted = authentication.decryptIntroductionPoints(content);
-				return ByteBuffer.wrap(decrypted);
-			} catch (HSAuthenticationException e) {
-				throw new TorParsingException("Failed to decrypt introduction points: "+ e.getMessage());
-			}
-		}
-	}
-
-	private void processSignature() {
-		fieldParser.endSignedEntity();
-		final TorSignature signature = fieldParser.parseSignature();
-		if(!fieldParser.verifySignedEntity(descriptor.getPermanentKey(), signature)) {
-			resultHandler.documentInvalid(descriptor, "Signature verification failed");
-			fieldParser.logWarn("Signature failed for descriptor: "+ descriptor.getDescriptorId().toBase32());
-			return;
-		}
-		resultHandler.documentParsed(descriptor);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/hs/HSDirectories.java b/orchid/src/com/subgraph/orchid/circuits/hs/HSDirectories.java
deleted file mode 100644
index 54292b3baba..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/hs/HSDirectories.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.subgraph.orchid.circuits.hs;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import com.subgraph.orchid.ConsensusDocument;
-import com.subgraph.orchid.Directory;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.crypto.TorRandom;
-import com.subgraph.orchid.data.HexDigest;
-
-public class HSDirectories {
-	private final static int DIR_CLUSTER_SZ = 3;
-	private final Directory directory;
-	private final TorRandom random;
-	private ConsensusDocument currentConsensus;
-	private List<Router> hsDirectories;
-	
-	HSDirectories(Directory directory) {
-		this.directory = directory;
-		this.hsDirectories = new ArrayList<Router>();
-		this.random = new TorRandom();
-	}
-	
-	List<HSDescriptorDirectory> getDirectoriesForHiddenService(HiddenService hs) {
-		final List<HSDescriptorDirectory> dirs = new ArrayList<HSDescriptorDirectory>(2 * DIR_CLUSTER_SZ);
-		for(HexDigest id: hs.getAllCurrentDescriptorIds()) {
-			for(Router r: getDirectoriesForDescriptorId(id)) {
-				dirs.add(new HSDescriptorDirectory(id, r));
-			}
-		}
-		return dirs;
-	}
-	
-	private List<Router> getDirectoriesForDescriptorId(HexDigest descriptorId) {
-		final String hexId = descriptorId.toString();
-		refreshFromDirectory();
-		final int idx = getIndexForDescriptorId(hexId);
-		return selectDirectoriesAtIndex(idx);
-	}
-	
-	private int getIndexForDescriptorId(String hexId) {
-		for(int i = 0; i < hsDirectories.size(); i++) {
-			String routerId = getHexIdForIndex(i);
-			if(routerId.compareTo(hexId) > 0) {
-				return i;
-			}
-		}
-		return 0;
-	}
-	
-	private String getHexIdForIndex(int idx) {
-		final Router r = hsDirectories.get(idx);
-		return r.getIdentityHash().toString();
-	}
-	
-	private List<Router> selectDirectoriesAtIndex(int idx) {
-		if(idx < 0 || idx >= hsDirectories.size()) {
-			throw new IllegalArgumentException("idx = "+ idx);
-		}
-		if(hsDirectories.size() < DIR_CLUSTER_SZ) {
-			throw new IllegalStateException();
-		}
-		final List<Router> dirs = new ArrayList<Router>(DIR_CLUSTER_SZ);
-		for(int i = 0; i < DIR_CLUSTER_SZ; i++) {
-			dirs.add(hsDirectories.get(idx));
-			idx += 1;
-			if(idx == hsDirectories.size()) {
-				idx = 0;
-			}
-		}
-		randomShuffle(dirs);
-		return dirs;
-	}
-	
-	
-	
-	private void refreshFromDirectory() {
-		ConsensusDocument consensus = directory.getCurrentConsensusDocument();
-		if(currentConsensus == consensus) {
-			return;
-		}
-		currentConsensus = consensus;
-		hsDirectories.clear();
-		for(Router r: directory.getAllRouters()) {
-			if(r.isHSDirectory()) {
-				hsDirectories.add(r);
-			}
-		}
-		
-		Collections.sort(hsDirectories, new Comparator<Router>() {
-			public int compare(Router r1, Router r2) {
-				final String s1 = r1.getIdentityHash().toString();
-				final String s2 = r2.getIdentityHash().toString();
-				return s1.compareTo(s2);
-			}
-		});
-	}
-	
-	private void randomShuffle(List<Router> dirs) {
-		for(int i = 0; i < dirs.size(); i++) {
-			swap(dirs, i, random.nextInt(dirs.size()));
-		}
-	}
-	
-	private void swap(List<Router> dirs, int idx1, int idx2) {
-		if(idx1 != idx2) {
-			final Router r1 = dirs.get(idx1);
-			final Router r2 = dirs.get(idx2);
-			dirs.set(idx1, r2);
-			dirs.set(idx2, r1);
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/hs/HiddenService.java b/orchid/src/com/subgraph/orchid/circuits/hs/HiddenService.java
deleted file mode 100644
index 738590b7a11..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/hs/HiddenService.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.subgraph.orchid.circuits.hs;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import com.subgraph.orchid.HiddenServiceCircuit;
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.circuits.hs.HSDescriptorCookie.CookieType;
-import com.subgraph.orchid.crypto.TorMessageDigest;
-import com.subgraph.orchid.data.Base32;
-import com.subgraph.orchid.data.HexDigest;
-
-public class HiddenService {
-	
-	private final TorConfig config;
-	private final byte[] permanentId;
-
-	private HSDescriptor descriptor;
-	private HiddenServiceCircuit circuit;
-	
-	static byte[] decodeOnion(String onionAddress) {
-		final int idx = onionAddress.indexOf(".onion");
-		if(idx == -1) {
-			return Base32.base32Decode(onionAddress);
-		} else {
-			return Base32.base32Decode(onionAddress.substring(0, idx));
-		}
-	}
-	
-
-	HiddenService(TorConfig config, byte[] permanentId) {
-		this.config = config;
-		this.permanentId = permanentId;
-	}
-
-	String getOnionAddressForLogging() {
-		if(config.getSafeLogging()) {
-			return "[scrubbed]";
-		} else {
-			return getOnionAddress();
-		}
-	}
-
-	String getOnionAddress() {
-		return Base32.base32Encode(permanentId) + ".onion";
-	}
-
-	boolean hasCurrentDescriptor() {
-		return (descriptor != null && !descriptor.isExpired());
-	}
-	
-	HSDescriptor getDescriptor() {
-		return descriptor;
-	}
-
-	void setDescriptor(HSDescriptor descriptor) {
-		this.descriptor = descriptor;
-	}
-
-	HiddenServiceCircuit getCircuit() {
-		return circuit;
-	}
-	
-	void setCircuit(HiddenServiceCircuit circuit) {
-		this.circuit = circuit;
-	}
-	
-	HSDescriptorCookie getAuthenticationCookie() {
-		return config.getHidServAuth(getOnionAddress());
-	}
-
-	List<HexDigest> getAllCurrentDescriptorIds() {
-		final List<HexDigest> ids = new ArrayList<HexDigest>();
-		ids.add(getCurrentDescriptorId(0));
-		ids.add(getCurrentDescriptorId(1));
-		return ids;
-	}
-
-	HexDigest getCurrentDescriptorId(int replica) {
-		final TorMessageDigest digest = new TorMessageDigest();
-		digest.update(permanentId);
-		digest.update(getCurrentSecretId(replica));
-		return digest.getHexDigest();
-	}
-
-	byte[] getCurrentSecretId(int replica) {
-		final TorMessageDigest digest = new TorMessageDigest();
-		digest.update(getCurrentTimePeriod());
-		final HSDescriptorCookie cookie = getAuthenticationCookie();
-		if(cookie != null && cookie.getType() == CookieType.COOKIE_STEALTH) {
-			digest.update(cookie.getValue());
-		}
-		digest.update(new byte[] { (byte) replica });
-		return digest.getDigestBytes();
-	}
-
-	byte[] getCurrentTimePeriod() {
-		final long now = System.currentTimeMillis() / 1000;
-		final int idByte = permanentId[0] & 0xFF;
-		return calculateTimePeriod(now, idByte);
-	}
-
-	static byte[] calculateTimePeriod(long currentTime, int idByte) {
-		final long t = (currentTime + (idByte * 86400L / 256)) / 86400L;
-		return toNetworkBytes(t);
-	}
-	
-	static byte[] toNetworkBytes(long value) {
-		final byte[] result = new byte[4];
-		for(int i = 3; i >= 0; i--) {
-			result[i] = (byte) (value & 0xFF);
-			value >>= 8;
-		}
-		return result;
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + Arrays.hashCode(permanentId);
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		HiddenService other = (HiddenService) obj;
-		if (!Arrays.equals(permanentId, other.permanentId))
-			return false;
-		return true;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/hs/HiddenServiceManager.java b/orchid/src/com/subgraph/orchid/circuits/hs/HiddenServiceManager.java
deleted file mode 100644
index 955901d46b7..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/hs/HiddenServiceManager.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.subgraph.orchid.circuits.hs;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeoutException;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.Directory;
-import com.subgraph.orchid.HiddenServiceCircuit;
-import com.subgraph.orchid.OpenFailedException;
-import com.subgraph.orchid.Stream;
-import com.subgraph.orchid.StreamConnectFailedException;
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.TorException;
-import com.subgraph.orchid.circuits.CircuitManagerImpl;
-
-public class HiddenServiceManager {
-	private final static int RENDEZVOUS_RETRY_COUNT = 5;
-	private final static int HS_STREAM_TIMEOUT = 20000;
-	
-	private final static Logger logger = Logger.getLogger(HiddenServiceManager.class.getName());
-	
-	private final Map<String, HiddenService> hiddenServices;
-	private final TorConfig config;
-	private final Directory directory;
-	private final HSDirectories hsDirectories;
-	private final CircuitManagerImpl circuitManager;
-	
-	public HiddenServiceManager(TorConfig config, Directory directory, CircuitManagerImpl circuitManager) {
-		this.config = config;
-		this.directory = directory;
-		this.hiddenServices = new HashMap<String, HiddenService>();
-		this.hsDirectories = new HSDirectories(directory);
-		this.circuitManager = circuitManager;
-	}
-	
-	public Stream getStreamTo(String onion, int port) throws OpenFailedException, InterruptedException, TimeoutException {
-		final HiddenService hs = getHiddenServiceForOnion(onion);
-		final HiddenServiceCircuit circuit = getCircuitTo(hs);
-		
-		try {
-			return circuit.openStream(port, HS_STREAM_TIMEOUT);
-		} catch (StreamConnectFailedException e) {
-			throw new OpenFailedException("Failed to open stream to hidden service "+ hs.getOnionAddressForLogging() + " reason "+ e.getReason());
-		}
-	}
-	
-	private synchronized HiddenServiceCircuit getCircuitTo(HiddenService hs) throws OpenFailedException {
-		if(hs.getCircuit() == null) {
-			final HiddenServiceCircuit c = openCircuitTo(hs);
-			if(c == null) {
-				throw new OpenFailedException("Failed to open circuit to "+ hs.getOnionAddressForLogging());
-			}
-			hs.setCircuit(c);
-		}
-		return hs.getCircuit();
-	}
-	
-	private HiddenServiceCircuit openCircuitTo(HiddenService hs) throws OpenFailedException {
-		HSDescriptor descriptor = getDescriptorFor(hs);
-		
-		for(int i = 0; i < RENDEZVOUS_RETRY_COUNT; i++) {
-			final HiddenServiceCircuit c = openRendezvousCircuit(hs, descriptor);
-			if(c != null) {
-				return c;
-			}
-		}
-		throw new OpenFailedException("Failed to open circuit to "+ hs.getOnionAddressForLogging());
-	}
-	
-	HSDescriptor getDescriptorFor(HiddenService hs) throws OpenFailedException {
-		if(hs.hasCurrentDescriptor()) {
-			return hs.getDescriptor();
-		}
-		final HSDescriptor descriptor = downloadDescriptorFor(hs);
-		if(descriptor == null) {
-			final String msg = "Failed to download HS descriptor for "+ hs.getOnionAddressForLogging(); 
-			logger.info(msg);
-			throw new OpenFailedException(msg);
-		}
-		hs.setDescriptor(descriptor);
-		return descriptor;
-	}
-	
-	private HSDescriptor downloadDescriptorFor(HiddenService hs) {
-		logger.fine("Downloading HS descriptor for "+ hs.getOnionAddressForLogging());
-		final List<HSDescriptorDirectory> dirs = hsDirectories.getDirectoriesForHiddenService(hs);
-		final HSDescriptorDownloader downloader = new HSDescriptorDownloader(hs, circuitManager, dirs);
-		return downloader.downloadDescriptor();
-	}
-
-	HiddenService getHiddenServiceForOnion(String onion) throws OpenFailedException {
-		final String key = onion.endsWith(".onion") ? onion.substring(0, onion.length() - 6) : onion;
-		synchronized(hiddenServices) {
-			if(!hiddenServices.containsKey(key)) {
-				hiddenServices.put(key, createHiddenServiceFor(key));
-			}
-			return hiddenServices.get(key);
-		}
-	}	
-	
-	private HiddenService createHiddenServiceFor(String key) throws OpenFailedException {
-		try {
-			byte[] decoded = HiddenService.decodeOnion(key);
-			return new HiddenService(config, decoded);
-		} catch (TorException e) {
-			final String target = config.getSafeLogging() ? "[scrubbed]" : (key + ".onion");
-			throw new OpenFailedException("Failed to decode onion address "+ target + " : "+ e.getMessage());
-		}
-	}
-
-	private HiddenServiceCircuit openRendezvousCircuit(HiddenService hs, HSDescriptor descriptor) {
-		final RendezvousCircuitBuilder builder = new RendezvousCircuitBuilder(directory, circuitManager, hs, descriptor);
-		try {
-			return builder.call();
-		} catch (Exception e) {
-			return null;
-		}
-	}
-}
\ No newline at end of file
diff --git a/orchid/src/com/subgraph/orchid/circuits/hs/IntroductionPoint.java b/orchid/src/com/subgraph/orchid/circuits/hs/IntroductionPoint.java
deleted file mode 100644
index df204819468..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/hs/IntroductionPoint.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.subgraph.orchid.circuits.hs;
-
-import com.subgraph.orchid.crypto.TorPublicKey;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.IPv4Address;
-
-public class IntroductionPoint {
-
-	private HexDigest identity;
-	private IPv4Address address;
-	private int onionPort;
-	private TorPublicKey onionKey;
-	private TorPublicKey serviceKey;
-	
-	IntroductionPoint(HexDigest identity) {
-		this.identity = identity;
-	}
-
-	void setAddress(IPv4Address address) {
-		this.address = address;
-	}
-	
-	void setOnionPort(int onionPort) {
-		this.onionPort = onionPort;
-	}
-	
-	void setOnionKey(TorPublicKey onionKey) {
-		this.onionKey = onionKey;
-	}
-	
-	void setServiceKey(TorPublicKey serviceKey) {
-		this.serviceKey = serviceKey;
-	}
-	
-	boolean isValidDocument() {
-		return identity != null && address != null && onionPort != 0 && onionKey != null && serviceKey != null;
-	}
-	
-	public HexDigest getIdentity() {
-		return identity;
-	}
-	
-	public IPv4Address getAddress() {
-		return address;
-	}
-	
-	public int getPort() {
-		return onionPort;
-	}
-	
-	public TorPublicKey getOnionKey() {
-		return onionKey;
-	}
-	
-	public TorPublicKey getServiceKey() {
-		return serviceKey;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/hs/IntroductionPointKeyword.java b/orchid/src/com/subgraph/orchid/circuits/hs/IntroductionPointKeyword.java
deleted file mode 100644
index 97ad59431b8..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/hs/IntroductionPointKeyword.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.subgraph.orchid.circuits.hs;
-
-public enum IntroductionPointKeyword {
-	SERVICE_AUTHENTICATION("service-authentication", 2),
-	INTRODUCTION_POINT("introduction-point", 1),
-	IP_ADDRESS("ip-address", 1),
-	ONION_PORT("onion-port", 1),
-	ONION_KEY("onion-key", 0),
-	SERVICE_KEY("service-key", 0),
-	INTRO_AUTHENTICATION("intro-authentication", 2),
-	UNKNOWN_KEYWORD("KEYWORD NOT FOUND", 0);
-	
-	private final String keyword;
-	private final int argumentCount;
-	
-	IntroductionPointKeyword(String keyword, int argumentCount) {
-		this.keyword = keyword;
-		this.argumentCount = argumentCount;
-	}
-	
-	String getKeyword() {
-		return keyword;
-	}
-	
-	int getArgumentCount() {
-		return argumentCount;
-	}
-	
-	static IntroductionPointKeyword findKeyword(String keyword) {
-		for(IntroductionPointKeyword k: values()) {
-			if(k.getKeyword().equals(keyword)) {
-				return k;
-			}
-		}
-		return UNKNOWN_KEYWORD;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/hs/IntroductionPointParser.java b/orchid/src/com/subgraph/orchid/circuits/hs/IntroductionPointParser.java
deleted file mode 100644
index 59d3a7927e9..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/hs/IntroductionPointParser.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.subgraph.orchid.circuits.hs;
-
-import com.subgraph.orchid.TorParsingException;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.directory.parsing.BasicDocumentParsingResult;
-import com.subgraph.orchid.directory.parsing.DocumentFieldParser;
-import com.subgraph.orchid.directory.parsing.DocumentParser;
-import com.subgraph.orchid.directory.parsing.DocumentParsingHandler;
-import com.subgraph.orchid.directory.parsing.DocumentParsingResult;
-import com.subgraph.orchid.directory.parsing.DocumentParsingResultHandler;
-
-public class IntroductionPointParser implements DocumentParser<IntroductionPoint>{
-
-	private final DocumentFieldParser fieldParser;
-	
-	private DocumentParsingResultHandler<IntroductionPoint> resultHandler;
-	private IntroductionPoint currentIntroductionPoint;
-	
-	public IntroductionPointParser(DocumentFieldParser fieldParser) {
-		this.fieldParser = fieldParser;
-		this.fieldParser.setHandler(createParsingHandler());
-	}
-	
-	public boolean parse(DocumentParsingResultHandler<IntroductionPoint> resultHandler) {
-		this.resultHandler = resultHandler;
-		try {
-			fieldParser.processDocument();
-			return true;
-		} catch(TorParsingException e) {
-			resultHandler.parsingError(e.getMessage());
-			return false;
-		}
-	}
-
-	public DocumentParsingResult<IntroductionPoint> parse() {
-		final BasicDocumentParsingResult<IntroductionPoint> result = new BasicDocumentParsingResult<IntroductionPoint>();
-		parse(result);
-		return result;
-	}
-
-	private DocumentParsingHandler createParsingHandler() {
-		return new DocumentParsingHandler() {
-			public void parseKeywordLine() {
-				processKeywordLine();
-			}
-			
-			public void endOfDocument() {
-				validateAndReportIntroductionPoint(currentIntroductionPoint);
-			}
-		};
-	}
-
-	private void resetIntroductionPoint(HexDigest identity) {
-		validateAndReportIntroductionPoint(currentIntroductionPoint);
-		currentIntroductionPoint = new IntroductionPoint(identity);
-	}
-	
-	private void validateAndReportIntroductionPoint(IntroductionPoint introductionPoint) {
-		if(introductionPoint == null) {
-			return;
-		}
-		
-		if(introductionPoint.isValidDocument()) {
-			resultHandler.documentParsed(introductionPoint);
-		} else {
-			resultHandler.documentInvalid(introductionPoint, "Invalid introduction point");
-		}
-	}
-	
-	
-	private void processKeywordLine() {
-		final IntroductionPointKeyword keyword = IntroductionPointKeyword.findKeyword(fieldParser.getCurrentKeyword());
-		if(!keyword.equals(IntroductionPointKeyword.UNKNOWN_KEYWORD)) {
-			processKeyword(keyword);
-		}
-	}
-	
-	private void processKeyword(IntroductionPointKeyword keyword) {
-		switch(keyword) {
-		case INTRO_AUTHENTICATION:
-			break;
-			
-		case INTRODUCTION_POINT:
-			resetIntroductionPoint(fieldParser.parseBase32Digest());
-			break;
-			
-		case IP_ADDRESS:
-			if(currentIntroductionPoint != null) {
-				currentIntroductionPoint.setAddress(fieldParser.parseAddress());
-			}
-			break;
-			
-		case ONION_KEY:
-			if(currentIntroductionPoint != null) {
-				currentIntroductionPoint.setOnionKey(fieldParser.parsePublicKey());
-			}
-			break;
-			
-		case ONION_PORT:
-			if(currentIntroductionPoint != null) {
-				currentIntroductionPoint.setOnionPort(fieldParser.parsePort());
-			}
-			break;
-			
-		case SERVICE_KEY:
-			if(currentIntroductionPoint != null) {
-				currentIntroductionPoint.setServiceKey(fieldParser.parsePublicKey());
-			}
-			break;
-			
-		case SERVICE_AUTHENTICATION:
-			break;
-			
-		case UNKNOWN_KEYWORD:
-			break;
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/hs/IntroductionProcessor.java b/orchid/src/com/subgraph/orchid/circuits/hs/IntroductionProcessor.java
deleted file mode 100644
index d182f155224..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/hs/IntroductionProcessor.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.subgraph.orchid.circuits.hs;
-
-import java.nio.ByteBuffer;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.Cell;
-import com.subgraph.orchid.Circuit;
-import com.subgraph.orchid.RelayCell;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.crypto.HybridEncryption;
-import com.subgraph.orchid.crypto.TorPublicKey;
-
-public class IntroductionProcessor {
-	private final static Logger logger = Logger.getLogger(IntroductionProcessor.class.getName());
-	private final static int INTRODUCTION_PROTOCOL_VERSION = 3;
-	
-	private final HiddenService hiddenService;
-	private final Circuit introductionCircuit;
-	private final IntroductionPoint introductionPoint;
-	
-	protected IntroductionProcessor(HiddenService hiddenService, Circuit introductionCircuit, IntroductionPoint introductionPoint) {
-		this.hiddenService = hiddenService;
-		this.introductionCircuit = introductionCircuit;
-		this.introductionPoint = introductionPoint;
-	}
-	
-	TorPublicKey getServiceKey() {
-		return introductionPoint.getServiceKey();
-	}
-	
-	boolean sendIntroduce(TorPublicKey permanentKey, byte[] publicKeyBytes, byte[] rendezvousCookie, Router rendezvousRouter) {
-		final RelayCell introduceCell = introductionCircuit.createRelayCell(RelayCell.RELAY_COMMAND_INTRODUCE1, 0, introductionCircuit.getFinalCircuitNode());
-
-		final byte[] payload = createIntroductionPayload(rendezvousRouter, publicKeyBytes, rendezvousCookie, permanentKey);
-		final TorPublicKey serviceKey = introductionPoint.getServiceKey();
-		introduceCell.putByteArray(serviceKey.getFingerprint().getRawBytes());
-		introduceCell.putByteArray(payload);
-		introductionCircuit.sendRelayCell(introduceCell);
-		
-		final RelayCell response = introductionCircuit.receiveRelayCell();
-		if(response == null) {
-			logger.fine("Timeout waiting for response to INTRODUCE1 cell");
-			return false;
-		} else if(response.getRelayCommand() != RelayCell.RELAY_COMMAND_INTRODUCE_ACK) {
-			logger.info("Unexpected relay cell type received waiting for response to INTRODUCE1 cell: "+ response.getRelayCommand());
-			return false;
-		} else if(response.cellBytesRemaining() == 0) {
-			return true;
-		} else {
-			logger.info("INTRODUCE_ACK indicates that introduction was not forwarded: "+ response.getByte());
-			return false;
-		} 
-	}
-	
-	void markCircuitForClose() {
-		introductionCircuit.markForClose();
-	}
-
-	private byte[] createIntroductionPayload(Router rendezvousRouter, byte[] publicKeyBytes, byte[] rendezvousCookie, TorPublicKey encryptionKey) {
-		final ByteBuffer buffer = createIntroductionBuffer((int) (System.currentTimeMillis() / 1000), rendezvousRouter, rendezvousCookie, publicKeyBytes);
-		return encryptIntroductionBuffer(buffer, encryptionKey);
-	}
-	
-	private ByteBuffer createIntroductionBuffer(int timestamp, Router rr, byte[] cookie, byte[] dhPublic) {
-		final ByteBuffer buffer = ByteBuffer.allocate(Cell.CELL_LEN);
-		final byte[] rpAddress = rr.getAddress().getAddressDataBytes();
-		final short rpPort = (short) rr.getOnionPort();
-		final byte[] rpIdentity = rr.getIdentityHash().getRawBytes();
-		final byte[] rpOnionKey = rr.getOnionKey().getRawBytes();
-		
-		buffer.put((byte) INTRODUCTION_PROTOCOL_VERSION);  // VER    Version byte: set to 3.        [1 octet]
-		addAuthentication(buffer);
-		//buffer.put((byte) 0);                              // AUTHT  The auth type that is used     [1 octet]
-		buffer.putInt(timestamp);                          // TS     A timestamp                   [4 octets]
-		buffer.put(rpAddress);                             // IP     Rendezvous point's address    [4 octets]
-		buffer.putShort(rpPort);                           // PORT   Rendezvous point's OR port    [2 octets]
-		buffer.put(rpIdentity);                            // ID     Rendezvous point identity ID [20 octets]
-		buffer.putShort((short) rpOnionKey.length);		   // KLEN   Length of onion key           [2 octets]
-		buffer.put(rpOnionKey); 		                   // KEY    Rendezvous point onion key [KLEN octets]
-		buffer.put(cookie); 		                       // RC     Rendezvous cookie            [20 octets]
-		buffer.put(dhPublic); 		                       // g^x    Diffie-Hellman data, part 1 [128 octets]
-		
-		return buffer;
-	}
-	
-	private void addAuthentication(ByteBuffer buffer) {
-		HSDescriptorCookie cookie = hiddenService.getAuthenticationCookie();
-		if(cookie == null) {
-			buffer.put((byte) 0);
-		} else {
-			buffer.put(cookie.getAuthTypeByte());
-			buffer.putShort((short) cookie.getValue().length);
-			buffer.put(cookie.getValue());
-		}
-	}
-
-	private byte[] encryptIntroductionBuffer(ByteBuffer buffer, TorPublicKey key) {
-		final int len = buffer.position();
-		final byte[] payload = new byte[len];
-		buffer.flip();
-		buffer.get(payload);
-		final HybridEncryption enc = new HybridEncryption();
-		return enc.encrypt(payload, key);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/hs/RendezvousCircuitBuilder.java b/orchid/src/com/subgraph/orchid/circuits/hs/RendezvousCircuitBuilder.java
deleted file mode 100644
index 089fb227ece..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/hs/RendezvousCircuitBuilder.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.subgraph.orchid.circuits.hs;
-
-import java.util.concurrent.Callable;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.Circuit;
-import com.subgraph.orchid.Directory;
-import com.subgraph.orchid.HiddenServiceCircuit;
-import com.subgraph.orchid.InternalCircuit;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.TorException;
-import com.subgraph.orchid.circuits.CircuitManagerImpl;
-import com.subgraph.orchid.crypto.TorTapKeyAgreement;
-
-public class RendezvousCircuitBuilder implements Callable<HiddenServiceCircuit>{
-	private final Logger logger = Logger.getLogger(RendezvousCircuitBuilder.class.getName());
-	
-	private final Directory directory;
-	
-	private final CircuitManagerImpl circuitManager;
-	private final HiddenService hiddenService;
-	private final HSDescriptor serviceDescriptor;
-	
-	public RendezvousCircuitBuilder(Directory directory, CircuitManagerImpl circuitManager, HiddenService hiddenService, HSDescriptor descriptor) {
-		this.directory = directory;
-		this.circuitManager = circuitManager;
-		this.hiddenService = hiddenService;
-		this.serviceDescriptor = descriptor;
-	}
-	
-	public HiddenServiceCircuit call() throws Exception {
-		
-		logger.fine("Opening rendezvous circuit for "+ logServiceName());
-		
-		final InternalCircuit rendezvous = circuitManager.getCleanInternalCircuit();
-		logger.fine("Establishing rendezvous for "+ logServiceName());
-		RendezvousProcessor rp = new RendezvousProcessor(rendezvous);
-		if(!rp.establishRendezvous()) {
-			rendezvous.markForClose();
-			return null;
-		}
-		logger.fine("Opening introduction circuit for "+ logServiceName());
-		final IntroductionProcessor introductionProcessor = openIntroduction();
-		if(introductionProcessor == null) {
-			logger.info("Failed to open connection to any introduction point");
-			rendezvous.markForClose();
-			return null;
-		}
-		logger.fine("Sending introduce cell for "+ logServiceName());
-		final TorTapKeyAgreement kex = new TorTapKeyAgreement();
-		final boolean icResult = introductionProcessor.sendIntroduce(introductionProcessor.getServiceKey(), kex.getPublicKeyBytes(), rp.getCookie(), rp.getRendezvousRouter());
-		introductionProcessor.markCircuitForClose();
-		if(!icResult) {
-			rendezvous.markForClose();
-			return null;
-		}
-		logger.fine("Processing RV2 for "+ logServiceName());
-		HiddenServiceCircuit hsc = rp.processRendezvous2(kex);
-		if(hsc == null) {
-			rendezvous.markForClose();
-		}
-
-		logger.fine("Rendezvous circuit opened for "+ logServiceName());
-		
-		return hsc;
-	}
-	
-	private String logServiceName() {
-		return hiddenService.getOnionAddressForLogging();
-	}
-	
-	private IntroductionProcessor openIntroduction() {
-		for(IntroductionPoint ip: serviceDescriptor.getShuffledIntroductionPoints()) {
-			final Circuit circuit = attemptOpenIntroductionCircuit(ip);
-			if(circuit != null) {
-				return new IntroductionProcessor(hiddenService, circuit, ip);
-			}
-		}
-		return null;
-	}
-	
-	private Circuit attemptOpenIntroductionCircuit(IntroductionPoint ip) {
-		final Router r = directory.getRouterByIdentity(ip.getIdentity());
-		if(r == null) {
-			return null;
-		}
-		
-		try {
-			final InternalCircuit circuit = circuitManager.getCleanInternalCircuit();
-			return circuit.cannibalizeToIntroductionPoint(r);
-		} catch (InterruptedException e) {
-			Thread.currentThread().interrupt();
-			return null;
-		} catch (TorException e) {
-			logger.fine("cannibalizeTo() failed : "+ e.getMessage());
-			return null;
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/hs/RendezvousProcessor.java b/orchid/src/com/subgraph/orchid/circuits/hs/RendezvousProcessor.java
deleted file mode 100644
index 9584fae6cd6..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/hs/RendezvousProcessor.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.subgraph.orchid.circuits.hs;
-
-import java.math.BigInteger;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.Cell;
-import com.subgraph.orchid.HiddenServiceCircuit;
-import com.subgraph.orchid.InternalCircuit;
-import com.subgraph.orchid.RelayCell;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.circuits.CircuitNodeCryptoState;
-import com.subgraph.orchid.circuits.CircuitNodeImpl;
-import com.subgraph.orchid.crypto.TorMessageDigest;
-import com.subgraph.orchid.crypto.TorRandom;
-import com.subgraph.orchid.crypto.TorTapKeyAgreement;
-import com.subgraph.orchid.data.HexDigest;
-
-public class RendezvousProcessor {
-	private final static Logger logger = Logger.getLogger(RendezvousProcessor.class.getName());
-	
-	private final static int RENDEZVOUS_COOKIE_LEN = 20;
-	private final static TorRandom random = new TorRandom();
-	
-	private final InternalCircuit circuit;
-	private final byte[] cookie;
-	
-	protected RendezvousProcessor(InternalCircuit circuit) {
-		this.circuit = circuit;
-		this.cookie = random.getBytes(RENDEZVOUS_COOKIE_LEN);
-	}
-	
-	boolean establishRendezvous() {
-		final RelayCell cell = circuit.createRelayCell(RelayCell.RELAY_COMMAND_ESTABLISH_RENDEZVOUS, 0, circuit.getFinalCircuitNode());
-		cell.putByteArray(cookie);
-		circuit.sendRelayCell(cell);
-		final RelayCell response = circuit.receiveRelayCell();
-		if(response == null) {
-			logger.info("Timeout waiting for Rendezvous establish response");
-			return false;
-		} else if(response.getRelayCommand() != RelayCell.RELAY_COMMAND_RENDEZVOUS_ESTABLISHED) {
-			logger.info("Response received from Rendezvous establish was not expected acknowledgement, Relay Command: "+ response.getRelayCommand());
-			return false;
-		} else {
-			return true;
-		}
-	}
-	
-	HiddenServiceCircuit processRendezvous2(TorTapKeyAgreement kex) {
-		final RelayCell cell = circuit.receiveRelayCell();
-		if(cell == null) {
-			logger.info("Timeout waiting for RENDEZVOUS2");
-			return null;
-		} else if (cell.getRelayCommand() != RelayCell.RELAY_COMMAND_RENDEZVOUS2) {
-			logger.info("Unexpected Relay cell type received while waiting for RENDEZVOUS2: "+ cell.getRelayCommand());
-			return null;
-		}
-		final BigInteger peerPublic = readPeerPublic(cell);
-		final HexDigest handshakeDigest = readHandshakeDigest(cell);
-		if(peerPublic == null || handshakeDigest == null) {
-			return null;
-		}
-		final byte[] verifyHash = new byte[TorMessageDigest.TOR_DIGEST_SIZE];
-		final byte[] keyMaterial = new byte[CircuitNodeCryptoState.KEY_MATERIAL_SIZE];
-		if(!kex.deriveKeysFromDHPublicAndHash(peerPublic, handshakeDigest.getRawBytes(), keyMaterial, verifyHash)) {
-			logger.info("Error deriving session keys while extending to hidden service");
-			return null;
-		}
-		return circuit.connectHiddenService(CircuitNodeImpl.createAnonymous(circuit.getFinalCircuitNode(), keyMaterial, verifyHash));
-	}
-	
-	private BigInteger readPeerPublic(Cell cell) {
-		final byte[] dhPublic = new byte[TorTapKeyAgreement.DH_LEN];
-		cell.getByteArray(dhPublic);
-		final BigInteger peerPublic = new BigInteger(1, dhPublic);
-		if(!TorTapKeyAgreement.isValidPublicValue(peerPublic)) {
-			logger.warning("Illegal DH public value received: "+ peerPublic);
-			return null;
-		}
-		return peerPublic;
-	}
-	
-	HexDigest readHandshakeDigest(Cell cell) {
-		final byte[] digestBytes = new byte[TorMessageDigest.TOR_DIGEST_SIZE];
-		cell.getByteArray(digestBytes);
-		return HexDigest.createFromDigestBytes(digestBytes);
-	}
-	
-	
-	byte[] getCookie() {
-		return cookie;
-	}
-
-	Router getRendezvousRouter() {
-		return circuit.getFinalCircuitNode().getRouter();
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/path/BandwidthWeightedRouters.java b/orchid/src/com/subgraph/orchid/circuits/path/BandwidthWeightedRouters.java
deleted file mode 100644
index 1521d8a0c69..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/path/BandwidthWeightedRouters.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.subgraph.orchid.circuits.path;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.crypto.TorRandom;
-
-public class BandwidthWeightedRouters {
-	private static class WeightedRouter {
-		private final Router router;
-		private boolean isUnknown;
-		private double weightedBandwidth;
-		private long scaledBandwidth;
-		
-		WeightedRouter(Router router, double bw) {
-			this.router = router;
-			this.weightedBandwidth = bw;
-		}
-				
-		void scaleBandwidth(double scaleFactor) {
-			scaledBandwidth = Math.round(weightedBandwidth * scaleFactor);
-		}
-	}
-	
-	private final static long MAX_SCALE = Long.MAX_VALUE / 4;
-	private final static double EPSILON = 0.1;
-	private final List<WeightedRouter> weightedRouters = new ArrayList<WeightedRouter>();
-	private final TorRandom random = new TorRandom();
-	
-	private double totalExitBw;
-	private double totalNonExitBw;
-	private double totalGuardBw;
-	
-	private boolean isScaled;
-	private int unknownCount;
-	
-	void addRouter(Router router, double weightedBandwidth) {
-		weightedRouters.add(new WeightedRouter(router, weightedBandwidth));
-		adjustTotals(router, weightedBandwidth);
-		isScaled = false;
-	}
-	
-	
-	boolean isTotalBandwidthZero() {
-		return getTotalBandwidth() < EPSILON;
-	}
-
-	double getTotalBandwidth() {
-		return totalExitBw + totalNonExitBw;
-	}
-	
-	double getTotalGuardBandwidth() {
-		return totalGuardBw;
-	}
-	
-	
-	double getTotalExitBandwidth() {
-		return totalExitBw;
-	}
-
-	private void adjustTotals(Router router, double bw) {
-		if(router.isExit()) {
-			totalExitBw += bw;
-		} else {
-			totalNonExitBw += bw;
-		}
-		if(router.isPossibleGuard()) {
-			totalGuardBw += bw;
-		}
-	}
-
-	void addRouterUnknown(Router router) {
-		final WeightedRouter wr = new WeightedRouter(router, 0);
-		wr.isUnknown = true;
-		weightedRouters.add(wr);
-		unknownCount += 1;
-	}
-	
-	int getRouterCount() {
-		return weightedRouters.size();
-	}
-	
-	int getUnknownCount() {
-		return unknownCount;
-	}
-	
-	void fixUnknownValues() {
-		if(unknownCount == 0) {
-			return;
-		}
-		if(isTotalBandwidthZero()) {
-			fixUnknownValues(40000, 20000);
-		} else {
-			final int knownCount = weightedRouters.size() - unknownCount;
-			final long average = (long) (getTotalBandwidth() / knownCount);
-			fixUnknownValues(average, average);
-		}
-	}
-
-	private void fixUnknownValues(long fastBw, long slowBw) {
-		for(WeightedRouter wr: weightedRouters) {
-			if(wr.isUnknown) {
-				long bw = wr.router.isFast() ? fastBw : slowBw;
-				wr.weightedBandwidth = bw;
-				wr.isUnknown = false;
-				adjustTotals(wr.router, bw);
-			}
-		}
-		unknownCount = 0;
-		isScaled = false;
-	}
-
-	Router chooseRandomRouterByWeight() {
-		final long total = getScaledTotal();
-		if(total == 0) {
-			if(weightedRouters.size() == 0) {
-				return null;
-			}
-			final int idx = random.nextInt(weightedRouters.size());
-			return weightedRouters.get(idx).router;
-		}
-		return chooseFirstElementAboveRandom(random.nextLong(total));
-	}
-	
-	void adjustWeights(double exitWeight, double guardWeight) {
-		for(WeightedRouter wr: weightedRouters) {
-			Router r = wr.router;
-			if(r.isExit() && r.isPossibleGuard()) {
-				wr.weightedBandwidth *= (exitWeight * guardWeight);
-			} else if(r.isPossibleGuard()) {
-				wr.weightedBandwidth *= guardWeight;
-			} else if(r.isExit()) {
-				wr.weightedBandwidth *= exitWeight;
-			}
-		}
-		scaleRouterWeights();
-	}
-
-	private Router chooseFirstElementAboveRandom(long randomValue) {
-		long sum = 0;
-		Router chosen = null;
-		for(WeightedRouter wr: weightedRouters) {
-			sum += wr.scaledBandwidth;
-			if(sum > randomValue) {
-				chosen = wr.router;
-				/* Don't return early to avoid leaking timing information about choice */
-				randomValue = Long.MAX_VALUE;
-			}
-		}
-		if(chosen == null) {
-			return weightedRouters.get(weightedRouters.size() - 1).router;
-		}
-		return chosen;
-	}
-	
-	private double getWeightedTotal() {
-		double total = 0.0;
-		for(WeightedRouter wr: weightedRouters) {
-			total += wr.weightedBandwidth;
-		}
-		return total;
-	}
-
-	private void scaleRouterWeights() {
-		final double scaleFactor = MAX_SCALE / getWeightedTotal();
-		for(WeightedRouter wr: weightedRouters) {
-			wr.scaleBandwidth(scaleFactor);
-		}
-		isScaled = true;
-	}
-
-	private long getScaledTotal() {
-		if(!isScaled) {
-			scaleRouterWeights();
-		}
-		long total = 0;
-		for(WeightedRouter wr: weightedRouters) {
-			total += wr.scaledBandwidth;
-		}
-		return total;
-	}	
-}
-   
\ No newline at end of file
diff --git a/orchid/src/com/subgraph/orchid/circuits/path/CircuitNodeChooser.java b/orchid/src/com/subgraph/orchid/circuits/path/CircuitNodeChooser.java
deleted file mode 100644
index 30047d94b92..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/path/CircuitNodeChooser.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package com.subgraph.orchid.circuits.path;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.ConsensusDocument;
-import com.subgraph.orchid.Directory;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.crypto.TorRandom;
-
-public class CircuitNodeChooser {
-	private final static Logger logger = Logger.getLogger(CircuitNodeChooser.class.getName());
-	
-	public enum WeightRule { WEIGHT_FOR_DIR, WEIGHT_FOR_EXIT, WEIGHT_FOR_MID, WEIGHT_FOR_GUARD, NO_WEIGHTING};
-	private final Directory directory;
-	private final TorRandom random = new TorRandom();
-	
-	private final TorConfigNodeFilter configNodeFilter;
-
-	
-	public CircuitNodeChooser(TorConfig config, Directory directory) {
-		this.directory = directory;
-		this.configNodeFilter = new TorConfigNodeFilter(config);
-	}
-	
-	/**
-	 * 
-	 * @param candidates
-	 * @return The chosen exit router or 'null' if no suitable router is available
-	 */
-	public Router chooseExitNode(List<Router> candidates) {
-		final List<Router> filteredCandidates = configNodeFilter.filterExitCandidates(candidates);
-		return chooseByBandwidth(filteredCandidates, WeightRule.WEIGHT_FOR_EXIT);
-	}
-	
-	public Router chooseDirectory() {
-		final RouterFilter filter = new RouterFilter() {
-			public boolean filter(Router router) {
-				return router.getDirectoryPort() != 0;
-			}
-		};
-		final List<Router> candidates = getFilteredRouters(filter, false);
-		final Router choice = chooseByBandwidth(candidates, WeightRule.WEIGHT_FOR_DIR);
-		if(choice == null) {
-			return directory.getRandomDirectoryAuthority();
-		} else {
-			return choice;
-		}
-	}
-
-	/**
-	 * 
-	 * @param rule
-	 * @param routerFilter
-	 * @return The chosen router or 'null' if no suitable router is available.
-	 */
-	public Router chooseRandomNode(WeightRule rule, RouterFilter routerFilter) {
-		final List<Router> candidates = getFilteredRouters(routerFilter, true);
-		final Router choice = chooseByBandwidth(candidates, rule);
-		if(choice == null) {
-			// try again with more permissive flags
-			return null;
-		}
-		return choice;
-	}
-	
-	private List<Router> getFilteredRouters(RouterFilter rf, boolean needDescriptor) {
-		final List<Router> routers = new ArrayList<Router>();
-		for(Router r: getUsableRouters(needDescriptor)) {
-			if(rf.filter(r)) {
-				routers.add(r);
-			}
-		}
-		return routers;
-	}
-	
-	List<Router> getUsableRouters(boolean needDescriptor) {
-		final List<Router> routers = new ArrayList<Router>();
-		for(Router r: directory.getAllRouters()) {
-			if(r.isRunning() && 
-					r.isValid() && 
-					!r.isHibernating() && 
-					!(needDescriptor && r.getCurrentDescriptor() == null)) {
-				
-				routers.add(r);
-			}
-		}
-		
-		return routers;
-	}
-
-	private Router chooseByBandwidth(List<Router> candidates, WeightRule rule) {
-		final Router choice = chooseNodeByBandwidthWeights(candidates, rule);
-		if(choice != null) {
-			return choice; 
-		} else {
-			return chooseNodeByBandwidth(candidates, rule);
-		}
-	}
-	
-	private Router chooseNodeByBandwidthWeights(List<Router> candidates, WeightRule rule) {
-		final ConsensusDocument consensus = directory.getCurrentConsensusDocument();
-		if(consensus == null) {
-			return null;
-		}
-		final BandwidthWeightedRouters bwr = computeWeightedBandwidths(candidates, consensus, rule);
-		return bwr.chooseRandomRouterByWeight();
-	}
-	
-	
-	private BandwidthWeightedRouters computeWeightedBandwidths(List<Router> candidates, ConsensusDocument consensus, WeightRule rule) {
-		final CircuitNodeChooserWeightParameters wp = CircuitNodeChooserWeightParameters.create(consensus, rule);
-		if(!wp.isValid()) {
-			logger.warning("Got invalid bandwidth weights. Falling back to old selection method");
-			return null;
-		}
-		final BandwidthWeightedRouters weightedRouters = new BandwidthWeightedRouters();
-		for(Router r: candidates) {
-			double wbw = wp.calculateWeightedBandwidth(r);
-			weightedRouters.addRouter(r, wbw);
-		}
-		return weightedRouters;
-	}
-	
-	private Router chooseNodeByBandwidth(List<Router> routers, WeightRule rule) {
-		final BandwidthWeightedRouters bwr = new BandwidthWeightedRouters();
-		for(Router r: routers) {
-			long bw = getRouterBandwidthBytes(r);
-			if(bw == -1) {
-				bwr.addRouterUnknown(r);
-			} else {
-				bwr.addRouter(r, bw);
-			}
-		}
-		bwr.fixUnknownValues();
-		if(bwr.isTotalBandwidthZero()) {
-			if(routers.size() == 0) {
-				return null;
-			}
-			
-			final int idx = random.nextInt(routers.size());
-			return routers.get(idx);
-		}
-		
-		computeFinalWeights(bwr, rule);
-		return bwr.chooseRandomRouterByWeight();
-	}
-
-
-	private final static double EPSILON = 0.1;
-	
-	private void computeFinalWeights(BandwidthWeightedRouters bwr, WeightRule rule) {
-		final double exitWeight = calculateWeight(rule == WeightRule.WEIGHT_FOR_EXIT, 
-				bwr.getTotalExitBandwidth(), bwr.getTotalBandwidth());
-		final double guardWeight = calculateWeight(rule == WeightRule.WEIGHT_FOR_GUARD, 
-				bwr.getTotalGuardBandwidth(), bwr.getTotalBandwidth());
-		
-		bwr.adjustWeights(exitWeight, guardWeight);
-	}
-
-	private double calculateWeight(boolean matchesRule, double totalByType, double total) {
-		if(matchesRule || totalByType < EPSILON) {
-			return 1.0;
-		}
-		final double result = 1.0 - (total / (3.0 * totalByType));
-		if(result <= 0.0) {
-			return 0.0;
-		} else {
-			return result;
-		}
-	}
-
-	private long getRouterBandwidthBytes(Router r) {
-		if(!r.hasBandwidth()) {
-			return  -1;
-		} else {
-			return kbToBytes(r.getEstimatedBandwidth());
-		}
-	}
-
-	private long kbToBytes(long bw) {
-		return (bw > (Long.MAX_VALUE / 1000) ? Long.MAX_VALUE : bw * 1000);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/path/CircuitNodeChooserWeightParameters.java b/orchid/src/com/subgraph/orchid/circuits/path/CircuitNodeChooserWeightParameters.java
deleted file mode 100644
index 49125ea6e66..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/path/CircuitNodeChooserWeightParameters.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package com.subgraph.orchid.circuits.path;
-
-import com.subgraph.orchid.ConsensusDocument;
-import com.subgraph.orchid.Router;
-
-class CircuitNodeChooserWeightParameters {
-	private final static int VAR_WG = 0;
-	private final static int VAR_WM = 1;
-	private final static int VAR_WE = 2;
-	private final static int VAR_WD = 3;
-	private final static int VAR_WGB = 4;
-	private final static int VAR_WMB = 5;
-	private final static int VAR_WEB = 6;
-	private final static int VAR_WDB = 7;
-	private final static int VAR_COUNT = 8;
-	
-	private final static String ZERO = "zero";
-	private final static String ONE = "one";
-	
-	static CircuitNodeChooserWeightParameters create(ConsensusDocument consensus, CircuitNodeChooser.WeightRule rule) {
-		final double[] vars = new double[VAR_COUNT];
-		final long scale = consensus.getWeightScaleParameter();
-		final String[] tags = getTagsForWeightRule(rule);
-		if(!populateVars(consensus, scale, tags, vars)) {
-			return new CircuitNodeChooserWeightParameters(new double[VAR_COUNT], false);
-		} else {
-			return new CircuitNodeChooserWeightParameters(vars, true);
-		}
-	}
-		
-	static boolean populateVars(ConsensusDocument consensus, long scale, String[] tags, double[] vars) {
-		for(int i = 0; i < VAR_COUNT; i++) {
-			vars[i] = tagToVarValue(consensus, scale, tags[i]);
-			if(vars[i] < 0.0) {
-				return false;
-			} else {
-				vars[i] /= scale;
-			}
-		}
-		return true;
-	}
-
-	static double tagToVarValue(ConsensusDocument consensus, long scale, String tag) {
-		if(tag.equals(ZERO)) {
-			return 0.0;
-		} else if (tag.equals(ONE)) {
-			return 1.0;
-		} else {
-			return consensus.getBandwidthWeight(tag);
-		}
-	}
-
-	static String[] getTagsForWeightRule(CircuitNodeChooser.WeightRule rule) {
-		switch(rule) {
-		case WEIGHT_FOR_GUARD:
-			return new String[] { 
-					"Wgg", "Wgm", ZERO, "Wgd",
-					"Wgb", "Wmb", "Web", "Wdb"};
-			
-		case WEIGHT_FOR_MID:
-			return new String[] {
-					"Wmg", "Wmm", "Wme", "Wmd",
-					"Wgb", "Wmb", "Web", "Wdb"};
-			
-		case WEIGHT_FOR_EXIT:
-			return new String[] {
-					"Wee", "Wem", "Wed", "Weg",
-					"Wgb", "Wmb", "Web", "Wdb"};
-			
-		case WEIGHT_FOR_DIR:
-			return new String[] { 
-					"Wbe", "Wbm", "Wbd", "Wbg",
-					ONE, ONE, ONE, ONE };
-			
-		case NO_WEIGHTING:
-			return new String[] {
-					ONE, ONE, ONE, ONE,
-					ONE, ONE, ONE, ONE };
-		default:
-			throw new IllegalArgumentException("Unhandled WeightRule type: "+ rule);
-		}
-	}
-
-	private final double[] vars;
-	private final boolean isValid;
-	
-	private CircuitNodeChooserWeightParameters(double[] vars, boolean isValid) {
-		this.vars = vars;
-		this.isValid = isValid;
-	}
-	
-	boolean isValid() {
-		return isValid;
-	}
-
-	double getWg() {
-		return vars[VAR_WG];
-	}
-
-	double getWm() {
-		return vars[VAR_WM];
-	}
-
-	double getWe() {
-		return vars[VAR_WE];
-	}
-
-	double getWd() {
-		return vars[VAR_WD];
-	}
-	
-	double getWgb() {
-		return vars[VAR_WGB];
-	}
-	double getWmb() {
-		return vars[VAR_WMB];
-	}
-	double getWeb() {
-		return vars[VAR_WEB];
-	}
-	double getWdb() {
-		return vars[VAR_WDB];
-	}
-	
-	double calculateWeightedBandwidth(Router router) {
-		final long bw = kbToBytes(router.getEstimatedBandwidth());
-		final double w = calculateWeight(
-				router.isExit() && !router.isBadExit(), 
-				router.isPossibleGuard(), 
-				router.getDirectoryPort() != 0);
-		return (w * bw) + 0.5;
-	}
-	
-	long kbToBytes(long kb) {
-		return (kb > (Long.MAX_VALUE / 1000) ? Long.MAX_VALUE : kb * 1000);
-	}
-	
-	private double calculateWeight(boolean isExit, boolean isGuard, boolean isDir) {
-		if(isGuard && isExit) {
-			return (isDir) ? getWdb() * getWd() : getWd();
-		} else if (isGuard) {
-			return (isDir) ? getWgb() * getWg() : getWg();
-		} else if (isExit) {
-			return (isDir) ? getWeb() * getWe() : getWe();
-		} else { // middle
-			return (isDir) ? getWmb() * getWm() : getWm();
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/path/CircuitPathChooser.java b/orchid/src/com/subgraph/orchid/circuits/path/CircuitPathChooser.java
deleted file mode 100644
index 5bae0b64537..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/path/CircuitPathChooser.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package com.subgraph.orchid.circuits.path;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.subgraph.orchid.Directory;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.circuits.guards.EntryGuards;
-import com.subgraph.orchid.circuits.path.CircuitNodeChooser.WeightRule;
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.data.exitpolicy.ExitTarget;
-
-public class CircuitPathChooser {
-	
-	public static CircuitPathChooser create(TorConfig config, Directory directory) {
-		return new CircuitPathChooser(config, directory, new CircuitNodeChooser(config, directory));
-	}
-
-	private final Directory directory;
-	private final CircuitNodeChooser nodeChooser;
-	
-	private EntryGuards entryGuards;
-	private boolean useEntryGuards;
-	
-	CircuitPathChooser(TorConfig config, Directory directory, CircuitNodeChooser nodeChooser) {
-		this.directory = directory;
-		this.nodeChooser = nodeChooser;
-		this.entryGuards = null;
-		this.useEntryGuards = false;
-	}
-
-	public void enableEntryGuards(EntryGuards entryGuards) {
-		this.entryGuards = entryGuards;
-		this.useEntryGuards = true;
-	}
-
-	public List<Router> chooseDirectoryPath() throws InterruptedException {
-		if(useEntryGuards && entryGuards.isUsingBridges()) {
-			final Set<Router> empty = Collections.emptySet();
-			final Router bridge = entryGuards.chooseRandomGuard(empty);
-			if(bridge == null) {
-				throw new IllegalStateException("Failed to choose bridge for directory request");
-			}
-			return Arrays.asList(bridge);
-		}
-		final Router dir = nodeChooser.chooseDirectory();
-		return Arrays.asList(dir);
-	}
-	
-	public List<Router> chooseInternalPath() throws InterruptedException, PathSelectionFailedException {
-		final Set<Router> excluded = Collections.emptySet();
-		final Router finalRouter = chooseMiddleNode(excluded);
-		return choosePathWithFinal(finalRouter);
-	}
-
-	public List<Router> choosePathWithExit(Router exitRouter) throws InterruptedException, PathSelectionFailedException {
-		return choosePathWithFinal(exitRouter);
-	}
-
-	public List<Router> choosePathWithFinal(Router finalRouter) throws InterruptedException, PathSelectionFailedException {
-		final Set<Router> excluded = new HashSet<Router>();
-		excludeChosenRouterAndRelated(finalRouter, excluded);
-
-		final Router middleRouter = chooseMiddleNode(excluded);
-		if(middleRouter == null) {
-			throw new PathSelectionFailedException("Failed to select suitable middle node");
-		}
-		excludeChosenRouterAndRelated(middleRouter, excluded);
-
-		final Router entryRouter = chooseEntryNode(excluded);
-		if(entryRouter == null) {
-			throw new PathSelectionFailedException("Failed to select suitable entry node");
-		}
-		return Arrays.asList(entryRouter, middleRouter, finalRouter);
-	}
-
-	public Router chooseEntryNode(final Set<Router> excludedRouters) throws InterruptedException {
-		if(useEntryGuards) {
-			return entryGuards.chooseRandomGuard(excludedRouters);
-		}
-
-		return nodeChooser.chooseRandomNode(WeightRule.WEIGHT_FOR_GUARD, new RouterFilter() {
-			public boolean filter(Router router) {
-				return router.isPossibleGuard() && !excludedRouters.contains(router);
-			}
-		});
-	}
-
-	Router chooseMiddleNode(final Set<Router> excludedRouters) {
-		return nodeChooser.chooseRandomNode(WeightRule.WEIGHT_FOR_MID, new RouterFilter() {
-			public boolean filter(Router router) {
-				return router.isFast() && !excludedRouters.contains(router);
-			}
-		});
-	}
-
-	public Router chooseExitNodeForTargets(List<ExitTarget> targets) {
-		final List<Router> routers = filterForExitTargets(
-				getUsableExitRouters(), targets);
-		return nodeChooser.chooseExitNode(routers);
-	}
-	
-	private List<Router> getUsableExitRouters() {
-		final List<Router> result = new ArrayList<Router>();
-		for(Router r: nodeChooser.getUsableRouters(true)) {
-			if(r.isExit() && !r.isBadExit()) {
-				result.add(r);
-			}
-		}
-		return result;
-	}
-
-	private void excludeChosenRouterAndRelated(Router router, Set<Router> excludedRouters) {
-		excludedRouters.add(router);
-		for(Router r: directory.getAllRouters()) {
-			if(areInSameSlash16(router, r)) {
-				excludedRouters.add(r);
-			}
-		}
-		
-		for(String s: router.getFamilyMembers()) {
-			Router r = directory.getRouterByName(s);
-			if(r != null) {
-				// Is mutual?
-				if(isFamilyMember(r.getFamilyMembers(), router)) {
-					excludedRouters.add(r);
-				}
-			}
-		}
-	}
-	
-	private boolean isFamilyMember(Collection<String> familyMemberNames, Router r) {
-		for(String s: familyMemberNames) {
-			Router member = directory.getRouterByName(s);
-			if(member != null && member.equals(r)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	// Are routers r1 and r2 in the same /16 network
-	private boolean areInSameSlash16(Router r1, Router r2) {
-		final IPv4Address a1 = r1.getAddress();
-		final IPv4Address a2 = r2.getAddress();
-		final int mask = 0xFFFF0000;
-		return (a1.getAddressData() & mask) == (a2.getAddressData() & mask);
-	}
-	
-	private List<Router> filterForExitTargets(List<Router> routers, List<ExitTarget> exitTargets) {
-		int bestSupport = 0;
-		if(exitTargets.isEmpty()) {
-			return routers;
-		}
-		
-		final int[] nSupport = new int[routers.size()];
-		
-		for(int i = 0; i < routers.size(); i++) {
-			final Router r = routers.get(i);
-			nSupport[i] = countTargetSupport(r, exitTargets);
-			if(nSupport[i] > bestSupport) {
-				bestSupport = nSupport[i];
-			}
-		}
-		
-		if(bestSupport == 0) {
-			return routers;
-		}
-
-		final List<Router> results = new ArrayList<Router>();
-		for(int i = 0; i < routers.size(); i++) {
-			if(nSupport[i] == bestSupport) {
-				results.add(routers.get(i));
-			}
-		}
-		return results;
-	}
-
-	private int countTargetSupport(Router router, List<ExitTarget> targets) {
-		int count = 0;
-		for(ExitTarget t: targets) {
-			if(routerSupportsTarget(router, t)) {
-				count += 1;
-			}
-		}
-		return count;
-	}
-
-	private boolean routerSupportsTarget(Router router, ExitTarget target) {
-		if(target.isAddressTarget()) {
-			return router.exitPolicyAccepts(target.getAddress(), target.getPort());
-		} else {
-			return router.exitPolicyAccepts(target.getPort());
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/path/ConfigNodeFilter.java b/orchid/src/com/subgraph/orchid/circuits/path/ConfigNodeFilter.java
deleted file mode 100644
index bb5d7524b02..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/path/ConfigNodeFilter.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package com.subgraph.orchid.circuits.path;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.IPv4Address;
-
-/**
- * Implements configuration options:
- * 
- *   ExcludeNodes,ExcludeExitNodes,ExitNodes,EntryNodes
- *
- */
-public class ConfigNodeFilter implements RouterFilter {
-
-	private final static Pattern NETMASK_PATTERN = Pattern.compile("^(\\d+)\\.(\\d+)\\.(\\d+)\\.(\\d+)/(\\d+)$");
-	private final static Pattern ADDRESS_BITS_PATTERN = Pattern.compile("^(\\d+\\.\\d+\\.\\d+\\.\\d+)/(\\d+)$");
-	
-	private final static Pattern IDENTITY_PATTERN = Pattern.compile("^[A-Fa-f0-9]{40}$");
-	private final static Pattern COUNTRYCODE_PATTERN = Pattern.compile("^\\{([A-Za-z]{2})\\}$");
-	private final static Pattern ROUTERNAME_PATTERN = Pattern.compile("^\\w{1,19}$");
-
-	static class MaskFilter implements RouterFilter {
-
-		private final int network;
-		private final int bits;
-		private final int mask;
-		
-
-		static int createMask(final int maskBitCount) {
-			return maskBitCount == 0 ? 0 : (1 << 31) >> (maskBitCount - 1);
-		}
-
-		MaskFilter(IPv4Address network, int bits) {
-			this.bits = bits;
-			this.mask = createMask(bits);
-			this.network = network.getAddressData() & mask;
-		}
-		
-		public boolean filter(Router router) {
-			final int routerAddress = router.getAddress().getAddressData();
-			return (routerAddress & mask) == network;
-		}
-		
-		public String toString() {
-			IPv4Address a = new IPv4Address(network);
-			return a.toString() + "/" + bits;
-			
-		}
-	}
-	
-	static class IdentityFilter implements RouterFilter {
-		private final HexDigest identity;
-		IdentityFilter(HexDigest identity) {
-			this.identity = identity;
-		}
-		public boolean filter(Router router) {
-			return router.getIdentityHash().equals(identity);
-		}
-	}
-
-	static class NameFilter implements RouterFilter {
-		private final String name;
-		NameFilter(String name) {
-			this.name = name;
-		}
-		public boolean filter(Router router) {
-			return name.equals(router.getNickname());
-		}
-	}
-	
-	static class CountryCodeFilter implements RouterFilter {
-		private final String countryCode;
-		public CountryCodeFilter(String countryCode) {
-			this.countryCode = countryCode;
-		}
-		public boolean filter(Router router) {
-			return countryCode.equalsIgnoreCase(router.getCountryCode());
-		}
-	}
-	
-	static boolean isAddressString(String s) {
-		Matcher matcher = NETMASK_PATTERN.matcher(s);
-		if(!matcher.matches()) {
-			return false;
-		}
-		try {
-			for(int i = 1; i < 5; i++) {
-				if(!isValidOctetString(matcher.group(i))) {
-					return false;
-				}
-			}
-			return isValidMaskValue(matcher.group(5));
-		} catch (NumberFormatException e) {
-			return false;
-		}
-	}
-	
-	private static boolean isValidOctetString(String s) {
-		int n = Integer.parseInt(s);
-		return n >= 0 && n <= 255;
-	}
-	
-	private static boolean isValidMaskValue(String s) {
-		int n = Integer.parseInt(s);
-		return n > 0 && n <= 32;
-	}
-	
-	static boolean isIdentityString(String s) {
-		return IDENTITY_PATTERN.matcher(s).matches();
-	}
-	
-	static boolean isCountryCodeString(String s) {
-		return COUNTRYCODE_PATTERN.matcher(s).matches();
-	}
-	
-	static boolean isNameString(String s) {
-		return ROUTERNAME_PATTERN.matcher(s).matches();
-	}
-
-	static RouterFilter createFilterFor(String s) {
-		if(isAddressString(s)) {
-			return createAddressFilter(s);
-		} else if(isCountryCodeString(s)) {
-			return createCountryCodeFilter(s);
-		} else if(isIdentityString(s)) {
-			return createIdentityFilter(s);
-		} else if (isNameString(s)) {
-			return createNameFilter(s);
-		} else {
-			return null;
-		}
-	}
-
-	private static RouterFilter createAddressFilter(String s) {
-		final Matcher matcher = ADDRESS_BITS_PATTERN.matcher(s);
-		if(!matcher.matches()) {
-			throw new IllegalArgumentException();
-		}
-		final IPv4Address network = IPv4Address.createFromString(matcher.group(1));
-		final int bits = Integer.parseInt(matcher.group(2));
-		return new MaskFilter(network, bits);
-	}
-	
-	private static RouterFilter createIdentityFilter(String s) {
-		if(isIdentityString(s)) {
-			throw new IllegalArgumentException();
-		}
-		final HexDigest identity = HexDigest.createFromString(s);
-		return new IdentityFilter(identity);
-	}
-	
-	private static RouterFilter createCountryCodeFilter(String s) {
-		final Matcher matcher = COUNTRYCODE_PATTERN.matcher(s);
-		if(!matcher.matches()) {
-			throw new IllegalArgumentException();
-		}
-		return new CountryCodeFilter(matcher.group(1));
-	}
-	
-	private static RouterFilter createNameFilter(String s) {
-		if(!isNameString(s)) {
-			throw new IllegalArgumentException();
-		}
-		return new NameFilter(s);
-	}
-
-	static ConfigNodeFilter createFromStrings(List<String> stringList) {
-		final List<RouterFilter> filters = new ArrayList<RouterFilter>();
-		for(String s: stringList) {
-			RouterFilter f = createFilterFor(s);
-			if(f != null) {
-				filters.add(f);
-			}
-		}
-		return new ConfigNodeFilter(filters);
-	}
-
-	private final List<RouterFilter> filterList;
-	
-	private ConfigNodeFilter(List<RouterFilter> filterList) {
-		this.filterList = filterList;
-	}
-
-	public boolean filter(Router router) {
-		for(RouterFilter f: filterList) {
-			if(f.filter(router)) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	boolean isEmpty() {
-		return filterList.isEmpty();
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/path/PathSelectionFailedException.java b/orchid/src/com/subgraph/orchid/circuits/path/PathSelectionFailedException.java
deleted file mode 100644
index a669ac2c5ed..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/path/PathSelectionFailedException.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.subgraph.orchid.circuits.path;
-
-public class PathSelectionFailedException extends Exception {
-	private static final long serialVersionUID = -8855252756021674268L;
-
-	public PathSelectionFailedException() {}
-	
-	public PathSelectionFailedException(String message) {
-		super(message);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/path/RouterFilter.java b/orchid/src/com/subgraph/orchid/circuits/path/RouterFilter.java
deleted file mode 100644
index ae8830179ac..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/path/RouterFilter.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.subgraph.orchid.circuits.path;
-
-import com.subgraph.orchid.Router;
-
-public interface RouterFilter {
-	boolean filter(Router router);
-}
diff --git a/orchid/src/com/subgraph/orchid/circuits/path/TorConfigNodeFilter.java b/orchid/src/com/subgraph/orchid/circuits/path/TorConfigNodeFilter.java
deleted file mode 100644
index 800509bb850..00000000000
--- a/orchid/src/com/subgraph/orchid/circuits/path/TorConfigNodeFilter.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.subgraph.orchid.circuits.path;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.TorConfig;
-
-public class TorConfigNodeFilter {
-	
-	/* 
-	 * Even though these are exactly the configuration file variable names, they are only
-	 * used here as keys into a Map<String,ConfigNodeFilter>
-	 */
-	private final static String EXCLUDE_NODES_FILTER = "ExcludeNodes";
-	private final static String EXCLUDE_EXIT_NODES_FILTER = "ExcludeExitNodes";
-	private final static String ENTRY_NODES_FILTER = "EntryNodes";
-	private final static String EXIT_NODES_FILTER = "ExitNodes";
-	
-	private final Map<String, ConfigNodeFilter> filters;
-	
-	TorConfigNodeFilter(TorConfig config) {
-		this.filters = new HashMap<String, ConfigNodeFilter>();
-		addFilter(filters, EXCLUDE_NODES_FILTER, config.getExcludeNodes());
-		addFilter(filters, EXCLUDE_EXIT_NODES_FILTER, config.getExcludeExitNodes());
-		addFilter(filters, ENTRY_NODES_FILTER, config.getEntryNodes());
-		addFilter(filters, EXIT_NODES_FILTER, config.getExitNodes());
-	}
-	
-	private static void addFilter(Map<String, ConfigNodeFilter> filters, String name, List<String> filterStrings) {
-		if(filterStrings == null || filterStrings.isEmpty()) {
-			return;
-		}
-		filters.put(name, ConfigNodeFilter.createFromStrings(filterStrings));
-	}
-	
-	List<Router> filterExitCandidates(List<Router> candidates) {
-		final List<Router> filtered = new ArrayList<Router>();
-		for(Router r: candidates) {
-			if(isExitNodeIncluded(r)) {
-				filtered.add(r);
-			}
-		}
-		return filtered;
-	}
-
-	boolean isExitNodeIncluded(Router exitRouter) {
-		return isIncludedByFilter(exitRouter, EXIT_NODES_FILTER) && 
-				!(isExcludedByFilter(exitRouter, EXCLUDE_EXIT_NODES_FILTER) || 
-						isExcludedByFilter(exitRouter, EXCLUDE_NODES_FILTER));
-	}
-	
-	boolean isIncludedByFilter(Router r, String filterName) {
-		final ConfigNodeFilter f = filters.get(filterName);
-		if(f == null || f.isEmpty()) {
-			return true;
-		}
-		return f.filter(r);
-	}
-	
-	boolean isExcludedByFilter(Router r, String filterName) {
-		final ConfigNodeFilter f = filters.get(filterName);
-		if(f == null || f.isEmpty()) {
-			return false;
-		}
-		return f.filter(r);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/config/TorConfigBridgeLine.java b/orchid/src/com/subgraph/orchid/config/TorConfigBridgeLine.java
deleted file mode 100644
index ef25d31f642..00000000000
--- a/orchid/src/com/subgraph/orchid/config/TorConfigBridgeLine.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.subgraph.orchid.config;
-
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.IPv4Address;
-
-public class TorConfigBridgeLine {
-	
-	private final IPv4Address address;
-	private final int port;
-	private final HexDigest fingerprint;
-
-	TorConfigBridgeLine(IPv4Address address, int port, HexDigest fingerprint) {
-		this.address = address;
-		this.port = port;
-		this.fingerprint = fingerprint;
-	}
-	
-	public IPv4Address getAddress() {
-		return address;
-	}
-	
-	public int getPort() {
-		return port;
-	}
-	
-	public HexDigest getFingerprint() {
-		return fingerprint;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/config/TorConfigHSAuth.java b/orchid/src/com/subgraph/orchid/config/TorConfigHSAuth.java
deleted file mode 100644
index 612c527c35a..00000000000
--- a/orchid/src/com/subgraph/orchid/config/TorConfigHSAuth.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.subgraph.orchid.config;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.subgraph.orchid.TorException;
-import com.subgraph.orchid.circuits.hs.HSDescriptorCookie;
-import com.subgraph.orchid.circuits.hs.HSDescriptorCookie.CookieType;
-import com.subgraph.orchid.data.Base32;
-import com.subgraph.orchid.encoders.Base64;
-
-public class TorConfigHSAuth {
-	
-	private final Map<String, HSDescriptorCookie> map = new HashMap<String, HSDescriptorCookie>();
-
-	void add(String key, String b64Value) {
-		final HSDescriptorCookie cookie = createFromBase64(b64Value);
-		final String k = validateKey(key);
-		map.put(k, cookie);
-	}
-	
-	private String validateKey(String key) {
-		final String k = (key.endsWith(".onion")) ? key.substring(0, (key.length() - 6)) : key;
-		try {
-			byte[] decoded = Base32.base32Decode(k);
-			if(decoded.length != 10) {
-				throw new IllegalArgumentException();
-			}
-			return k;
-		} catch (TorException e) {
-			throw new IllegalArgumentException(e.getMessage());
-		}
-	}
-	
-	HSDescriptorCookie get(String key) {
-		return map.get(validateKey(key));
-	}
-	
-	private HSDescriptorCookie createFromBase64(String b64) {
-		if(b64.length() != 22) {
-			throw new IllegalArgumentException();
-		}
-		final byte[] decoded = Base64.decode(b64 + "A=");
-		final byte lastByte = decoded[decoded.length - 1];
-		final int flag = (lastByte & 0xFF) >> 4;
-		final byte[] cookie = new byte[decoded.length - 1];
-		System.arraycopy(decoded, 0, cookie, 0, cookie.length);
-		switch(flag) {
-		case 0:
-			return new HSDescriptorCookie(CookieType.COOKIE_BASIC, cookie);
-		case 1:
-			return new HSDescriptorCookie(CookieType.COOKIE_STEALTH, cookie);
-		default:
-			throw new TorException("Illegal cookie descriptor with flag value: "+ flag);
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/config/TorConfigInterval.java b/orchid/src/com/subgraph/orchid/config/TorConfigInterval.java
deleted file mode 100644
index ecb3b89ed63..00000000000
--- a/orchid/src/com/subgraph/orchid/config/TorConfigInterval.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.subgraph.orchid.config;
-
-import java.util.concurrent.TimeUnit;
-
-public class TorConfigInterval {
-
-	public static TorConfigInterval createFrom(String s) {
-		final String[] ss = s.split(" ");
-		final long n = Long.parseLong(ss[0]);
-		if(ss.length == 1) {
-			return new TorConfigInterval(n, TimeUnit.SECONDS);
-		} else {
-			return createForValueAndUnit(n, ss[1]);
-		}
-	}
-	
-	private static TorConfigInterval createForValueAndUnit(long value, String unitName) {
-		if(stringMatchesUnit(unitName, "week")) {
-			return new TorConfigInterval(value * 7, TimeUnit.DAYS);
-		} else {
-			final TimeUnit unit = stringToUnit(unitName);
-			return new TorConfigInterval(value, unit);
-		}
-	}
-	
-	private static TimeUnit stringToUnit(String s) {
-		if(stringMatchesUnit(s, "day")) {
-			return TimeUnit.DAYS;
-		} else if(stringMatchesUnit(s, "hour")) {
-			return TimeUnit.HOURS;
-		} else if(stringMatchesUnit(s, "minute")) {
-			return TimeUnit.MINUTES;
-		} else if(stringMatchesUnit(s, "second")) {
-			return TimeUnit.SECONDS;
-		} else if(stringMatchesUnit(s, "millisecond")) {
-			return TimeUnit.MILLISECONDS;
-		} else {
-			throw new IllegalArgumentException();
-		}
-	}
-	
-	private static boolean stringMatchesUnit(String s, String unitType) {
-		if(s == null) {
-			return false;
-		} else {
-			return s.equalsIgnoreCase(unitType) || s.equalsIgnoreCase(unitType + "s");
-		}
-	}
-	
-	private final TimeUnit timeUnit;
-	private final long value;
-
-
-	public TorConfigInterval(long value, TimeUnit timeUnit) {
-		this.timeUnit = getTimeUnitFor(value, timeUnit);
-		this.value = getValueFor(value, timeUnit);
-
-	}
-	
-	public long getMilliseconds() {
-		return TimeUnit.MILLISECONDS.convert(value, timeUnit);
-	}
-
-	private static TimeUnit getTimeUnitFor(long value, TimeUnit timeUnit) {
-		if(timeUnit == TimeUnit.NANOSECONDS || timeUnit == TimeUnit.MICROSECONDS) {
-			return TimeUnit.MILLISECONDS;
-		} else {
-			return timeUnit;
-		}
-	}
-	
-	private static long getValueFor(long value, TimeUnit timeUnit) {
-		if(timeUnit == TimeUnit.NANOSECONDS || timeUnit == TimeUnit.MICROSECONDS) {
-			return TimeUnit.MILLISECONDS.convert(value, timeUnit);
-		} else {
-			return value;
-		}
-	}
-
-	public String toString() {
-		if(timeUnit == TimeUnit.DAYS && (value % 7 == 0)) {
-			final long weeks = value / 7;
-			return (weeks == 1) ? "1 week" : (weeks + " weeks");
-		}
-		final StringBuilder sb = new StringBuilder();
-		sb.append(value);
-		sb.append(" ");
-		sb.append(unitToString(timeUnit));
-		if(value != 1) {
-			sb.append("s");
-		}
-		return sb.toString();
-	}
-	
-	private static String unitToString(TimeUnit unit) {
-		switch(unit) {
-		case MILLISECONDS:
-			return "millisecond";
-		case SECONDS:
-			return "second";
-		case MINUTES:
-			return "minute";
-		case HOURS:
-			return "hour";
-		case DAYS:
-			return "days";
-		default:
-			throw new IllegalArgumentException();
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/config/TorConfigParser.java b/orchid/src/com/subgraph/orchid/config/TorConfigParser.java
deleted file mode 100644
index c44a066f441..00000000000
--- a/orchid/src/com/subgraph/orchid/config/TorConfigParser.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.subgraph.orchid.config;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.TorConfig.AutoBoolValue;
-import com.subgraph.orchid.TorConfig.ConfigVarType;
-
-public class TorConfigParser {
-	
-	public Object parseValue(String value, ConfigVarType type) {
-		switch(type) {
-		case BOOLEAN:
-			return Boolean.parseBoolean(value);
-		case INTEGER:
-			return Integer.parseInt(value);
-		case INTERVAL:
-			return parseIntervalValue(value);
-		case PATH:
-			return parseFileValue(value);
-		case PORTLIST:
-			return parseIntegerList(value);
-		case STRING:
-			return value;
-		case STRINGLIST:
-			return parseCSV(value);
-		case AUTOBOOL:
-			return parseAutoBool(value);
-		case HS_AUTH:
-		default:
-			throw new IllegalArgumentException();
-		}
-	}
-
-	private File parseFileValue(String value) {
-		if(value.startsWith("~/")) {
-			final File home = new File(System.getProperty("user.home"));
-			return new File(home, value.substring(2));
-		}
-		return new File(value);
-	}
-	private TorConfigInterval parseIntervalValue(String value) {
-		return TorConfigInterval.createFrom(value);
-	}
-	
-	private List<Integer> parseIntegerList(String value) {
-		final List<Integer> list = new ArrayList<Integer>();
-		for(String s: value.split(",")) {
-			list.add(Integer.parseInt(s));
-		}
-		return list;
-	}
-	
-	private List<String> parseCSV(String value) {
-		final List<String> list = new ArrayList<String>();
-		for(String s: value.split(",")) {
-			list.add(s);
-		}
-		return list;
-	}
-	
-	private TorConfig.AutoBoolValue parseAutoBool(String value) {
-		if("auto".equalsIgnoreCase(value)) {
-			return AutoBoolValue.AUTO;
-		} else if("true".equalsIgnoreCase(value)) {
-			return AutoBoolValue.TRUE;
-		} else if("false".equalsIgnoreCase(value)) {
-			return AutoBoolValue.FALSE;
-		} else {
-			throw new IllegalArgumentException("Could not parse AutoBool value "+ value);
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/config/TorConfigProxy.java b/orchid/src/com/subgraph/orchid/config/TorConfigProxy.java
deleted file mode 100644
index 9e732293f28..00000000000
--- a/orchid/src/com/subgraph/orchid/config/TorConfigProxy.java
+++ /dev/null
@@ -1,199 +0,0 @@
-package com.subgraph.orchid.config;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.TorConfig.ConfigVar;
-import com.subgraph.orchid.TorConfig.ConfigVarType;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.IPv4Address;
-
-public class TorConfigProxy implements InvocationHandler {
-	
-	private final Map<String, Object> configValues;
-	private final List<TorConfigBridgeLine> bridges;
-	private final TorConfigParser parser;
-	
-	public TorConfigProxy() {
-		this.configValues = new HashMap<String, Object>();
-		this.bridges = new ArrayList<TorConfigBridgeLine>();
-		this.configValues.put("Bridges", bridges);
-		this.parser = new TorConfigParser();
-	}
-	
-	public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-		if(method.getName().startsWith("set")) {
-			invokeSetMethod(method, args);
-			return null;
-		} else if(method.getName().startsWith("get")) {
-			if(args == null) {
-				return invokeGetMethod(method);
-			} else {
-				return invokeGetMethodWithArgs(method, args);
-			}
-		} else if(method.getName().startsWith("add")) { 
-			invokeAddMethod(method, args);
-			return null;
-		} else {
-			throw new IllegalArgumentException();
-		}
-	}
-	
-	void invokeSetMethod(Method method, Object[] args) {
-		final String name = getVariableNameForMethod(method);
-		final ConfigVar annotation = getAnnotationForVariable(name);
-		if(annotation != null && annotation.type() == ConfigVarType.INTERVAL) {
-			setIntervalValue(name, args);
-		} else {
-			configValues.put(name, args[0]);
-		}
-	}
-	
-	private void setIntervalValue(String varName, Object[] args) {
-		if(!(args[0] instanceof Long && args[1] instanceof TimeUnit)) {
-			throw new IllegalArgumentException();
-		}
-		final long time = (Long) args[0];
-		final TimeUnit unit = (TimeUnit) args[1];
-		final TorConfigInterval interval = new TorConfigInterval(time, unit);
-		configValues.put(varName, interval);
-	}
-
-	
-	private Object invokeGetMethodWithArgs(Method method, Object[] args) {
-		final String varName = getVariableNameForMethod(method);
-		if(getVariableType(varName) == ConfigVarType.HS_AUTH) {
-			return invokeHSAuthGet(varName, args);
-		} else {
-			throw new IllegalArgumentException();
-		}
-	}
-	
-	private Object invokeGetMethod(Method method) {
-		final String varName = getVariableNameForMethod(method);
-		final Object value = getVariableValue(varName);
-		
-		if(value instanceof TorConfigInterval) {
-			final TorConfigInterval interval = (TorConfigInterval) value;
-			return interval.getMilliseconds();
-		} else {
-			return value;
-		}
-	}
-	
-	private Object invokeHSAuthGet(String varName, Object[] args) {
-		if(!(args[0] instanceof String)) {
-			throw new IllegalArgumentException();
-		}
-		final TorConfigHSAuth hsAuth = getHSAuth(varName);		
-		return hsAuth.get((String) args[0]);
-	}
-
-	private void invokeAddMethod(Method method, Object[] args) {
-		final String name = getVariableNameForMethod(method);
-		final ConfigVarType type = getVariableType(name);
-		switch(type) {
-		case HS_AUTH:
-			invokeHSAuthAdd(name, args);
-			break;
-			
-		case BRIDGE_LINE:
-			invokeBridgeAdd(args);
-			break;
-			
-		default:
-			throw new UnsupportedOperationException("addX configuration methods only supported for HS_AUTH or BRIDGE_LINE type");
-		}
-	}
-	
-	private void invokeBridgeAdd(Object[] args) {
-		if(args.length >= 2 && (args[0] instanceof IPv4Address) && (args[1] instanceof Integer)) {
-			if(args.length == 2) {
-				bridges.add(new TorConfigBridgeLine((IPv4Address)args[0], (Integer)args[1], null));
-				return;
-			} else if(args.length == 3 && (args[2] instanceof HexDigest)) {
-				bridges.add(new TorConfigBridgeLine((IPv4Address) args[0], (Integer) args[1], (HexDigest) args[2]));
-				return;
-			}
-		}
-		throw new IllegalArgumentException();
-	}
-	
-	private void invokeHSAuthAdd(String name, Object[] args) {
-		if(!(args.length == 2 && (args[0] instanceof String) && (args[1] instanceof String))) {
-			throw new IllegalArgumentException();
-		}
-		final TorConfigHSAuth hsAuth = getHSAuth(name);
-		hsAuth.add((String)args[0], (String)args[1]);
-	}
-	
-	private TorConfigHSAuth getHSAuth(String keyName) {
-		if(!configValues.containsKey(keyName)) {
-			configValues.put(keyName, new TorConfigHSAuth());
-		}
-		return (TorConfigHSAuth) configValues.get(keyName);
-	}
-
-	private Object getVariableValue(String varName) {
-		if(configValues.containsKey(varName)) {
-			return configValues.get(varName);
-		} else {
-			return getDefaultVariableValue(varName);
-		}
-	}
-
-	private Object getDefaultVariableValue(String varName) {
-		final String defaultValue = getDefaultValueString(varName);
-		final ConfigVarType type = getVariableType(varName);
-		if(defaultValue == null || type == null) {
-			return null;
-		}
-		return parser.parseValue(defaultValue, type);
-	}
-	
-	private String getDefaultValueString(String varName) {
-		final ConfigVar var = getAnnotationForVariable(varName);
-		if(var == null) {
-			return null;
-		} else {
-			return var.defaultValue();
-		}
-	}
-
-	private ConfigVarType getVariableType(String varName) {
-		if("Bridge".equals(varName)) {
-			return ConfigVarType.BRIDGE_LINE;
-		}
-		
-		final ConfigVar var = getAnnotationForVariable(varName);
-		if(var == null) {
-			return null;
-		} else {
-			return var.type();
-		}
-	}
-	
-	private String getVariableNameForMethod(Method method) {
-		final String methodName = method.getName();
-		if(methodName.startsWith("get") || methodName.startsWith("set") || methodName.startsWith("add")) {
-			return methodName.substring(3);
-		}
-		throw new IllegalArgumentException();
-	}
-	
-	private ConfigVar getAnnotationForVariable(String varName) {
-		final String getName = "get"+ varName;
-		for(Method m: TorConfig.class.getDeclaredMethods()) {
-			if(getName.equals(m.getName())) {
-				return m.getAnnotation(TorConfig.ConfigVar.class);
-			}
-		}
-		return null;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/connections/ConnectionCacheImpl.java b/orchid/src/com/subgraph/orchid/connections/ConnectionCacheImpl.java
deleted file mode 100644
index 5f5683515ae..00000000000
--- a/orchid/src/com/subgraph/orchid/connections/ConnectionCacheImpl.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package com.subgraph.orchid.connections;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Logger;
-
-import javax.net.ssl.SSLSocket;
-
-import com.subgraph.orchid.Connection;
-import com.subgraph.orchid.ConnectionCache;
-import com.subgraph.orchid.ConnectionFailedException;
-import com.subgraph.orchid.ConnectionHandshakeException;
-import com.subgraph.orchid.ConnectionTimeoutException;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.circuits.TorInitializationTracker;
-import com.subgraph.orchid.dashboard.DashboardRenderable;
-import com.subgraph.orchid.dashboard.DashboardRenderer;
-
-public class ConnectionCacheImpl implements ConnectionCache, DashboardRenderable {
-	private final static Logger logger = Logger.getLogger(ConnectionCacheImpl.class.getName());
-	
-	private class ConnectionTask implements Callable<ConnectionImpl> {
-
-		private final Router router;
-		private final boolean isDirectoryConnection;
-		
-		ConnectionTask(Router router, boolean isDirectoryConnection) {
-			this.router = router;
-			this.isDirectoryConnection = isDirectoryConnection;
-		}
-
-		public ConnectionImpl call() throws Exception {
-			final SSLSocket socket = factory.createSocket();
-			final ConnectionImpl conn = new ConnectionImpl(config, socket, router, initializationTracker, isDirectoryConnection);
-			conn.connect();
-			return conn;
-		}
-	}
-	
-	private class CloseIdleConnectionCheckTask implements Runnable {
-		public void run() {
-			for(Future<ConnectionImpl> f: activeConnections.values()) {
-				if(f.isDone()) {
-					try {
-						final ConnectionImpl c = f.get();
-						c.idleCloseCheck();
-					} catch (Exception e) { }
-				}
-			}
-		}
-	}
-
-	private final ConcurrentMap<Router, Future<ConnectionImpl>> activeConnections = new ConcurrentHashMap<Router, Future<ConnectionImpl>>();
-	private final ConnectionSocketFactory factory = new ConnectionSocketFactory();
-	private final ScheduledExecutorService scheduledExecutor = Executors.newSingleThreadScheduledExecutor();
-
-	private final TorConfig config;
-	private final TorInitializationTracker initializationTracker;
-	private volatile boolean isClosed;
-
-	
-	public ConnectionCacheImpl(TorConfig config, TorInitializationTracker tracker) {
-		this.config = config;
-		this.initializationTracker = tracker;
-		scheduledExecutor.scheduleAtFixedRate(new CloseIdleConnectionCheckTask(), 5000, 5000, TimeUnit.MILLISECONDS);
-	}
-
-	public void close() {
-		if(isClosed) {
-			return;
-		}
-		isClosed = true;
-		for(Future<ConnectionImpl> f: activeConnections.values()) {
-			if(f.isDone()) {
-				try {
-					ConnectionImpl conn = f.get();
-					conn.closeSocket();
-				} catch (InterruptedException e) {
-					logger.warning("Unexpected interruption while closing connection");
-				} catch (ExecutionException e) {
-					logger.warning("Exception closing connection: "+ e.getCause());
-				}
-			} else {
-				// FIXME this doesn't close the socket, so the connection task lingers
-				// A proper fix would require maintaining pending connections in a separate
-				// collection.
-				f.cancel(true);
-			}
-		}
-		activeConnections.clear();
-		scheduledExecutor.shutdownNow();
-	}
-
-	@Override
-	public boolean isClosed() {
-		return isClosed;
-	}
-
-	public Connection getConnectionTo(Router router, boolean isDirectoryConnection) throws InterruptedException, ConnectionTimeoutException, ConnectionFailedException, ConnectionHandshakeException {
-		if(isClosed) {
-			throw new IllegalStateException("ConnectionCache has been closed");
-		}
-		logger.fine("Get connection to "+ router.getAddress() + " "+ router.getOnionPort() + " " + router.getNickname());
-		while(true) {
-			Future<ConnectionImpl> f = getFutureFor(router, isDirectoryConnection);
-			try {
-				Connection c = f.get();
-				if(c.isClosed()) {
-					activeConnections.remove(router, f);
-				} else {
-					return c;
-				}
-			} catch (CancellationException e) {
-				activeConnections.remove(router, f);
-			} catch (ExecutionException e) {
-				activeConnections.remove(router, f);
-				final Throwable t = e.getCause();
-				if(t instanceof ConnectionTimeoutException) {
-					throw (ConnectionTimeoutException) t;
-				} else if(t instanceof ConnectionFailedException) {
-					throw (ConnectionFailedException) t;
-				} else if(t instanceof ConnectionHandshakeException) {
-					throw (ConnectionHandshakeException) t;
-				}
-				throw new RuntimeException("Unexpected exception: "+ e, e);
-			}
-		}
-	}
-
-	private Future<ConnectionImpl> getFutureFor(Router router, boolean isDirectoryConnection) {
-		Future<ConnectionImpl> f = activeConnections.get(router);
-		if(f != null) {
-			return f;
-		}
-		return createFutureForIfAbsent(router, isDirectoryConnection);
-	}
-
-	private Future<ConnectionImpl> createFutureForIfAbsent(Router router, boolean isDirectoryConnection) {
-		final Callable<ConnectionImpl> task = new ConnectionTask(router, isDirectoryConnection);
-		final FutureTask<ConnectionImpl> futureTask = new FutureTask<ConnectionImpl>(task);
-		
-		final Future<ConnectionImpl> f = activeConnections.putIfAbsent(router, futureTask);
-		if(f != null) {
-			return f;
-		}
-		
-		futureTask.run();
-		return futureTask;
-	}
-
-	public void dashboardRender(DashboardRenderer renderer, PrintWriter writer, int flags) throws IOException {
-		if((flags & DASHBOARD_CONNECTIONS) == 0) {
-			return;
-		}
-		printDashboardBanner(writer, flags);
-		for(Connection c: getActiveConnections()) {
-			if(!c.isClosed()) {
-				renderer.renderComponent(writer, flags, c);
-			}
-		}
-		writer.println();
-	}
-
-	private void printDashboardBanner(PrintWriter writer, int flags) {
-		final boolean verbose = (flags & DASHBOARD_CONNECTIONS_VERBOSE) != 0;
-		if(verbose) {
-			writer.println("[Connection Cache (verbose)]");
-		} else {
-			writer.println("[Connection Cache]");
-		}
-		writer.println();
-	}
-
-	List<Connection> getActiveConnections() {
-		final List<Connection> cs = new ArrayList<Connection>();
-		for(Future<ConnectionImpl> future: activeConnections.values()) {
-			addConnectionFromFuture(future, cs);
-		}
-		return cs;
-	}
-
-	private void addConnectionFromFuture(Future<ConnectionImpl> future, List<Connection> connectionList) {
-		try {
-			if(future.isDone() && !future.isCancelled()) {
-				connectionList.add(future.get());
-			}
-		} catch (InterruptedException e) {
-			Thread.currentThread().interrupt();
-		} catch (ExecutionException e) { }
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/connections/ConnectionHandshake.java b/orchid/src/com/subgraph/orchid/connections/ConnectionHandshake.java
deleted file mode 100644
index 052bf8f2823..00000000000
--- a/orchid/src/com/subgraph/orchid/connections/ConnectionHandshake.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.subgraph.orchid.connections;
-
-import java.io.IOException;
-import java.security.PublicKey;
-import java.security.interfaces.RSAPublicKey;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.logging.Logger;
-
-import javax.net.ssl.SSLSocket;
-
-import com.subgraph.orchid.BridgeRouter;
-import com.subgraph.orchid.Cell;
-import com.subgraph.orchid.ConnectionHandshakeException;
-import com.subgraph.orchid.ConnectionIOException;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.circuits.cells.CellImpl;
-import com.subgraph.orchid.crypto.TorPublicKey;
-import com.subgraph.orchid.data.IPv4Address;
-
-public abstract class ConnectionHandshake {
-	private final static Logger logger = Logger.getLogger(ConnectionHandshake.class.getName());
-	
-	static ConnectionHandshake createHandshake(TorConfig config, ConnectionImpl connection, SSLSocket socket) throws ConnectionHandshakeException {
-		if(config.getHandshakeV3Enabled() && ConnectionHandshakeV3.sessionSupportsHandshake(socket.getSession())) {
-			return new ConnectionHandshakeV3(connection, socket);
-		} else if(config.getHandshakeV2Enabled()) {
-			return new ConnectionHandshakeV2(connection, socket);
-		} else {
-			throw new ConnectionHandshakeException("No valid handshake type available for this connection");
-		}
-			
-	}
-	
-	protected final ConnectionImpl connection;
-	protected final SSLSocket socket;
-	
-	protected final List<Integer> remoteVersions;
-	private int remoteTimestamp;
-	private IPv4Address myAddress;
-	private final List<IPv4Address> remoteAddresses;
-
-	ConnectionHandshake(ConnectionImpl connection, SSLSocket socket) {
-		this.connection = connection;
-		this.socket = socket;
-		this.remoteVersions = new ArrayList<Integer>();
-		this.remoteAddresses = new ArrayList<IPv4Address>();
-	}
-
-	abstract void runHandshake() throws IOException, InterruptedException, ConnectionIOException;
-		
-	int getRemoteTimestamp() {
-		return remoteTimestamp;
-	}
-
-	IPv4Address getMyAddress() {
-		return myAddress;
-	}
-	
-	protected Cell expectCell(Integer... expectedTypes) throws ConnectionHandshakeException {
-		try {
-			final Cell c = connection.readConnectionControlCell();
-			for(int t: expectedTypes) {
-				if(c.getCommand() == t) {
-					return c;
-				}
-			}
-			final List<Integer> expected = Arrays.asList(expectedTypes);
-			throw new ConnectionHandshakeException("Expecting Cell command "+ expected + " and got [ "+ c.getCommand() +" ] instead");
-		} catch (ConnectionIOException e) {
-			throw new ConnectionHandshakeException("Connection exception while performing handshake "+ e);
-		}
-	}
-
-	protected  void sendVersions(int... versions) throws ConnectionIOException {
-		final Cell cell = CellImpl.createVarCell(0, Cell.VERSIONS, versions.length * 2);
-		for(int v: versions) {
-			cell.putShort(v);
-		}
-		connection.sendCell(cell);
-	}
-
-	protected void receiveVersions() throws ConnectionHandshakeException {
-		final Cell c = expectCell(Cell.VERSIONS);
-		while(c.cellBytesRemaining() >= 2) {
-			remoteVersions.add(c.getShort());
-		}
-	}
-
-	protected void sendNetinfo() throws ConnectionIOException {
-		final Cell cell = CellImpl.createCell(0, Cell.NETINFO);
-		putTimestamp(cell);
-		putIPv4Address(cell, connection.getRouter().getAddress());
-		putMyAddresses(cell);
-		connection.sendCell(cell);
-	}
-
-	private void putTimestamp(Cell cell) {
-		final Date now = new Date();
-		cell.putInt((int) (now.getTime() / 1000));
-	}
-
-	private void putIPv4Address(Cell cell, IPv4Address address) {
-		final byte[] data = address.getAddressDataBytes();
-		cell.putByte(Cell.ADDRESS_TYPE_IPV4);
-		cell.putByte(data.length); 
-		cell.putByteArray(data);
-	}
-	
-	private void putMyAddresses(Cell cell) {
-		cell.putByte(1);
-		putIPv4Address(cell, new IPv4Address(0));
-	}
-
-	protected void recvNetinfo() throws ConnectionHandshakeException {
-		processNetInfo(expectCell(Cell.NETINFO));
-	}
-	
-	protected void processNetInfo(Cell netinfoCell) {
-		remoteTimestamp = netinfoCell.getInt();
-		myAddress = readAddress(netinfoCell);
-		final int addressCount = netinfoCell.getByte();
-		for(int i = 0; i < addressCount; i++) {
-			IPv4Address addr = readAddress(netinfoCell);
-			if(addr != null) {
-				remoteAddresses.add(addr);
-			}
-		}
-	}
-
-	private IPv4Address readAddress(Cell cell) {
-		final int type = cell.getByte();
-		final int len = cell.getByte();
-		if(type == Cell.ADDRESS_TYPE_IPV4 && len == 4) {
-			return new IPv4Address(cell.getInt());
-		}
-		final byte[] buffer = new byte[len];
-		cell.getByteArray(buffer);
-		return null;
-	}
-	
-	protected void verifyIdentityKey(PublicKey publicKey) throws ConnectionHandshakeException {
-		if(!(publicKey instanceof RSAPublicKey)) {
-			throw new ConnectionHandshakeException("Identity certificate public key is not an RSA key as expected");
-		}
-		final TorPublicKey identityKey = new TorPublicKey((RSAPublicKey)publicKey);
-		final Router router = connection.getRouter();
-		if((router instanceof BridgeRouter) && (router.getIdentityHash() == null)) {
-			logger.info("Setting Bridge fingerprint from connection handshake for "+ router);
-			((BridgeRouter) router).setIdentity(identityKey.getFingerprint());
-		} else if(!identityKey.getFingerprint().equals(router.getIdentityHash())) {
-			throw new ConnectionHandshakeException("Router identity does not match certificate key");
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/connections/ConnectionHandshakeV2.java b/orchid/src/com/subgraph/orchid/connections/ConnectionHandshakeV2.java
deleted file mode 100644
index 130a287ba22..00000000000
--- a/orchid/src/com/subgraph/orchid/connections/ConnectionHandshakeV2.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.subgraph.orchid.connections;
-
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.PublicKey;
-
-import javax.net.ssl.HandshakeCompletedEvent;
-import javax.net.ssl.HandshakeCompletedListener;
-import javax.net.ssl.SSLPeerUnverifiedException;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocket;
-import javax.security.cert.CertificateException;
-import javax.security.cert.X509Certificate;
-
-import com.subgraph.orchid.ConnectionHandshakeException;
-import com.subgraph.orchid.ConnectionIOException;
-
-/**
- * This class performs a Version 2 handshake as described in section 2 of
- * tor-spec.txt.  The handshake is considered complete after VERSIONS and
- * NETINFO cells have been exchanged between the two sides.
- */
-public class ConnectionHandshakeV2 extends ConnectionHandshake {
-
-	private static class HandshakeFinishedMonitor implements HandshakeCompletedListener {
-		final Object lock = new Object();
-		boolean isFinished;
-
-		public void handshakeCompleted(HandshakeCompletedEvent event) {
-			synchronized(lock) {
-				this.isFinished = true;
-				lock.notifyAll();
-			}
-		}
-	
-		public void waitFinished() throws InterruptedException {
-			synchronized(lock) {
-				while(!isFinished) {
-					lock.wait();
-				}
-			}
-		}
-	}
-	
-	ConnectionHandshakeV2(ConnectionImpl connection, SSLSocket socket) {
-		super(connection, socket);
-	}
-
-	void runHandshake() throws IOException, InterruptedException, ConnectionIOException {
-		// Swap in V1-only ciphers for second handshake as a workaround for:
-		//
-		//     https://trac.torproject.org/projects/tor/ticket/4591
-		// 
-		socket.setEnabledCipherSuites(ConnectionSocketFactory.V1_CIPHERS_ONLY);
-		
-		final HandshakeFinishedMonitor monitor = new HandshakeFinishedMonitor();
-		socket.addHandshakeCompletedListener(monitor);
-		socket.startHandshake();
-		monitor.waitFinished();
-		socket.removeHandshakeCompletedListener(monitor);
-		
-		verifyIdentityKey(getIdentityKey());
-		sendVersions(2);
-		receiveVersions();
-		sendNetinfo();
-		recvNetinfo();
-	}
-	
-	private PublicKey getIdentityKey() throws ConnectionHandshakeException {
-		final X509Certificate identityCertificate = getIdentityCertificateFromSession(socket.getSession());
-		return identityCertificate.getPublicKey();
-	}
-
-	private X509Certificate getIdentityCertificateFromSession(SSLSession session) throws ConnectionHandshakeException {
-		try {
-			X509Certificate[] chain = session.getPeerCertificateChain();
-			if(chain.length != 2) {
-				throw new ConnectionHandshakeException("Expecting 2 certificate chain from router and received chain length "+ chain.length);
-			}
-			chain[0].verify(chain[1].getPublicKey());
-			return chain[1];
-		} catch (SSLPeerUnverifiedException e) {
-			throw new ConnectionHandshakeException("No certificates received from router");
-		} catch (GeneralSecurityException e) {
-			throw new ConnectionHandshakeException("Incorrect signature on certificate chain");
-		} catch (CertificateException e) {
-			throw new ConnectionHandshakeException("Malformed certificate received");
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/connections/ConnectionHandshakeV3.java b/orchid/src/com/subgraph/orchid/connections/ConnectionHandshakeV3.java
deleted file mode 100644
index ca2ff75b073..00000000000
--- a/orchid/src/com/subgraph/orchid/connections/ConnectionHandshakeV3.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package com.subgraph.orchid.connections;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.GeneralSecurityException;
-import java.security.Principal;
-import java.security.PublicKey;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.security.interfaces.RSAPublicKey;
-
-import javax.net.ssl.SSLPeerUnverifiedException;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocket;
-
-import com.subgraph.orchid.Cell;
-import com.subgraph.orchid.ConnectionHandshakeException;
-import com.subgraph.orchid.ConnectionIOException;
-
-public class ConnectionHandshakeV3 extends ConnectionHandshake {
-
-	private X509Certificate linkCertificate;
-	private X509Certificate identityCertificate;
-	
-	ConnectionHandshakeV3(ConnectionImpl connection, SSLSocket socket) {
-		super(connection, socket);
-	}
-
-	void runHandshake() throws IOException, InterruptedException, ConnectionIOException {
-		sendVersions(3);
-		receiveVersions();
-		recvCerts();
-		recvAuthChallengeAndNetinfo();
-		verifyCertificates();
-		sendNetinfo();
-	}
-	
-	void recvCerts() throws ConnectionHandshakeException  {
-		final Cell cell = expectCell(Cell.CERTS);
-		final int ncerts = cell.getByte();
-		if(ncerts != 2) {
-			throw new ConnectionHandshakeException("Expecting 2 certificates and got "+ ncerts);
-		}
-
-		linkCertificate = null;
-		identityCertificate = null;
-		
-		for(int i = 0; i < ncerts; i++) {
-			int type = cell.getByte();
-			if(type == 1) {
-				linkCertificate = testAndReadCertificate(cell, linkCertificate, "Link (type = 1)");
-			} else if(type == 2) {
-				identityCertificate = testAndReadCertificate(cell, identityCertificate, "Identity (type = 2)");
-			} else {
-				throw new ConnectionHandshakeException("Unexpected certificate type = "+ type + " in CERTS cell");
-			}
-		}
-		
-	}
-	
-	RSAPublicKey getConnectionPublicKey() {
-		try {
-			javax.security.cert.X509Certificate[] chain = socket.getSession().getPeerCertificateChain();
-			return (RSAPublicKey) chain[0].getPublicKey();
-		} catch (SSLPeerUnverifiedException e) {
-			return null;
-		}
-	}
-	
-
-	private X509Certificate testAndReadCertificate(Cell cell, X509Certificate currentValue, String type) throws ConnectionHandshakeException {
-		if(currentValue == null) {
-			return readCertificateFromCell(cell);
-		} else {
-			throw new ConnectionHandshakeException("Duplicate "+ type + " certificates in CERTS cell");
-		}
-	}
-	
-	private X509Certificate readCertificateFromCell(Cell cell) {
-		try {
-			final CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
-			final int clen = cell.getShort();
-			final byte[] certificateBuffer = new byte[clen];
-			cell.getByteArray(certificateBuffer);
-			final ByteArrayInputStream bis = new ByteArrayInputStream(certificateBuffer);
-			return (X509Certificate) certificateFactory.generateCertificate(bis);
-		} catch (CertificateException e) {
-			return null;
-		}
-		
-	}
-	
-	void verifyCertificates() throws ConnectionHandshakeException {
-		PublicKey publicKey = identityCertificate.getPublicKey();
-		verifyIdentityKey(publicKey);
-		RSAPublicKey rsaPublicKey = (RSAPublicKey) publicKey;
-		
-		if(rsaPublicKey.getModulus().bitLength() != 1024) {
-			throw new ConnectionHandshakeException("Invalid RSA modulus length in router identity key");
-		}
-		
-		try {
-			identityCertificate.checkValidity();
-			identityCertificate.verify(rsaPublicKey);
-			linkCertificate.checkValidity();
-			linkCertificate.verify(rsaPublicKey);
-		} catch (GeneralSecurityException e) {
-			throw new ConnectionHandshakeException("Router presented invalid certificate chain in CERTS cell");
-		}
-	
-		RSAPublicKey rsa2 = (RSAPublicKey) linkCertificate.getPublicKey();
-		if(!getConnectionPublicKey().getModulus().equals(rsa2.getModulus())) {
-			throw new ConnectionHandshakeException("Link certificate in CERTS cell does not match connection certificate");
-		}
-	}
-
-	void recvAuthChallengeAndNetinfo() throws ConnectionHandshakeException {
-		final Cell cell = expectCell(Cell.AUTH_CHALLENGE, Cell.NETINFO);
-		if(cell.getCommand() == Cell.NETINFO) {
-			processNetInfo(cell);
-			return;
-		}
-		final Cell netinfo = expectCell(Cell.NETINFO);
-		processNetInfo(netinfo);
-	}
-	
-	public static boolean sessionSupportsHandshake(SSLSession session) {
-		javax.security.cert.X509Certificate cert = getConnectionCertificateFromSession(session);
-		if(cert == null) {
-			return false;
-		}
-		return isSelfSigned(cert) || testDName(cert.getSubjectDN()) ||
-				testDName(cert.getIssuerDN()) || testModulusLength(cert); 
-	}
-	
-	static private javax.security.cert.X509Certificate getConnectionCertificateFromSession(SSLSession session) {
-		try {
-			final javax.security.cert.X509Certificate[] chain = session.getPeerCertificateChain();
-			return chain[0];
-		} catch (SSLPeerUnverifiedException e) {
-			return null;
-		}
-	}
-	
-	static private boolean isSelfSigned(javax.security.cert.X509Certificate certificate) {
-		try {
-			certificate.verify(certificate.getPublicKey());
-			return true;
-		} catch (Exception e) {
-			return false;
-		}
-	}
-	
-    /*
-     * * Some component other than "commonName" is set in the subject or
-     *   issuer DN of the certificate.
-     *   
-     * * The commonName of the subject or issuer of the certificate ends
-     *   with a suffix other than ".net".
-     */
-	static private boolean testDName(Principal dn) {
-		final String dname = dn.getName();
-		if(dname.indexOf(",") >= 0) {
-			return true;
-		}
-		return !getCN(dname).endsWith(".net");
-	}
-
-	/*
-	 * * The certificate's public key modulus is longer than 1024 bits.
-	 */
-	static private boolean testModulusLength(javax.security.cert.X509Certificate cert) {
-		if(!(cert.getPublicKey() instanceof RSAPublicKey)) {
-			return false;
-		}
-		final RSAPublicKey rsaPublicKey = (RSAPublicKey) cert.getPublicKey();
-		final BigInteger modulus = rsaPublicKey.getModulus();
-		return modulus.bitLength() > 1024;
-	}
-
-	static private String getCN(String dname) {
-		final int idx = dname.indexOf("CN=");
-		if(idx == -1) {
-			return "";
-		}
-		final int comma = dname.indexOf(',', idx);
-		if(comma == -1) {
-			return dname.substring(idx);
-		} else {
-			return dname.substring(idx, comma);
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/connections/ConnectionImpl.java b/orchid/src/com/subgraph/orchid/connections/ConnectionImpl.java
deleted file mode 100644
index ff3513ac34f..00000000000
--- a/orchid/src/com/subgraph/orchid/connections/ConnectionImpl.java
+++ /dev/null
@@ -1,374 +0,0 @@
-package com.subgraph.orchid.connections;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.net.SocketTimeoutException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.net.ssl.SSLSocket;
-
-import com.subgraph.orchid.Cell;
-import com.subgraph.orchid.Circuit;
-import com.subgraph.orchid.Connection;
-import com.subgraph.orchid.ConnectionFailedException;
-import com.subgraph.orchid.ConnectionHandshakeException;
-import com.subgraph.orchid.ConnectionIOException;
-import com.subgraph.orchid.ConnectionTimeoutException;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.Threading;
-import com.subgraph.orchid.Tor;
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.TorException;
-import com.subgraph.orchid.circuits.TorInitializationTracker;
-import com.subgraph.orchid.circuits.cells.CellImpl;
-import com.subgraph.orchid.crypto.TorRandom;
-import com.subgraph.orchid.dashboard.DashboardRenderable;
-import com.subgraph.orchid.dashboard.DashboardRenderer;
-
-/**
- * This class represents a transport link between two onion routers or
- * between an onion proxy and an entry router.
- *
- */
-public class ConnectionImpl implements Connection, DashboardRenderable {
-	private final static Logger logger = Logger.getLogger(ConnectionImpl.class.getName());
-	private final static int CONNECTION_IDLE_TIMEOUT = 5 * 60 * 1000; // 5 minutes
-	private final static int DEFAULT_CONNECT_TIMEOUT = 5000;
-	private final static Cell connectionClosedSentinel = CellImpl.createCell(0, 0);
-
-	private final TorConfig config;
-	private final SSLSocket socket;
-	private InputStream input;
-	private OutputStream output;
-	private final Router router;
-	private final Map<Integer, Circuit> circuitMap;
-	private final BlockingQueue<Cell> connectionControlCells;
-	private final TorInitializationTracker initializationTracker;
-	private final boolean isDirectoryConnection;
-	
-	private int currentId = 1;
-	private boolean isConnected;
-	private volatile boolean isClosed;
-	private final Thread readCellsThread;
-	private final ReentrantLock connectLock = Threading.lock("connect");
-	private final ReentrantLock circuitsLock = Threading.lock("circuits");
-	private final ReentrantLock outputLock = Threading.lock("output");
-	private final AtomicLong lastActivity = new AtomicLong();
-
-
-	public ConnectionImpl(TorConfig config, SSLSocket socket, Router router, TorInitializationTracker tracker, boolean isDirectoryConnection) {
-		this.config = config;
-		this.socket = socket;
-		this.router = router;
-		this.circuitMap = new HashMap<Integer, Circuit>();
-		this.readCellsThread = new Thread(createReadCellsRunnable());
-		this.readCellsThread.setDaemon(true);
-		this.connectionControlCells = new LinkedBlockingQueue<Cell>();
-		this.initializationTracker = tracker;
-		this.isDirectoryConnection = isDirectoryConnection;
-		initializeCurrentCircuitId();
-	}
-	
-	private void initializeCurrentCircuitId() {
-		final TorRandom random = new TorRandom();
-		currentId = random.nextInt(0xFFFF) + 1;
-	}
-
-	public Router getRouter() {
-		return router;
-	}
-
-	public boolean isClosed() {
-		return isClosed;
-	}
-
-	public int bindCircuit(Circuit circuit) {
-		circuitsLock.lock();
-		try {
-			while(circuitMap.containsKey(currentId)) 
-				incrementNextId();
-			final int id = currentId;
-			incrementNextId();
-			circuitMap.put(id, circuit);
-			return id;
-		} finally {
-			circuitsLock.unlock();
-		}
-	}
-
-	private void incrementNextId() {
-		currentId++;
-		if(currentId > 0xFFFF)
-			currentId = 1;
-	}
-
-	void connect() throws ConnectionFailedException, ConnectionTimeoutException, ConnectionHandshakeException {
-		connectLock.lock();
-		try {
-			if(isConnected) {
-				return;
-			}
-			try {
-				doConnect();
-			} catch (SocketTimeoutException e) {
-				throw new ConnectionTimeoutException();
-			} catch (IOException e) {
-				throw new ConnectionFailedException(e.getClass().getName() + " : "+ e.getMessage());
-			} catch (InterruptedException e) {
-				Thread.currentThread().interrupt();
-				throw new ConnectionHandshakeException("Handshake interrupted");
-			} catch (ConnectionHandshakeException e) { 
-				throw e;
-			} catch (ConnectionIOException e) {
-				throw new ConnectionFailedException(e.getMessage());
-			}
-			isConnected = true;
-		} finally {
-			connectLock.unlock();
-		}
-	}
-
-	private void doConnect() throws IOException, InterruptedException, ConnectionIOException {
-		connectSocket();
-		final ConnectionHandshake handshake = ConnectionHandshake.createHandshake(config, this, socket);
-		input = socket.getInputStream();
-		output = socket.getOutputStream();
-		readCellsThread.start();
-		handshake.runHandshake();
-		updateLastActivity();
-	}
-	
-	private void connectSocket() throws IOException {
-		if(initializationTracker != null) {
-			if(isDirectoryConnection) {
-				initializationTracker.notifyEvent(Tor.BOOTSTRAP_STATUS_CONN_DIR);
-			} else {
-				initializationTracker.notifyEvent(Tor.BOOTSTRAP_STATUS_CONN_OR);
-			}
-		}
-
-		socket.connect(routerToSocketAddress(router), DEFAULT_CONNECT_TIMEOUT);
-		
-		if(initializationTracker != null) {
-			if(isDirectoryConnection) {
-				initializationTracker.notifyEvent(Tor.BOOTSTRAP_STATUS_HANDSHAKE_DIR);
-			} else {
-				initializationTracker.notifyEvent(Tor.BOOTSTRAP_STATUS_HANDSHAKE_OR);
-			}
-		}
-	}
-
-	private SocketAddress routerToSocketAddress(Router router) {
-		final InetAddress address = router.getAddress().toInetAddress();
-		return new InetSocketAddress(address, router.getOnionPort());
-	}
-
-	public void sendCell(Cell cell) throws ConnectionIOException  {
-		if(!socket.isConnected()) {
-			throw new ConnectionIOException("Cannot send cell because connection is not connected");
-		}
-		updateLastActivity();
-		outputLock.lock();
-		try {
-			try {
-				output.write(cell.getCellBytes());
-			} catch (IOException e) {
-				logger.fine("IOException writing cell to connection "+ e.getMessage());
-				closeSocket();
-				throw new ConnectionIOException(e.getClass().getName() + " : "+ e.getMessage());
-			}
-		} finally {
-			outputLock.unlock();
-		}
-	}
-
-	private Cell recvCell() throws ConnectionIOException {
-		try {
-			return CellImpl.readFromInputStream(input);
-		} catch(EOFException e) {
-			closeSocket();
-			throw new ConnectionIOException();
-		} catch (IOException e) {
-			if(!isClosed) {
-				logger.fine("IOException reading cell from connection "+ this + " : "+ e.getMessage());
-				closeSocket();
-			}
-			throw new ConnectionIOException(e.getClass().getName() + " " + e.getMessage());
-		}
-	}
-
-	void closeSocket() {
-		try {
-			logger.fine("Closing connection to "+ this);
-			isClosed = true;
-			socket.close();
-			isConnected = false;
-		} catch (IOException e) {
-			logger.warning("Error closing socket: "+ e.getMessage());
-		}
-	}
-
-	private Runnable createReadCellsRunnable() {
-		return new Runnable() {
-			public void run() {
-				try {
-					readCellsLoop();
-				} catch(Exception e) {
-					logger.log(Level.WARNING, "Unhandled exception processing incoming cells on connection "+ e, e);
-				}
-			}
-		};
-	}
-
-	private void readCellsLoop() {
-		while(!Thread.interrupted()) {
-			try {
-				processCell( recvCell() );
-			} catch(ConnectionIOException e) {
-				connectionControlCells.add(connectionClosedSentinel);
-				notifyCircuitsLinkClosed();
-				return;
-			} catch(TorException e) {
-				logger.log(Level.WARNING, "Unhandled Tor exception reading and processing cells: "+ e.getMessage(), e);
-			}
-		}
-	}
-
-	private void notifyCircuitsLinkClosed() {
-		
-	}
-
-	Cell readConnectionControlCell() throws ConnectionIOException {
-		try {
-			return connectionControlCells.take();
-		} catch (InterruptedException e) {
-			closeSocket();
-			throw new ConnectionIOException();
-		}
-	}
-
-	private void processCell(Cell cell) {
-		updateLastActivity();
-		final int command = cell.getCommand();
-
-		if(command == Cell.RELAY) {
-			processRelayCell(cell);
-			return;
-		}
-
-		switch(command) {
-		case Cell.NETINFO:
-		case Cell.VERSIONS:
-		case Cell.CERTS:
-		case Cell.AUTH_CHALLENGE:
-			connectionControlCells.add(cell);
-			break;
-
-		case Cell.CREATED:
-		case Cell.CREATED_FAST:
-		case Cell.DESTROY:
-			processControlCell(cell);
-			break;
-		default:
-			// Ignore everything else
-			break;
-		}
-	}
-
-	private void processRelayCell(Cell cell) {
-		Circuit circuit;
-		circuitsLock.lock();
-		try {
-			circuit = circuitMap.get(cell.getCircuitId());
-			if(circuit == null) {
-				logger.warning("Could not deliver relay cell for circuit id = "+ cell.getCircuitId() +" on connection "+ this +". Circuit not found");
-				return;
-			}
-		} finally {
-			circuitsLock.unlock();
-		}
-
-		circuit.deliverRelayCell(cell);
-	}
-
-	private void processControlCell(Cell cell) {
-		Circuit circuit;
-		circuitsLock.lock();
-		try {
-			circuit = circuitMap.get(cell.getCircuitId());
-		} finally {
-			circuitsLock.unlock();
-		}
-
-		if(circuit != null) {
-			circuit.deliverControlCell(cell);
-		}
-	}
-
-	void idleCloseCheck() {
-		circuitsLock.lock();
-		try {
-			final boolean needClose =  (!isClosed && circuitMap.isEmpty() && getIdleMilliseconds() > CONNECTION_IDLE_TIMEOUT);
-			if(needClose) {
-				logger.fine("Closing connection to "+ this +" on idle timeout");
-				closeSocket();
-			}
-		} finally {
-			circuitsLock.unlock();
-		}
-	}
-
-	private void updateLastActivity() {
-		lastActivity.set(System.currentTimeMillis());
-	}
-
-	private long getIdleMilliseconds() {
-		if(lastActivity.get() == 0) {
-			return 0;
-		}
-		return System.currentTimeMillis() - lastActivity.get();
-	}
-
-	public void removeCircuit(Circuit circuit) {
-		circuitsLock.lock();
-		try {
-			circuitMap.remove(circuit.getCircuitId());
-		} finally {
-			circuitsLock.unlock();
-		}
-	}
-
-	public String toString() {
-		return "!" + router.getNickname() + "!";
-	}
-
-	public void dashboardRender(DashboardRenderer renderer, PrintWriter writer, int flags) throws IOException {
-		final int circuitCount;
-		circuitsLock.lock();
-		try {
-			circuitCount = circuitMap.size();
-		} finally {
-			circuitsLock.unlock();
-		}
-		if(circuitCount == 0 && (flags & DASHBOARD_CONNECTIONS_VERBOSE) == 0) {
-			return;
-		}
-		writer.print("  [Connection router="+ router.getNickname());
-		writer.print(" circuits="+ circuitCount);
-		writer.print(" idle="+ (getIdleMilliseconds()/1000) + "s");
-		writer.println("]");
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/connections/ConnectionSocketFactory.java b/orchid/src/com/subgraph/orchid/connections/ConnectionSocketFactory.java
deleted file mode 100644
index 9ffdf6c92f6..00000000000
--- a/orchid/src/com/subgraph/orchid/connections/ConnectionSocketFactory.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.subgraph.orchid.connections;
-
-import java.io.IOException;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-
-import com.subgraph.orchid.TorException;
-
-public class ConnectionSocketFactory {
-	static final String[] V1_CIPHERS_ONLY = {
-		"TLS_DHE_RSA_WITH_AES_256_CBC_SHA",
-	    "TLS_DHE_RSA_WITH_AES_128_CBC_SHA",
-	    "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA",
-	};
-	
-	private static final String[] MANDATORY_CIPHERS = {
-		"TLS_DHE_RSA_WITH_AES_256_CBC_SHA",
-	    "TLS_DHE_RSA_WITH_AES_128_CBC_SHA",
-	    "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA",
-	    "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA"};
-
-	private static final TrustManager[] NULL_TRUST = {
-		new X509TrustManager() {
-			private final X509Certificate[] empty = {};
-			public void checkClientTrusted(X509Certificate[] chain, String authType)
-					throws CertificateException {
-			}
-
-			public void checkServerTrusted(X509Certificate[] chain, String authType)
-					throws CertificateException {
-			}
-
-			public X509Certificate[] getAcceptedIssuers() {
-				return empty;
-			}
-		}
-	};
-	
-	private static SSLContext createSSLContext() {
-		System.setProperty("sun.security.ssl.allowUnsafeRenegotiation", "true");
-		try {
-			final SSLContext sslContext = SSLContext.getInstance("TLS");
-			sslContext.init(null, NULL_TRUST, null);
-			return sslContext;
-		} catch (NoSuchAlgorithmException e) {
-			throw new TorException(e);
-		} catch (KeyManagementException e) {
-			throw new TorException(e);
-		}
-	}
-	
-	private final SSLSocketFactory socketFactory;
-	
-	ConnectionSocketFactory() {
-		socketFactory = createSSLContext().getSocketFactory();
-	}
-	
-	SSLSocket createSocket() {
-		try {
-			final SSLSocket socket = (SSLSocket) socketFactory.createSocket();
-			socket.setEnabledCipherSuites(MANDATORY_CIPHERS);
-			socket.setUseClientMode(true);
-			return socket;
-		} catch (IOException e) {
-			throw new TorException(e);
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/crypto/ASN1Parser.java b/orchid/src/com/subgraph/orchid/crypto/ASN1Parser.java
deleted file mode 100644
index 0c60837e77f..00000000000
--- a/orchid/src/com/subgraph/orchid/crypto/ASN1Parser.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.subgraph.orchid.crypto;
-
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A very minimal ASN.1 BER parser which only supports the ASN.1 object types needed
- * for parsing encoded RSA public keys.
- */
-public class ASN1Parser {
-	
-	private final static int ASN1_TAG_SEQUENCE = 16;
-	private final static int ASN1_TAG_INTEGER = 2;
-	private final static int ASN1_TAG_BITSTRING = 3;
-	
-	static interface ASN1Object {};
-	
-	static class ASN1Sequence implements ASN1Object {
-		private final List<ASN1Object> items;
-		
-		ASN1Sequence(List<ASN1Object> items) {
-			this.items = items;
-		}
-		
-		List<ASN1Object> getItems() {
-			return items;
-		}
-	}
-	
-	static class ASN1Integer implements ASN1Object {
-		final BigInteger value;
-		ASN1Integer(BigInteger value) {
-			this.value = value;
-		}
-		BigInteger getValue() {
-			return value;
-		}
-	}
-
-	
-	static class ASN1BitString implements ASN1Object {
-		final byte[] bytes;
-		
-		ASN1BitString(byte[] bytes) {
-			this.bytes = bytes;
-		}
-		
-		byte[] getBytes() {
-			return bytes;
-		}
-	}
-
-	/* For object types we don't handle, just stuff the bytes into here */
-	static class ASN1Blob extends ASN1BitString {
-		ASN1Blob(byte[] bytes) {
-			super(bytes);
-		}
-	}
-
-	ASN1Object parseASN1(ByteBuffer data) {
-		final int typeOctet = data.get() & 0xFF;
-		final int tag = typeOctet & 0x1F;
-		final ByteBuffer objectBuffer = getObjectBuffer(data);
-		
-		switch(tag) {
-		case ASN1_TAG_SEQUENCE:
-			return parseASN1Sequence(objectBuffer);
-		case ASN1_TAG_INTEGER:
-			return parseASN1Integer(objectBuffer);
-		case ASN1_TAG_BITSTRING:
-			return parseASN1BitString(objectBuffer);
-		default:
-			return createBlob(objectBuffer);
-		}
-		
-	}
-	
-	/*
-	 * Read 'length' from data buffer, create a new buffer as a slice() which
-	 * contains 'length' bytes of data following length field and return this
-	 * buffer. Increment position pointer of data buffer to skip over these bytes.
-	 */
-	ByteBuffer getObjectBuffer(ByteBuffer data) {
-		final int length = parseASN1Length(data);
-		if(length > data.remaining()) {
-			throw new IllegalArgumentException();
-		}
-		final ByteBuffer objectBuffer = data.slice();
-		objectBuffer.limit(length);
-		data.position(data.position() + length);
-		return objectBuffer;
-	}
-	
-	int parseASN1Length(ByteBuffer data) {
-		final int firstOctet = data.get() & 0xFF;
-		if(firstOctet < 0x80) {
-			return firstOctet;
-		}
-		return parseASN1LengthLong(firstOctet & 0x7F, data);
-	}
-	
-	int parseASN1LengthLong(int lengthOctets, ByteBuffer data) {
-		if(lengthOctets == 0 || lengthOctets > 3) {
-			// indefinite form or too long
-			throw new IllegalArgumentException();
-		}
-		int length = 0;
-		for(int i = 0; i < lengthOctets; i++) {
-			length <<= 8;
-			length |= (data.get() & 0xFF);
-		}
-		return length;
-	}
-	
-	ASN1Sequence parseASN1Sequence(ByteBuffer data) {
-		final List<ASN1Object> obs = new ArrayList<ASN1Object>();
-		while(data.hasRemaining()) {
-			obs.add(parseASN1(data));
-		}
-		return new ASN1Sequence(obs);
-	}
-	
-	ASN1Integer parseASN1Integer(ByteBuffer data) {
-		return new ASN1Integer(new BigInteger(getRemainingBytes(data)));
-	}
-	
-	ASN1BitString parseASN1BitString(ByteBuffer data) {
-		final int unusedBits = data.get() & 0xFF;
-		if(unusedBits != 0) {
-			throw new IllegalArgumentException();
-		}
-		return new ASN1BitString(getRemainingBytes(data));
-	}
-
-	ASN1Blob createBlob(ByteBuffer data) {
-		return new ASN1Blob(getRemainingBytes(data));
-	}
-	
-	private byte[] getRemainingBytes(ByteBuffer data) {
-		final byte[] bs = new byte[data.remaining()];
-		data.get(bs);
-		return bs;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/crypto/Curve25519.java b/orchid/src/com/subgraph/orchid/crypto/Curve25519.java
deleted file mode 100644
index 8cdb49c595f..00000000000
--- a/orchid/src/com/subgraph/orchid/crypto/Curve25519.java
+++ /dev/null
@@ -1,469 +0,0 @@
-package com.subgraph.orchid.crypto;
-
-//
-//  Copyright (c) 2011, Neil Alexander T.
-//  All rights reserved.
-// 
-//  Redistribution and use in source and binary forms, with
-//  or without modification, are permitted provided that the following
-//  conditions are met:
-// 
-//  - Redistributions of source code must retain the above copyright notice,
-//    this list of conditions and the following disclaimer.
-//  - Redistributions in binary form must reproduce the above copyright notice,
-//    this list of conditions and the following disclaimer in the documentation
-//    and/or other materials provided with the distribution.
-// 
-//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-//  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-//  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-//  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-//  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-//  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-//  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-//  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-//  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//  POSSIBILITY OF SUCH DAMAGE.
-//
-
-/*
- * https://github.com/neilalexander/jnacl/blob/master/crypto/curve25519.java
- */
-public class Curve25519
-{
-	final int CRYPTO_BYTES = 32;
-	final int CRYPTO_SCALARBYTES = 32;
-	
-	static byte[] basev = { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-	static int[] minusp = { 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128 };
-
-	public static int crypto_scalarmult_base(byte[] q, byte[] n)
-	{
-		byte[] basevp = basev;
-		return crypto_scalarmult(q, n, basevp);
-	}
-	
-	static void add(int[] outv, int outvoffset, int[] a, int aoffset, int[] b, int boffset)
-	{
-		int u = 0;
-		
-		for (int j = 0; j < 31; ++j)
-		{
-			u += a[aoffset + j] + b[boffset + j];
-			outv[outvoffset + j] = u & 255;
-			u >>>= 8;
-		}
-		
-		u += a[aoffset + 31] + b[boffset + 31];
-		outv[outvoffset + 31] = u;
-	}
-
-	static void sub(int[] outv, int outvoffset, int[] a, int aoffset, int[] b, int boffset)
-	{
-		int u = 218;
-		
-		for (int j = 0; j < 31; ++j)
-		{
-			u += a[aoffset + j] + 65280 - b[boffset + j];
-			outv[outvoffset + j] = u & 255;
-			u >>>= 8;
-		}
-		
-		u += a[aoffset + 31] - b[boffset + 31];
-		outv[outvoffset + 31] = u;
-	}
-
-	static void squeeze(int[] a, int aoffset)
-	{
-		int u = 0;
-		
-		for (int j = 0; j < 31; ++j)
-		{
-			u += a[aoffset + j];
-			a[aoffset + j] = u & 255;
-			u >>>= 8;
-		}
-		
-		u += a[aoffset + 31];
-		a[aoffset + 31] = u & 127;
-		u = 19 * (u >>> 7);
-		
-		for (int j = 0; j < 31; ++j)
-		{
-			u += a[aoffset + j];
-			a[aoffset + j] = u & 255;
-			u >>>= 8;
-		}
-		
-		u += a[aoffset + 31];
-		a[aoffset + 31] = u;
-	}
-
-	static void freeze(int[] a, int aoffset)
-	{
-		int[] aorig = new int[32];
-		
-		for (int j = 0; j < 32; ++j)
-			aorig[j] = a[aoffset + j];
-		
-		int[] minuspp = minusp;
-		
-		add(a, 0, a, 0, minuspp, 0);
-		
-		int negative = (int) (-((a[aoffset + 31] >>> 7) & 1));
-		
-		for (int j = 0; j < 32; ++j)
-			a[aoffset + j] ^= negative & (aorig[j] ^ a[aoffset + j]);
-	}
-
-	static void mult(int[] outv, int outvoffset, int[] a, int aoffset, int[] b, int boffset)
-	{
-		int j;
-		
-		for (int i = 0; i < 32; ++i)
-		{
-			int u = 0;
-			
-			for (j = 0; j <= i; ++j)
-				u += a[aoffset + j] * b[boffset + i - j];
-			
-			for (j = i + 1; j < 32; ++j)
-				u += 38 * a[aoffset + j] * b[boffset + i + 32 - j];
-			
-			outv[outvoffset + i] = u;
-		}
-		
-		squeeze(outv, outvoffset);
-	}
-
-	static void mult121665(int[] outv, int[] a)
-	{
-		int j;
-		int u = 0;
-		
-		for (j = 0; j < 31; ++j)
-		{
-			u += 121665 * a[j];
-			outv[j] = u & 255;
-			u >>>= 8;
-		}
-		
-		u += 121665 * a[31];
-		outv[31] = u & 127;
-		u = 19 * (u >>> 7);
-		
-		for (j = 0; j < 31; ++j)
-		{
-			u += outv[j];
-			outv[j] = u & 255;
-			u >>>= 8;
-		}
-		
-		u += outv[j];
-		outv[j] = u;
-	}
-	
-	static void square(int[] outv, int outvoffset, int[] a, int aoffset)
-	{
-		int j;
-		
-		for (int i = 0; i < 32; ++i)
-		{
-			int u = 0;
-			
-			for (j = 0; j < i - j; ++j)
-				u += a[aoffset + j] * a[aoffset + i - j];
-			
-			for (j = i + 1; j < i + 32 - j; ++j)
-				u += 38 * a[aoffset + j] * a[aoffset + i + 32 - j];
-			
-			u *= 2;
-			
-			if ((i & 1) == 0)
-			{
-				u += a[aoffset + i / 2] * a[aoffset + i / 2];
-				u += 38 * a[aoffset + i / 2 + 16] * a[aoffset + i / 2 + 16];
-			}
-			
-			outv[outvoffset + i] = u;
-		}
-		
-		squeeze(outv, outvoffset);
-	}
-
-	static void select(int[] p, int[] q, int[] r, int[] s, int b)
-	{
-		int bminus1 = b - 1;
-		
-		for (int j = 0; j < 64; ++j)
-		{
-			int t = bminus1 & (r[j] ^ s[j]);
-			p[j] = s[j] ^ t;
-			q[j] = r[j] ^ t;
-		}
-	}
-
-	static void mainloop(int[] work, byte[] e)
-	{
-		int[] xzm1 = new int[64];
-		int[] xzm = new int[64];
-		int[] xzmb = new int[64];
-		int[] xzm1b = new int[64];
-		int[] xznb = new int[64];
-		int[] xzn1b = new int[64];
-		int[] a0 = new int[64];
-		int[] a1 = new int[64];
-		int[] b0 = new int[64];
-		int[] b1 = new int[64];
-		int[] c1 = new int[64];
-		int[] r = new int[32];
-		int[] s = new int[32];
-		int[] t = new int[32];
-		int[] u = new int[32];
-
-		for (int j = 0; j < 32; ++j)
-			xzm1[j] = work[j];
-		
-		xzm1[32] = 1;
-		
-		for (int j = 33; j < 64; ++j)
-			xzm1[j] = 0;
-
-		xzm[0] = 1;
-		
-		for (int j = 1; j < 64; ++j)
-			xzm[j] = 0;
-
-		int[] xzmbp = xzmb, a0p = a0, xzm1bp = xzm1b;
-		int[] a1p = a1, b0p = b0, b1p = b1, c1p = c1;
-		int[] xznbp = xznb, up = u, xzn1bp = xzn1b;
-		int[] workp = work, sp = s, rp = r;
-
-		for (int pos = 254; pos >= 0; --pos)
-		{
-			int b = ((int) ((e[pos / 8] & 0xFF) >>> (pos & 7)));
-			b &= 1;
-			select(xzmb, xzm1b, xzm, xzm1, b);
-			add(a0, 	0,	xzmb, 	0,	xzmbp,	32);
-			sub(a0p,	32,	xzmb, 	0,	xzmbp, 	32);
-			add(a1, 	0,	xzm1b, 	0,	xzm1bp,	32);
-			sub(a1p,	32,	xzm1b, 	0,	xzm1bp, 32);
-			square(b0p,	0,	a0p,	0);
-			square(b0p, 32,	a0p,	32);
-			mult(b1p,	0,	a1p,	0, 	a0p,	32);
-			mult(b1p,	32,	a1p,	32,	a0p,	0);
-			add(c1, 	0,	b1, 	0,	b1p,	32);
-			sub(c1p,	32,	b1,		0,	b1p,	32);
-			square(rp,	0,	c1p,	32);
-			sub(sp,		0,	b0,		0,	b0p,	32);
-			mult121665(t, s);
-			add(u, 		0,	t, 		0,	b0p,	0);
-			mult(xznbp,	0,	b0p,	0,	b0p,	32);
-			mult(xznbp,	32, sp,		0,	up,		0);
-			square(xzn1bp, 0, c1p,	0);
-			mult(xzn1bp, 32, rp, 	0, 	workp, 	0);
-			select(xzm, xzm1, xznb, xzn1b, b);
-		}
-
-		for (int j = 0; j < 64; ++j)
-			work[j] = xzm[j];
-	}
-
-	static void recip(int[] outv, int outvoffset, int[] z, int zoffset)
-	{
-		int[] z2 = new int[32];
-		int[] z9 = new int[32];
-		int[] z11 = new int[32];
-		int[] z2_5_0 = new int[32];
-		int[] z2_10_0 = new int[32];
-		int[] z2_20_0 = new int[32];
-		int[] z2_50_0 = new int[32];
-		int[] z2_100_0 = new int[32];
-		int[] t0 = new int[32];
-		int[] t1 = new int[32];
-
-		/* 2 */
-		int[] z2p = z2;
-		square(z2p, 0, z, zoffset);
-		
-		/* 4 */
-		square(t1, 0, z2, 0);
-		
-		/* 8 */
-		square(t0, 0, t1, 0);
-		
-		/* 9 */
-		int[] z9p = z9, t0p = t0;
-		mult(z9p, 0, t0p, 0, z, zoffset);
-		
-		/* 11 */
-		mult(z11, 0, z9, 0, z2, 0);
-		
-		/* 22 */
-		square(t0, 0, z11, 0);
-		
-		/* 2^5 - 2^0 = 31 */
-		mult(z2_5_0, 0, t0, 0, z9, 0);
-
-		/* 2^6 - 2^1 */
-		square(t0, 0, z2_5_0, 0);
-		
-		/* 2^7 - 2^2 */
-		square(t1, 0, t0, 0);
-		
-		/* 2^8 - 2^3 */
-		square(t0, 0, t1, 0);
-		
-		/* 2^9 - 2^4 */
-		square(t1, 0, t0, 0);
-		
-		/* 2^10 - 2^5 */
-		square(t0, 0, t1, 0);
-		
-		/* 2^10 - 2^0 */
-		mult(z2_10_0, 0, t0, 0, z2_5_0, 0);
-
-		/* 2^11 - 2^1 */
-		square(t0, 0, z2_10_0, 0);
-		
-		/* 2^12 - 2^2 */
-		square(t1, 0, t0, 0);
-		
-		/* 2^20 - 2^10 */
-		for (int i = 2; i < 10; i += 2)
-		{ 
-			square(t0, 0, t1, 0);
-			square(t1, 0, t0, 0);
-		}
-		
-		/* 2^20 - 2^0 */
-		mult(z2_20_0, 0, t1, 0, z2_10_0, 0);
-
-		/* 2^21 - 2^1 */
-		square(t0, 0, z2_20_0, 0);
-		
-		/* 2^22 - 2^2 */
-		square(t1, 0, t0, 0);
-		
-		/* 2^40 - 2^20 */
-		for (int i = 2; i < 20; i += 2) 
-		{ 
-			square(t0, 0, t1, 0); 
-			square(t1, 0, t0, 0); 
-		}
-		
-		/* 2^40 - 2^0 */
-		mult(t0, 0, t1, 0, z2_20_0, 0);
-
-		/* 2^41 - 2^1 */
-		square(t1, 0, t0, 0);
-		
-		/* 2^42 - 2^2 */
-		square(t0, 0, t1, 0);
-		
-		/* 2^50 - 2^10 */
-		for (int i = 2; i < 10; i += 2) 
-		{ 
-			square(t1, 0, t0, 0); 
-			square(t0, 0, t1, 0); 
-		}
-		
-		/* 2^50 - 2^0 */
-		mult(z2_50_0, 0, t0, 0, z2_10_0, 0);
-
-		/* 2^51 - 2^1 */
-		square(t0, 0, z2_50_0, 0);
-		
-		/* 2^52 - 2^2 */
-		square(t1, 0, t0, 0);
-		
-		/* 2^100 - 2^50 */
-		for (int i = 2; i < 50; i += 2)
-		{ 
-			square(t0, 0, t1, 0); 
-			square(t1, 0, t0, 0); 
-		}
-		
-		/* 2^100 - 2^0 */
-		mult(z2_100_0, 0, t1, 0, z2_50_0, 0);
-
-		/* 2^101 - 2^1 */
-		square(t1, 0, z2_100_0, 0);
-		
-		/* 2^102 - 2^2 */
-		square(t0, 0, t1, 0);
-		
-		/* 2^200 - 2^100 */
-		for (int i = 2; i < 100; i += 2)
-		{
-			square(t1, 0, t0, 0);
-			square(t0, 0, t1, 0);
-		}
-		
-		/* 2^200 - 2^0 */
-		mult(t1, 0, t0, 0, z2_100_0, 0);
-
-		/* 2^201 - 2^1 */
-		square(t0, 0, t1, 0);
-		
-		/* 2^202 - 2^2 */
-		square(t1, 0, t0, 0);
-		
-		/* 2^250 - 2^50 */
-		for (int i = 2; i < 50; i += 2)
-		{
-			square(t0, 0, t1, 0);
-			square(t1, 0, t0, 0);
-		}
-		
-		/* 2^250 - 2^0 */
-		mult(t0, 0, t1, 0, z2_50_0, 0);
-
-		/* 2^251 - 2^1 */
-		square(t1, 0, t0, 0);
-		
-		/* 2^252 - 2^2 */
-		square(t0, 0, t1, 0);
-		
-		/* 2^253 - 2^3 */
-		square(t1, 0, t0, 0);
-		
-		/* 2^254 - 2^4 */
-		square(t0, 0, t1, 0);
-		
-		/* 2^255 - 2^5 */
-		square(t1, 0, t0, 0);
-		
-		/* 2^255 - 21 */
-		int[] t1p = t1, z11p = z11;
-		mult(outv, outvoffset, t1p, 0, z11p, 0);
-	}
-
-	public static int crypto_scalarmult(byte[] q, byte[] n, byte[] p)
-	{
-		int[] work = new int[96];
-		byte[] e = new byte[32];
-		
-		for (int i = 0; i < 32; ++i)
-			e[i] = n[i];
-		
-		e[0] &= 248;
-		e[31] &= 127;
-		e[31] |= 64;
-		
-		for (int i = 0; i < 32; ++i)
-			work[i] = p[i] & 0xFF;
-		
-		mainloop(work, e);
-		
-		recip(work, 32, work, 32);
-		mult(work, 64, work, 0, work, 32);		
-		freeze(work, 64);
-		
-		for (int i = 0; i < 32; ++i)
-			q[i] = (byte) work[64 + i];
-		
-		return 0;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/crypto/HybridEncryption.java b/orchid/src/com/subgraph/orchid/crypto/HybridEncryption.java
deleted file mode 100644
index 33a394c9151..00000000000
--- a/orchid/src/com/subgraph/orchid/crypto/HybridEncryption.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.subgraph.orchid.crypto;
-
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-
-import com.subgraph.orchid.TorException;
-
-/**
- * The <code>HybridEncryption</code> class implements the "hybrid encryption" scheme
- * as described in section 0.3 of the main Tor specification (tor-spec.txt).
- */
-public class HybridEncryption {
-	
-	private final static int PK_ENC_LEN = 128;
-	private final static int PK_PAD_LEN = 42;
-	private final static int PK_DATA_LEN = PK_ENC_LEN - PK_PAD_LEN; // 86 bytes
-	private final static int PK_DATA_LEN_WITH_KEY = PK_DATA_LEN - TorStreamCipher.KEY_LEN; // 70 bytes
-	/*
-	 * The "hybrid encryption" of a byte sequence M with a public key PK is
-   	 * computed as follows:
-   	 * 
-     *  1. If M is less than PK_ENC_LEN-PK_PAD_LEN (86), pad and encrypt M with PK.
-     *  2. Otherwise, generate a KEY_LEN byte random key K.
-     *     Let M1 = the first PK_ENC_LEN-PK_PAD_LEN-KEY_LEN (70) bytes of M,
-     *     and let M2 = the rest of M.
-     *     Pad and encrypt K|M1 with PK.  Encrypt M2 with our stream cipher,
-     *     using the key K.  Concatenate these encrypted values.
-	 */
-	final private Cipher cipher;
-	
-	/**
-	 * Create a new <code>HybridEncryption</code> instance which can be used for performing
-	 * "hybrid encryption" operations as described in the main Tor specification (tor-spec.txt).
-	 */
-	public HybridEncryption() {
-		try {
-			cipher = Cipher.getInstance("RSA/ECB/OAEPWithSHA1AndMGF1Padding");
-		} catch (NoSuchAlgorithmException e) {
-			throw new TorException(e);
-		} catch (NoSuchPaddingException e) {
-			throw new TorException(e);
-		}
-	}
-	
-	/**
-	 * Encrypt the entire contents of the byte array <code>data</code> with the given <code>TorPublicKey</code>
-	 * according to the "hybrid encryption" scheme described in the main Tor specification (tor-spec.txt).
-	 * 
-	 * @param data The bytes to be encrypted.
-	 * @param publicKey The public key to use for encryption.
-	 * @return A new array containing the encrypted data.
-	 */
-	public byte[] encrypt(byte[] data, TorPublicKey publicKey) {
-		if(data.length < PK_DATA_LEN) 
-			return encryptSimple(data, publicKey);
-		
-		// RSA( K | M1 ) --> C1
-		TorStreamCipher randomKeyCipher = TorStreamCipher.createWithRandomKey();
-		final byte[] kAndM1 = new byte[PK_DATA_LEN];
-		System.arraycopy(randomKeyCipher.getKeyBytes(), 0, kAndM1, 0, TorStreamCipher.KEY_LEN);
-		System.arraycopy(data, 0, kAndM1, TorStreamCipher.KEY_LEN, PK_DATA_LEN_WITH_KEY);
-		final byte[] c1 = encryptSimple(kAndM1, publicKey);
-		
-		// AES_CTR(M2)  --> C2
-		final byte[] c2 = new byte[data.length - PK_DATA_LEN_WITH_KEY];
-		System.arraycopy(data, PK_DATA_LEN_WITH_KEY, c2, 0, c2.length);
-		randomKeyCipher.encrypt(c2);
-		//final byte[] c2 = randomKeyCipher.doFinal(data, PK_DATA_LEN_WITH_KEY, data.length - PK_DATA_LEN_WITH_KEY);
-		
-		// C1 | C2
-		final byte[] output = new byte[c1.length + c2.length];
-		System.arraycopy(c1, 0, output, 0, c1.length);
-		System.arraycopy(c2, 0, output, c1.length, c2.length);
-		return output;		
-	}
-	
-	private byte[] encryptSimple(byte[] data, TorPublicKey publicKey) {
-		try {
-			cipher.init(Cipher.ENCRYPT_MODE, publicKey.getRSAPublicKey());
-			return cipher.doFinal(data);
-		} catch (InvalidKeyException e) {
-			throw new TorException(e);
-		} catch (IllegalBlockSizeException e) {
-			throw new TorException(e);
-		} catch (BadPaddingException e) {
-			throw new TorException(e);
-		}
-	}
-	
-	/**
-	 * Decrypt the contents of the byte array <code>data</code> with the given <code>TorPrivateKey</code>
-	 * according to the "hybrid encryption" scheme described in the main Tor specification (tor-spec.txt).
-	 * 
-	 * @param data Encrypted data to decrypt.
-	 * @param privateKey The private key to use to decrypt the data.
-	 * @return A new byte array containing the decrypted data.
-	 */
-	
-	public byte[] decrypt(byte[] data, TorPrivateKey privateKey) {
-		if(data.length < PK_ENC_LEN)
-			throw new TorException("Message is too short");
-		
-		if(data.length == PK_ENC_LEN) 
-			return decryptSimple(data, privateKey);
-		
-		// ( C1 | C2 ) --> C1, C2
-		final byte[] c1 = new byte[PK_ENC_LEN];
-		final byte[] c2 = new byte[data.length - PK_ENC_LEN];
-		System.arraycopy(data, 0, c1, 0, PK_ENC_LEN);
-		System.arraycopy(data, PK_ENC_LEN, c2, 0, c2.length);
-		
-		// RSA( C1 ) --> ( K | M1 ) --> K, M1
-		final byte[] kAndM1 = decryptSimple(c1, privateKey);
-		final byte[] streamKey = new byte[TorStreamCipher.KEY_LEN];
-		final int m1Length = kAndM1.length - TorStreamCipher.KEY_LEN;
-		final byte[] m1 = new byte[m1Length];
-		System.arraycopy(kAndM1, 0, streamKey, 0, TorStreamCipher.KEY_LEN);
-		System.arraycopy(kAndM1, TorStreamCipher.KEY_LEN, m1, 0, m1Length);
-		
-		// AES_CTR( C2 ) --> M2
-		final TorStreamCipher streamCipher = TorStreamCipher.createFromKeyBytes(streamKey);
-		streamCipher.encrypt(c2);
-		final byte[] m2 = c2;
-		
-		final byte[] output = new byte[m1.length + m2.length];
-		System.arraycopy(m1, 0, output, 0, m1.length);
-		System.arraycopy(m2, 0, output, m1.length, m2.length);
-		return output;		      
-	}
-	
-	private byte[] decryptSimple(byte[] data, TorPrivateKey privateKey) {
-		try {
-			cipher.init(Cipher.DECRYPT_MODE, privateKey.getRSAPrivateKey());
-			return cipher.doFinal(data);
-		} catch (InvalidKeyException e) {
-			throw new TorException(e);
-		} catch (IllegalBlockSizeException e) {
-			throw new TorException(e);
-		} catch (BadPaddingException e) {
-			throw new TorException(e);
-		}
-	}
-	
-	
-}
diff --git a/orchid/src/com/subgraph/orchid/crypto/PRNGFixes.java b/orchid/src/com/subgraph/orchid/crypto/PRNGFixes.java
deleted file mode 100644
index b49ffb5dde2..00000000000
--- a/orchid/src/com/subgraph/orchid/crypto/PRNGFixes.java
+++ /dev/null
@@ -1,360 +0,0 @@
-package com.subgraph.orchid.crypto;
-
-/*
- * This software is provided 'as-is', without any express or implied
- * warranty.  In no event will Google be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, as long as the origin is not misrepresented.
- */
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.security.NoSuchAlgorithmException;
-import java.security.Provider;
-import java.security.SecureRandom;
-import java.security.SecureRandomSpi;
-import java.security.Security;
-import java.util.logging.Logger;
-
-/**
- * Fixes for the output of the default PRNG having low entropy.
- *
- * The fixes need to be applied via {@link #apply()} before any use of Java
- * Cryptography Architecture primitives. A good place to invoke them is in the
- * application's {@code onCreate}.
- */
-public final class PRNGFixes {
-
-	private final static Logger logger = Logger.getLogger(PRNGFixes.class.getName());
-	
-    private static final int VERSION_CODE_JELLY_BEAN = 16;
-    private static final int VERSION_CODE_JELLY_BEAN_MR2 = 18;
-    private static final byte[] BUILD_FINGERPRINT_AND_DEVICE_SERIAL =
-        getBuildFingerprintAndDeviceSerial();
-
-    /** Hidden constructor to prevent instantiation. */
-    private PRNGFixes() {}
-
-    /**
-     * Applies all fixes.
-     *
-     * @throws SecurityException if a fix is needed but could not be applied.
-     */
-    public static void apply() {
-        applyOpenSSLFix();
-        installLinuxPRNGSecureRandom();
-    }
-
-    /**
-     * Applies the fix for OpenSSL PRNG having low entropy. Does nothing if the
-     * fix is not needed.
-     *
-     * @throws SecurityException if the fix is needed but could not be applied.
-     */
-    private static void applyOpenSSLFix() throws SecurityException {
-    	int sdkVersion = getSdkVersion();
-        if ((sdkVersion < VERSION_CODE_JELLY_BEAN)
-                || (sdkVersion > VERSION_CODE_JELLY_BEAN_MR2)) {
-            // No need to apply the fix
-            return;
-        }
-
-        try {
-            // Mix in the device- and invocation-specific seed.
-            Class.forName("org.apache.harmony.xnet.provider.jsse.NativeCrypto")
-                    .getMethod("RAND_seed", byte[].class)
-                    .invoke(null, generateSeed());
-
-            // Mix output of Linux PRNG into OpenSSL's PRNG
-            int bytesRead = (Integer) Class.forName(
-                    "org.apache.harmony.xnet.provider.jsse.NativeCrypto")
-                    .getMethod("RAND_load_file", String.class, long.class)
-                    .invoke(null, "/dev/urandom", 1024);
-            if (bytesRead != 1024) {
-                throw new IOException(
-                        "Unexpected number of bytes read from Linux PRNG: "
-                                + bytesRead);
-            }
-        } catch (Exception e) {
-            throw new SecurityException("Failed to seed OpenSSL PRNG", e);
-        }
-    }
-
-    /**
-     * Installs a Linux PRNG-backed {@code SecureRandom} implementation as the
-     * default. Does nothing if the implementation is already the default or if
-     * there is not need to install the implementation.
-     *
-     * @throws SecurityException if the fix is needed but could not be applied.
-     */
-    private static void installLinuxPRNGSecureRandom()
-            throws SecurityException {
-        if (getSdkVersion() > VERSION_CODE_JELLY_BEAN_MR2) {
-            // No need to apply the fix
-            return;
-        }
-
-        // Install a Linux PRNG-based SecureRandom implementation as the
-        // default, if not yet installed.
-        Provider[] secureRandomProviders =
-                Security.getProviders("SecureRandom.SHA1PRNG");
-        if ((secureRandomProviders == null)
-                || (secureRandomProviders.length < 1)
-                || (!LinuxPRNGSecureRandomProvider.class.equals(
-                        secureRandomProviders[0].getClass()))) {
-            Security.insertProviderAt(new LinuxPRNGSecureRandomProvider(), 1);
-        }
-
-        // Assert that new SecureRandom() and
-        // SecureRandom.getInstance("SHA1PRNG") return a SecureRandom backed
-        // by the Linux PRNG-based SecureRandom implementation.
-        SecureRandom rng1 = new SecureRandom();
-        if (!LinuxPRNGSecureRandomProvider.class.equals(
-                rng1.getProvider().getClass())) {
-            throw new SecurityException(
-                    "new SecureRandom() backed by wrong Provider: "
-                            + rng1.getProvider().getClass());
-        }
-
-        SecureRandom rng2;
-        try {
-            rng2 = SecureRandom.getInstance("SHA1PRNG");
-        } catch (NoSuchAlgorithmException e) {
-            throw new SecurityException("SHA1PRNG not available", e);
-        }
-        if (!LinuxPRNGSecureRandomProvider.class.equals(
-                rng2.getProvider().getClass())) {
-            throw new SecurityException(
-                    "SecureRandom.getInstance(\"SHA1PRNG\") backed by wrong"
-                    + " Provider: " + rng2.getProvider().getClass());
-        }
-    }
-
-    /**
-     * {@code Provider} of {@code SecureRandom} engines which pass through
-     * all requests to the Linux PRNG.
-     */
-    private static class LinuxPRNGSecureRandomProvider extends Provider {
-
-		private static final long serialVersionUID = 1L;
-
-		public LinuxPRNGSecureRandomProvider() {
-            super("LinuxPRNG",
-                    1.0,
-                    "A Linux-specific random number provider that uses"
-                        + " /dev/urandom");
-            // Although /dev/urandom is not a SHA-1 PRNG, some apps
-            // explicitly request a SHA1PRNG SecureRandom and we thus need to
-            // prevent them from getting the default implementation whose output
-            // may have low entropy.
-            put("SecureRandom.SHA1PRNG", LinuxPRNGSecureRandom.class.getName());
-            put("SecureRandom.SHA1PRNG ImplementedIn", "Software");
-        }
-    }
-
-    /**
-     * {@link SecureRandomSpi} which passes all requests to the Linux PRNG
-     * ({@code /dev/urandom}).
-     */
-    public static class LinuxPRNGSecureRandom extends SecureRandomSpi {
-
-        /*
-         * IMPLEMENTATION NOTE: Requests to generate bytes and to mix in a seed
-         * are passed through to the Linux PRNG (/dev/urandom). Instances of
-         * this class seed themselves by mixing in the current time, PID, UID,
-         * build fingerprint, and hardware serial number (where available) into
-         * Linux PRNG.
-         *
-         * Concurrency: Read requests to the underlying Linux PRNG are
-         * serialized (on sLock) to ensure that multiple threads do not get
-         * duplicated PRNG output.
-         */
-
-     
-		private static final long serialVersionUID = 1L;
-
-		private static final File URANDOM_FILE = new File("/dev/urandom");
-
-        private static final Object sLock = new Object();
-
-        /**
-         * Input stream for reading from Linux PRNG or {@code null} if not yet
-         * opened.
-         *
-         * @GuardedBy("sLock")
-         */
-        private static DataInputStream sUrandomIn;
-
-        /**
-         * Output stream for writing to Linux PRNG or {@code null} if not yet
-         * opened.
-         *
-         * @GuardedBy("sLock")
-         */
-        private static OutputStream sUrandomOut;
-
-        /**
-         * Whether this engine instance has been seeded. This is needed because
-         * each instance needs to seed itself if the client does not explicitly
-         * seed it.
-         */
-        private boolean mSeeded;
-
-        @Override
-        protected void engineSetSeed(byte[] bytes) {
-            try {
-                OutputStream out;
-                synchronized (sLock) {
-                    out = getUrandomOutputStream();
-                }
-                out.write(bytes);
-                out.flush();
-            } catch (IOException e) {
-                // On a small fraction of devices /dev/urandom is not writable.
-                // Log and ignore.
-                logger.warning("Failed to mix seed into " + URANDOM_FILE);
-            } finally {
-                mSeeded = true;
-            }
-        }
-
-        @Override
-        protected void engineNextBytes(byte[] bytes) {
-            if (!mSeeded) {
-                // Mix in the device- and invocation-specific seed.
-                engineSetSeed(generateSeed());
-            }
-
-            try {
-                DataInputStream in;
-                synchronized (sLock) {
-                    in = getUrandomInputStream();
-                }
-                synchronized (in) {
-                    in.readFully(bytes);
-                }
-            } catch (IOException e) {
-                throw new SecurityException(
-                        "Failed to read from " + URANDOM_FILE, e);
-            }
-        }
-
-        @Override
-        protected byte[] engineGenerateSeed(int size) {
-            byte[] seed = new byte[size];
-            engineNextBytes(seed);
-            return seed;
-        }
-
-        private DataInputStream getUrandomInputStream() {
-            synchronized (sLock) {
-                if (sUrandomIn == null) {
-                    // NOTE: Consider inserting a BufferedInputStream between
-                    // DataInputStream and FileInputStream if you need higher
-                    // PRNG output performance and can live with future PRNG
-                    // output being pulled into this process prematurely.
-                    try {
-                        sUrandomIn = new DataInputStream(
-                                new FileInputStream(URANDOM_FILE));
-                    } catch (IOException e) {
-                        throw new SecurityException("Failed to open "
-                                + URANDOM_FILE + " for reading", e);
-                    }
-                }
-                return sUrandomIn;
-            }
-        }
-
-        private OutputStream getUrandomOutputStream() throws IOException {
-            synchronized (sLock) {
-                if (sUrandomOut == null) {
-                    sUrandomOut = new FileOutputStream(URANDOM_FILE);
-                }
-                return sUrandomOut;
-            }
-        }
-    }
-
-    /**
-     * Generates a device- and invocation-specific seed to be mixed into the
-     * Linux PRNG.
-     */
-    private static byte[] generateSeed() {
-        try {
-            ByteArrayOutputStream seedBuffer = new ByteArrayOutputStream();
-            DataOutputStream seedBufferOut =
-                    new DataOutputStream(seedBuffer);
-            seedBufferOut.writeLong(System.currentTimeMillis());
-            seedBufferOut.writeLong(System.nanoTime());
-            //seedBufferOut.writeInt(Process.myPid());
-            //seedBufferOut.writeInt(Process.myUid());
-            seedBufferOut.write(BUILD_FINGERPRINT_AND_DEVICE_SERIAL);
-            seedBufferOut.close();
-            return seedBuffer.toByteArray();
-        } catch (IOException e) {
-            throw new SecurityException("Failed to generate seed", e);
-        }
-    }
-
-    /**
-     * Gets the hardware serial number of this device.
-     *
-     * @return serial number or {@code null} if not available.
-     */
-    private static String getDeviceSerialNumber() {
-        // We're using the Reflection API because Build.SERIAL is only available
-        // since API Level 9 (Gingerbread, Android 2.3).
-        try {
-        	return (String) Class.forName("android.os.Build").getField("SERIAL").get(null);
-            //return (String) Build.class.getField("SERIAL").get(null);
-        } catch (Exception ignored) {
-            return null;
-        }
-    }
-    
-    private static int getSdkVersion() {
-    	try {
-			return Class.forName("android.os.Build").getField("VERSION").getClass().getField("SDK_INT").getInt(null);
-		} catch (Exception e) {
-			logger.warning("Could not get Build.VERSION.SDK_INT value : "+ e);
-			return 0;
-		} 
-    }
-    
-    private static String getBuildFingerprint() {
-    	try {
-    		return (String) Class.forName("android.os.Build").getField("FINGERPRINT").get(null);
-    	} catch (Exception e) {
-    		logger.warning("Could not get BUILD.FINGERPRINT value : "+ e);
-    		return "";
-    	}
-    }
-
-    private static byte[] getBuildFingerprintAndDeviceSerial() {
-        StringBuilder result = new StringBuilder();
-        // String fingerprint = Build.FINGERPRINT;
-        String fingerprint = getBuildFingerprint();
-        if (fingerprint != null) {
-            result.append(fingerprint);
-        }
-        String serial = getDeviceSerialNumber();
-        if (serial != null) {
-            result.append(serial);
-        }
-        try {
-            return result.toString().getBytes("UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException("UTF-8 encoding not supported");
-        }
-    }
-}
\ No newline at end of file
diff --git a/orchid/src/com/subgraph/orchid/crypto/RSAKeyEncoder.java b/orchid/src/com/subgraph/orchid/crypto/RSAKeyEncoder.java
deleted file mode 100644
index 28eb474a6bc..00000000000
--- a/orchid/src/com/subgraph/orchid/crypto/RSAKeyEncoder.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.subgraph.orchid.crypto;
-
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.security.GeneralSecurityException;
-import java.security.InvalidKeyException;
-import java.security.KeyFactory;
-import java.security.interfaces.RSAPublicKey;
-import java.security.spec.RSAPublicKeySpec;
-import java.util.List;
-
-import com.subgraph.orchid.crypto.ASN1Parser.ASN1BitString;
-import com.subgraph.orchid.crypto.ASN1Parser.ASN1Integer;
-import com.subgraph.orchid.crypto.ASN1Parser.ASN1Object;
-import com.subgraph.orchid.crypto.ASN1Parser.ASN1Sequence;
-import com.subgraph.orchid.encoders.Base64;
-
-public class RSAKeyEncoder {
-	private final static String HEADER = "-----BEGIN RSA PUBLIC KEY-----";
-	private final static String FOOTER = "-----END RSA PUBLIC KEY-----";
-	
-	private final ASN1Parser asn1Parser = new ASN1Parser();
-	
-	/**
-	 * Parse a PKCS1 PEM encoded RSA public key into the modulus/exponent components
-	 * and construct a new RSAPublicKey
-	 *  
-	 * @param pem The PEM encoded string to parse.
-	 * @return a new RSAPublicKey
-	 * 
-	 * @throws GeneralSecurityException If an error occurs while parsing the pem argument or creating the RSA key.
-	 */
-	public RSAPublicKey parsePEMPublicKey(String pem) throws GeneralSecurityException {
-		try {
-			byte[] bs = decodeAsciiArmoredPEM(pem);
-			ByteBuffer data = ByteBuffer.wrap(bs);
-			final ASN1Object ob = asn1Parser.parseASN1(data);
-			final List<ASN1Object> seq = asn1ObjectToSequence(ob, 2);
-			final BigInteger modulus = asn1ObjectToBigInt(seq.get(0));
-			final BigInteger exponent = asn1ObjectToBigInt(seq.get(1));
-			return createKeyFromModulusAndExponent(modulus, exponent);
-		} catch (IllegalArgumentException e) {
-			throw new InvalidKeyException();
-		}
-	}
-
-	private RSAPublicKey createKeyFromModulusAndExponent(BigInteger modulus, BigInteger exponent) throws GeneralSecurityException {
-		RSAPublicKeySpec spec = new RSAPublicKeySpec(modulus, exponent);
-		KeyFactory fac = KeyFactory.getInstance("RSA");
-		return (RSAPublicKey) fac.generatePublic(spec);
-	}
-
-	/**
-	 * Return the PKCS1 encoded representation of the specified RSAPublicKey.  Since 
-	 * the primary encoding format for RSA public keys is X.509 SubjectPublicKeyInfo,
-	 * this needs to be converted to PKCS1 by extracting the needed field.
-	 * 
-	 * @param publicKey The RSA public key to encode.
-	 * @return The PKCS1 encoded representation of the publicKey argument
-	 */
-	public byte[] getPKCS1Encoded(RSAPublicKey publicKey) {
-		return extractPKCS1KeyFromSubjectPublicKeyInfo(publicKey.getEncoded());
-	}
-
-	/*
-	 * SubjectPublicKeyInfo encoding looks like this:
-	 * 
-	 * SEQUENCE {
-	 *     SEQUENCE {
-	 *         OBJECT IDENTIFIER rsaEncryption (1 2 840 113549 1 1 1)
-	 *         NULL
-	 *     }
-	 *     BIT STRING (encapsulating) {  <-- contains PKCS1 encoded key
-	 *         SEQUENCE {
-	 *             INTEGER (modulus)
-	 *             INTEGER (exponent)
-	 *         }
-	 *     }
-	 * }
-	 * 
-	 * See: http://www.jensign.com/JavaScience/dotnet/JKeyNet/index.html
-	 */
-	private byte[] extractPKCS1KeyFromSubjectPublicKeyInfo(byte[] input) {
-		final ASN1Object ob = asn1Parser.parseASN1(ByteBuffer.wrap(input));
-		final List<ASN1Object> seq = asn1ObjectToSequence(ob, 2);
-		return asn1ObjectToBitString(seq.get(1));
-	}
-	
-	private BigInteger asn1ObjectToBigInt(ASN1Object ob) {
-		if(!(ob instanceof ASN1Integer)) {
-			throw new IllegalArgumentException();
-		}
-		final ASN1Integer n = (ASN1Integer) ob;
-		return n.getValue();
-	}
-	
-
-	private List<ASN1Object> asn1ObjectToSequence(ASN1Object ob, int expectedSize) {
-		if(ob instanceof ASN1Sequence) {
-			final ASN1Sequence seq = (ASN1Sequence) ob;
-			if(seq.getItems().size() != expectedSize) {
-				throw new IllegalArgumentException();
-			}
-			return seq.getItems();
-		}
-		throw new IllegalArgumentException();
-	}
-
-	private byte[] asn1ObjectToBitString(ASN1Object ob) {
-		if(!(ob instanceof ASN1BitString)) {
-			throw new IllegalArgumentException();
-		}
-		final ASN1BitString bitstring = (ASN1BitString) ob;
-		return bitstring.getBytes();
-	}
-
-	private byte[] decodeAsciiArmoredPEM(String pem) {
-		final String trimmed = removeDelimiters(pem);
-		return Base64.decode(trimmed);
-	}
-	
-	private String removeDelimiters(String pem) {
-		final int headerIdx = pem.indexOf(HEADER);
-		final int footerIdx = pem.indexOf(FOOTER);
-		if(headerIdx == -1 || footerIdx == -1 || footerIdx <= headerIdx) {
-			throw new IllegalArgumentException("PEM object not formatted with expected header and footer");
-		}
-		return pem.substring(headerIdx + HEADER.length(), footerIdx);
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/crypto/TorCreateFastKeyAgreement.java b/orchid/src/com/subgraph/orchid/crypto/TorCreateFastKeyAgreement.java
deleted file mode 100644
index 7563b2af5b9..00000000000
--- a/orchid/src/com/subgraph/orchid/crypto/TorCreateFastKeyAgreement.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.subgraph.orchid.crypto;
-
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-
-public class TorCreateFastKeyAgreement implements TorKeyAgreement {
-	
-	private final byte[] xValue;
-	private byte[] yValue;
-
-	public TorCreateFastKeyAgreement() {
-		final TorRandom random = new TorRandom();
-		xValue = random.getBytes(TorMessageDigest.TOR_DIGEST_SIZE);
-	}
-	
-	public byte[] getPublicValue() {
-		return Arrays.copyOf(xValue, xValue.length);
-	}
-
-	public void setOtherValue(byte[] yValue) {
-		if(yValue == null || yValue.length != TorMessageDigest.TOR_DIGEST_SIZE) {
-			throw new IllegalArgumentException();
-		}
-		this.yValue = Arrays.copyOf(yValue, yValue.length);
-	}
-	
-	public byte[] getDerivedValue() {
-		if(yValue == null) {
-			throw new IllegalStateException("Must call setOtherValue() first");
-		}
-		final byte[] result = new byte[2 * TorMessageDigest.TOR_DIGEST_SIZE];
-		System.arraycopy(xValue, 0, result, 0, TorMessageDigest.TOR_DIGEST_SIZE);
-		System.arraycopy(yValue, 0, result, TorMessageDigest.TOR_DIGEST_SIZE, TorMessageDigest.TOR_DIGEST_SIZE);
-		return result;
-	}
-
-	public byte[] createOnionSkin() {
-		return getPublicValue();
-	}
-
-	public boolean deriveKeysFromHandshakeResponse(byte[] handshakeResponse,
-			byte[] keyMaterialOut, byte[] verifyHashOut) {
-		final ByteBuffer bb = ByteBuffer.wrap(handshakeResponse);
-		final byte[] peerValue = new byte[TorMessageDigest.TOR_DIGEST_SIZE];
-		final byte[] keyHash = new byte[TorMessageDigest.TOR_DIGEST_SIZE];
-		bb.get(peerValue);
-		bb.get(keyHash);
-		setOtherValue(peerValue);
-		final byte[] seed = getDerivedValue();
-		final TorKeyDerivation kdf = new TorKeyDerivation(seed);
-		kdf.deriveKeys(keyMaterialOut, verifyHashOut);
-		return Arrays.equals(verifyHashOut, keyHash);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/crypto/TorKeyAgreement.java b/orchid/src/com/subgraph/orchid/crypto/TorKeyAgreement.java
deleted file mode 100644
index c9467aa1799..00000000000
--- a/orchid/src/com/subgraph/orchid/crypto/TorKeyAgreement.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.subgraph.orchid.crypto;
-
-public interface TorKeyAgreement {
-	byte[] createOnionSkin();
-	boolean deriveKeysFromHandshakeResponse(byte[] handshakeResponse, byte[] keyMaterialOut, byte[] verifyHashOut);
-}
diff --git a/orchid/src/com/subgraph/orchid/crypto/TorKeyDerivation.java b/orchid/src/com/subgraph/orchid/crypto/TorKeyDerivation.java
deleted file mode 100644
index e965984a677..00000000000
--- a/orchid/src/com/subgraph/orchid/crypto/TorKeyDerivation.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.subgraph.orchid.crypto;
-
-import java.nio.ByteBuffer;
-
-public class TorKeyDerivation {
-	
-	private final byte[] kdfBuffer;
-	private int round;
-	
-	public TorKeyDerivation(byte[] seed) {
-		this.kdfBuffer = new byte[seed.length + 1];
-		System.arraycopy(seed, 0, kdfBuffer, 0, seed.length);
-	}
-	public void deriveKeys(byte[] keyMaterialOut, byte[] verifyHashOut) {
-		final ByteBuffer keyData = deriveKeys(keyMaterialOut.length + verifyHashOut.length);
-		keyData.get(verifyHashOut);
-		keyData.get(keyMaterialOut);
-	}
-	
-	public ByteBuffer deriveKeys(int length) {
-		final ByteBuffer outputBuffer = ByteBuffer.allocate(length);
-		round = 0;
-		while(outputBuffer.hasRemaining()) {
-			byte[] bs = calculateRoundData();
-			int n = Math.min(outputBuffer.remaining(), bs.length);
-			outputBuffer.put(bs, 0, n);
-		}
-		
-		outputBuffer.flip();
-		return outputBuffer;
-	}
-	
-	private byte[] calculateRoundData() {
-		final TorMessageDigest md = new TorMessageDigest();
-		kdfBuffer[kdfBuffer.length - 1] = (byte) round;
-		round += 1;
-		md.update(kdfBuffer);
-		return md.getDigestBytes();
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/crypto/TorMessageDigest.java b/orchid/src/com/subgraph/orchid/crypto/TorMessageDigest.java
deleted file mode 100644
index d6857877124..00000000000
--- a/orchid/src/com/subgraph/orchid/crypto/TorMessageDigest.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.subgraph.orchid.crypto;
-
-import java.io.UnsupportedEncodingException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-import com.subgraph.orchid.TorException;
-import com.subgraph.orchid.data.HexDigest;
-
-/**
- * This class wraps the default cryptographic message digest algorithm
- * used in Tor (SHA-1). 
- */
-public class TorMessageDigest {
-
-	
-	public static final int TOR_DIGEST_SIZE = 20;
-	public static final int TOR_DIGEST256_SIZE = 32;
-	
-	private static final String TOR_DIGEST_ALGORITHM = "SHA-1";
-	private static final String TOR_DIGEST256_ALGORITHM = "SHA-256";
-
-	private final MessageDigest digestInstance;
-	private final boolean isDigest256;
-	
-	public TorMessageDigest(boolean isDigest256) {
-		digestInstance = createDigestInstance(isDigest256);
-		this.isDigest256 = isDigest256;
-	}
-
-	public TorMessageDigest() {
-		this(false);
-	}
-
-	private MessageDigest createDigestInstance(boolean isDigest256) {
-		try {
-			final String algorithm = (isDigest256) ? TOR_DIGEST256_ALGORITHM : TOR_DIGEST_ALGORITHM;
-			return MessageDigest.getInstance(algorithm);
-		} catch (NoSuchAlgorithmException e) {
-			throw new TorException(e);
-		}
-	}
-
-	/**
-	 * Return <tt>true</tt> if this is a 256 bit digest instance.
-	 * 
-	 * @return <tt>true</tt> if this is a 256 bit digest instance.
-	 */
-	public boolean isDigest256() {
-		return isDigest256;
-	}
-
-	/**
-	 * Return the digest value of all data processed up until this point.
-	 * @return The digest value as an array of <code>TOR_DIGEST_SIZE<code> or <code>TOR_DIGEST256_SIZE</code> bytes.
-	 */
-	public byte[] getDigestBytes() {
-		try {
-			// Make a clone because #digest() will reset the MessageDigest instance
-			// and we want to be able to use this class for running digests on circuits
-			final MessageDigest clone = (MessageDigest) digestInstance.clone();
-			return clone.digest();
-		} catch (CloneNotSupportedException e) {
-			throw new TorException(e);
-		}
-	}
-
-	/**
-	 * Return what the digest for the current running hash would be IF we
-	 * added <code>data</code>, but don't really add the data to the digest
-	 * calculation.
-	 */
-	public byte[] peekDigest(byte[] data, int offset, int length) {
-		try {
-			final MessageDigest clone = (MessageDigest) digestInstance.clone();
-			clone.update(data, offset, length);
-			return clone.digest();
-		} catch (CloneNotSupportedException e) {
-			throw new TorException(e);
-		}
-	}
-
-	/**
-	 * Calculate the digest value of all data processed up until this point and convert
-	 * the digest into a <code>HexDigest</code> object.
-	 * @return A new <code>HexDigest</code> object representing the current digest value.
-	 * @see HexDigest
-	 */
-	public HexDigest getHexDigest() {
-		return HexDigest.createFromDigestBytes(getDigestBytes());
-	}
-
-	/**
-	 * Add the entire contents of the byte array <code>input</code> to the current digest calculation.
-	 * 
-	 * @param input An array of input bytes to process.
-	 */
-	public void update(byte[] input) {
-		digestInstance.update(input);
-	}
-
-	/**
-	 * Add <code>length</code> bytes of the contents of the byte array <code>input</code> beginning at 
-	 * <code>offset</code> into the array to the current digest calculation.
-	 * 
-	 * @param input An array of input bytes to process.
-	 * @param offset The offset into the <code>input</code> array to begin processing.
-	 * @param length A count of how many bytes of the <code>input</code> array to process.
-	 */
-	public void update(byte[] input, int offset, int length) {
-		digestInstance.update(input, offset, length);
-	}
-
-	/**
-	 * Convert the String <code>input</code> into an array of bytes using the ISO-8859-1 encoding
-	 * and add these bytes to the current digest calculation.
-	 * 
-	 * @param input A string to process.
-	 */
-	public void update(String input) {
-		try {
-			digestInstance.update(input.getBytes("ISO-8859-1"));
-		} catch (UnsupportedEncodingException e) {
-			throw new TorException(e);
-		}
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/crypto/TorNTorKeyAgreement.java b/orchid/src/com/subgraph/orchid/crypto/TorNTorKeyAgreement.java
deleted file mode 100644
index fab6414e1a1..00000000000
--- a/orchid/src/com/subgraph/orchid/crypto/TorNTorKeyAgreement.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.subgraph.orchid.crypto;
-
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.misc.Utils;
-
-public class TorNTorKeyAgreement implements TorKeyAgreement {
-	public final static int CURVE25519_PUBKEY_LEN = 32;
-	final static int CURVE25519_OUTPUT_LEN = 32;
-	final static int DIGEST256_LEN = 32;
-	final static int DIGEST_LEN = 20;
-	final static int KEY_LEN = 16;
-	final static int NTOR_ONIONSKIN_LEN = 2 * CURVE25519_PUBKEY_LEN + DIGEST_LEN;
-	final static String PROTOID = "ntor-curve25519-sha256-1";
-	final static String SERVER_STR = "Server";
-	final static int SECRET_INPUT_LEN = CURVE25519_PUBKEY_LEN * 3 + CURVE25519_OUTPUT_LEN * 2 + DIGEST_LEN + PROTOID.length();
-	final static int AUTH_INPUT_LEN = DIGEST256_LEN + DIGEST_LEN + (CURVE25519_PUBKEY_LEN * 3) + PROTOID.length()  + SERVER_STR.length(); 
-	final static Charset cs = Charset.forName("ISO-8859-1");
-	
-	private final TorRandom random = new TorRandom();
-	private final HexDigest peerIdentity;
-	private final byte[] peerNTorOnionKey;  /* pubkey_B */
-	private final byte[] secretKey_x; 
-	private final byte[] publicKey_X; 
-
-	public TorNTorKeyAgreement(HexDigest peerIdentity, byte[] peerNTorOnionKey) {
-		this.peerIdentity = peerIdentity;
-		this.peerNTorOnionKey = peerNTorOnionKey;
-		this.secretKey_x = generateSecretKey();
-		this.publicKey_X = getPublicKeyForPrivate(secretKey_x);
-	}
-	
-	
-	public byte[] createOnionSkin() {
-		final ByteBuffer buffer = makeBuffer(NTOR_ONIONSKIN_LEN);
-		buffer.put(peerIdentity.getRawBytes());
-		buffer.put(peerNTorOnionKey);
-		buffer.put(publicKey_X);
-		return buffer.array();
-	}
-
-	private ByteBuffer makeBuffer(int sz) {
-		final byte[] array = new byte[sz];
-		return ByteBuffer.wrap(array);
-	}
-	
-	byte[] generateSecretKey() {
-		final byte[]key = random.getBytes(32);
-		key[0] &= 248;
-		key[31] &= 127;
-		key[31] |= 64;
-		return key;
-	}
-	
-	byte[] getPublicKeyForPrivate(byte[] secretKey) {
-		final byte[] pub = new byte[32];
-		Curve25519.crypto_scalarmult_base(pub, secretKey);
-		return pub;
-	}
-	
-	private boolean isBad;
-
-	public boolean deriveKeysFromHandshakeResponse(byte[] handshakeResponse, byte[] keyMaterialOut, byte[] verifyHashOut) {
-		isBad = false;
-				
-		final ByteBuffer hr = ByteBuffer.wrap(handshakeResponse);
-		byte[] serverPub = new byte[CURVE25519_PUBKEY_LEN];
-		byte[] authCandidate = new byte[DIGEST256_LEN];
-		hr.get(serverPub);
-		hr.get(authCandidate);
-
-		final byte[] secretInput = buildSecretInput(serverPub);
-		final byte[] verify = tweak("verify", secretInput);
-		final byte[] authInput = buildAuthInput(verify, serverPub);
-		final byte[] auth = tweak("mac", authInput);
-		isBad |= !Utils.constantTimeArrayEquals(auth, authCandidate);
-		final byte[] seed = tweak("key_extract", secretInput);
-		
-		final TorRFC5869KeyDerivation kdf = new TorRFC5869KeyDerivation(seed);
-		kdf.deriveKeys(keyMaterialOut, verifyHashOut);
-		
-		return !isBad;
-	}
-	
-	public byte[] getNtorCreateMagic() {
-		return "ntorNTORntorNTOR".getBytes(cs);
-	}
-
-	private byte[] buildSecretInput(byte[] serverPublic_Y) {
-		final ByteBuffer bb = makeBuffer(SECRET_INPUT_LEN);
-		bb.put(scalarMult(serverPublic_Y));
-		bb.put(scalarMult(peerNTorOnionKey));
-		bb.put(peerIdentity.getRawBytes());
-		bb.put(peerNTorOnionKey);
-		bb.put(publicKey_X);
-		bb.put(serverPublic_Y);
-		bb.put(PROTOID.getBytes());
-		return bb.array();
-	}
-	
-	private byte[] buildAuthInput(byte[] verify, byte[] serverPublic_Y) {
-		final ByteBuffer bb = makeBuffer(AUTH_INPUT_LEN);
-		bb.put(verify);
-		bb.put(peerIdentity.getRawBytes());
-		bb.put(peerNTorOnionKey);
-		bb.put(serverPublic_Y);
-		bb.put(publicKey_X);
-		bb.put(PROTOID.getBytes(cs));
-		bb.put(SERVER_STR.getBytes(cs));
-		return bb.array();
-	}
-	
-	private byte[] scalarMult(byte[] peerValue) {
-		final byte[] out = new byte[CURVE25519_OUTPUT_LEN];
-		Curve25519.crypto_scalarmult(out, secretKey_x, peerValue);
-		isBad |= isAllZero(out);
-		return out;
-	}
-	
-	boolean isAllZero(byte[] bs) {
-		boolean result = true;
-		for(byte b: bs) {
-			result &= (b == 0);
-		}
-		return result;
-	}
-
-	byte[] tweak(String suffix, byte[] input) {
-		return hmac256(input, getStringConstant(suffix));
-	}
-
-	byte[] hmac256(byte[] input, byte[] key) {
-		final SecretKeySpec keyspec = new SecretKeySpec(key, "HmacSHA256");
-		try {
-			final Mac mac = Mac.getInstance("HmacSHA256");
-			mac.init(keyspec);
-			return mac.doFinal(input);
-		} catch (NoSuchAlgorithmException e) {
-			throw new IllegalStateException("Failed to create HmacSHA256 instance: "+ e);
-		} catch (InvalidKeyException e) {
-			throw new IllegalStateException("Failed to create HmacSHA256 instance: "+ e);
-		}
-	}
-	
-	byte[] getStringConstant(String suffix) {
-		if(suffix == null || suffix.isEmpty()) {
-			return PROTOID.getBytes(cs);
-		} else {
-			return (PROTOID + ":" + suffix).getBytes(cs);
-		}
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/crypto/TorPrivateKey.java b/orchid/src/com/subgraph/orchid/crypto/TorPrivateKey.java
deleted file mode 100644
index f6c14771ba0..00000000000
--- a/orchid/src/com/subgraph/orchid/crypto/TorPrivateKey.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.subgraph.orchid.crypto;
-
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.security.interfaces.RSAPrivateKey;
-import java.security.interfaces.RSAPublicKey;
-
-import com.subgraph.orchid.TorException;
-
-public class TorPrivateKey {
-
-	static public TorPrivateKey generateNewKeypair() {
-		KeyPairGenerator generator = createGenerator();
-		generator.initialize(1024, new SecureRandom());
-		KeyPair pair = generator.generateKeyPair();
-		return new TorPrivateKey((RSAPrivateKey)pair.getPrivate(), (RSAPublicKey)pair.getPublic());
-	}
-
-	static KeyPairGenerator createGenerator() {
-		try {
-			return KeyPairGenerator.getInstance("RSA");
-		} catch (NoSuchAlgorithmException e) {
-			throw new TorException(e);
-		}
-	}
-
-	private final TorPublicKey publicKey;
-	private final RSAPrivateKey privateKey;
-
-	TorPrivateKey(RSAPrivateKey privateKey, RSAPublicKey publicKey) {
-		this.privateKey = privateKey;
-		this.publicKey = new TorPublicKey(publicKey);
-	}
-
-	public TorPublicKey getPublicKey() {
-		return publicKey;
-	}
-
-	public RSAPublicKey getRSAPublicKey() {
-		return publicKey.getRSAPublicKey();
-	}
-
-	public RSAPrivateKey getRSAPrivateKey() {
-		return privateKey;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/crypto/TorPublicKey.java b/orchid/src/com/subgraph/orchid/crypto/TorPublicKey.java
deleted file mode 100644
index d66bedb3746..00000000000
--- a/orchid/src/com/subgraph/orchid/crypto/TorPublicKey.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.subgraph.orchid.crypto;
-
-import java.security.GeneralSecurityException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.interfaces.RSAPublicKey;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-
-import com.subgraph.orchid.TorException;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.misc.Utils;
-
-/**
- * This class wraps the RSA public keys used in the Tor protocol.
- */
-public class TorPublicKey {
-	static public TorPublicKey createFromPEMBuffer(String buffer) {
-		return new TorPublicKey(buffer);
-	}
-
-	private final String pemBuffer;
-	private RSAPublicKey key;
-
-	private byte[] rawKeyBytes = null;
-	private HexDigest keyFingerprint = null;
-
-	private TorPublicKey(String pemBuffer) {
-		this.pemBuffer = pemBuffer;
-		this.key = null;
-	}
-
-	public TorPublicKey(RSAPublicKey key) {
-		this.pemBuffer = null;
-		this.key = key;
-	}
-
-	private synchronized RSAPublicKey getKey() {
-		if(key != null) {
-			return key;
-		} else if(pemBuffer != null) {
-			final RSAKeyEncoder encoder = new RSAKeyEncoder();
-			try {
-				key = encoder.parsePEMPublicKey(pemBuffer);
-			} catch (GeneralSecurityException e) {
-				throw new IllegalArgumentException("Failed to parse PEM encoded key: "+ e);
-			}
-		}
-		return key;
-	}
-
-	public synchronized byte[] getRawBytes() {
-		if(rawKeyBytes == null) {
-			final RSAKeyEncoder encoder = new RSAKeyEncoder();
-			rawKeyBytes = encoder.getPKCS1Encoded(getKey());
-		}
-		return rawKeyBytes;
-	}
-
-	public synchronized HexDigest getFingerprint() {
-		if(keyFingerprint == null) {
-			keyFingerprint = HexDigest.createDigestForData(getRawBytes());
-		}
-		return keyFingerprint;
-	}
-
-	public boolean verifySignature(TorSignature signature, HexDigest digest) {
-		return verifySignatureFromDigestBytes(signature, digest.getRawBytes());
-	}
-
-	public boolean verifySignature(TorSignature signature, TorMessageDigest digest) {
-		return verifySignatureFromDigestBytes(signature, digest.getDigestBytes());
-	}
-
-	public boolean verifySignatureFromDigestBytes(TorSignature signature, byte[] digestBytes) {
-		final Cipher cipher = createCipherInstance();
-		try {
-			byte[] decrypted = cipher.doFinal(signature.getSignatureBytes());
-			return Utils.constantTimeArrayEquals(decrypted, digestBytes);
-		} catch (IllegalBlockSizeException e) {
-			throw new TorException(e);
-		} catch (BadPaddingException e) {
-			throw new TorException(e);
-		}
-	}
-
-	private Cipher createCipherInstance() {
-		try {
-			Cipher cipher = getCipherInstance();
-			cipher.init(Cipher.DECRYPT_MODE, getKey());
-			return cipher;
-		} catch (InvalidKeyException e) {
-			throw new TorException(e);
-		} 
-	}
-
-	private Cipher getCipherInstance() {
-		try {
-			try {
-				return Cipher.getInstance("RSA/ECB/PKCS1Padding", "SunJCE");
-			} catch (NoSuchProviderException e) {
-				return Cipher.getInstance("RSA/ECB/PKCS1Padding");
-			}
-		} catch (NoSuchAlgorithmException e) {
-			throw new TorException(e);
-		} catch (NoSuchPaddingException e) {
-			throw new TorException(e);
-		}
-	}
-	
-	public RSAPublicKey getRSAPublicKey() {
-		return getKey();
-	}
-
-	public String toString() {
-		return "Tor Public Key: " + getFingerprint();
-	}
-
-	public boolean equals(Object o) {
-		if(!(o instanceof TorPublicKey))
-			return false;
-		final TorPublicKey other = (TorPublicKey) o;
-		return other.getFingerprint().equals(getFingerprint());
-	}
-
-	public int hashCode() {
-		return getFingerprint().hashCode();
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/crypto/TorRFC5869KeyDerivation.java b/orchid/src/com/subgraph/orchid/crypto/TorRFC5869KeyDerivation.java
deleted file mode 100644
index 93f7cd55bfd..00000000000
--- a/orchid/src/com/subgraph/orchid/crypto/TorRFC5869KeyDerivation.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.subgraph.orchid.crypto;
-
-import java.nio.ByteBuffer;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-
-import com.subgraph.orchid.Tor;
-
-public class TorRFC5869KeyDerivation {
-	private final static String PROTOID = "ntor-curve25519-sha256-1";
-	private final static String M_EXPAND = PROTOID + ":key_expand";
-	private final static byte[] M_EXPAND_BYTES = M_EXPAND.getBytes(Tor.getDefaultCharset());
-	
-	private final byte[] seed;
-	
-	public TorRFC5869KeyDerivation(byte[] seed) {
-		this.seed = new byte[seed.length];
-		System.arraycopy(seed, 0, this.seed, 0, seed.length);
-	}
-	
-	public void deriveKeys(byte[] keyMaterialOut, byte[] verifyHashOut) {
-		final ByteBuffer keyData = deriveKeys(keyMaterialOut.length + verifyHashOut.length);
-		keyData.get(keyMaterialOut);
-		keyData.get(verifyHashOut);
-	}
-	
-	public ByteBuffer deriveKeys(int length) {
-		int round = 1;
-		final ByteBuffer bb = makeBuffer(length);
-		byte[] macOutput = null;
-		while(bb.hasRemaining()) {
-			macOutput = expandRound(round, macOutput);
-			if(macOutput.length > bb.remaining()) {
-				bb.put(macOutput, 0, bb.remaining());
-			} else {
-				bb.put(macOutput);
-			}
-			round += 1;
-		}
-		bb.flip();
-		return bb;
-	}
-	
-	private byte[] expandRound(int round, byte[] priorMac) {
-		final ByteBuffer bb;
-		if(round == 1) {
-			bb = makeBuffer(M_EXPAND_BYTES.length + 1);
-		} else {
-			bb = makeBuffer(M_EXPAND_BYTES.length + TorMessageDigest.TOR_DIGEST256_SIZE + 1);
-			bb.put(priorMac);
-		}
-		bb.put(M_EXPAND_BYTES);
-		bb.put((byte) round);
-
-		final Mac mac = createMacInstance();
-		return mac.doFinal(bb.array());
-	}
-	
-	private ByteBuffer makeBuffer(int len) {
-		final byte[] bs = new byte[len];
-		return ByteBuffer.wrap(bs);
-	}
-
-	private Mac createMacInstance() {
-		final SecretKeySpec keyspec = new SecretKeySpec(seed, "HmacSHA256");
-		try {
-			final Mac mac = Mac.getInstance("HmacSHA256");
-			mac.init(keyspec);
-			return mac;
-		} catch (NoSuchAlgorithmException e) {
-			throw new IllegalStateException("Could not create HmacSHA256 instance: "+ e);
-		} catch (InvalidKeyException e) {
-			throw new IllegalStateException("Could not create HmacSHA256 instance: "+ e);
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/crypto/TorRandom.java b/orchid/src/com/subgraph/orchid/crypto/TorRandom.java
deleted file mode 100644
index bbe9d07de2b..00000000000
--- a/orchid/src/com/subgraph/orchid/crypto/TorRandom.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.subgraph.orchid.crypto;
-
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-
-import com.subgraph.orchid.TorException;
-
-public class TorRandom {
-
-	private final SecureRandom random;
-	
-	public TorRandom() {
-		random = createRandom();
-	}
-	
-	private static SecureRandom createRandom() {
-		try {
-			return SecureRandom.getInstance("SHA1PRNG");
-		} catch (NoSuchAlgorithmException e) {
-			throw new TorException(e);
-		}
-	}
-
-	public byte[] getBytes(int n) {
-		final byte[] bs = new byte[n];
-		random.nextBytes(bs);
-		return bs;
-	}
-
-	public long nextLong(long n) {
-		long bits, val;
-		do {
-			bits = nextLong();
-			val = bits % n;
-		} while(bits - val + (n - 1) < 0);
-		return val;
-	}
-
-	public int nextInt(int n) {
-		return random.nextInt(n);
-	}
-	
-	public int nextInt() {
-		return random.nextInt() & Integer.MAX_VALUE;
-	}
-	
-	/**
-	 * Return a uniformly distributed positive random value between 0 and Long.MAX_VALUE
-	 * 
-	 * @return A positive random value between 0 and Long.MAX_VALUE.
-	 */
-	public long nextLong() {
-		return random.nextLong() & Long.MAX_VALUE;
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/crypto/TorSignature.java b/orchid/src/com/subgraph/orchid/crypto/TorSignature.java
deleted file mode 100644
index dcdbc49aeb4..00000000000
--- a/orchid/src/com/subgraph/orchid/crypto/TorSignature.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.subgraph.orchid.crypto;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.Arrays;
-
-import com.subgraph.orchid.TorException;
-import com.subgraph.orchid.TorParsingException;
-import com.subgraph.orchid.encoders.Base64;
-import com.subgraph.orchid.encoders.Hex;
-
-public class TorSignature {
-	private final static String SIGNATURE_BEGIN = "-----BEGIN SIGNATURE-----";
-	private final static String ID_SIGNATURE_BEGIN = "-----BEGIN ID SIGNATURE-----"; 
-	private final static String SIGNATURE_END = "-----END SIGNATURE-----";
-	private final static String ID_SIGNATURE_END = "-----END ID SIGNATURE-----";
-
-	static public TorSignature createFromPEMBuffer(String buffer) {
-		BufferedReader reader = new BufferedReader(new StringReader(buffer));
-		final String header = nextLine(reader);
-		if(!(SIGNATURE_BEGIN.equals(header) || ID_SIGNATURE_BEGIN.equals(header)))
-			throw new TorParsingException("Did not find expected signature BEGIN header");
-		return new TorSignature(Base64.decode(parseBase64Data(reader)), DigestAlgorithm.DIGEST_SHA1);	
-	}
-	static private String parseBase64Data(BufferedReader reader) {
-		final StringBuilder base64Data = new StringBuilder();
-		while(true) {
-			final String line = nextLine(reader);
-			if(SIGNATURE_END.equals(line) || ID_SIGNATURE_END.equals(line))
-				return base64Data.toString();
-			base64Data.append(line);
-		}
-	}
-	static String nextLine(BufferedReader reader) {
-		try {
-			final String line = reader.readLine();
-			if(line == null) 
-				throw new TorParsingException("Did not find expected signature END header");
-			return line;
-		} catch (IOException e) {
-			throw new TorException(e);
-		}
-	}
-
-	public enum DigestAlgorithm { DIGEST_SHA1, DIGEST_SHA256 };
-
-	private final byte[] signatureBytes;
-	private final DigestAlgorithm digestAlgorithm;
-	
-	private TorSignature(byte[] signatureBytes, DigestAlgorithm digestAlgorithm) {
-		this.signatureBytes = signatureBytes;
-		this.digestAlgorithm = digestAlgorithm;
-	}
-
-	
-	public byte[] getSignatureBytes() {
-		return Arrays.copyOf(signatureBytes, signatureBytes.length);
-	}
-	
-	public boolean verify(TorPublicKey publicKey, TorMessageDigest digest) {
-		return publicKey.verifySignature(this, digest);
-	}
-	
-	public DigestAlgorithm getDigestAlgorithm() {
-		return digestAlgorithm;
-	}
-
-	public String toString() {
-		return "TorSignature: (" + signatureBytes.length + " bytes) " + new String(Hex.encode(signatureBytes));
-	}
-	
-	
-
-}
diff --git a/orchid/src/com/subgraph/orchid/crypto/TorStreamCipher.java b/orchid/src/com/subgraph/orchid/crypto/TorStreamCipher.java
deleted file mode 100644
index 57093258d54..00000000000
--- a/orchid/src/com/subgraph/orchid/crypto/TorStreamCipher.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.subgraph.orchid.crypto;
-
-import java.security.GeneralSecurityException;
-
-import javax.crypto.Cipher;
-import javax.crypto.KeyGenerator;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
-
-import com.subgraph.orchid.TorException;
-
-public class TorStreamCipher {
-	public static final int KEY_LEN = 16;
-	
-	public static TorStreamCipher createWithRandomKey() {
-		final SecretKey randomKey = generateRandomKey();
-		return new TorStreamCipher(randomKey.getEncoded());
-	}
-	
-	public static TorStreamCipher createFromKeyBytes(byte[] keyBytes) {
-		return new TorStreamCipher(keyBytes);
-	}
-	
-	public static TorStreamCipher createFromKeyBytesWithIV(byte[] keyBytes, byte[] iv) {
-		return new TorStreamCipher(keyBytes, iv);
-	}
-
-	private static final int BLOCK_SIZE = 16;
-	private final Cipher cipher;
-	private final byte[] counter;
-	private final byte[] counterOut;
-	/* Next byte of keystream in counterOut */
-	private int keystreamPointer = -1;
-	private final SecretKeySpec key;
-	
-	
-	private TorStreamCipher(byte[] keyBytes) {
-		this(keyBytes, null);
-	}
-	
-	private TorStreamCipher(byte[] keyBytes, byte[] iv) {
-		key = keyBytesToSecretKey(keyBytes);
-		cipher = createCipher(key);
-		counter = new byte[BLOCK_SIZE];
-		counterOut = new byte[BLOCK_SIZE];
-		
-		if(iv != null) {
-			applyIV(iv);
-		}
-	}
-	
-	private void applyIV(byte[] iv) {
-		if(iv.length != BLOCK_SIZE) {
-			throw new IllegalArgumentException();
-		}
-		System.arraycopy(iv, 0, counter, 0, BLOCK_SIZE);
-	}
-	
-	public void encrypt(byte[] data) {
-		encrypt(data, 0, data.length);
-	}
-	
-	public synchronized void encrypt(byte[] data, int offset, int length) {
-		for(int i = 0; i < length; i++) 
-			data[i + offset] ^= nextKeystreamByte();
-	}
-	
-	public byte[] getKeyBytes() {
-		return key.getEncoded();
-	}
-	
-	private static SecretKeySpec keyBytesToSecretKey(byte[] keyBytes) {
-		return new SecretKeySpec(keyBytes, "AES");
-	}
-	
-	private static Cipher createCipher(SecretKeySpec keySpec) {
-		try {
-			final Cipher cipher = Cipher.getInstance("AES/ECB/NoPadding");
-			cipher.init(Cipher.ENCRYPT_MODE, keySpec);
-			return cipher;
-		} catch (GeneralSecurityException e) {
-			throw new TorException(e);
-		} 
-	}
-	
-	private static SecretKey generateRandomKey() {
-		try {
-			KeyGenerator generator = KeyGenerator.getInstance("AES");
-			generator.init(128);
-			return generator.generateKey();
-		} catch (GeneralSecurityException e) {
-			throw new TorException(e);
-		} 
-	}
-	
-	private byte nextKeystreamByte() {
-		if(keystreamPointer == -1 || (keystreamPointer >= BLOCK_SIZE))
-			updateCounter();
-		return counterOut[keystreamPointer++];
-	}
-	private void updateCounter() {
-		encryptCounter();
-		incrementCounter();
-		keystreamPointer = 0;
-	}
-	
-	private void encryptCounter() {
-		try {
-			cipher.doFinal(counter, 0, BLOCK_SIZE, counterOut, 0);
-		} catch (GeneralSecurityException e) {
-			throw new TorException(e);
-		}
-	}
-	
-	private void incrementCounter() {
-		int carry = 1;
-		for(int i = counter.length - 1; i >= 0; i--) {
-			int x = (counter[i] & 0xff) + carry;
-			if(x > 0xff) 
-				carry = 1;
-			else
-				carry = 0;
-			counter[i] = (byte)x;
-		}
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/crypto/TorTapKeyAgreement.java b/orchid/src/com/subgraph/orchid/crypto/TorTapKeyAgreement.java
deleted file mode 100644
index eae5eaef5a5..00000000000
--- a/orchid/src/com/subgraph/orchid/crypto/TorTapKeyAgreement.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package com.subgraph.orchid.crypto;
-
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.security.GeneralSecurityException;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PublicKey;
-import java.util.Arrays;
-
-import javax.crypto.KeyAgreement;
-import javax.crypto.interfaces.DHPublicKey;
-import javax.crypto.spec.DHParameterSpec;
-import javax.crypto.spec.DHPublicKeySpec;
-
-import com.subgraph.orchid.TorException;
-/**
- * The <code>TorKeyAgreement</code> class implements the diffie-hellman key agreement
- * protocol using the parameters specified in the main Tor specification (tor-spec.txt).
- * 
- * An instance of this class can only be used to perform a single key agreement operation.
- * 
- * After instantiating the class, a user calls {@link #getPublicValue()} or {@link #getPublicKeyBytes()}
- * to retrieve the public value to transmit to the peer in the key agreement operation.  After receiving
- * a public value from the peer, this value should be converted into a <code>BigInteger</code> and
- * {@link #isValidPublicValue(BigInteger)} should be called to verify that the peer has sent a safe
- * and legal public value.  If {@link #isValidPublicValue(BigInteger)} returns true, the peer public
- * value is valid and {@link #getSharedSecret(BigInteger)} can be called to complete the key agreement
- * protocol and return the shared secret value.
- * 
- */
-public class TorTapKeyAgreement implements TorKeyAgreement {
-	public final static int DH_LEN = 128;
-	public final static int DH_SEC_LEN = 40;
-	/*
-	 * tor-spec 0.3
-	 * 
-	 * For Diffie-Hellman, we use a generator (g) of 2.  For the modulus (p), we
-     * use the 1024-bit safe prime from rfc2409 section 6.2 whose hex
-     * representation is:
-	 */
-	private static final BigInteger P1024 = new BigInteger(
-	  "00FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E08"
-    + "8A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B"
-    + "302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9"
-    + "A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE6"
-    + "49286651ECE65381FFFFFFFFFFFFFFFF", 16);
-	private static final BigInteger G = new BigInteger("2");
-	
-	/*
-	 * tor-spec 0.3
-	 * 
-	 * As an optimization, implementations SHOULD choose DH private keys (x) of
-     * 320 bits.
-	 */
-	private static final int PRIVATE_KEY_SIZE = 320;
-	private static final DHParameterSpec DH_PARAMETER_SPEC = new DHParameterSpec(P1024, G, PRIVATE_KEY_SIZE);
-	
-	private final KeyAgreement dh;
-	private final KeyPair keyPair;
-	private final TorPublicKey onionKey;
-	
-	/**
-	 * Create a new <code>TorKeyAgreement</code> instance which can be used to perform a single
-	 * key agreement operation.  A new set of ephemeral Diffie-Hellman parameters are generated
-	 * when this class is instantiated.
-	 */
-	public TorTapKeyAgreement(TorPublicKey onionKey) {
-		this.keyPair = generateKeyPair();
-		this.dh = createDH();
-		this.onionKey = onionKey;
-		
-	}
-	
-	public TorTapKeyAgreement() {
-		this(null);
-	}
-	
-	/**
-	 * Return the generated public value for this key agreement operation as a <code>BigInteger</code>.
-	 * 
-	 * @return The diffie-hellman public value as a <code>BigInteger</code>.
-	 */
-	public BigInteger getPublicValue() {
-		DHPublicKey pubKey = (DHPublicKey) keyPair.getPublic();
-		return pubKey.getY();
-	}
-	
-	/**
-	 * Return the generated public value for this key agreement operation as an array with the value
-	 * encoded in big-endian byte order.
-	 * 
-	 * @return A byte array containing the encoded public value for this key agreement operation.
-	 */
-	public byte[] getPublicKeyBytes() {
-		final byte[] output = new byte[128];
-		final byte[] yBytes = getPublicValue().toByteArray();
-		if(yBytes[0] == 0 && yBytes.length == (DH_LEN + 1)) {
-			System.arraycopy(yBytes, 1, output, 0, DH_LEN);
-		} else if (yBytes.length <= DH_LEN) {
-			final int offset = DH_LEN - yBytes.length;
-			System.arraycopy(yBytes, 0, output, offset, yBytes.length);
-		} else {
-			throw new IllegalStateException("Public value is longer than DH_LEN but not because of sign bit");
-		}
-		return output;
-	}
-	
-	
-	
-	/**
-	 * Return <code>true</code> if the specified value is a legal public
-	 * value rather than a dangerous degenerate or confined subgroup value.  
-	 * 
-	 * tor-spec 5.2
-	 * Before computing g^xy, both client and server MUST verify that 
-	 * the received g^x or g^y value is not degenerate; that is, it must
-	 * be strictly greater than 1 and strictly less than p-1 where p is 
-	 * the DH modulus.  Implementations MUST NOT complete a handshake 
-	 * with degenerate keys.
-	 */
-	public static boolean isValidPublicValue(BigInteger publicValue) {
-		if(publicValue.signum() < 1 || publicValue.equals(BigInteger.ONE))
-			return false;
-		if(publicValue.compareTo(P1024.subtract(BigInteger.ONE)) >= 0)
-			return false;
-		return true;
-	}
-
-	/**
-	 * Complete the key agreement protocol with the peer public value
-	 * <code>otherPublic</code> and return the calculated shared secret.
-	 * 
-	 * @param otherPublic The peer public value.
-	 * @return The shared secret value produced by the protocol.
-	 */
-	public byte[] getSharedSecret(BigInteger otherPublic) {
-		try {
-			KeyFactory factory = KeyFactory.getInstance("DH");
-			DHPublicKeySpec pub = new DHPublicKeySpec(otherPublic, P1024, G);
-			PublicKey key = factory.generatePublic(pub);
-			dh.doPhase(key, true);
-			return dh.generateSecret();
-		} catch (GeneralSecurityException e) {
-			throw new TorException(e);
-		} 
-	}
-	private final KeyAgreement createDH() {
-		try {
-			KeyAgreement dh = KeyAgreement.getInstance("DH");
-			dh.init(keyPair.getPrivate());
-			return dh;
-		} catch (GeneralSecurityException e) {
-			throw new TorException(e);
-		} 
-	}
-	
-	private final KeyPair generateKeyPair() {
-		try {
-			KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DH");
-			keyGen.initialize(DH_PARAMETER_SPEC);
-			return keyGen.generateKeyPair();	
-		} catch (GeneralSecurityException e) {
-			throw new TorException(e);
-		} 
-	}
-
-	public byte[] createOnionSkin() {
-		final byte[] yBytes = getPublicKeyBytes();
-		final HybridEncryption hybrid = new HybridEncryption();
-		return hybrid.encrypt(yBytes, onionKey);
-	}
-
-	public boolean deriveKeysFromHandshakeResponse(byte[] handshakeResponse,
-			byte[] keyMaterialOut, byte[] verifyHashOut) {
-		ByteBuffer bb = ByteBuffer.wrap(handshakeResponse);
-		byte[] dhPublic = new byte[DH_LEN];
-		byte[] keyHash = new byte[TorMessageDigest.TOR_DIGEST_SIZE];
-		bb.get(dhPublic);
-		bb.get(keyHash);
-		BigInteger peerPublic = new BigInteger(1, dhPublic);
-		return deriveKeysFromDHPublicAndHash(peerPublic, keyHash, keyMaterialOut, verifyHashOut);
-	}
-	
-	public boolean deriveKeysFromDHPublicAndHash(BigInteger peerPublic, byte[] keyHash, byte[] keyMaterialOut, byte[] verifyHashOut) {
-		if(!isValidPublicValue(peerPublic)) {
-			throw new TorException("Illegal DH public value");
-		}
-		final byte[] sharedSecret = getSharedSecret(peerPublic);
-		final TorKeyDerivation kdf = new TorKeyDerivation(sharedSecret);
-		kdf.deriveKeys(keyMaterialOut, verifyHashOut);
-		return Arrays.equals(verifyHashOut, keyHash);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/dashboard/Dashboard.java b/orchid/src/com/subgraph/orchid/dashboard/Dashboard.java
deleted file mode 100644
index 10e2c790fb2..00000000000
--- a/orchid/src/com/subgraph/orchid/dashboard/Dashboard.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package com.subgraph.orchid.dashboard;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.Executor;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.Threading;
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.misc.GuardedBy;
-
-/**
- * A debugging utility which displays continuously updated information about the internal state
- * of various components to clients which connect to a network port listening on localhost.
- */
-public class Dashboard implements DashboardRenderable, DashboardRenderer {
-	private final static Logger logger = Logger.getLogger(Dashboard.class.getName());
-	
-	private final static String DASHBOARD_PORT_PROPERTY = "com.subgraph.orchid.dashboard.port";
-	
-	private final static int DEFAULT_LISTENING_PORT = 12345;
-	private final static int DEFAULT_FLAGS = DASHBOARD_CIRCUITS | DASHBOARD_STREAMS;
-	private final static IPv4Address LOCALHOST = IPv4Address.createFromString("127.0.0.1");
-			
-	@GuardedBy("this") private int listeningPort;
-	@GuardedBy("this") private int flags = DEFAULT_FLAGS;
-	@GuardedBy("this") private ServerSocket listeningSocket;
-	@GuardedBy("this") private boolean isListening;
-	
-	private final List<DashboardRenderable> renderables;
-	private final Executor executor;
-	
-	public Dashboard() {
-		renderables = new CopyOnWriteArrayList<DashboardRenderable>();
-		renderables.add(this);
-		executor = Threading.newPool("Dashboard worker");
-		listeningPort = chooseListeningPort();
-	}
-	
-	private static int chooseListeningPort() {
-		final String dbPort = System.getProperty(DASHBOARD_PORT_PROPERTY);
-		final int port = parsePortProperty(dbPort);
-		if(port > 0 && port <= 0xFFFF) {
-			return port;
-		} else if(dbPort != null) {
-			logger.warning(DASHBOARD_PORT_PROPERTY + " was not a valid port value: "+ dbPort);
-		}
-		return DEFAULT_LISTENING_PORT;
-	}
-	
-	private static int parsePortProperty(String dbPort) {
-		if(dbPort == null) {
-			return -1;
-		}
-		try {
-			return Integer.parseInt(dbPort);
-		} catch (NumberFormatException e) {
-			return -1;
-		}
-	}
-	
-	public void addRenderables(Object...objects) {
-		for(Object ob: objects) {
-			if(ob instanceof DashboardRenderable) {
-				renderables.add((DashboardRenderable) ob);
-			}
-		}
-	}
-
-	public void addRenderable(DashboardRenderable renderable) {
-		renderables.add(renderable);
-	}
-
-	public synchronized void enableFlag(int flag) {
-		flags |= flag;
-	}
-	
-	public synchronized void disableFlag(int flag) {
-		flags &= ~flag;
-	}
-	
-	
-	public synchronized boolean isEnabled(int f) {
-		return (flags & f) != 0;
-	}
-	
-	public synchronized void setListeningPort(int port) {
-		if(port != listeningPort) {
-			listeningPort = port;
-			if(isListening) {
-				stopListening();
-				startListening();
-			}
-		}
-	}
-	
-	public boolean isEnabledByProperty() {
-		return System.getProperty(DASHBOARD_PORT_PROPERTY) != null;
-	}
-
-	public synchronized void startListening() {
-		if(isListening) {
-			return;
-		}
-		try {
-			listeningSocket = new ServerSocket(listeningPort, 50, LOCALHOST.toInetAddress());
-			isListening = true;
-			logger.info("Dashboard listening on "+ LOCALHOST + ":"+ listeningPort);
-			executor.execute(createAcceptLoopRunnable(listeningSocket));
-		} catch (IOException e) {
-			logger.warning("Failed to create listening Dashboard socket on port "+ listeningPort +": "+ e);
-		}
-	}
-	
-	public synchronized void stopListening() {
-		if(!isListening) {
-			return;
-		}
-		if(listeningSocket != null) {
-			closeQuietly(listeningSocket);
-			listeningSocket = null;
-		}
-		isListening = false;
-	}
-	
-	public synchronized boolean isListening() {
-		return isListening;
-	}
-
-	private Runnable createAcceptLoopRunnable(final ServerSocket ss) {
-		return new Runnable() {
-			public void run() {
-				acceptConnections(ss);
-			}
-		};
-	}
-
-	private void acceptConnections(ServerSocket ss) {
-		while(true) {
-			try {
-				Socket s = ss.accept();
-				executor.execute(new DashboardConnection(this, s));
-			} catch (IOException e) {
-				if(!ss.isClosed()) {
-					logger.warning("IOException on dashboard server socket: "+ e);
-				}
-				stopListening();
-				return;
-			}
-		}
-	}
-	
-	void renderAll(PrintWriter writer) throws IOException {
-		final int fs;
-		synchronized (this) {
-			fs = flags;
-		}
-		
-		for(DashboardRenderable dr: renderables) {
-			dr.dashboardRender(this, writer, fs);
-		}
-	}
-
-	private void closeQuietly(ServerSocket s) {
-		try {
-			s.close();
-		} catch (IOException e) { }
-	}
-
-	public void dashboardRender(DashboardRenderer renderer, PrintWriter writer, int flags) {
-		writer.println("[Dashboard]");
-		writer.println();
-	}
-
-	public void renderComponent(PrintWriter writer, int flags, Object component) throws IOException {
-		if(!(component instanceof DashboardRenderable)) {
-			return;
-		}
-		final DashboardRenderable renderable = (DashboardRenderable) component;
-		renderable.dashboardRender(this, writer, flags);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/dashboard/DashboardConnection.java b/orchid/src/com/subgraph/orchid/dashboard/DashboardConnection.java
deleted file mode 100644
index 3d1baa15940..00000000000
--- a/orchid/src/com/subgraph/orchid/dashboard/DashboardConnection.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.subgraph.orchid.dashboard;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.net.Socket;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-public class DashboardConnection implements Runnable {
-	
-	private final static int REFRESH_INTERVAL = 1000;
-
-	private final Dashboard dashboard;
-	private final Socket socket;
-	private final ScheduledExecutorService refreshExecutor;
-	
-	public DashboardConnection(Dashboard dashboard, Socket socket) {
-		this.dashboard = dashboard;
-		this.socket = socket;
-		this.refreshExecutor = new ScheduledThreadPoolExecutor(1);
-	}
-
-	public void run() {
-		ScheduledFuture<?> handle = null;
-		try {
-			final PrintWriter writer = new PrintWriter(socket.getOutputStream());
-			handle = refreshExecutor.scheduleAtFixedRate(createRefreshRunnable(writer), 0, REFRESH_INTERVAL, TimeUnit.MILLISECONDS);
-			runInputLoop(socket.getInputStream());
-		} catch (IOException e) {
-			closeQuietly(socket);
-		} finally {
-			if(handle != null) {
-				handle.cancel(true);
-			}
-			refreshExecutor.shutdown();
-		}
-	}
-
-	private void closeQuietly(Socket s) {
-		try {
-			s.close();
-		} catch (IOException e) { }
-	}
-
-	private void runInputLoop(InputStream input) throws IOException {
-		int c;
-		
-		while((c = input.read()) != -1) {
-			switch(c) {
-			case 'c':
-				toggleFlagWithVerbose(DashboardRenderable.DASHBOARD_CONNECTIONS, DashboardRenderable.DASHBOARD_CONNECTIONS_VERBOSE);
-				break;
-			case 'p':
-				toggleFlag(DashboardRenderable.DASHBOARD_PREDICTED_PORTS);
-				break;
-			default:
-				break;
-			}
-		}
-	}
-
-	// Rotate between 3 states
-	//    0 (no flags),
-	//    basicFlag,
-	//    basicFlag|verboseFlag
-	private void toggleFlagWithVerbose(int basicFlag, int verboseFlag) {
-		if(dashboard.isEnabled(verboseFlag)) {
-			dashboard.disableFlag(basicFlag | verboseFlag);
-		} else if(dashboard.isEnabled(basicFlag)) {
-			dashboard.enableFlag(verboseFlag);
-		} else {
-			dashboard.enableFlag(basicFlag);
-		}
-	}
-	
-	private void toggleFlag(int flag) {
-		if(dashboard.isEnabled(flag)) {
-			dashboard.disableFlag(flag);
-		} else {
-			dashboard.enableFlag(flag);
-		}
-	}
-
-	private void hideCursor(Writer writer) throws IOException {
-		emitCSI(writer);
-		writer.write("?25l");
-	}
-
-	private void emitCSI(Writer writer) throws IOException {
-		writer.append((char) 0x1B);
-		writer.append('[');
-	}
-	
-	private void clear(PrintWriter writer) throws IOException {
-		emitCSI(writer);
-		writer.write("2J");
-	}
-	
-	private void moveTo(PrintWriter writer, int x, int y) throws IOException {
-		emitCSI(writer);
-		writer.printf("%d;%dH", x+1, y+1);
-	}
-	
-	private void refresh(PrintWriter writer) {
-		try {
-			if(socket.isClosed()) {
-				return;
-			}
-			hideCursor(writer);
-			clear(writer);
-			moveTo(writer, 0, 0);
-			dashboard.renderAll(writer);
-			writer.flush();
-		} catch(IOException e) {
-			closeQuietly(socket);
-		}
-	}
-
-	private Runnable createRefreshRunnable(final PrintWriter writer) {
-		return new Runnable() {
-			public void run() {
-				refresh(writer);
-			}
-		};
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/dashboard/DashboardRenderable.java b/orchid/src/com/subgraph/orchid/dashboard/DashboardRenderable.java
deleted file mode 100644
index 30a58b9993b..00000000000
--- a/orchid/src/com/subgraph/orchid/dashboard/DashboardRenderable.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.subgraph.orchid.dashboard;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-public interface DashboardRenderable {
-	
-	static int DASHBOARD_CONNECTIONS           = 1 << 0;
-	static int DASHBOARD_CONNECTIONS_VERBOSE   = 1 << 1;
-	static int DASHBOARD_PREDICTED_PORTS       = 1 << 2;
-	static int DASHBOARD_CIRCUITS              = 1 << 3;
-	static int DASHBOARD_STREAMS               = 1 << 4;
-	
-	void dashboardRender(DashboardRenderer renderer, PrintWriter writer, int flags) throws IOException;
-}
diff --git a/orchid/src/com/subgraph/orchid/dashboard/DashboardRenderer.java b/orchid/src/com/subgraph/orchid/dashboard/DashboardRenderer.java
deleted file mode 100644
index b14f602ab9c..00000000000
--- a/orchid/src/com/subgraph/orchid/dashboard/DashboardRenderer.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.subgraph.orchid.dashboard;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-public interface DashboardRenderer {
-	void renderComponent(PrintWriter writer, int flags, Object component) throws IOException;
-}
diff --git a/orchid/src/com/subgraph/orchid/data/BandwidthHistory.java b/orchid/src/com/subgraph/orchid/data/BandwidthHistory.java
deleted file mode 100644
index 9f8e4c8071a..00000000000
--- a/orchid/src/com/subgraph/orchid/data/BandwidthHistory.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.subgraph.orchid.data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class BandwidthHistory {
-	
-	private final Timestamp reportingTime;
-	private final int reportingInterval;
-	private final List<Integer>  samples = new ArrayList<Integer>();
-	
-	public BandwidthHistory(Timestamp reportingTime, int reportingInterval) {
-		this.reportingTime = reportingTime;
-		this.reportingInterval = reportingInterval;
-	}
-	
-	public int getReportingInterval() {
-		return reportingInterval;
-	}
-	
-	public Timestamp getReportingTime() {
-		return reportingTime;
-	}
-	
-	public void addSample(int value) {
-		samples.add(value);
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/data/HexDigest.java b/orchid/src/com/subgraph/orchid/data/HexDigest.java
deleted file mode 100644
index aedb632f0a8..00000000000
--- a/orchid/src/com/subgraph/orchid/data/HexDigest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.subgraph.orchid.data;
-
-import java.util.Arrays;
-import java.util.List;
-
-import com.subgraph.orchid.Tor;
-import com.subgraph.orchid.TorException;
-import com.subgraph.orchid.crypto.TorMessageDigest;
-import com.subgraph.orchid.encoders.Base64;
-import com.subgraph.orchid.encoders.Hex;
-
-/**
- * This class represents both digests and fingerprints that appear in directory
- * documents.  The names fingerprint and digest are used interchangeably in 
- * the specification but generally a fingerprint is a message digest (ie: SHA1)
- * over the DER ASN.1 encoding of a public key.  A digest is usually
- * a message digest over a set of fields in a directory document.
- * 
- * Digests always appear as a 40 character hex string:
- * 
- * 0EA20CAA3CE696E561BC08B15E00106700E8F682
- *
- * Fingerprints may either appear as a single hex string as above or sometimes in
- * a more easily human-parsed spaced format:
- * 
- * 1E0F 5874 2268 E82F C600 D81D 9064 07C5 7CC2 C3A7
- *
- */
-public class HexDigest {
-	public static HexDigest createFromStringList(List<String> strings) {
-		StringBuilder builder = new StringBuilder();
-		for(String chunk: strings) 
-			builder.append(chunk);
-		return createFromString(builder.toString());
-	}
-
-	public static HexDigest createFromBase32String(String b32) {
-		return new HexDigest(Base32.base32Decode(b32));
-	}
-
-	public static HexDigest createFromString(String fingerprint) {
-		final String[] parts = fingerprint.split(" ");
-		if(parts.length > 1)
-			return createFromStringList(Arrays.asList(parts));
-		final byte[] digestData = Hex.decode(fingerprint);
-		return new HexDigest(digestData);
-	}
-
-	public static HexDigest createFromDigestBytes(byte[] data) {
-		return new HexDigest(data);
-	}
-	
-	public static HexDigest createDigestForData(byte[] data) {
-		final TorMessageDigest digest = new TorMessageDigest();
-		digest.update(data);
-		return new HexDigest(digest.getDigestBytes());
-	}
-
-	private final byte[] digestBytes;
-	private final boolean isDigest256;
-
-	private HexDigest(byte[] data) {
-		if(data.length != TorMessageDigest.TOR_DIGEST_SIZE && data.length != TorMessageDigest.TOR_DIGEST256_SIZE) {
-			throw new TorException("Digest data is not the correct length "+ data.length +" != (" + TorMessageDigest.TOR_DIGEST_SIZE + " or "+ TorMessageDigest.TOR_DIGEST256_SIZE +")");
-		}
-		digestBytes = new byte[data.length];
-		isDigest256 = digestBytes.length == TorMessageDigest.TOR_DIGEST256_SIZE;
-		System.arraycopy(data, 0, digestBytes, 0, data.length);
-	}
-
-	public boolean isDigest256() {
-		return isDigest256;
-	}
-
-	public byte[] getRawBytes() {
-		return Arrays.copyOf(digestBytes, digestBytes.length);
-	}
-
-	public String toString() {
-		return new String(Hex.encode(digestBytes));
-	}
-
-	/**
-	 * Return a spaced fingerprint representation of this HexDigest. 
-	 * 
-	 * ex:
-	 * 
-	 * 1E0F 5874 2268 E82F C600 D81D 9064 07C5 7CC2 C3A7
-	 *
-	 * @return A string representation of this HexDigest in the spaced fingerprint format.
-	 */
-	public String toSpacedString() {
-		final String original = toString();
-		final StringBuilder builder = new StringBuilder();
-		for(int i = 0; i < original.length(); i++) {
-			if(i > 0 && (i % 4) == 0)
-				builder.append(' ');
-			builder.append(original.charAt(i));
-		}
-		return builder.toString();
-	}
-
-	public String toBase32() {
-		return Base32.base32Encode(digestBytes);
-	}
-
-	public String toBase64(boolean stripTrailingEquals) {
-		final String b64 = new String(Base64.encode(digestBytes), Tor.getDefaultCharset());
-		if(stripTrailingEquals) {
-			return stripTrailingEquals(b64);
-		} else {
-			return b64;
-		}
-	}
-		
-	private String stripTrailingEquals(String s) {
-		int idx = s.length();
-		while(idx > 0 && s.charAt(idx - 1) == '=') {
-			idx -= 1;
-		}
-		return s.substring(0, idx);
-	}
-
-	public boolean equals(Object o) {
-		if(!(o instanceof HexDigest))
-			return false;
-		final HexDigest other = (HexDigest)o;
-		return Arrays.equals(other.digestBytes, this.digestBytes);
-	}
-
-	public int hashCode() {
-		int hash = 0;
-		for(int i = 0; i < 4; i++) {
-			hash <<= 8;
-			hash |= (digestBytes[i] & 0xFF);
-		}
-		return hash;
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/data/IPv4Address.java b/orchid/src/com/subgraph/orchid/data/IPv4Address.java
deleted file mode 100644
index 771514571b2..00000000000
--- a/orchid/src/com/subgraph/orchid/data/IPv4Address.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.subgraph.orchid.data;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-import com.subgraph.orchid.TorException;
-import com.subgraph.orchid.TorParsingException;
-
-public class IPv4Address {
-	
-	public static IPv4Address createFromString(String addressString) {
-		return new IPv4Address(parseStringToAddressData(addressString));		
-	}
-	
-	private static int parseStringToAddressData(String ipString) {
-		final String[] octets = ipString.split("\\.");
-		final int[] shifts = {24, 16, 8, 0};
-		int addressData = 0;
-		int i = 0;
-		for(String o: octets)
-			addressData |= (octetStringToInt(o) << shifts[i++]);
-		
-		return addressData;
-	}
-	
-	private static int octetStringToInt(String octet) {
-		try {
-			int result = Integer.parseInt(octet);
-			if(result < 0 || result > 255)
-				throw new TorParsingException("Octet out of range: " + octet);
-			return result;
-		} catch(NumberFormatException e) {
-			throw new TorParsingException("Failed to parse octet: " + octet);
-		}	
-	}
-	
-	public static boolean isValidIPv4AddressString(String addressString) {
-		try {
-			createFromString(addressString);
-			return true;
-		} catch (Exception e) {
-			return false;
-		}
-	}
-
-	private final int addressData;
-	
-	public IPv4Address(int addressData) {
-		this.addressData = addressData;
-	
-	}
-	public int getAddressData() {
-		return addressData;
-	}
-	
-	public byte[] getAddressDataBytes() {
-		final byte[] result = new byte[4];
-		result[0] = (byte)((addressData >> 24) & 0xFF);
-		result[1] = (byte)((addressData >> 16) & 0xFF);
-		result[2] = (byte)((addressData >> 8) & 0xFF);
-		result[3] = (byte)(addressData & 0xFF);
-		return result;
-	}
-	
-	public InetAddress toInetAddress() {
-		try {
-			return InetAddress.getByAddress(getAddressDataBytes());
-		} catch (UnknownHostException e) {
-			throw new TorException(e);
-		}
-	}
-	
-	public static String stringFormat(int addressData) {
-		return ((addressData >> 24) & 0xFF) +"."+
-			((addressData >> 16) & 0xFF) +"."+
-			((addressData >> 8) & 0xFF) +"."+
-			(addressData & 0xFF);
-	}
-	
-	public String toString() {
-		return stringFormat(addressData);
-	}
-	
-	public boolean equals(Object ob) {
-		if(this == ob)
-			return true;
-		if(!(ob instanceof IPv4Address))
-			return false;
-		IPv4Address other = (IPv4Address)ob;
-		return (other.addressData == addressData);
-	}
-	
-	public int hashCode() {
-		int n = 0;
-		for(int i = 0; i < 4; i++) {
-			n <<= 4;
-			n ^= ((addressData >> (i * 8)) & 0xFF);
-		}
-		return n;
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/data/RandomSet.java b/orchid/src/com/subgraph/orchid/data/RandomSet.java
deleted file mode 100644
index 990d21c8d8b..00000000000
--- a/orchid/src/com/subgraph/orchid/data/RandomSet.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.subgraph.orchid.data;
-
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.subgraph.orchid.TorException;
-
-public class RandomSet<E> {
-	
-	private final Set<E> set;
-	private final List<E> list;
-	private final SecureRandom random;
-	
-	public RandomSet() {
-		set = new HashSet<E>();
-		list = new ArrayList<E>();
-		random = createRandom();
-	}
-	
-	private static SecureRandom createRandom() {
-		try {
-			return SecureRandom.getInstance("SHA1PRNG");
-		} catch (NoSuchAlgorithmException e) {
-			throw new TorException(e);
-		}
-	}
-	
-	public boolean add(E o) {
-		if(set.add(o)) {
-			list.add(o);
-			return true;
-		} else {
-			return false;
-		}
-	}
-	
-	public boolean contains(Object o) {
-		return set.contains(o);
-	}
-	
-	public boolean isEmpty() {
-		return set.isEmpty();
-	}
-	
-	public void clear() {
-		set.clear();
-		list.clear();
-	}
-	
-	public boolean remove(Object o) {
-		if(set.remove(o)) {
-			list.remove(o);
-			return true;
-		} else {
-			return false;
-		}
-	}
-	
-	public int size() {
-		return set.size();
-	}
-	
-	public E getRandomElement() {
-		int idx = random.nextInt(list.size());
-		return list.get(idx);
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/data/Timestamp.java b/orchid/src/com/subgraph/orchid/data/Timestamp.java
deleted file mode 100644
index c8272d24fe1..00000000000
--- a/orchid/src/com/subgraph/orchid/data/Timestamp.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.subgraph.orchid.data;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.TimeZone;
-
-import com.subgraph.orchid.TorParsingException;
-
-public class Timestamp {
-	private final Date date;
-	
-	public static Timestamp createFromDateAndTimeString(String dateAndTime) {
-		final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		format.setTimeZone(TimeZone.getTimeZone("GMT"));
-		format.setLenient(false);
-		try {
-			Timestamp ts = new Timestamp(format.parse(dateAndTime));
-			return ts;
-		} catch (ParseException e) {
-			throw new TorParsingException("Could not parse timestamp string: "+ dateAndTime);
-		}
-	}
-	
-	public Timestamp(Date date) {
-		this.date = date;
-	}
-	
-	public long getTime() {
-		return date.getTime();
-	}
-
-	public Date getDate() {
-		return new Date(date.getTime());
-	}
-	
-	public boolean hasPassed() {
-		final Date now = new Date();
-		return date.before(now);
-	}
-	
-	public boolean isBefore(Timestamp ts) {
-		return date.before(ts.getDate());
-	}
-	
-	public String toString() {
-		return  date.toString();
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/data/exitpolicy/ExitPolicy.java b/orchid/src/com/subgraph/orchid/data/exitpolicy/ExitPolicy.java
deleted file mode 100644
index 2a0f06519dd..00000000000
--- a/orchid/src/com/subgraph/orchid/data/exitpolicy/ExitPolicy.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.subgraph.orchid.data.exitpolicy;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.subgraph.orchid.data.IPv4Address;
-
-public class ExitPolicy {
-	private final List<PolicyRule> rules = new ArrayList<PolicyRule>();
-
-	public void addAcceptRule(String rule) {
-		rules.add(PolicyRule.createAcceptFromString(rule));
-	}
-
-	public void addRejectRule(String rule) {
-		rules.add(PolicyRule.createRejectFromString(rule));
-	}
-
-	public boolean acceptsTarget(ExitTarget target) {
-		if(target.isAddressTarget())
-			return acceptsDestination(target.getAddress(), target.getPort());
-		else
-			return acceptsPort(target.getPort());
-	}
-	
-	public boolean acceptsDestination(IPv4Address address, int port) {
-		if(address == null)
-			return acceptsPort(port);
-
-		for(PolicyRule r: rules) {
-			if(r.matchesDestination(address, port)) 
-				return r.isAcceptRule();
-		}
-		// Default accept (see dir-spec.txt section 2.1, 'accept'/'reject' keywords)
-		return true;
-	}
-
-	public boolean acceptsPort(int port) {
-		for(PolicyRule r: rules) {
-			if(r.matchesPort(port))
-				return r.isAcceptRule();
-		}
-		return false;
-	}
-
-	public String toString() {
-		final StringBuilder sb = new StringBuilder();
-		for(PolicyRule r: rules) {
-			sb.append(r);
-			sb.append("\n");
-		}
-		return sb.toString();
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/data/exitpolicy/ExitPorts.java b/orchid/src/com/subgraph/orchid/data/exitpolicy/ExitPorts.java
deleted file mode 100644
index 9c8926bd5a5..00000000000
--- a/orchid/src/com/subgraph/orchid/data/exitpolicy/ExitPorts.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.subgraph.orchid.data.exitpolicy;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * Used by router status entries in consensus documents
- */
-public class ExitPorts {
-	public static ExitPorts createAcceptExitPorts(String ports) {
-		final ExitPorts exitPorts = new ExitPorts(true);
-		exitPorts.parsePortRanges(ports);
-		return exitPorts;
-	}
-	
-	public static ExitPorts createRejectExitPorts(String ports) {
-		final ExitPorts exitPorts = new ExitPorts(false);
-		exitPorts.parsePortRanges(ports);
-		return exitPorts;
-	}
-	
-	private final List<PortRange> ranges = new ArrayList<PortRange>();
-	private final boolean areAcceptPorts;
-	
-	private ExitPorts(boolean acceptPorts) {
-		this.areAcceptPorts = acceptPorts;
-	}
-	
-	public boolean areAcceptPorts() {
-		return areAcceptPorts;
-	}
-	
-	public boolean acceptsPort(int port) {
-		if(areAcceptPorts) 
-			return contains(port);
-		else
-			return !contains(port);
-	}
-	public boolean contains(int port) {
-		for(PortRange r: ranges) 
-			if(r.rangeContains(port))
-				return true;
-		return false;
-	}
-	
-	private void parsePortRanges(String portRanges) {
-		final String[] args = portRanges.split(",");
-		for(String arg: args)
-			ranges.add(PortRange.createFromString(arg));
-	}
-	
-
-}
diff --git a/orchid/src/com/subgraph/orchid/data/exitpolicy/ExitTarget.java b/orchid/src/com/subgraph/orchid/data/exitpolicy/ExitTarget.java
deleted file mode 100644
index de9a7077a79..00000000000
--- a/orchid/src/com/subgraph/orchid/data/exitpolicy/ExitTarget.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.subgraph.orchid.data.exitpolicy;
-
-import com.subgraph.orchid.data.IPv4Address;
-
-public interface ExitTarget {
-	boolean isAddressTarget();
-	IPv4Address getAddress();
-	String getHostname();
-	int getPort();
-}
diff --git a/orchid/src/com/subgraph/orchid/data/exitpolicy/Network.java b/orchid/src/com/subgraph/orchid/data/exitpolicy/Network.java
deleted file mode 100644
index a13c669ec30..00000000000
--- a/orchid/src/com/subgraph/orchid/data/exitpolicy/Network.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.subgraph.orchid.data.exitpolicy;
-
-import com.subgraph.orchid.TorParsingException;
-import com.subgraph.orchid.data.IPv4Address;
-
-public class Network {
-	public static final Network ALL_ADDRESSES = new Network(IPv4Address.createFromString("0.0.0.0"), 0, "*");
-	public static Network createFromString(String networkString) {
-		final String[] parts = networkString.split("/");
-		final IPv4Address network = IPv4Address.createFromString(parts[0]);
-		if(parts.length == 1)
-			return new Network(network, 32, networkString);
-		
-		if(parts.length != 2)
-			throw new TorParsingException("Invalid network CIDR notation: " + networkString);
-
-		try {
-			final int maskBits = Integer.parseInt(parts[1]);
-			return new Network(network, maskBits, networkString);
-		} catch(NumberFormatException e) {
-			throw new TorParsingException("Invalid netblock mask bit value: " + parts[1]);
-		}
-	}
-	
-	private final IPv4Address network;
-	private final int maskValue;
-	private final String originalString;
-	
-	Network(IPv4Address network, int bits, String originalString) {
-		this.network = network;
-		this.maskValue = createMask(bits);
-		this.originalString = originalString;
-	}
-	
-	private static int createMask(int maskBits) {
-		return maskBits == 0 ? 0 : (1 << 31) >> (maskBits - 1);
-	}
-	
-	public boolean contains(IPv4Address address) {
-		return (address.getAddressData() & maskValue) == (network.getAddressData() & maskValue);
-	}
-	
-	public String toString() {
-		return originalString;
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/data/exitpolicy/PolicyRule.java b/orchid/src/com/subgraph/orchid/data/exitpolicy/PolicyRule.java
deleted file mode 100644
index 94768acbb3a..00000000000
--- a/orchid/src/com/subgraph/orchid/data/exitpolicy/PolicyRule.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.subgraph.orchid.data.exitpolicy;
-
-import com.subgraph.orchid.TorParsingException;
-import com.subgraph.orchid.data.IPv4Address;
-
-public class PolicyRule {
-	private final static String WILDCARD = "*";
-	
-	public static PolicyRule createAcceptFromString(String rule) {
-		return createRule(rule, true);
-	}
-
-	public static PolicyRule createRejectFromString(String rule) {
-		return createRule(rule, false);
-	}
-
-	private static PolicyRule createRule(String rule, boolean isAccept) {
-		final String[] args = rule.split(":");
-		if(args.length != 2)
-			throw new TorParsingException("Could not parse exit policy rule: "+ rule);
-
-		return new PolicyRule(parseNetwork(args[0]), parsePortRange(args[1]), isAccept);
-	}
-
-	private static Network parseNetwork(String network) {
-		if(network.equals(WILDCARD))
-			return Network.ALL_ADDRESSES;
-		else
-			return Network.createFromString(network);
-	}
-
-	private static PortRange parsePortRange(String portRange) {
-		if(portRange.equals(WILDCARD))
-			return PortRange.ALL_PORTS;
-		else
-			return PortRange.createFromString(portRange);
-	}
-
-	private final boolean isAcceptRule;
-	private final Network network;
-	private final PortRange portRange;
-
-	private PolicyRule(Network network, PortRange portRange, boolean isAccept) {
-		this.network = network;
-		this.portRange = portRange;
-		this.isAcceptRule = isAccept;
-	}
-
-	public boolean matchesPort(int port) {
-		if(!network.equals(Network.ALL_ADDRESSES))
-			return false;
-		return portRange.rangeContains(port);
-	}
-
-	public boolean matchesDestination(IPv4Address address, int port) {
-		if(!network.contains(address))
-			return false;
-		return portRange.rangeContains(port);
-	}
-
-	public boolean isAcceptRule() {
-		return isAcceptRule;
-	}
-	
-	public String toString() {
-		final String keyword = isAcceptRule ? "accept" : "reject";
-		return keyword + " "+ network + ":"+ portRange;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/data/exitpolicy/PortRange.java b/orchid/src/com/subgraph/orchid/data/exitpolicy/PortRange.java
deleted file mode 100644
index 67347204f34..00000000000
--- a/orchid/src/com/subgraph/orchid/data/exitpolicy/PortRange.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.subgraph.orchid.data.exitpolicy;
-
-import com.subgraph.orchid.TorException;
-import com.subgraph.orchid.TorParsingException;
-
-public class PortRange {
-	
-	public static PortRange createFromString(String ports) {
-		final String[] parts = ports.split("-");
-		if(parts.length == 1) {
-			return new PortRange(stringToPort(parts[0]));
-		} else if(parts.length == 2) {
-			return new PortRange(stringToPort(parts[0]), stringToPort(parts[1]));
-		} else {
-			throw new TorParsingException("Could not parse port range from string: " + ports);
-		}
-	}
-	
-	private static int stringToPort(String port) {
-		try {
-			final int portValue = Integer.parseInt(port);
-			if(!isValidPort(portValue)) 
-				throw new TorParsingException("Illegal port value: "+ port);
-			return portValue;
-		} catch(NumberFormatException e) {
-			throw new TorParsingException("Could not parse port value: "+ port);
-		}
-	}
-	private final static int MAX_PORT = 0xFFFF;
-	public final static PortRange ALL_PORTS = new PortRange(1,MAX_PORT);
-	private final int portStart;
-	private final int portEnd;
-	
-	PortRange(int portValue) {
-		this(portValue, portValue);
-	}
-	
-	PortRange(int start, int end) {
-		if(!isValidRange(start, end))
-			throw new TorException("Invalid port range: "+ start +"-"+ end);
-		portStart = start;
-		portEnd = end;
-	}
-	
-	static private boolean isValidRange(int start, int end) {
-		if(!(isValidPort(start) && isValidPort(end)))
-				return false;
-		else if(start > end)
-			return false;
-		else 
-			return true;
-	}
-	
-	static private boolean isValidPort(int port) {
-		return port >= 0 && port <= MAX_PORT;
-	}
-	
-	public boolean rangeContains(int port) {
-		return port >= portStart && port <= portEnd;
-	}
-	
-	public String toString() {
-		if(portStart == 1 && portEnd == MAX_PORT) {
-			return "*";
-		} else if(portStart == portEnd) { 
-			return Integer.toString(portStart);
-		} else {
-			return Integer.toString(portStart) + "-" + Integer.toString(portEnd);
-		}
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/DescriptorCache.java b/orchid/src/com/subgraph/orchid/directory/DescriptorCache.java
deleted file mode 100644
index 7a72e3fd3d9..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/DescriptorCache.java
+++ /dev/null
@@ -1,206 +0,0 @@
-package com.subgraph.orchid.directory;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.Descriptor;
-import com.subgraph.orchid.DirectoryStore;
-import com.subgraph.orchid.DirectoryStore.CacheFile;
-import com.subgraph.orchid.Threading;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.directory.parsing.DocumentParser;
-import com.subgraph.orchid.directory.parsing.DocumentParsingResult;
-import com.subgraph.orchid.misc.GuardedBy;
-
-public abstract class DescriptorCache <T extends Descriptor> {
-	private final static Logger logger = Logger.getLogger(DescriptorCache.class.getName());
-	
-	private final DescriptorCacheData<T> data;
-
-	private final DirectoryStore store;
-	private final ScheduledExecutorService rebuildExecutor =
-			Threading.newScheduledPool("DescriptorCache rebuild worker");
-
-	private final CacheFile cacheFile;
-	private final CacheFile journalFile;
-	
-	@GuardedBy("this")
-	private int droppedBytes;
-	
-	@GuardedBy("this")
-	private int journalLength;
-	
-	@GuardedBy("this")
-	private int cacheLength;
-	
-	@GuardedBy("this")
-	private boolean initiallyLoaded;
-
-	DescriptorCache(DirectoryStore store, CacheFile cacheFile, CacheFile journalFile) {
-		this.data = new DescriptorCacheData<T>();
-		this.store = store;
-		this.cacheFile = cacheFile;
-		this.journalFile = journalFile;
-		startRebuildTask();
-	}
-
-	public synchronized void initialLoad() {
-		if(initiallyLoaded) {
-			return;
-		}
-		reloadCache();
-	}
-	
-	public void shutdown() {
-		rebuildExecutor.shutdownNow();
-	}
-
-	public T getDescriptor(HexDigest digest) {
-		return data.findByDigest(digest);
-	}
-
-	public synchronized void addDescriptors(List<T> descriptors) {
-		final List<T> journalDescriptors = new ArrayList<T>();
-		int duplicateCount = 0;
-		for(T d: descriptors) {
-			if(data.addDescriptor(d)) {
-				if(d.getCacheLocation() == Descriptor.CacheLocation.NOT_CACHED) {
-					journalLength += d.getBodyLength();
-					journalDescriptors.add(d);
-				}
-			} else {
-				duplicateCount += 1;
-			}
-		}
-
-		if(!journalDescriptors.isEmpty()) {
-			store.appendDocumentList(journalFile, journalDescriptors);
-		}
-		if(duplicateCount > 0) {
-			logger.info("Duplicate descriptors added to journal, count = "+ duplicateCount);
-		}
-	}
-
-	public void addDescriptor(T d) {
-		final List<T> descriptors = new ArrayList<T>();
-		descriptors.add(d);
-		addDescriptors(descriptors);
-	}
-	
-	private synchronized void clearMemoryCache() {
-		data.clear();
-		journalLength = 0;
-		cacheLength = 0;
-		droppedBytes = 0;
-	}
-
-	private synchronized void reloadCache() {
-		clearMemoryCache();
-		final ByteBuffer[] buffers = loadCacheBuffers();
-		loadCacheFileBuffer(buffers[0]);
-		loadJournalFileBuffer(buffers[1]);
-		if(!initiallyLoaded) {
-			initiallyLoaded = true;
-		}
-	}
-
-	private ByteBuffer[] loadCacheBuffers() {
-		synchronized (store) {
-			final ByteBuffer[] buffers = new ByteBuffer[2];
-			buffers[0] = store.loadCacheFile(cacheFile);
-			buffers[1] = store.loadCacheFile(journalFile);
-			return buffers;
-		}
-	}
-
-	private void loadCacheFileBuffer(ByteBuffer buffer) {
-		cacheLength = buffer.limit();
-		if(cacheLength == 0) {
-			return;
-		}
-		final DocumentParser<T> parser = createDocumentParser(buffer);
-		final DocumentParsingResult<T> result = parser.parse();
-		if(result.isOkay()) {
-			for(T d: result.getParsedDocuments()) {
-				d.setCacheLocation(Descriptor.CacheLocation.CACHED_CACHEFILE);
-				data.addDescriptor(d);
-			}
-		}
-
-	}
-	
-	private void loadJournalFileBuffer(ByteBuffer buffer) {
-		journalLength = buffer.limit();
-		if(journalLength == 0) {
-			return;
-		}
-		final DocumentParser<T> parser = createDocumentParser(buffer);
-		final DocumentParsingResult<T> result = parser.parse();
-		if(result.isOkay()) {
-			int duplicateCount = 0;
-			logger.fine("Loaded "+ result.getParsedDocuments().size() + " descriptors from journal");
-			for(T d: result.getParsedDocuments()) {
-				d.setCacheLocation(Descriptor.CacheLocation.CACHED_JOURNAL);
-				if(!data.addDescriptor(d)) {
-					duplicateCount += 1;
-				}
-			} 
-			if(duplicateCount > 0) {
-				logger.info("Found "+ duplicateCount + " duplicate descriptors in journal file");
-			}
-		} else if(result.isInvalid()) {
-			logger.warning("Invalid descriptor data parsing from journal file : "+ result.getMessage());
-		} else if(result.isError()) {
-			logger.warning("Error parsing descriptors from journal file : "+ result.getMessage());			
-		}
-	}
-	
-	abstract protected DocumentParser<T> createDocumentParser(ByteBuffer buffer);
-	
-	private ScheduledFuture<?> startRebuildTask() {
-		return rebuildExecutor.scheduleAtFixedRate(new Runnable() {
-			public void run() {
-				maybeRebuildCache();
-			}
-		}, 5, 30, TimeUnit.MINUTES);
-	}
-	
-	private synchronized void maybeRebuildCache() {
-		if(!initiallyLoaded) {
-			return;
-		}
-		
-		droppedBytes += data.cleanExpired();
-		
-		if(!shouldRebuildCache()) {
-			return;
-		}
-		rebuildCache();
-	}
-	
-	private boolean shouldRebuildCache() {
-		if(journalLength < 16384) {
-			return false;
-		}
-		if(droppedBytes > (journalLength + cacheLength) / 3) {
-			return true;
-		}
-		if(journalLength > (cacheLength / 2)) {
-			return true;
-		}
-		return false;
-	}
-	
-	private void rebuildCache() {
-		synchronized(store) {
-			store.writeDocumentList(cacheFile, data.getAllDescriptors());
-			store.removeCacheFile(journalFile);
-		}
-		reloadCache();
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/DescriptorCacheData.java b/orchid/src/com/subgraph/orchid/directory/DescriptorCacheData.java
deleted file mode 100644
index cfb651457ec..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/DescriptorCacheData.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.subgraph.orchid.directory;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.subgraph.orchid.Descriptor;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.misc.GuardedBy;
-
-
-
-public class DescriptorCacheData <T extends Descriptor> {
-
-	/** 7 days */
-	private final static long EXPIRY_PERIOD = 7 * 24 * 60 * 60 * 1000;
-	
-	@GuardedBy("this")
-	private final Map<HexDigest, T> descriptorMap;
-	
-	@GuardedBy("this")
-	private final List<T> allDescriptors;
-	
-	public DescriptorCacheData() {
-		this.descriptorMap = new HashMap<HexDigest, T>();
-		this.allDescriptors = new ArrayList<T>();
-	}
-	
-	synchronized T findByDigest(HexDigest digest) {
-		return descriptorMap.get(digest);
-	}
-	
-	synchronized List<T> getAllDescriptors() {
-		return new ArrayList<T>(allDescriptors);
-	}
-
-	synchronized boolean addDescriptor(T d) {
-		if(descriptorMap.containsKey(d.getDescriptorDigest())) {
-			return false;
-		}
-		descriptorMap.put(d.getDescriptorDigest(), d);
-		allDescriptors.add(d);
-		return true;
-	}
-	
-	synchronized void clear() {
-		descriptorMap.clear();
-		allDescriptors.clear();
-	}
-	
-	synchronized int cleanExpired() {
-		final Set<T> expired = getExpiredSet();
-
-		if(expired.isEmpty()) {
-			return 0;
-		}
-		
-		clear();
-		int dropped = 0;
-		for(T d: allDescriptors) {
-			if(expired.contains(d)) {
-				dropped += d.getBodyLength();
-			} else {
-				addDescriptor(d);
-			}
-		}
-		
-		return dropped;
-	}
-
-	private Set<T> getExpiredSet() {
-		final long now = System.currentTimeMillis();
-		final Set<T> expired = new HashSet<T>();
-		for(T d: allDescriptors) {
-			if(isExpired(d, now)) {
-				expired.add(d);
-			}
-		}
-		return expired;
-	}
-
-	private boolean isExpired(T d, long now) {
-		return d.getLastListed() != 0 && d.getLastListed() < (now - EXPIRY_PERIOD);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/DirectoryAuthorityStatus.java b/orchid/src/com/subgraph/orchid/directory/DirectoryAuthorityStatus.java
deleted file mode 100644
index cf9c08a31f5..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/DirectoryAuthorityStatus.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.subgraph.orchid.directory;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import com.subgraph.orchid.RouterStatus;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.data.Timestamp;
-import com.subgraph.orchid.data.exitpolicy.ExitPorts;
-
-public class DirectoryAuthorityStatus implements RouterStatus {
-
-	private String nickname;
-	private HexDigest identity;
-	private IPv4Address address;
-	private int routerPort;
-	private int directoryPort;
-	private Set<String> flags = new HashSet<String>();
-	private HexDigest v3Ident;
-	
-	void setV1Authority() { }
-	void setHiddenServiceAuthority() { addFlag("HSDir"); }
-	void unsetHiddenServiceAuthority() { flags.remove("HSDir"); }
-	void setBridgeAuthority() { }
-	void unsetV2Authority() { flags.remove("V2Dir"); }
-	void setNickname(String name) { nickname = name; }
-	void setIdentity(HexDigest identity) { this.identity = identity; }
-	void setAddress(IPv4Address address) { this.address = address; }
-	void setRouterPort(int port) { this.routerPort = port; }
-	void setDirectoryPort(int port) { this.directoryPort = port; }
-	void addFlag(String flag) { this.flags.add(flag); }
-	void setV3Ident(HexDigest v3Ident) { this.v3Ident = v3Ident; }
-	
-	DirectoryAuthorityStatus() {
-		addFlag("Authority");
-		addFlag("V2Dir");
-	}
-	
-	public IPv4Address getAddress() {
-		return address;
-	}
-
-	public HexDigest getDescriptorDigest() {
-		return null;
-	}
-
-	public int getDirectoryPort() {
-		return directoryPort;
-	}
-
-	public int getEstimatedBandwidth() {
-		return 0;
-	}
-
-	public ExitPorts getExitPorts() {
-		return null;
-	}
-
-	public HexDigest getIdentity() {
-		return identity;
-	}
-
-	public boolean hasBandwidth() {
-		return false;
-	}
-
-	public int getMeasuredBandwidth() {
-		return 0;
-	}
-
-	public String getNickname() {
-		return nickname;
-	}
-
-	public Timestamp getPublicationTime() {		
-		return null;
-	}
-
-	public int getRouterPort() {
-		return routerPort;
-	}
-
-	public String getVersion() {
-		return null;
-	}
-
-	public boolean hasFlag(String flag) {
-		return flags.contains(flag);
-	}
-
-	public boolean isDirectory() {
-		return true;
-	}
-
-	HexDigest getV3Ident() {
-		return v3Ident;
-	}
-	public HexDigest getMicrodescriptorDigest() {
-		return null;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/DirectoryImpl.java b/orchid/src/com/subgraph/orchid/directory/DirectoryImpl.java
deleted file mode 100644
index 9bcccbe7467..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/DirectoryImpl.java
+++ /dev/null
@@ -1,513 +0,0 @@
-package com.subgraph.orchid.directory;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.ConsensusDocument;
-import com.subgraph.orchid.ConsensusDocument.ConsensusFlavor;
-import com.subgraph.orchid.ConsensusDocument.RequiredCertificate;
-import com.subgraph.orchid.Descriptor;
-import com.subgraph.orchid.Directory;
-import com.subgraph.orchid.DirectoryServer;
-import com.subgraph.orchid.DirectoryStore;
-import com.subgraph.orchid.DirectoryStore.CacheFile;
-import com.subgraph.orchid.GuardEntry;
-import com.subgraph.orchid.KeyCertificate;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.RouterDescriptor;
-import com.subgraph.orchid.RouterMicrodescriptor;
-import com.subgraph.orchid.RouterStatus;
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.TorConfig.AutoBoolValue;
-import com.subgraph.orchid.TorException;
-import com.subgraph.orchid.crypto.TorRandom;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.RandomSet;
-import com.subgraph.orchid.directory.parsing.DocumentParser;
-import com.subgraph.orchid.directory.parsing.DocumentParserFactory;
-import com.subgraph.orchid.directory.parsing.DocumentParsingResult;
-import com.subgraph.orchid.events.Event;
-import com.subgraph.orchid.events.EventHandler;
-import com.subgraph.orchid.events.EventManager;
-
-public class DirectoryImpl implements Directory {
-	private final static Logger logger = Logger.getLogger(DirectoryImpl.class.getName());
-
-	private final Object loadLock = new Object();
-	private boolean isLoaded = false;
-	
-	private final DirectoryStore store;
-	private final TorConfig config;
-	private final StateFile stateFile;
-	private final DescriptorCache<RouterMicrodescriptor> microdescriptorCache;
-	private final DescriptorCache<RouterDescriptor> basicDescriptorCache;
-	
-	private final Map<HexDigest, RouterImpl> routersByIdentity;
-	private final Map<String, RouterImpl> routersByNickname;
-	private final RandomSet<RouterImpl> directoryCaches;
-	private final Set<ConsensusDocument.RequiredCertificate> requiredCertificates;
-	private boolean haveMinimumRouterInfo;
-	private boolean needRecalculateMinimumRouterInfo;
-	private final EventManager consensusChangedManager;
-	private final TorRandom random;
-	private final static DocumentParserFactory parserFactory = new DocumentParserFactoryImpl();
-	
-	private ConsensusDocument currentConsensus;
-	private ConsensusDocument consensusWaitingForCertificates;
-
-	public DirectoryImpl(TorConfig config, DirectoryStore customDirectoryStore) {
-		store = (customDirectoryStore == null) ? (new DirectoryStoreImpl(config)) : (customDirectoryStore);
-		this.config = config;
-		stateFile = new StateFile(store, this);
-		microdescriptorCache = createMicrodescriptorCache(store);
-		basicDescriptorCache = createBasicDescriptorCache(store);	
-		routersByIdentity = new HashMap<HexDigest, RouterImpl>();
-		routersByNickname = new HashMap<String, RouterImpl>();
-		directoryCaches = new RandomSet<RouterImpl>();
-		requiredCertificates = new HashSet<ConsensusDocument.RequiredCertificate>();
-		consensusChangedManager = new EventManager();
-		random = new TorRandom();
-	}
-
-	private static DescriptorCache<RouterMicrodescriptor> createMicrodescriptorCache(DirectoryStore store) {
-		return new DescriptorCache<RouterMicrodescriptor>(store, CacheFile.MICRODESCRIPTOR_CACHE, CacheFile.MICRODESCRIPTOR_JOURNAL) {
-			@Override
-			protected DocumentParser<RouterMicrodescriptor> createDocumentParser(ByteBuffer buffer) {
-				return parserFactory.createRouterMicrodescriptorParser(buffer);
-			}
-		};
-	}
-
-	private static DescriptorCache<RouterDescriptor> createBasicDescriptorCache(DirectoryStore store) {
-		return new DescriptorCache<RouterDescriptor>(store, CacheFile.DESCRIPTOR_CACHE, CacheFile.DESCRIPTOR_JOURNAL) {
-			@Override
-			protected DocumentParser<RouterDescriptor> createDocumentParser(ByteBuffer buffer) {
-				return parserFactory.createRouterDescriptorParser(buffer, false);
-			}
-		};
-	}
-
-	public synchronized boolean haveMinimumRouterInfo() {
-		if(needRecalculateMinimumRouterInfo) {
-			checkMinimumRouterInfo();
-		}
-		return haveMinimumRouterInfo;
-	}
-
-	private synchronized void checkMinimumRouterInfo() {
-		if(currentConsensus == null || !currentConsensus.isLive()) {
-			needRecalculateMinimumRouterInfo = true;
-			haveMinimumRouterInfo = false;
-			return;
-		}
-
-		int routerCount = 0;
-		int descriptorCount = 0;
-		for(Router r: routersByIdentity.values()) {
-			routerCount++;
-			if(!r.isDescriptorDownloadable())
-				descriptorCount++;
-		}
-		needRecalculateMinimumRouterInfo = false;
-		haveMinimumRouterInfo = (descriptorCount * 4 > routerCount);
-	}
-
-	public void loadFromStore() {
-		logger.info("Loading cached network information from disk");
-		
-		synchronized(loadLock) {
-			if(isLoaded) {
-				return;
-			}
-			boolean useMicrodescriptors = config.getUseMicrodescriptors() != AutoBoolValue.FALSE;
-			last = System.currentTimeMillis();
-			logger.info("Loading certificates");
-			loadCertificates(store.loadCacheFile(CacheFile.CERTIFICATES));
-			logElapsed();
-			
-			logger.info("Loading consensus");
-			loadConsensus(store.loadCacheFile(useMicrodescriptors ? CacheFile.CONSENSUS_MICRODESC : CacheFile.CONSENSUS));
-			logElapsed();
-			
-			if(!useMicrodescriptors) {
-				logger.info("Loading descriptors");
-				basicDescriptorCache.initialLoad();
-			} else {
-				logger.info("Loading microdescriptor cache");
-				microdescriptorCache.initialLoad();
-			}
-			needRecalculateMinimumRouterInfo = true;
-			logElapsed();
-			
-			logger.info("loading state file");
-			stateFile.parseBuffer(store.loadCacheFile(CacheFile.STATE));
-			logElapsed();
-			
-			isLoaded = true;
-			loadLock.notifyAll();
-		}
-	}
-
-	public void close() {
-		basicDescriptorCache.shutdown();
-		microdescriptorCache.shutdown();
-	}
-
-	private long last = 0;
-	private void logElapsed() {
-		final long now = System.currentTimeMillis();
-		final long elapsed =  now - last;
-		last = now;
-		logger.fine("Loaded in "+ elapsed + " ms.");
-	}
-
-	private void loadCertificates(ByteBuffer buffer) {
-		final DocumentParser<KeyCertificate> parser = parserFactory.createKeyCertificateParser(buffer);
-		final DocumentParsingResult<KeyCertificate> result = parser.parse();
-		if(testResult(result, "certificates")) {
-			for(KeyCertificate cert: result.getParsedDocuments()) {
-				addCertificate(cert);
-			}
-		}
-	}
-	
-	private void loadConsensus(ByteBuffer buffer) {
-		final DocumentParser<ConsensusDocument> parser = parserFactory.createConsensusDocumentParser(buffer);
-		final DocumentParsingResult<ConsensusDocument> result = parser.parse();
-		if(testResult(result, "consensus")) {
-			addConsensusDocument(result.getDocument(), true);
-		}
-	}
-
-	private boolean testResult(DocumentParsingResult<?> result, String type) {
-		if(result.isOkay()) {
-			return true;
-		} else if(result.isError()) {
-			logger.warning("Parsing error loading "+ type + " : "+ result.getMessage());
-		} else if(result.isInvalid()) {
-			logger.warning("Problem loading "+ type + " : "+ result.getMessage());
-		} else {
-			logger.warning("Unknown problem loading "+ type);
-		}
-		return false;
-	}
-	
-	public void waitUntilLoaded() {
-		synchronized (loadLock) {
-			while(!isLoaded) {
-				try {
-					loadLock.wait();
-				} catch (InterruptedException e) {
-					logger.warning("Thread interrupted while waiting for directory to load from disk");
-				}
-			}
-		}
-	}
-
-	public Collection<DirectoryServer> getDirectoryAuthorities() {
-		return TrustedAuthorities.getInstance().getAuthorityServers();
-	}
-
-	public DirectoryServer getRandomDirectoryAuthority() {
-		final List<DirectoryServer> servers = TrustedAuthorities.getInstance().getAuthorityServers();
-		final int idx = random.nextInt(servers.size());
-		return servers.get(idx);
-	}
-
-	public Set<ConsensusDocument.RequiredCertificate> getRequiredCertificates() {
-		return new HashSet<ConsensusDocument.RequiredCertificate>(requiredCertificates);
-	}
-	
-	public void addCertificate(KeyCertificate certificate) {
-		synchronized(TrustedAuthorities.getInstance()) {
-			final boolean wasRequired = removeRequiredCertificate(certificate);
-			final DirectoryServer as = TrustedAuthorities.getInstance().getAuthorityServerByIdentity(certificate.getAuthorityFingerprint());
-			if(as == null) {
-				logger.warning("Certificate read for unknown directory authority with identity: "+ certificate.getAuthorityFingerprint());
-				return;
-			}
-			as.addCertificate(certificate);
-			
-			if(consensusWaitingForCertificates != null && wasRequired) {
-				
-				switch(consensusWaitingForCertificates.verifySignatures()) {
-				case STATUS_FAILED:
-					consensusWaitingForCertificates = null;
-					return;
-					
-				case STATUS_VERIFIED:
-					addConsensusDocument(consensusWaitingForCertificates, false);
-					consensusWaitingForCertificates = null;
-					return;
-
-				case STATUS_NEED_CERTS:
-					requiredCertificates.addAll(consensusWaitingForCertificates.getRequiredCertificates());
-					return;
-				}
-			}
-		}
-	}
-	
-	private boolean removeRequiredCertificate(KeyCertificate certificate) {
-		final Iterator<RequiredCertificate> it = requiredCertificates.iterator();
-		while(it.hasNext()) {
-			RequiredCertificate r = it.next();
-			if(r.getSigningKey().equals(certificate.getAuthoritySigningKey().getFingerprint())) {
-				it.remove();
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	public void storeCertificates() {
-		synchronized(TrustedAuthorities.getInstance()) {
-			final List<KeyCertificate> certs = new ArrayList<KeyCertificate>();
-			for(DirectoryServer ds: TrustedAuthorities.getInstance().getAuthorityServers()) {
-				certs.addAll(ds.getCertificates());
-			}
-			store.writeDocumentList(CacheFile.CERTIFICATES, certs);
-		}
-	}
-
-	public void addRouterDescriptors(List<RouterDescriptor> descriptors) {
-		basicDescriptorCache.addDescriptors(descriptors);
-		needRecalculateMinimumRouterInfo = true;
-	}
-
-	public synchronized void addConsensusDocument(ConsensusDocument consensus, boolean fromCache) {
-		if(consensus.equals(currentConsensus))
-			return;
-
-		if(currentConsensus != null && consensus.getValidAfterTime().isBefore(currentConsensus.getValidAfterTime())) {
-			logger.warning("New consensus document is older than current consensus document");
-			return;
-		}
-
-		synchronized(TrustedAuthorities.getInstance()) {
-			switch(consensus.verifySignatures()) {
-			case STATUS_FAILED:
-				logger.warning("Unable to verify signatures on consensus document, discarding...");
-				return;
-				
-			case STATUS_NEED_CERTS:
-				consensusWaitingForCertificates = consensus;
-				requiredCertificates.addAll(consensus.getRequiredCertificates());
-				return;
-
-			case STATUS_VERIFIED:
-				break;
-			}
-			requiredCertificates.addAll(consensus.getRequiredCertificates());
-		
-		}
-		final Map<HexDigest, RouterImpl> oldRouterByIdentity = new HashMap<HexDigest, RouterImpl>(routersByIdentity);
-
-		clearAll();
-
-		for(RouterStatus status: consensus.getRouterStatusEntries()) {
-			if(status.hasFlag("Running") && status.hasFlag("Valid")) {
-				final RouterImpl router = updateOrCreateRouter(status, oldRouterByIdentity);
-				addRouter(router);
-				classifyRouter(router);
-			}
-			final Descriptor d = getDescriptorForRouterStatus(status, consensus.getFlavor() == ConsensusFlavor.MICRODESC);
-			if(d != null) {
-				d.setLastListed(consensus.getValidAfterTime().getTime());
-			}
-		}
-		
-		logger.fine("Loaded "+ routersByIdentity.size() +" routers from consensus document");
-		currentConsensus = consensus;
-		
-		if(!fromCache) {
-			storeCurrentConsensus();
-		}
-		consensusChangedManager.fireEvent(new Event() {});
-	}
-
-	private void storeCurrentConsensus() {
-		if(currentConsensus != null) {
-			if(currentConsensus.getFlavor() == ConsensusFlavor.MICRODESC) {
-				store.writeDocument(CacheFile.CONSENSUS_MICRODESC, currentConsensus);
-			} else {
-				store.writeDocument(CacheFile.CONSENSUS, currentConsensus);
-			}
-		}
-	}
-
-	private Descriptor getDescriptorForRouterStatus(RouterStatus rs, boolean isMicrodescriptor) {
-		if(isMicrodescriptor) {
-			return microdescriptorCache.getDescriptor(rs.getMicrodescriptorDigest());
-		} else {
-			return basicDescriptorCache.getDescriptor(rs.getDescriptorDigest());
-		}
-	}
-	
-	private RouterImpl updateOrCreateRouter(RouterStatus status, Map<HexDigest, RouterImpl> knownRouters) {
-		final RouterImpl router = knownRouters.get(status.getIdentity());
-		if(router == null)
-			return RouterImpl.createFromRouterStatus(this, status);
-		router.updateStatus(status);
-		return router;
-	}
-
-	private void clearAll() {
-		routersByIdentity.clear();
-		routersByNickname.clear();
-		directoryCaches.clear();
-	}
-
-	private void classifyRouter(RouterImpl router) {
-		if(isValidDirectoryCache(router)) {
-			directoryCaches.add(router);
-		} else {
-			directoryCaches.remove(router);
-		}
-	}
-
-	private boolean isValidDirectoryCache(RouterImpl router) {
-		if(router.getDirectoryPort() == 0)
-			return false;
-		if(router.hasFlag("BadDirectory"))
-			return false;
-		return router.hasFlag("V2Dir");
-	}
-
-	private void addRouter(RouterImpl router) {
-		routersByIdentity.put(router.getIdentityHash(), router);
-		addRouterByNickname(router);
-	}
-
-	private void addRouterByNickname(RouterImpl router) {
-		final String name = router.getNickname();
-		if(name == null || name.equals("Unnamed"))
-			return;
-		if(routersByNickname.containsKey(router.getNickname())) {
-			//logger.warn("Duplicate router nickname: "+ router.getNickname());
-			return;
-		}
-		routersByNickname.put(name, router);
-	}
-
-	public synchronized void addRouterMicrodescriptors(List<RouterMicrodescriptor> microdescriptors) {
-		microdescriptorCache.addDescriptors(microdescriptors);
-		needRecalculateMinimumRouterInfo = true;
-	}
-
-	synchronized public List<Router> getRoutersWithDownloadableDescriptors() {
-		waitUntilLoaded();
-		final List<Router> routers = new ArrayList<Router>();
-		for(RouterImpl router: routersByIdentity.values()) {
-			if(router.isDescriptorDownloadable())
-				routers.add(router);
-		}
-
-		for(int i = 0; i < routers.size(); i++) {
-			final Router a = routers.get(i);
-			final int swapIdx = random.nextInt(routers.size());
-			final Router b = routers.get(swapIdx);
-			routers.set(i, b);
-			routers.set(swapIdx, a);
-		}
-
-		return routers;
-	}
-
-	public ConsensusDocument getCurrentConsensusDocument() {
-		return currentConsensus;
-	}
-
-	public boolean hasPendingConsensus() {
-		synchronized (TrustedAuthorities.getInstance()) {
-			return consensusWaitingForCertificates != null;	
-		}
-	}
-
-	public void registerConsensusChangedHandler(EventHandler handler) {
-		consensusChangedManager.addListener(handler);
-	}
-
-	public void unregisterConsensusChangedHandler(EventHandler handler) {
-		consensusChangedManager.removeListener(handler);
-	}
-
-	public Router getRouterByName(String name) {
-		if(name.equals("Unnamed")) {
-			return null;
-		}
-		if(name.length() == 41 && name.charAt(0) == '$') {
-			try {
-				final HexDigest identity = HexDigest.createFromString(name.substring(1));
-				return getRouterByIdentity(identity);
-			} catch (Exception e) {
-				return null;
-			}
-		}
-		waitUntilLoaded();
-		return routersByNickname.get(name);
-	}
-
-	public Router getRouterByIdentity(HexDigest identity) {
-		waitUntilLoaded();
-		synchronized (routersByIdentity) {
-			return routersByIdentity.get(identity);
-		}
-	}
-
-	public List<Router> getRouterListByNames(List<String> names) {
-		waitUntilLoaded();
-		final List<Router> routers = new ArrayList<Router>();
-		for(String n: names) {
-			final Router r = getRouterByName(n);
-			if(r == null)
-				throw new TorException("Could not find router named: "+ n);
-			routers.add(r);
-		}
-		return routers;
-	}
-
-	public List<Router> getAllRouters() {
-		waitUntilLoaded();
-		synchronized(routersByIdentity) {
-			return new ArrayList<Router>(routersByIdentity.values());
-		}
-	}
-
-	public GuardEntry createGuardEntryFor(Router router) {
-		waitUntilLoaded();
-		return stateFile.createGuardEntryFor(router);
-	}
-
-	public List<GuardEntry> getGuardEntries() {
-		waitUntilLoaded();
-		return stateFile.getGuardEntries();
-	}
-
-	public void removeGuardEntry(GuardEntry entry) {
-		waitUntilLoaded();
-		stateFile.removeGuardEntry(entry);
-	}
-
-	public void addGuardEntry(GuardEntry entry) {
-		waitUntilLoaded();
-		stateFile.addGuardEntry(entry);
-	}
-
-	public RouterMicrodescriptor getMicrodescriptorFromCache(HexDigest descriptorDigest) {
-		return microdescriptorCache.getDescriptor(descriptorDigest);
-	}
-
-
-	public RouterDescriptor getBasicDescriptorFromCache(HexDigest descriptorDigest) {
-		return basicDescriptorCache.getDescriptor(descriptorDigest);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/DirectoryServerImpl.java b/orchid/src/com/subgraph/orchid/directory/DirectoryServerImpl.java
deleted file mode 100644
index d8f0bcebdce..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/DirectoryServerImpl.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.subgraph.orchid.directory;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import com.subgraph.orchid.DirectoryServer;
-import com.subgraph.orchid.KeyCertificate;
-import com.subgraph.orchid.RouterStatus;
-import com.subgraph.orchid.data.HexDigest;
-
-public class DirectoryServerImpl extends RouterImpl implements DirectoryServer {
-	
-	private List<KeyCertificate> certificates = new ArrayList<KeyCertificate>();
-
-	private boolean isHiddenServiceAuthority = false;
-	private boolean isBridgeAuthority = false;
-	private boolean isExtraInfoCache = false;
-	private int port;
-	private HexDigest v3Ident;
-	
-	DirectoryServerImpl(RouterStatus status) {
-		super(null, status);
-	}
-	
-	void setHiddenServiceAuthority() { isHiddenServiceAuthority = true; }
-	void unsetHiddenServiceAuthority() { isHiddenServiceAuthority = false; }
-	void setBridgeAuthority() { isBridgeAuthority = true; }
-	void setExtraInfoCache() { isExtraInfoCache = true; }
-	void setPort(int port) { this.port = port; }
-	void setV3Ident(HexDigest fingerprint) { this.v3Ident = fingerprint; }
-	
-	public boolean isTrustedAuthority() {
-		return true;
-	}
-	
-	/**
-	 * Return true if this DirectoryServer entry has
-	 * complete and valid information.
-	 * @return
-	 */
-	public boolean isValid() {
-		return true;
-	}
-	
-	public boolean isV2Authority() {
-		return hasFlag("Authority") && hasFlag("V2Dir");
-	}
-	
-	public boolean isV3Authority() {
-		return hasFlag("Authority") && v3Ident != null;
-	}
-	
-	public boolean isHiddenServiceAuthority() {
-		return isHiddenServiceAuthority;
-	}
-	
-	public boolean isBridgeAuthority() {
-		return isBridgeAuthority;
-	}
-	
-	public boolean isExtraInfoCache() {
-		return isExtraInfoCache;
-	}
-	
-	public HexDigest getV3Identity() {
-		return v3Ident;
-	}
-
-	public KeyCertificate getCertificateByFingerprint(HexDigest fingerprint) {
-		for(KeyCertificate kc: getCertificates()) {
-			if(kc.getAuthoritySigningKey().getFingerprint().equals(fingerprint)) {
-				return kc;
-			}
-		}
-		return null;
-	}
-	
-	public List<KeyCertificate> getCertificates() {
-		synchronized(certificates) {
-			purgeExpiredCertificates();
-			purgeOldCertificates();
-			return new ArrayList<KeyCertificate>(certificates);
-		}
-	}
-
-	private void purgeExpiredCertificates() {
-		Iterator<KeyCertificate> it = certificates.iterator();
-		while(it.hasNext()) {
-			KeyCertificate elem = it.next();
-			if(elem.isExpired()) {
-				it.remove();
-			}
-		}
-	}
-	
-	private void purgeOldCertificates() {
-		if(certificates.size() < 2) {
-			return;
-		}
-		final KeyCertificate newest = getNewestCertificate();
-		final Iterator<KeyCertificate> it = certificates.iterator();
-		while(it.hasNext()) {
-			KeyCertificate elem = it.next();
-			if(elem != newest && isMoreThan48HoursOlder(newest, elem)) {
-				it.remove();
-			}
-		}
-	}
-	
-	private KeyCertificate getNewestCertificate() {
-		KeyCertificate newest = null;
-		for(KeyCertificate kc : certificates) {
-			if(newest == null || getPublishedMilliseconds(newest) > getPublishedMilliseconds(kc)) {
-				newest = kc;
-			}
-		}
-		return newest;
-	}
-	
-	private boolean isMoreThan48HoursOlder(KeyCertificate newer, KeyCertificate older) {
-		final long milliseconds = 48 * 60 * 60 * 1000;
-		return (getPublishedMilliseconds(newer) - getPublishedMilliseconds(older)) > milliseconds;
-	}
-	
-	private long getPublishedMilliseconds(KeyCertificate certificate) {
-		return certificate.getKeyPublishedTime().getDate().getTime();
-	}
-	
-	public void addCertificate(KeyCertificate certificate) {
-		if(!certificate.getAuthorityFingerprint().equals(v3Ident)) {
-			throw new IllegalArgumentException("This certificate does not appear to belong to this directory authority");
-		}
-		synchronized(certificates) {
-			certificates.add(certificate);
-		}
-	}
-	
-	public String toString() {
-		if(v3Ident != null) 
-			return "(Directory: "+ getNickname() +" "+ getAddress() +":"+ port +" fingerprint="+ getIdentityHash() +" v3ident="+ 
-				v3Ident +")";
-		else
-			return "(Directory: "+ getNickname() +" "+ getAddress() +":"+ port +" fingerprint="+ getIdentityHash() +")";
-
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/DirectoryStoreFile.java b/orchid/src/com/subgraph/orchid/directory/DirectoryStoreFile.java
deleted file mode 100644
index 0e702f46a83..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/DirectoryStoreFile.java
+++ /dev/null
@@ -1,226 +0,0 @@
-package com.subgraph.orchid.directory;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
-import java.nio.channels.FileChannel;
-import java.nio.channels.WritableByteChannel;
-import java.util.List;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.Document;
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.crypto.TorRandom;
-
-public class DirectoryStoreFile {
-	private final static Logger logger = Logger.getLogger(DirectoryStoreFile.class.getName());
-	private final static ByteBuffer EMPTY_BUFFER = ByteBuffer.allocate(0);
-	private final static TorRandom random = new TorRandom();
-	
-	private final TorConfig config;
-	private final String cacheFilename;
-	
-	private RandomAccessFile openFile;
-	
-	private boolean openFileFailed;
-	private boolean directoryCreationFailed;
-	
-	DirectoryStoreFile(TorConfig config, String cacheFilename) {
-		this.config = config;
-		this.cacheFilename = cacheFilename;
-	}
-	
-	public void writeData(ByteBuffer data) {
-		final File tempFile = createTempFile();
-		final FileOutputStream fos = openFileOutputStream(tempFile);
-		if(fos == null) {
-			return;
-		}
-		try {
-			writeAllToChannel(fos.getChannel(), data);
-			quietClose(fos);
-			installTempFile(tempFile);
-		} catch (IOException e) {
-			logger.warning("I/O error writing to temporary cache file "+ tempFile + " : "+ e);
-			return;
-		} finally {
-			quietClose(fos);
-			tempFile.delete();
-		}
-	}
-
-	public void writeDocuments(List<? extends Document> documents) {
-		final File tempFile = createTempFile();
-		final FileOutputStream fos = openFileOutputStream(tempFile);
-		if(fos == null) {
-			return;
-		}
-		try {
-			writeDocumentsToChannel(fos.getChannel(), documents);
-			quietClose(fos);
-			installTempFile(tempFile);
-		} catch (IOException e) {
-			logger.warning("I/O error writing to temporary cache file "+ tempFile + " : "+ e);
-			return;
-		} finally {
-			quietClose(fos);
-			tempFile.delete();
-		}
-	}
-	
-	private FileOutputStream openFileOutputStream(File file) {
-		try {
-			createDirectoryIfMissing();
-			return new FileOutputStream(file);
-		} catch (FileNotFoundException e) {
-			logger.warning("Failed to open file "+ file + " : "+ e);
-			return null;
-		}
-	}
-
-	public void appendDocuments(List<? extends Document> documents) {
-		if(!ensureOpened()) {
-			return;
-		}
-		try {
-			final FileChannel channel = openFile.getChannel();
-			channel.position(channel.size());
-			writeDocumentsToChannel(channel, documents);
-			channel.force(true);
-		} catch (IOException e) {
-			logger.warning("I/O error writing to cache file "+ cacheFilename);
-			return;
-		}
-	}
-	
-	public ByteBuffer loadContents() {
-		if(!(fileExists() && ensureOpened())) {
-			return EMPTY_BUFFER;
-		}
-		
-		try {
-			return readAllFromChannel(openFile.getChannel());
-		} catch (IOException e) {
-			logger.warning("I/O error reading cache file "+ cacheFilename + " : "+ e);
-			return EMPTY_BUFFER;
-		}
-	}
-	
-	private ByteBuffer readAllFromChannel(FileChannel channel) throws IOException {
-		channel.position(0);
-		final ByteBuffer buffer = createBufferForChannel(channel);
-		while(buffer.hasRemaining()) {
-			if(channel.read(buffer) == -1) {
-				logger.warning("Unexpected EOF reading from cache file");
-				return EMPTY_BUFFER;
-			}
-		}
-		buffer.rewind();
-		return buffer;
-	}
-
-	private ByteBuffer createBufferForChannel(FileChannel channel) throws IOException {
-		final int sz = (int) (channel.size() & 0xFFFFFFFF);
-		return ByteBuffer.allocateDirect(sz);
-	}
-	
-	void close() {
-		if(openFile != null) {
-			quietClose(openFile);
-			openFile = null;
-		}
-	}
-	
-	private boolean fileExists() {
-		final File file = getFile();
-		return file.exists();
-	}
-
-	private boolean ensureOpened() {
-		if(openFileFailed) {
-			return false;
-		}
-		if(openFile != null) {
-			return true;
-		}
-		openFile = openFile();
-		return openFile != null;
-	}
-
-	private RandomAccessFile openFile() {
-		try {
-			final File f = new File(config.getDataDirectory(), cacheFilename);
-			createDirectoryIfMissing();
-			return new RandomAccessFile(f, "rw");
-		} catch (FileNotFoundException e) {
-			openFileFailed = true;
-			logger.warning("Failed to open cache file "+ cacheFilename);
-			return null;
-		}
-	}
-	
-	private void installTempFile(File tempFile) {
-		close();
-		final File target = getFile();
-		if(target.exists() && !target.delete()) {
-			logger.warning("Failed to delete file "+ target);
-		}
-		if(!tempFile.renameTo(target)) {
-			logger.warning("Failed to rename temp file "+ tempFile +" to "+ target);
-		}
-		tempFile.delete();
-		ensureOpened();
-	}
-
-	private File createTempFile() {
-		final long n = random.nextLong();
-		final File f = new File(config.getDataDirectory(), cacheFilename + Long.toString(n));
-		f.deleteOnExit();
-		return f;
-	}
-	
-	private void writeDocumentsToChannel(FileChannel channel, List<? extends Document> documents) throws IOException {
-		for(Document d: documents) {
-			writeAllToChannel(channel, d.getRawDocumentBytes());
-		}
-	}
-
-	private void writeAllToChannel(WritableByteChannel channel, ByteBuffer data) throws IOException {
-		data.rewind();
-		while(data.hasRemaining()) {
-			channel.write(data);
-		}
-	}
-	
-	private void quietClose(Closeable closeable) {
-		try {
-			closeable.close();
-		} catch (IOException e) {}
-	}
-	
-	private File getFile() {
-		return new File(config.getDataDirectory(), cacheFilename);
-	}
-
-	public void remove() {
-		close();
-		getFile().delete();
-	}
-	
-	private void createDirectoryIfMissing() {
-		if(directoryCreationFailed) {
-			return;
-		}
-		final File dd = config.getDataDirectory();
-		if(!dd.exists()) {
-			if(!dd.mkdirs()) {
-				directoryCreationFailed = true;
-				logger.warning("Failed to create data directory "+ dd);
-			}
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/DirectoryStoreImpl.java b/orchid/src/com/subgraph/orchid/directory/DirectoryStoreImpl.java
deleted file mode 100644
index f23b293515b..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/DirectoryStoreImpl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.subgraph.orchid.directory;
-
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.subgraph.orchid.DirectoryStore;
-import com.subgraph.orchid.Document;
-import com.subgraph.orchid.TorConfig;
-
-public class DirectoryStoreImpl implements DirectoryStore {
-	
-	private final TorConfig config;
-	private Map<CacheFile, DirectoryStoreFile> fileMap;
-
-	DirectoryStoreImpl(TorConfig config) {
-		this.config = config;
-		this.fileMap = new HashMap<CacheFile, DirectoryStoreFile>();
-	}
-
-	public synchronized ByteBuffer loadCacheFile(CacheFile cacheFile) {
-		return getStoreFile(cacheFile).loadContents();
-	}
-	
-	public synchronized void writeData(CacheFile cacheFile, ByteBuffer data) {
-		getStoreFile(cacheFile).writeData(data);
-	}
-	
-	public synchronized void writeDocument(CacheFile cacheFile, Document document) {
-		writeDocumentList(cacheFile, Arrays.asList(document));
-	}
-	
-	public synchronized void writeDocumentList(CacheFile cacheFile, List<? extends Document> documents) {
-		getStoreFile(cacheFile).writeDocuments(documents);
-	}
-
-	public synchronized void appendDocumentList(CacheFile cacheFile, List<? extends Document> documents) {
-		getStoreFile(cacheFile).appendDocuments(documents);
-	}
-	
-	public synchronized void removeCacheFile(CacheFile cacheFile) {
-		getStoreFile(cacheFile).remove();
-	}
-	
-	public synchronized void removeAllCacheFiles() {
-		for(CacheFile cf: CacheFile.values()) {
-			getStoreFile(cf).remove();
-		}
-	}
-	
-	private DirectoryStoreFile getStoreFile(CacheFile cacheFile) {
-		if(!fileMap.containsKey(cacheFile)) {
-			fileMap.put(cacheFile, new DirectoryStoreFile(config, cacheFile.getFilename()));
-		}
-		return fileMap.get(cacheFile);
-	}	
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/DocumentFieldParserImpl.java b/orchid/src/com/subgraph/orchid/directory/DocumentFieldParserImpl.java
deleted file mode 100644
index 24296e3183a..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/DocumentFieldParserImpl.java
+++ /dev/null
@@ -1,422 +0,0 @@
-package com.subgraph.orchid.directory;
-
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.List;
-import java.util.TimeZone;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.TorException;
-import com.subgraph.orchid.TorParsingException;
-import com.subgraph.orchid.crypto.TorMessageDigest;
-import com.subgraph.orchid.crypto.TorNTorKeyAgreement;
-import com.subgraph.orchid.crypto.TorPublicKey;
-import com.subgraph.orchid.crypto.TorSignature;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.data.Timestamp;
-import com.subgraph.orchid.directory.parsing.DocumentFieldParser;
-import com.subgraph.orchid.directory.parsing.DocumentObject;
-import com.subgraph.orchid.directory.parsing.DocumentParsingHandler;
-import com.subgraph.orchid.directory.parsing.NameIntegerParameter;
-import com.subgraph.orchid.encoders.Base64;
-
-public class DocumentFieldParserImpl implements DocumentFieldParser {
-	private final static Logger logger = Logger.getLogger(DocumentFieldParserImpl.class.getName());
-	private final static String BEGIN_TAG = "-----BEGIN";
-	private final static String END_TAG = "-----END";
-	private final static String TAG_DELIMITER = "-----";
-	private final static String DEFAULT_DELIMITER = " ";
-	private final ByteBuffer inputBuffer;
-	private final SimpleDateFormat dateFormat;
-	private String delimiter = DEFAULT_DELIMITER;
-	private String currentKeyword;
-	private List<String> currentItems;
-	private int currentItemsPosition;
-	private boolean recognizeOpt;
-	/* If a line begins with this string do not include it in the current signature. */
- 	private String signatureIgnoreToken;
-	private boolean isProcessingSignedEntity = false;
-	private TorMessageDigest signatureDigest;
-	private TorMessageDigest signatureDigest256;
-	private StringBuilder rawDocumentBuffer;
-
-	private DocumentParsingHandler callbackHandler;
-
-	public DocumentFieldParserImpl(ByteBuffer buffer) {
-		buffer.rewind();
-		this.inputBuffer = buffer;
-		rawDocumentBuffer = new StringBuilder();
-		dateFormat = createDateFormat();
-	}
-
-	private static SimpleDateFormat createDateFormat() {
-		final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		format.setTimeZone(TimeZone.getTimeZone("GMT"));
-		format.setLenient(false);
-		return format;
-	}
-
-	public String parseNickname() {
-		// XXX verify valid nickname
-		return getItem();
-	}
-	public String parseString() {
-		return getItem();
-	}
-
-	public void setRecognizeOpt() {
-		recognizeOpt = true;
-	}
-
-	public void setHandler(DocumentParsingHandler handler) {
-		callbackHandler = handler;
-	}
-
-	public void setDelimiter(String delimiter) {
-		this.delimiter = delimiter;
-	}
-
-	public int argumentsRemaining() {
-		return currentItems.size() - currentItemsPosition;
-	}
-
-	private String getItem() {
-		if(currentItemsPosition >= currentItems.size()) 
-			throw new TorParsingException("Overrun while reading arguments");
-		return currentItems.get(currentItemsPosition++);
-	}
-	/*
-	 * Return a string containing all remaining arguments concatenated together
-	 */
-	public String parseConcatenatedString() {
-		StringBuilder result = new StringBuilder();
-		while(argumentsRemaining() > 0) {
-			if(result.length() > 0)
-				result.append(" ");
-			result.append(getItem());
-		}
-		return result.toString();
-	}
-
-	public boolean parseBoolean() {
-		final int i = parseInteger();
-		if(i == 1)
-			return true;
-		else if(i == 0)
-			return false;
-		else 
-			throw new TorParsingException("Illegal boolean value: "+ i);
-	}
-
-	public int parseInteger() {
-		return parseInteger(getItem());
-	}
-
-	public int parseInteger(String item) {
-		try {
-			return Integer.parseInt(item);
-		} catch(NumberFormatException e) {
-			throw new TorParsingException("Failed to parse expected integer value: " + item);
-		}
-	}
-
-	public int[] parseIntegerList() {
-		final String item = getItem();
-		final String[] ns = item.split(",");
-		final int[] result = new int[ns.length];
-		for(int i = 0; i < result.length; i++) {
-			result[i] = parseInteger(ns[i]);
-		}
-		return result;
-	}
-
-	public int parsePort() {
-		return parsePort(getItem());
-	}
-
-	public int parsePort(String item) {
-		final int port = parseInteger(item);
-		if(port < 0 || port > 65535)
-			throw new TorParsingException("Illegal port value: " + port);
-		return port;
-	}
-
-
-	public Timestamp parseTimestamp() {
-		String timeAndDate = getItem() + " " + getItem();
-		try {
-			return new Timestamp(dateFormat.parse(timeAndDate));
-		} catch (ParseException e) {
-			throw new TorParsingException("Could not parse timestamp value: "+ timeAndDate);
-		}
-	}
-
-	public HexDigest parseHexDigest() {
-		return HexDigest.createFromString(parseString());
-	}
-	
-	public HexDigest parseBase32Digest() {
-		return HexDigest.createFromBase32String(parseString());
-	}
-
-	public HexDigest parseFingerprint() {
-		return HexDigest.createFromString(parseConcatenatedString());
-	}
-
-	public void verifyExpectedArgumentCount(String keyword, int argumentCount) {
-		verifyExpectedArgumentCount(keyword, argumentCount, argumentCount);
-	}
-
-	private  void verifyExpectedArgumentCount(String keyword, int expectedMin, int expectedMax) {
-		final int argumentCount = argumentsRemaining();
-		if(expectedMin != -1 && argumentCount < expectedMin) 
-			throw new TorParsingException("Not enough arguments for keyword '"+ keyword +"' expected "+ expectedMin +" and got "+ argumentCount);
-
-		if(expectedMax != -1 && argumentCount > expectedMax)
-			// Is this the correct thing to do, or should just be a warning?
-			throw new TorParsingException("Too many arguments for keyword '"+ keyword +"' expected "+ expectedMax +" and got "+ argumentCount);
-	}
-
-	public byte[] parseBase64Data() {
-		final StringBuilder string = new StringBuilder(getItem());
-		switch(string.length() % 4) {
-		case 2:
-			string.append("==");
-			break;
-		case 3:
-			string.append("=");
-			break;
-		default:
-			break;
-		}
-		try {
-			return Base64.decode(string.toString().getBytes("ISO-8859-1"));
-		} catch (UnsupportedEncodingException e) {
-			throw new TorException(e);
-		}
-
-	}
-
-	public IPv4Address parseAddress() {
-		return IPv4Address.createFromString(getItem());
-	}
-
-	public TorPublicKey parsePublicKey() {
-		final DocumentObject documentObject = parseObject();
-		return TorPublicKey.createFromPEMBuffer(documentObject.getContent());
-	}
-
-	
-	public byte[] parseNtorPublicKey() {
-		final byte[] key = parseBase64Data();
-		if(key.length != TorNTorKeyAgreement.CURVE25519_PUBKEY_LEN) {
-			throw new TorParsingException("NTor public key was not expected length after base64 decoding.  Length is "+ key.length);
-		}
-		return key;
-	}
-
-	public TorSignature parseSignature() {
-		final DocumentObject documentObject = parseObject();
-		TorSignature s = TorSignature.createFromPEMBuffer(documentObject.getContent());
-		return s;
-	}
-
-	public NameIntegerParameter parseParameter() {
-		final String item = getItem();
-		final int eq = item.indexOf('=');
-		if(eq == -1) {
-			throw new TorParsingException("Parameter not in expected form name=value");
-		}
-		final String name = item.substring(0, eq);
-		validateParameterName(name);
-		final int value = parseInteger(item.substring(eq + 1));
-		return new NameIntegerParameter(name, value);
-	}
-	
-	private void validateParameterName(String name) {
-		if(name.isEmpty()) {
-			throw new TorParsingException("Parameter name cannot be empty");
-		}
-		for(char c: name.toCharArray()) {
-			if(!(Character.isLetterOrDigit(c) || c == '_')) {
-				throw new TorParsingException("Parameter name can only contain letters.  Rejecting: "+ name);
-			}
-		}
-	}
-
-	public DocumentObject parseTypedObject(String type) {
-		final DocumentObject object = parseObject();
-		if(!type.equals(object.getKeyword()))
-			throw new TorParsingException("Unexpected object type.  Expecting: "+ type +", but got: "+ object.getKeyword());
-		return object;
-	}
-
-	public DocumentObject parseObject() {
-		final String line = readLine();
-		final String keyword = parseObjectHeader(line);
-		final DocumentObject object = new DocumentObject(keyword, line);
-		parseObjectBody(object, keyword);
-		return object;
-	}
-
-	private String parseObjectHeader(String headerLine) {
-		if(!(headerLine.startsWith(BEGIN_TAG) && headerLine.endsWith(TAG_DELIMITER)))
-			throw new TorParsingException("Did not find expected object start tag.");
-		return headerLine.substring(BEGIN_TAG.length() + 1, 
-				headerLine.length() - TAG_DELIMITER.length());
-	}
-
-	private void parseObjectBody(DocumentObject object, String keyword) {
-		final String endTag = END_TAG +" "+ keyword +TAG_DELIMITER;
-		while(true) {
-			final String line = readLine();
-			if(line == null) {
-				throw new TorParsingException("EOF reached before end of '"+ keyword +"' object.");
-			}
-			if(line.equals(endTag)) {
-				object.addFooterLine(line);
-				return;
-			}
-			parseObjectContent(object, line);
-		}
-	}
-
-	private void parseObjectContent(DocumentObject object, String content) {
-		// XXX verify legal base64 data
-		object.addContent(content);
-	}
-
-	public String getCurrentKeyword() {
-		return currentKeyword;
-	}
-
-	public void processDocument() {
-		if(callbackHandler == null) 
-			throw new TorException("DocumentFieldParser#processDocument() called with null callbackHandler");
-
-		while(true) {
-			final String line = readLine();
-			if(line == null) {
-				callbackHandler.endOfDocument();
-				return;
-			}
-			if(processLine(line))
-				callbackHandler.parseKeywordLine();
-		}
-	}
-
-	public void startSignedEntity() {
-		isProcessingSignedEntity = true;
-		signatureDigest = new TorMessageDigest();
-		signatureDigest256 = new TorMessageDigest(true);
-	}
-
-	public void endSignedEntity() {
-		isProcessingSignedEntity = false;
-	}
-
-	public void setSignatureIgnoreToken(String token) {
-		signatureIgnoreToken = token;
-	}
-
-	public TorMessageDigest getSignatureMessageDigest() {
-		return signatureDigest;
-	}
-
-	public TorMessageDigest getSignatureMessageDigest256() {
-		return signatureDigest256;
-	}
-
-	private void updateRawDocument(String line) {
-		rawDocumentBuffer.append(line);
-		rawDocumentBuffer.append('\n');
-	}
-
-	public String getRawDocument() {
-		return rawDocumentBuffer.toString();
-	}
-
-	public void resetRawDocument() {
-		rawDocumentBuffer = new StringBuilder();
-	}
-
-	public void resetRawDocument(String initialContent) {
-		rawDocumentBuffer = new StringBuilder();
-		rawDocumentBuffer.append(initialContent);
-	}
-
-	public boolean verifySignedEntity(TorPublicKey publicKey, TorSignature signature) {
-		isProcessingSignedEntity = false;
-		return publicKey.verifySignature(signature, signatureDigest);
-	}
-
-	private String readLine() {
-		final String line = nextLineFromInputBuffer();
-		if(line != null) {
-			updateCurrentSignature(line);
-			updateRawDocument(line);
-		}
-		return line;
-	}
-	
-	private String nextLineFromInputBuffer() {
-		if(!inputBuffer.hasRemaining()) {
-			return null;
-		}
-		final StringBuilder sb = new StringBuilder();
-		while(inputBuffer.hasRemaining()) {
-			char c = (char) (inputBuffer.get() & 0xFF);
-			if(c == '\n') {
-				return sb.toString();
-			} else if(c != '\r') {
-				sb.append(c);
-			}
-		}
-		return sb.toString();
-	}
-
-	private void updateCurrentSignature(String line) {
-		if(!isProcessingSignedEntity)
-			return;
-		if(signatureIgnoreToken != null && line.startsWith(signatureIgnoreToken))
-			return;
-		signatureDigest.update(line + "\n");
-		signatureDigest256.update(line + "\n");
-	}
-
-	private boolean processLine(String line) {
-		final List<String> lineItems = Arrays.asList(line.split(delimiter));
-		if(lineItems.size() == 0 || lineItems.get(0).length() == 0) {
-			// XXX warn
-			return false;
-		}
-
-		currentKeyword = lineItems.get(0);
-		currentItems = lineItems;
-		currentItemsPosition = 1;
-
-		if(recognizeOpt && currentKeyword.equals("opt") && lineItems.size() > 1) {
-			currentKeyword = lineItems.get(1);
-			currentItemsPosition = 2;
-		}
-
-		return true;
-	}
-
-	public void logDebug(String message) {
-		logger.fine(message);
-	}
-
-	public void logError(String message) {
-		logger.warning(message);
-	}
-
-	public void logWarn(String message) {
-		logger.info(message);
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/DocumentParserFactoryImpl.java b/orchid/src/com/subgraph/orchid/directory/DocumentParserFactoryImpl.java
deleted file mode 100644
index e837a85c5ff..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/DocumentParserFactoryImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.subgraph.orchid.directory;
-
-import java.nio.ByteBuffer;
-
-import com.subgraph.orchid.ConsensusDocument;
-import com.subgraph.orchid.KeyCertificate;
-import com.subgraph.orchid.RouterDescriptor;
-import com.subgraph.orchid.RouterMicrodescriptor;
-import com.subgraph.orchid.directory.certificate.KeyCertificateParser;
-import com.subgraph.orchid.directory.consensus.ConsensusDocumentParser;
-import com.subgraph.orchid.directory.parsing.DocumentFieldParser;
-import com.subgraph.orchid.directory.parsing.DocumentParser;
-import com.subgraph.orchid.directory.parsing.DocumentParserFactory;
-import com.subgraph.orchid.directory.router.RouterDescriptorParser;
-import com.subgraph.orchid.directory.router.RouterMicrodescriptorParser;
-
-public class DocumentParserFactoryImpl implements DocumentParserFactory {
-	
-	public DocumentParser<KeyCertificate> createKeyCertificateParser(ByteBuffer buffer) {
-		return new KeyCertificateParser(new DocumentFieldParserImpl(buffer));
-	}
-
-	public DocumentParser<RouterDescriptor> createRouterDescriptorParser(ByteBuffer buffer, boolean verifySignatures) {
-		return new RouterDescriptorParser(new DocumentFieldParserImpl(buffer), verifySignatures);
-	}
-
-	public DocumentParser<RouterMicrodescriptor> createRouterMicrodescriptorParser(ByteBuffer buffer) {
-		buffer.rewind();
-		DocumentFieldParser dfp = new DocumentFieldParserImpl(buffer);
-		return new RouterMicrodescriptorParser(dfp);
-	}
-
-	public DocumentParser<ConsensusDocument> createConsensusDocumentParser(ByteBuffer buffer) {
-		return new ConsensusDocumentParser(new DocumentFieldParserImpl(buffer));
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/GuardEntryImpl.java b/orchid/src/com/subgraph/orchid/directory/GuardEntryImpl.java
deleted file mode 100644
index 6694cbde577..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/GuardEntryImpl.java
+++ /dev/null
@@ -1,274 +0,0 @@
-package com.subgraph.orchid.directory;
-
-import java.util.Date;
-
-import com.subgraph.orchid.Directory;
-import com.subgraph.orchid.GuardEntry;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.data.HexDigest;
-
-public class GuardEntryImpl implements GuardEntry {
-	private final static String NL = System.getProperty("line.separator");
-	
-	private final Directory directory;
-	private final StateFile stateFile;
-	private final String nickname;
-	private final String identity;
-	private final Object lock = new Object();
-	private String version;
-	private Date createdTime;
-	
-	private boolean isAdded;
-	private Date unlistedSince;
-	private Date downSince;
-	private Date lastConnect;
-	
-	GuardEntryImpl(Directory directory, StateFile stateFile, String nickname, String identity) {
-		this.directory = directory;
-		this.stateFile = stateFile;
-		this.nickname = nickname;
-		this.identity = identity;
-	}
-
-	void setAddedFlag() {
-		isAdded = true;
-	}
-	
-	void setVersion(String version) {
-		this.version = version;
-	}
-	
-	void setCreatedTime(Date date) {
-		this.createdTime = date;
-	}
-
-	void setUnlistedSince(Date date) {
-		synchronized(lock) {
-			unlistedSince = date;
-		}
-	}
-	
-	void setDownSince(Date downSince, Date lastTried) {
-		synchronized (lock) {
-			this.downSince = downSince;
-			this.lastConnect = lastTried;
-		}
-	}
-
-	public boolean isAdded() {
-		return isAdded;
-	}
-
-	public void markAsDown() {
-		synchronized(lock) {
-			final Date now = new Date();
-			if(downSince == null) {
-				downSince = now;
-			} else {
-				lastConnect = now;
-			}
-		}
-		if(isAdded) {
-			stateFile.writeFile();
-		}
-	}
-	
-	public void clearDownSince() {
-		synchronized (lock) {
-			downSince = null;
-			lastConnect = null;
-		}
-		if(isAdded) {
-			stateFile.writeFile();
-		}
-	}
-
-	public void clearUnlistedSince() {
-		synchronized (lock) {
-			unlistedSince = null;
-		}
-		if(isAdded) {
-			stateFile.writeFile();
-		}
-	}
-
-	public String getNickname() {
-		return nickname;
-	}
-
-	public String getIdentity() {
-		return identity;
-	}
-
-	public String getVersion() {
-		return version;
-	}
-
-	public Date getCreatedTime() {
-		synchronized (lock) {
-			return dup(createdTime);
-		}
-	}
-
-	public Date getDownSince() {
-		synchronized (lock) {
-			return dup(downSince);	
-		}
-	}
-
-	public Date getLastConnectAttempt() {
-		synchronized (lock) {
-			return dup(lastConnect);
-		}
-	}
-
-	public Date getUnlistedSince() {
-		synchronized (lock) {
-			return dup(unlistedSince);
-		}
-	}
-	
-	private Date dup(Date date) {
-		if(date == null) {
-			return null;
-		} else {
-			return new Date(date.getTime());
-		}
-	}
-
-	public String writeToString() {
-		final StringBuilder sb = new StringBuilder();
-		synchronized (lock) {
-			appendEntryGuardLine(sb);
-			appendEntryGuardAddedBy(sb);
-			if(downSince != null) {
-				appendEntryGuardDownSince(sb);
-			}
-			if(unlistedSince != null) {
-				appendEntryGuardUnlistedSince(sb);
-			}
-		}
-		return sb.toString();
-	}
-	
-	private void appendEntryGuardLine(StringBuilder sb) {
-		sb.append(StateFile.KEYWORD_ENTRY_GUARD);
-		sb.append(" ");
-		sb.append(nickname);
-		sb.append(" ");
-		sb.append(identity);
-		sb.append(NL);
-	}
-	
-	
-	private void appendEntryGuardAddedBy(StringBuilder sb) {
-		sb.append(StateFile.KEYWORD_ENTRY_GUARD_ADDED_BY);
-		sb.append(" ");
-		sb.append(identity);
-		sb.append(" ");
-		sb.append(version);
-		sb.append(" ");
-		sb.append(formatDate(createdTime));
-		sb.append(NL);
-	}
-	
-	private void appendEntryGuardDownSince(StringBuilder sb) {
-		if(downSince == null) {
-			return;
-		}
-		sb.append(StateFile.KEYWORD_ENTRY_GUARD_DOWN_SINCE);
-		sb.append(" ");
-		sb.append(formatDate(downSince));
-		if(lastConnect != null) {
-			sb.append(" ");
-			sb.append(formatDate(lastConnect));
-		}
-		sb.append(NL);
-	}
-	
-	private void appendEntryGuardUnlistedSince(StringBuilder sb) {
-		if(unlistedSince == null) {
-			return;
-		}
-		sb.append(StateFile.KEYWORD_ENTRY_GUARD_UNLISTED_SINCE);
-		sb.append(" ");
-		sb.append(formatDate(unlistedSince));
-		sb.append(NL);
-	}
-
-	private String formatDate(Date date) {
-		return stateFile.formatDate(date);
-	}
-
-	public Router getRouterForEntry() {
-		final HexDigest id = HexDigest.createFromString(identity);
-		return directory.getRouterByIdentity(id);
-	}
-
-	public boolean testCurrentlyUsable() {
-		final Router router = getRouterForEntry();
-		boolean isUsable = router != null && router.isValid() && router.isPossibleGuard() && router.isRunning();
-		if(isUsable) {
-			markUsable();
-			return true;
-		} else {
-			markUnusable();
-			return false;
-		}
-	}
-	
-	private void markUsable() {
-		synchronized (lock) {
-			if(unlistedSince != null) {
-				unlistedSince = null;
-				if(isAdded) {
-					stateFile.writeFile();
-				}
-			}
-		}
-	}
-	
-	private synchronized void markUnusable() {
-		synchronized (lock) {
-			if(unlistedSince == null) {
-				unlistedSince = new Date();
-				if(isAdded) {
-					stateFile.writeFile();
-				}
-			}
-		}
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result
-				+ ((identity == null) ? 0 : identity.hashCode());
-		result = prime * result
-				+ ((nickname == null) ? 0 : nickname.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		GuardEntryImpl other = (GuardEntryImpl) obj;
-		if (identity == null) {
-			if (other.identity != null)
-				return false;
-		} else if (!identity.equals(other.identity))
-			return false;
-		if (nickname == null) {
-			if (other.nickname != null)
-				return false;
-		} else if (!nickname.equals(other.nickname))
-			return false;
-		return true;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/RouterImpl.java b/orchid/src/com/subgraph/orchid/directory/RouterImpl.java
deleted file mode 100644
index 38991c09314..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/RouterImpl.java
+++ /dev/null
@@ -1,260 +0,0 @@
-package com.subgraph.orchid.directory;
-
-import java.util.Collections;
-import java.util.Set;
-
-import com.subgraph.orchid.Descriptor;
-import com.subgraph.orchid.Directory;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.RouterDescriptor;
-import com.subgraph.orchid.RouterStatus;
-import com.subgraph.orchid.TorException;
-import com.subgraph.orchid.crypto.TorPublicKey;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.geoip.CountryCodeService;
-
-public class RouterImpl implements Router {
-	static RouterImpl createFromRouterStatus(Directory directory, RouterStatus status) {
-		return new RouterImpl(directory, status);
-	}
-
-	private final Directory directory;
-	private final HexDigest identityHash;
-	protected RouterStatus status;
-	private Descriptor descriptor;
-	
-	private volatile String cachedCountryCode;
-	
-	protected RouterImpl(Directory directory, RouterStatus status) {
-		this.directory = directory;
-		this.identityHash = status.getIdentity();
-		this.status = status;
-		refreshDescriptor();
-	}
-
-	void updateStatus(RouterStatus status) {
-		if(!identityHash.equals(status.getIdentity()))
-			throw new TorException("Identity hash does not match status update");
-		this.status = status;
-		this.cachedCountryCode = null;
-		this.descriptor = null;
-		refreshDescriptor();
-	}
-
-	public boolean isDescriptorDownloadable() {
-		refreshDescriptor();
-		if(descriptor != null) {
-			return false;
-		}
-	
-		final long now = System.currentTimeMillis();
-		final long diff = now - status.getPublicationTime().getDate().getTime();
-		return diff > (1000 * 60 * 10);	
-	}
-	
-	public String getVersion() {
-		return status.getVersion();
-	}
-
-	public HexDigest getDescriptorDigest() {
-		return status.getDescriptorDigest();
-	}
-
-	public IPv4Address getAddress() {
-		return status.getAddress();
-	}
-
-	public Descriptor getCurrentDescriptor() {
-		refreshDescriptor();
-		return descriptor;
-	}
-
-	private synchronized void refreshDescriptor() {
-		if(descriptor != null || directory == null) {
-			return;
-		}
-		if(status.getMicrodescriptorDigest() != null) {
-			descriptor = directory.getMicrodescriptorFromCache(status.getMicrodescriptorDigest());
-		} else if(status.getDescriptorDigest() != null){
-			descriptor = directory.getBasicDescriptorFromCache(status.getDescriptorDigest());
-		}
-	}
-
-	public HexDigest getMicrodescriptorDigest() {
-		return status.getMicrodescriptorDigest();
-	}
-
-	public boolean hasFlag(String flag) {
-		return status.hasFlag(flag);
-	}
-
-	public boolean isHibernating() {
-		final RouterDescriptor rd = downcastDescriptor();
-		if(rd == null) {
-			return false;
-		} else {
-			return rd.isHibernating();
-		}
-	}
-
-	public boolean isRunning() {
-		return hasFlag("Running");
-	}
-
-	public boolean isValid() {
-		return hasFlag("Valid");
-	}
-
-	public boolean isBadExit() {
-		return hasFlag("BadExit");
-	}
-
-	public boolean isPossibleGuard() {
-		return hasFlag("Guard");
-	}
-
-	public boolean isExit() {
-		return hasFlag("Exit");
-	}
-
-	public boolean isFast() {
-		return hasFlag("Fast");
-	}
-
-	public boolean isStable() {
-		return hasFlag("Stable");
-	}
-	
-	public boolean isHSDirectory() {
-		return hasFlag("HSDir");
-	}
-
-	public int getDirectoryPort() {
-		return status.getDirectoryPort();
-	}
-
-	public HexDigest getIdentityHash() {
-		return identityHash;
-	}
-	
-	public TorPublicKey getIdentityKey() {
-		final RouterDescriptor rd = downcastDescriptor();
-		if(rd != null) {
-			return rd.getIdentityKey();
-		} else {
-			return null;
-		}
-	}
-
-	public String getNickname() {
-		return status.getNickname();
-	}
-
-	public int getOnionPort() {
-		return status.getRouterPort();
-	}
-
-	public TorPublicKey getOnionKey() {
-		refreshDescriptor();
-		if(descriptor != null) {
-			return descriptor.getOnionKey();
-		} else {
-			return null;
-		}
-	}
-
-	public byte[] getNTorOnionKey() {
-		refreshDescriptor();
-		if(descriptor != null) {
-			return descriptor.getNTorOnionKey();
-		} else {
-			return null;
-		}
-	}
-
-	public boolean hasBandwidth() {
-		return status.hasBandwidth();
-	}
-
-	public int getEstimatedBandwidth() {
-		return status.getEstimatedBandwidth();
-	}
-
-	public int getMeasuredBandwidth() {
-		return status.getMeasuredBandwidth();
-	}
-
-	public Set<String> getFamilyMembers() {
-		refreshDescriptor();
-		if(descriptor != null) {
-			return descriptor.getFamilyMembers();
-		} else {
-			return Collections.emptySet();
-		}
-	}
-	
-	public int getAverageBandwidth() {
-		final RouterDescriptor rd = downcastDescriptor();
-		if(rd == null) {
-			return 0;
-		} else {
-			return rd.getAverageBandwidth();
-		}
-	}
-
-	public int getBurstBandwidth() {
-		final RouterDescriptor rd = downcastDescriptor();
-		if(rd == null) {
-			return 0;
-		} else {
-			return rd.getBurstBandwidth();
-		}
-	}
-
-	public int getObservedBandwidth() {
-		final RouterDescriptor rd = downcastDescriptor();
-		if(rd == null) {
-			return 0;
-		} else {
-			return rd.getObservedBandwidth();
-		}
-	}
-
-	public boolean exitPolicyAccepts(IPv4Address address, int port) {
-		refreshDescriptor();
-		if(descriptor == null) {
-			return false;
-		} else if(address == null) {
-			return descriptor.exitPolicyAccepts(port);
-		} else {
-			return descriptor.exitPolicyAccepts(address, port);
-		}
-	}
-
-	public boolean exitPolicyAccepts(int port) {
-		return exitPolicyAccepts(null, port);
-	}
-	
-	public String toString() {
-		return "Router["+ getNickname() +" ("+getAddress() +":"+ getOnionPort() +")]";
-	}
-
-	public String getCountryCode() {
-		String cc = cachedCountryCode;
-		if(cc == null) {
-			cc = CountryCodeService.getInstance().getCountryCodeForAddress(getAddress());
-			cachedCountryCode = cc;
-		}
-		return cc;
-	}
-	
-	private RouterDescriptor downcastDescriptor() {
-		refreshDescriptor();
-		if(descriptor instanceof RouterDescriptor) {
-			return (RouterDescriptor) descriptor;
-		} else {
-			return null;
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/StateFile.java b/orchid/src/com/subgraph/orchid/directory/StateFile.java
deleted file mode 100644
index 8020547e1d4..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/StateFile.java
+++ /dev/null
@@ -1,296 +0,0 @@
-package com.subgraph.orchid.directory;
-
-import java.nio.ByteBuffer;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.Directory;
-import com.subgraph.orchid.DirectoryStore;
-import com.subgraph.orchid.GuardEntry;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.Tor;
-import com.subgraph.orchid.DirectoryStore.CacheFile;
-import com.subgraph.orchid.crypto.TorRandom;
-
-public class StateFile {
-	private final static Logger logger = Logger.getLogger(StateFile.class.getName());
-	
-	private final static int DATE_LENGTH = 19;
-	
-	final static String KEYWORD_ENTRY_GUARD = "EntryGuard";
-	final static String KEYWORD_ENTRY_GUARD_ADDED_BY = "EntryGuardAddedBy";
-	final static String KEYWORD_ENTRY_GUARD_DOWN_SINCE = "EntryGuardDownSince";
-	final static String KEYWORD_ENTRY_GUARD_UNLISTED_SINCE = "EntryGuardUnlistedSince";
-	
-	private final List<GuardEntryImpl> guardEntries = new ArrayList<GuardEntryImpl>();
-	private final TorRandom random = new TorRandom();
-	private final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-	
-	private class Line {
-		final String line;
-		int offset;
-		
-		Line(String line) {
-			this.line = line;
-			offset = 0;
-		}
-		
-		private boolean hasChars() {
-			return offset < line.length();
-		}
-		
-		private char getChar() {
-			return line.charAt(offset);
-		}
-
-		private void incrementOffset(int n) {
-			offset += n;
-			if(offset > line.length()) {
-				offset = line.length();
-			}
-		}
-	
-		private void skipWhitespace() {
-			while(hasChars() && Character.isWhitespace(getChar())) {
-				offset += 1;
-			}
-		}
-		
-		String nextToken() {
-			skipWhitespace();
-			if(!hasChars()) {
-				return null;
-			}
-		
-			final StringBuilder token = new StringBuilder();
-			while(hasChars() && !Character.isWhitespace(getChar())) {
-				token.append(getChar());
-				offset += 1;
-			}
-			return token.toString();
-		}
-		
-		Date parseDate() {
-			skipWhitespace();
-			if(!hasChars()) {
-				return null;
-			}
-			try {
-				final Date date = dateFormat.parse(line.substring(offset));
-				incrementOffset(DATE_LENGTH);
-				return date;
-			} catch (ParseException e) {
-				return null;
-			}
-		}
-	}
-
-	String formatDate(Date date) {
-		return dateFormat.format(date);
-	}
-
-	private final DirectoryStore directoryStore;
-	private final Directory directory;
-	
-	StateFile(DirectoryStore store, Directory directory) {
-		this.directoryStore = store;
-		this.directory = directory;
-	}
-
-	public GuardEntry createGuardEntryFor(Router router) {
-		final GuardEntryImpl entry = new GuardEntryImpl(directory, this, router.getNickname(), router.getIdentityHash().toString());
-		final String version = Tor.getImplementation() + "-" + Tor.getVersion();
-		entry.setVersion(version);
-		
-		/* 
-		 * "Choose expiry time smudged over the last month."
-		 * 
-		 * See add_an_entry_guard() in entrynodes.c 
-		 */
-		final long createTime = (new Date()).getTime() - (random.nextInt(3600 * 24 * 30) * 1000L);
-		entry.setCreatedTime(new Date(createTime));
-		return entry;
-	}
-
-	public List<GuardEntry> getGuardEntries() {
-		synchronized (guardEntries) {
-			return new ArrayList<GuardEntry>(guardEntries);
-		}
-	}
-
-	public void removeGuardEntry(GuardEntry entry) {
-		synchronized (guardEntries) {
-			guardEntries.remove(entry);
-			writeFile();
-		}
-	}
-
-	public void addGuardEntry(GuardEntry entry) {
-		addGuardEntry(entry, true);
-	}
-
-	private void addGuardEntry(GuardEntry entry, boolean writeFile) {
-		synchronized(guardEntries) {
-			if(guardEntries.contains(entry)) {
-				return;
-			}
-			final GuardEntryImpl impl = (GuardEntryImpl) entry;
-			guardEntries.add(impl);
-			synchronized (impl) {
-				impl.setAddedFlag();
-				if(writeFile) {
-					writeFile();
-				}
-			}
-		}
-	}
-
-	void writeFile() {
-		directoryStore.writeData(CacheFile.STATE, getFileContents());
-	}
-	
-	ByteBuffer getFileContents() {
-		final StringBuilder sb = new StringBuilder();
-		synchronized (guardEntries) {
-			for(GuardEntryImpl entry: guardEntries) {
-				sb.append(entry.writeToString());
-			}
-		}
-		return ByteBuffer.wrap(sb.toString().getBytes(Tor.getDefaultCharset()));
-	}
-
-	void parseBuffer(ByteBuffer buffer) {
-		synchronized (guardEntries) {
-			guardEntries.clear();
-			loadGuardEntries(buffer);
-		}
-	}
-
-	private void loadGuardEntries(ByteBuffer buffer) {
-		GuardEntryImpl currentEntry = null;
-		while(true) {
-			Line line = readLine(buffer);
-			if(line == null) {
-				addEntryIfValid(currentEntry);
-				return;
-			}
-			currentEntry = processLine(line, currentEntry);
-		}
-	}
-
-	private GuardEntryImpl processLine(Line line, GuardEntryImpl current) {
-		final String keyword = line.nextToken();
-		if(keyword == null) {
-			return current;
-		} else if(keyword.equals(KEYWORD_ENTRY_GUARD)) {
-			addEntryIfValid(current);
-			GuardEntryImpl newEntry = processEntryGuardLine(line);
-			if(newEntry == null) {
-				return current;
-			} else {
-				return newEntry;
-			}
-		} else if(keyword.equals(KEYWORD_ENTRY_GUARD_ADDED_BY)) {
-			processEntryGuardAddedBy(line, current);
-			return current;
-		} else if(keyword.equals(KEYWORD_ENTRY_GUARD_DOWN_SINCE)) {
-			processEntryGuardDownSince(line, current);
-			return current;
-		} else if(keyword.equals(KEYWORD_ENTRY_GUARD_UNLISTED_SINCE)) {
-			processEntryGuardUnlistedSince(line, current);
-			return current;
-		} else {
-			return current;
-		}
-	}
-	
-	private GuardEntryImpl processEntryGuardLine(Line line) {
-		final String name = line.nextToken();
-		final String identity = line.nextToken();
-		if(name == null || name.isEmpty() || identity == null || identity.isEmpty()) {
-			logger.warning("Failed to parse EntryGuard line: "+ line.line);
-			return null;
-		}
-		return new GuardEntryImpl(directory, this, name, identity);
-	}
-	
-	private void processEntryGuardAddedBy(Line line, GuardEntryImpl current) {
-		if(current == null) {
-			logger.warning("EntryGuardAddedBy line seen before EntryGuard in state file");
-			return;
-		}
-		final String identity = line.nextToken();
-		final String version = line.nextToken();
-		final Date created = line.parseDate();
-		if(identity == null || identity.isEmpty() || version == null || version.isEmpty() || created == null) {
-			logger.warning("Missing EntryGuardAddedBy field in state file");
-			return;
-		}
-		current.setVersion(version);
-		current.setCreatedTime(created);
-	}
-	
-	private void processEntryGuardDownSince(Line line, GuardEntryImpl current) {
-		if(current == null) {
-			logger.warning("EntryGuardDownSince line seen before EntryGuard in state file");
-			return;
-		}
-		
-		final Date downSince = line.parseDate();
-		final Date lastTried = line.parseDate();
-		if(downSince == null) {
-			logger.warning("Failed to parse date field in EntryGuardDownSince line in state file");
-			return;
-		}
-		current.setDownSince(downSince, lastTried);
-	}
-	
-	private void processEntryGuardUnlistedSince(Line line, GuardEntryImpl current) {
-		if(current == null) {
-			logger.warning("EntryGuardUnlistedSince line seen before EntryGuard in state file");
-			return;
-		}
-		final Date unlistedSince = line.parseDate();
-		if(unlistedSince == null) {
-			logger.warning("Failed to parse date field in EntryGuardUnlistedSince line in state file");
-			return;
-		}
-		current.setUnlistedSince(unlistedSince);
-	}
-
-	private void addEntryIfValid(GuardEntryImpl entry) {
-		if(isValidEntry(entry)) {
-			addGuardEntry(entry, false);
-		}
-	}
-
-	private boolean isValidEntry(GuardEntryImpl entry) {
-		return entry != null &&
-				entry.getNickname() != null && 
-				entry.getIdentity() != null && 
-				entry.getVersion() != null && 
-				entry.getCreatedTime() != null;
-	}
-
-	private Line readLine(ByteBuffer buffer) {
-		if(!buffer.hasRemaining()) {
-			return null;
-		}
-		
-		final StringBuilder sb = new StringBuilder();
-		while(buffer.hasRemaining()) {
-			char c = (char) (buffer.get() & 0xFF);
-			if(c == '\n') {
-				return new Line(sb.toString());
-			} else if(c != '\r') {
-				sb.append(c);
-			}
-		}
-		return new Line(sb.toString());
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/TrustedAuthorities.java b/orchid/src/com/subgraph/orchid/directory/TrustedAuthorities.java
deleted file mode 100644
index 95c13fba8b0..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/TrustedAuthorities.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.subgraph.orchid.directory;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.subgraph.orchid.DirectoryServer;
-import com.subgraph.orchid.Tor;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.directory.parsing.DocumentFieldParser;
-import com.subgraph.orchid.directory.parsing.DocumentParsingHandler;
-
-/*
- * This class contains the hardcoded 'bootstrap' directory authority
- * server information. 
- */
-public class TrustedAuthorities {
-	
-	private final static String[] dirServers = {
-		"authority moria1 orport=9101 no-v2 v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
-	    "authority tor26 v1 orport=443 v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
-	    "authority dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
-	    "authority Tonga orport=443 bridge no-v2 82.94.251.203:80 4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
-	    "authority longclaw orport=9090 no-v2 v3ident=23D15D965BC35114467363C165C4F724B64B4F66 202.85.227.202:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
-	    "authority dannenberg orport=443 no-v2 v3ident=585769C78764D58426B8B52B6651A5A71137189A 193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
-	    "authority urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C 208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",
-	    "authority maatuska orport=80 no-v2 v3ident=49015F787433103580E3B66A1707A00E60F2D15B 171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
-	    "authority Faravahar orport=443 no-v2 v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
-	    "authority gabelmoo orport=443 no-v2 v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
-	};
-
-	private final List<DirectoryServer> directoryServers = new ArrayList<DirectoryServer>();
-	private final int v3ServerCount;
-	
-	private final static TrustedAuthorities _instance = new TrustedAuthorities();
-	
-	public static TrustedAuthorities getInstance() {
-		return _instance;
-	}
-	
-    private TrustedAuthorities() {
-    	initialize();
-    	v3ServerCount = countV3Servers();
-    }
-    
-    private int countV3Servers() {
-    	int n = 0;
-    	for(DirectoryServer ds: directoryServers) {
-    		if(ds.getV3Identity() != null) {
-    			n += 1;
-    		}
-    	}
-    	return n;
-    }
-    
-	void initialize() {
-		final StringBuilder builder = new StringBuilder();
-		for(String entry: dirServers) {
-			builder.append(entry);
-			builder.append('\n');
-		}
-		final ByteBuffer buffer = ByteBuffer.wrap(builder.toString().getBytes(Tor.getDefaultCharset()));
-		final DocumentFieldParser parser = new DocumentFieldParserImpl(buffer);
-		
-		parser.setHandler(new DocumentParsingHandler() {
-			public void endOfDocument() {}
-			public void parseKeywordLine() { processKeywordLine(parser);}
-		});
-		parser.processDocument();
-	}
-	
-	private void processKeywordLine(DocumentFieldParser fieldParser) {
-		final DirectoryAuthorityStatus status = new DirectoryAuthorityStatus();
-		status.setNickname(fieldParser.parseNickname());
-		while(fieldParser.argumentsRemaining() > 0) 
-			processArgument(fieldParser, status);
-	}
-	
-	private void processArgument(DocumentFieldParser fieldParser, DirectoryAuthorityStatus status) {
-		final String item = fieldParser.parseString();
-		if(Character.isDigit(item.charAt(0))) {
-			parseAddressPort(fieldParser, item, status);
-			status.setIdentity(fieldParser.parseFingerprint());
-			DirectoryServerImpl server = new DirectoryServerImpl(status);
-			if(status.getV3Ident() != null) {
-				server.setV3Ident(status.getV3Ident());
-			}
-			fieldParser.logDebug("Adding trusted authority: " + server);
-			directoryServers.add(server);
-			return;
-		} else {
-			parseFlag(fieldParser, item, status);
-		}
-	}
-	
-	private void parseAddressPort(DocumentFieldParser parser, String item, DirectoryAuthorityStatus status) {
-		final String[] args = item.split(":");
-		status.setAddress(IPv4Address.createFromString(args[0]));
-		status.setDirectoryPort(parser.parsePort(args[1]));	
-	}
-	
-	private void parseFlag(DocumentFieldParser parser, String flag, DirectoryAuthorityStatus status) {
-		if(flag.equals("v1")) {
-			status.setV1Authority();
-			status.setHiddenServiceAuthority();
-		} else if(flag.equals("hs")) {
-			status.setHiddenServiceAuthority();
-		} else if(flag.equals("no-hs")) {
-			status.unsetHiddenServiceAuthority();
-		} else if(flag.equals("bridge")) {
-			status.setBridgeAuthority();
-		} else if(flag.equals("no-v2")) {
-			status.unsetV2Authority();
-		} else if(flag.startsWith("orport=")) {
-			status.setRouterPort( parser.parsePort(flag.substring(7)));
-		} else if(flag.startsWith("v3ident=")) {
-			status.setV3Ident(HexDigest.createFromString(flag.substring(8)));
-		}
-	}
-	
-	public int getV3AuthorityServerCount() {
-		return v3ServerCount;
-	}
-
-	public List<DirectoryServer> getAuthorityServers() {
-		return directoryServers;
-	}
-
-	public DirectoryServer getAuthorityServerByIdentity(HexDigest identity) {
-		for(DirectoryServer ds: directoryServers) {
-			if(identity.equals(ds.getV3Identity())) {
-				return ds;
-			}
-		}
-		return null;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/certificate/KeyCertificateImpl.java b/orchid/src/com/subgraph/orchid/directory/certificate/KeyCertificateImpl.java
deleted file mode 100644
index cf3071bdfac..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/certificate/KeyCertificateImpl.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.subgraph.orchid.directory.certificate;
-
-import java.nio.ByteBuffer;
-
-import com.subgraph.orchid.KeyCertificate;
-import com.subgraph.orchid.Tor;
-import com.subgraph.orchid.crypto.TorPublicKey;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.data.Timestamp;
-
-public class KeyCertificateImpl implements KeyCertificate {
-	
-	private IPv4Address directoryAddress;
-	private int directoryPort;
-	private HexDigest fingerprint;
-	private TorPublicKey identityKey;
-	private Timestamp keyPublished;
-	private Timestamp keyExpires;
-	private TorPublicKey signingKey;
-	private String rawDocumentData;
-	
-	private boolean hasValidSignature = false;
-
-	void setDirectoryPort(int port) { this.directoryPort = port; }
-	void setDirectoryAddress(IPv4Address address) { this.directoryAddress = address; }
-	void setAuthorityFingerprint(HexDigest fingerprint) { this.fingerprint = fingerprint;}
-	void setAuthorityIdentityKey(TorPublicKey key) { this.identityKey = key; }
-	void setAuthoritySigningKey(TorPublicKey key) { this.signingKey = key; }
-	void setKeyPublishedTime(Timestamp time) { this.keyPublished = time; }
-	void setKeyExpiryTime(Timestamp time) { this.keyExpires = time; }
-	void setValidSignature() { hasValidSignature = true;}
-	void setRawDocumentData(String rawData) { rawDocumentData = rawData; }
-	
-	public boolean isValidDocument() {
-		return hasValidSignature && (fingerprint != null) && (identityKey != null) &&
-			(keyPublished != null) && (keyExpires != null) && (signingKey != null);
-	}
-	
-	public IPv4Address getDirectoryAddress() {
-		return directoryAddress;
-	}
-	
-	public int getDirectoryPort() {
-		return directoryPort;
-	}
-	
-	public HexDigest getAuthorityFingerprint() {
-		return fingerprint;
-	}
-	
-	public TorPublicKey getAuthorityIdentityKey() {
-		return identityKey;
-	}
-	
-	public TorPublicKey getAuthoritySigningKey() {
-		return signingKey;
-	}
-	
-	public Timestamp getKeyPublishedTime() {
-		return keyPublished;
-	}
-	
-	public Timestamp getKeyExpiryTime() {
-		return keyExpires;
-	}
-	
-	public boolean isExpired() {
-		if(keyExpires != null) {
-			return keyExpires.hasPassed();
-		} else {
-			return false;
-		}
-	}
-	
-	public String getRawDocumentData() {
-		return rawDocumentData;
-	}
-	
-	public ByteBuffer getRawDocumentBytes() {
-		if(getRawDocumentData() == null) {
-			return ByteBuffer.allocate(0);
-		} else {
-			return ByteBuffer.wrap(getRawDocumentData().getBytes(Tor.getDefaultCharset()));
-		}
-	}
-	
-	public String toString() {
-		return "(Certificate: address="+ directoryAddress +":"+ directoryPort 
-			+" fingerprint="+ fingerprint +" published="+ keyPublished +" expires="+ keyExpires +")"+
-			"\nident="+ identityKey +" sign="+ signingKey;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/certificate/KeyCertificateKeyword.java b/orchid/src/com/subgraph/orchid/directory/certificate/KeyCertificateKeyword.java
deleted file mode 100644
index 89737668bc7..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/certificate/KeyCertificateKeyword.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.subgraph.orchid.directory.certificate;
-
-public enum KeyCertificateKeyword {
-	/*
-	 * See dir-spec.txt
-	 * Section 3.1 Key certificates
-	 */
-	DIR_KEY_CERTIFICATE_VERSION("dir-key-certificate-version", 1),
-	DIR_ADDRESS("dir-address", 1),
-	FINGERPRINT("fingerprint", 1),
-	DIR_IDENTITY_KEY("dir-identity-key", 0),
-	DIR_KEY_PUBLISHED("dir-key-published", 2),
-	DIR_KEY_EXPIRES("dir-key-expires", 2),
-	DIR_SIGNING_KEY("dir-signing-key", 0),
-	DIR_KEY_CROSSCERT("dir-key-crosscert", 0),
-	DIR_KEY_CERTIFICATION("dir-key-certification", 0),
-	UNKNOWN_KEYWORD("KEYWORD NOT FOUND", 0);
-	
-	private final String keyword;
-	private final int argumentCount;
-	
-	KeyCertificateKeyword(String keyword, int argumentCount) {
-		this.keyword = keyword;
-		this.argumentCount = argumentCount;
-	}
-	
-	String getKeyword() {
-		return keyword;
-	}
-	
-	int getArgumentCount() {
-		return argumentCount;
-	}
-	
-	static KeyCertificateKeyword findKeyword(String keyword) {
-		for(KeyCertificateKeyword k: values()) 
-			if(k.getKeyword().equals(keyword))
-				return k;
-		return UNKNOWN_KEYWORD;
-	}
-	
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/certificate/KeyCertificateParser.java b/orchid/src/com/subgraph/orchid/directory/certificate/KeyCertificateParser.java
deleted file mode 100644
index 7b69f38116a..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/certificate/KeyCertificateParser.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.subgraph.orchid.directory.certificate;
-
-import com.subgraph.orchid.KeyCertificate;
-import com.subgraph.orchid.TorParsingException;
-import com.subgraph.orchid.crypto.TorPublicKey;
-import com.subgraph.orchid.crypto.TorSignature;
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.directory.parsing.BasicDocumentParsingResult;
-import com.subgraph.orchid.directory.parsing.DocumentFieldParser;
-import com.subgraph.orchid.directory.parsing.DocumentParser;
-import com.subgraph.orchid.directory.parsing.DocumentParsingHandler;
-import com.subgraph.orchid.directory.parsing.DocumentParsingResult;
-import com.subgraph.orchid.directory.parsing.DocumentParsingResultHandler;
-
-public class KeyCertificateParser implements DocumentParser<KeyCertificate> {
-	private final static int CURRENT_CERTIFICATE_VERSION = 3;
-	private final DocumentFieldParser fieldParser;
-	private KeyCertificateImpl currentCertificate;
-	private DocumentParsingResultHandler<KeyCertificate> resultHandler;
-	
-	public KeyCertificateParser(DocumentFieldParser fieldParser) {
-		this.fieldParser = fieldParser;
-		this.fieldParser.setHandler(createParsingHandler());
-	}
-	
-	private DocumentParsingHandler createParsingHandler() {
-		return new DocumentParsingHandler() {
-			public void parseKeywordLine() {
-				processKeywordLine();
-			}
-			
-			public void endOfDocument() {
-			}
-		};
-	}
-	
-	private void processKeywordLine() {
-		final KeyCertificateKeyword keyword = KeyCertificateKeyword.findKeyword(fieldParser.getCurrentKeyword());
-		/*
-		 * dirspec.txt (1.2)
-		 * When interpreting a Document, software MUST ignore any KeywordLine that
-		 * starts with a keyword it doesn't recognize;
-		 */
-		if(!keyword.equals(KeyCertificateKeyword.UNKNOWN_KEYWORD))
-			processKeyword(keyword);
-	}
-	
-	private void startNewCertificate() {
-		fieldParser.resetRawDocument();
-		fieldParser.startSignedEntity();
-		currentCertificate = new KeyCertificateImpl();
-	}
-	
-	public boolean parse(DocumentParsingResultHandler<KeyCertificate> resultHandler) {
-		this.resultHandler = resultHandler;
-		startNewCertificate();
-		try {
-			fieldParser.processDocument();
-			return true;
-		} catch(TorParsingException e) {
-			resultHandler.parsingError(e.getMessage());
-			return false;
-		}
-	}
-	
-	public DocumentParsingResult<KeyCertificate> parse() {
-		final BasicDocumentParsingResult<KeyCertificate> result = new BasicDocumentParsingResult<KeyCertificate>();
-		parse(result);
-		return result;
-	}
-
-	private void processKeyword(KeyCertificateKeyword keyword) {
-		switch(keyword) {
-		case DIR_KEY_CERTIFICATE_VERSION:
-			processCertificateVersion();
-			break;
-		case DIR_ADDRESS:
-			processDirectoryAddress();
-			break;
-		case FINGERPRINT:
-			currentCertificate.setAuthorityFingerprint(fieldParser.parseHexDigest());
-			break;
-		case DIR_IDENTITY_KEY:
-			currentCertificate.setAuthorityIdentityKey(fieldParser.parsePublicKey());
-			break;
-		case DIR_SIGNING_KEY:
-			currentCertificate.setAuthoritySigningKey(fieldParser.parsePublicKey());
-			break;
-		case DIR_KEY_PUBLISHED:
-			currentCertificate.setKeyPublishedTime(fieldParser.parseTimestamp());
-			break;
-		case DIR_KEY_EXPIRES:
-			currentCertificate.setKeyExpiryTime(fieldParser.parseTimestamp());
-			break;
-		case DIR_KEY_CROSSCERT:
-			verifyCrossSignature(fieldParser.parseSignature());
-			break;
-		case DIR_KEY_CERTIFICATION:
-			processCertificateSignature();
-			break;
-		case UNKNOWN_KEYWORD:
-			break;
-		}
-	}
-	
-	private void processCertificateVersion() {
-		final int version = fieldParser.parseInteger();
-		if(version != CURRENT_CERTIFICATE_VERSION)
-			throw new TorParsingException("Unexpected certificate version: " + version);
-	}
-	
-	private void processDirectoryAddress() {
-		final String addrport = fieldParser.parseString();
-		final String[] args = addrport.split(":");
-		if(args.length != 2)
-			throw new TorParsingException("Address/Port string incorrectly formed: " + addrport);
-		currentCertificate.setDirectoryAddress(IPv4Address.createFromString(args[0]));
-		currentCertificate.setDirectoryPort(fieldParser.parsePort(args[1]));
-	}
-	
-	private void verifyCrossSignature(TorSignature crossSignature) {
-		TorPublicKey identityKey = currentCertificate.getAuthorityIdentityKey();
-		TorPublicKey signingKey = currentCertificate.getAuthoritySigningKey();
-		if(!signingKey.verifySignature(crossSignature, identityKey.getFingerprint())) 
-			throw new TorParsingException("Cross signature on certificate failed.");
-	}
-
-	private boolean verifyCurrentCertificate(TorSignature signature) {
-		if(!fieldParser.verifySignedEntity(currentCertificate.getAuthorityIdentityKey(), signature)) {
-			resultHandler.documentInvalid(currentCertificate, "Signature failed");
-			fieldParser.logWarn("Signature failed for certificate with fingerprint: "+ currentCertificate.getAuthorityFingerprint());
-			return false;
-		}
-		currentCertificate.setValidSignature();
-		final boolean isValid = currentCertificate.isValidDocument();
-		if(!isValid) {
-			resultHandler.documentInvalid(currentCertificate, "Certificate data is invalid");
-			fieldParser.logWarn("Certificate data is invalid for certificate with fingerprint: "+ currentCertificate.getAuthorityFingerprint());
-		}
-		return isValid;
-	}
-	
-	private void processCertificateSignature() {
-		fieldParser.endSignedEntity();
-		if(verifyCurrentCertificate(fieldParser.parseSignature())) {
-			currentCertificate.setRawDocumentData(fieldParser.getRawDocument());
-			resultHandler.documentParsed(currentCertificate);
-		}
-		startNewCertificate();
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/consensus/AuthoritySectionParser.java b/orchid/src/com/subgraph/orchid/directory/consensus/AuthoritySectionParser.java
deleted file mode 100644
index e215bf52571..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/consensus/AuthoritySectionParser.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.subgraph.orchid.directory.consensus;
-
-import com.subgraph.orchid.directory.consensus.ConsensusDocumentParser.DocumentSection;
-import com.subgraph.orchid.directory.parsing.DocumentFieldParser;
-
-public class AuthoritySectionParser extends ConsensusDocumentSectionParser {
-
-	private VoteAuthorityEntryImpl currentEntry = null;
-	
-	AuthoritySectionParser(DocumentFieldParser parser , ConsensusDocumentImpl document) {
-		super(parser, document);
-		startEntry();
-	}
-	
-	@Override
-	void parseLine(DocumentKeyword keyword) {
-		switch(keyword) {
-		case DIR_SOURCE:
-			parseDirSource();
-			break;
-		case CONTACT:
-			currentEntry.setContact(fieldParser.parseConcatenatedString());
-			break;
-		case VOTE_DIGEST:
-			currentEntry.setVoteDigest(fieldParser.parseHexDigest());
-			addCurrentEntry();
-			break;
-		default:
-			break;
-		}
-	}
-	
-	private void startEntry() {
-		currentEntry = new VoteAuthorityEntryImpl();
-	}
-	
-	private void addCurrentEntry() {
-		document.addVoteAuthorityEntry(currentEntry);
-		startEntry();
-	}
-
-	private void parseDirSource() {
-		currentEntry.setNickname(fieldParser.parseNickname());
-		currentEntry.setIdentity(fieldParser.parseHexDigest());
-		currentEntry.setHostname(fieldParser.parseString());
-		currentEntry.setAddress(fieldParser.parseAddress());
-		currentEntry.setDirectoryPort(fieldParser.parsePort());
-		currentEntry.setRouterPort(fieldParser.parsePort());
-	}
-
-	@Override
-	String getNextStateKeyword() {
-		return "r";
-	}
-
-	@Override
-	DocumentSection getSection() {
-		return DocumentSection.AUTHORITY;
-	}
-	
-	DocumentSection nextSection() {
-		return DocumentSection.ROUTER_STATUS;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/consensus/ConsensusDocumentImpl.java b/orchid/src/com/subgraph/orchid/directory/consensus/ConsensusDocumentImpl.java
deleted file mode 100644
index 7421f8bcb0c..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/consensus/ConsensusDocumentImpl.java
+++ /dev/null
@@ -1,344 +0,0 @@
-package com.subgraph.orchid.directory.consensus;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.ConsensusDocument;
-import com.subgraph.orchid.DirectoryServer;
-import com.subgraph.orchid.KeyCertificate;
-import com.subgraph.orchid.RouterStatus;
-import com.subgraph.orchid.Tor;
-import com.subgraph.orchid.VoteAuthorityEntry;
-import com.subgraph.orchid.crypto.TorPublicKey;
-import com.subgraph.orchid.crypto.TorSignature.DigestAlgorithm;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.Timestamp;
-import com.subgraph.orchid.directory.TrustedAuthorities;
-
-public class ConsensusDocumentImpl implements ConsensusDocument {
-	
-	enum SignatureVerifyStatus { STATUS_UNVERIFIED, STATUS_NEED_CERTS, STATUS_VERIFIED };
-	
-	private final static Logger logger = Logger.getLogger(ConsensusDocumentImpl.class.getName());
-	
-	private final static String BW_WEIGHT_SCALE_PARAM = "bwweightscale";
-	private final static int BW_WEIGHT_SCALE_DEFAULT = 10000;
-	private final static int BW_WEIGHT_SCALE_MIN = 1;
-	private final static int BW_WEIGHT_SCALE_MAX = Integer.MAX_VALUE;
-	
-	private final static String CIRCWINDOW_PARAM = "circwindow";
-	private final static int CIRCWINDOW_DEFAULT = 1000;
-	private final static int CIRCWINDOW_MIN = 100;
-	private final static int CIRCWINDOW_MAX = 1000;
-	
-	private final static String USE_NTOR_HANDSHAKE_PARAM = "UseNTorHandshake";
-	
-	private Set<RequiredCertificate> requiredCertificates = new HashSet<RequiredCertificate>();
-	
-	
-	private int consensusMethod;
-	private ConsensusFlavor flavor;
-	private Timestamp validAfter;
-	private Timestamp freshUntil;
-	private Timestamp validUntil;
-	private int distDelaySeconds;
-	private int voteDelaySeconds;
-	private Set<String> clientVersions;
-	private Set<String> serverVersions;
-	private Set<String> knownFlags;
-	private HexDigest signingHash;
-	private HexDigest signingHash256;
-	private Map<HexDigest, VoteAuthorityEntry> voteAuthorityEntries;
-	private List<RouterStatus> routerStatusEntries;
-	private Map<String, Integer> bandwidthWeights;
-	private Map<String, Integer> parameters;
-	private int signatureCount;
-	private boolean isFirstCallToVerifySignatures = true;
-	private String rawDocumentData;
-	
-	void setConsensusFlavor(ConsensusFlavor flavor) { this.flavor = flavor; }
-	void setConsensusMethod(int method) { consensusMethod = method; }
-	void setValidAfter(Timestamp ts) { validAfter = ts; }
-	void setFreshUntil(Timestamp ts) { freshUntil = ts; }
-	void setValidUntil(Timestamp ts) { validUntil = ts; }
-	void setDistDelaySeconds(int seconds) { distDelaySeconds = seconds; }
-	void setVoteDelaySeconds(int seconds) { voteDelaySeconds = seconds; }
-	void addClientVersion(String version) { clientVersions.add(version); }
-	void addServerVersion(String version) { serverVersions.add(version); }
-	void addParameter(String name, int value) { parameters.put(name, value); }
-	void addBandwidthWeight(String name, int value) { bandwidthWeights.put(name, value); }
-		
-	void addSignature(DirectorySignature signature) {
-		final VoteAuthorityEntry voteAuthority = voteAuthorityEntries.get(signature.getIdentityDigest());
-		if(voteAuthority == null) {
-			logger.warning("Consensus contains signature for source not declared in authority section: "+ signature.getIdentityDigest());
-			return;
-		}
-		final List<DirectorySignature> signatures = voteAuthority.getSignatures();
-		final DigestAlgorithm newSignatureAlgorithm = signature.getSignature().getDigestAlgorithm();
-		for(DirectorySignature sig: signatures) {
-			DigestAlgorithm algo = sig.getSignature().getDigestAlgorithm();
-			if(algo.equals(newSignatureAlgorithm)) {
-				logger.warning("Consensus contains two or more signatures for same source with same algorithm");
-				return;
-			}
-		}
-		signatureCount += 1;
-		signatures.add(signature);
-	}
-
-	void setSigningHash(HexDigest hash) { signingHash = hash; }
-	void setSigningHash256(HexDigest hash) { signingHash256 = hash; }
-	void setRawDocumentData(String rawData) { rawDocumentData = rawData; }
-	
-	ConsensusDocumentImpl() {
-		clientVersions = new HashSet<String>();
-		serverVersions = new HashSet<String>();
-		knownFlags = new HashSet<String>();
-		voteAuthorityEntries = new HashMap<HexDigest, VoteAuthorityEntry>();
-		routerStatusEntries = new ArrayList<RouterStatus>();
-		bandwidthWeights = new HashMap<String, Integer>();
-		parameters = new HashMap<String, Integer>();
-	}
-	
-	void addKnownFlag(String flag) {
-		knownFlags.add(flag);
-	}
-	
-	void addVoteAuthorityEntry(VoteAuthorityEntry entry) {
-		voteAuthorityEntries.put(entry.getIdentity(), entry);
-	}
-	
-	void addRouterStatusEntry(RouterStatusImpl entry) {
-		routerStatusEntries.add(entry);
-	}
-	
-	public ConsensusFlavor getFlavor() {
-		return flavor;
-	}
-
-	public Timestamp getValidAfterTime() {
-		return validAfter;
-	}
-	
-	public Timestamp getFreshUntilTime() {
-		return freshUntil;
-	}
-	
-	public Timestamp getValidUntilTime() {
-		return validUntil;
-	}
-	
-	public int getConsensusMethod() {
-		return consensusMethod;
-	}
-	
-	public int getVoteSeconds() {
-		return voteDelaySeconds;
-	}
-	
-	public int getDistSeconds() {
-		return distDelaySeconds;
-	}
-	
-	public Set<String> getClientVersions() {
-		return clientVersions;
-	}
-	
-	public Set<String> getServerVersions() {
-		return serverVersions;
-	}
-	
-	public boolean isLive() {
-		if(validUntil == null) {
-			return false;
-		} else {
-			return !validUntil.hasPassed(); 
-		}
-	}
-	
-	public List<RouterStatus> getRouterStatusEntries() {
-		return Collections.unmodifiableList(routerStatusEntries);
-	}
-	
-	public String getRawDocumentData() {
-		return rawDocumentData;
-	}
-	
-	public ByteBuffer getRawDocumentBytes() {
-		if(getRawDocumentData() == null) {
-			return ByteBuffer.allocate(0);
-		} else {
-			return ByteBuffer.wrap(getRawDocumentData().getBytes(Tor.getDefaultCharset()));
-		}
-	}
-
-	public boolean isValidDocument() {
-		return (validAfter != null) && (freshUntil != null) && (validUntil != null) &&
-		(voteDelaySeconds > 0) && (distDelaySeconds > 0) && (signingHash != null) &&
-		(signatureCount > 0);
-	}
-	
-	public HexDigest getSigningHash() {
-		return signingHash;
-	}
-	
-	public HexDigest getSigningHash256() {
-		return signingHash256;
-	}
-	
-	public synchronized SignatureStatus verifySignatures() {
-		boolean firstCall = isFirstCallToVerifySignatures;
-		isFirstCallToVerifySignatures = false;
-		requiredCertificates.clear();
-		int verifiedCount = 0;
-		int certsNeededCount = 0;
-		final int v3Count = TrustedAuthorities.getInstance().getV3AuthorityServerCount();
-		final int required = (v3Count / 2) + 1;
-		
-		for(VoteAuthorityEntry entry: voteAuthorityEntries.values()) {
-			switch(verifySingleAuthority(entry)) {
-			case STATUS_FAILED:
-				break;
-			case STATUS_NEED_CERTS:
-				certsNeededCount += 1;
-				break;
-			case STATUS_VERIFIED:
-				verifiedCount += 1;
-				break;
-			}
-		}
-		
-		if(verifiedCount >= required) {
-			return SignatureStatus.STATUS_VERIFIED;
-		} else if(verifiedCount + certsNeededCount >= required) {
-			if(firstCall) {
-				logger.info("Certificates need to be retrieved to verify consensus");
-			}
-			return SignatureStatus.STATUS_NEED_CERTS;
-		} else {
-			return SignatureStatus.STATUS_FAILED;
-		}
-	}
-
-	private SignatureStatus verifySingleAuthority(VoteAuthorityEntry authority) {
-		
-		boolean certsNeeded = false;
-		boolean validSignature = false;
-		
-		for(DirectorySignature s: authority.getSignatures()) {
-			DirectoryServer trusted = TrustedAuthorities.getInstance().getAuthorityServerByIdentity(s.getIdentityDigest());
-			if(trusted == null) {
-				logger.warning("Consensus signed by unrecognized directory authority: "+ s.getIdentityDigest());
-				return SignatureStatus.STATUS_FAILED;
-			} else {
-				switch(verifySignatureForTrustedAuthority(trusted, s)) {
-				case STATUS_NEED_CERTS:
-					certsNeeded = true;
-					break;
-				case STATUS_VERIFIED:
-					validSignature = true;
-					break;
-				default:
-					break;
-				}
-			}
-		}
-		
-		if(validSignature) {
-			return SignatureStatus.STATUS_VERIFIED;
-		} else if(certsNeeded) {
-			return SignatureStatus.STATUS_NEED_CERTS;
-		} else {
-			return SignatureStatus.STATUS_FAILED;
-		}
-	}
-	
-	private SignatureStatus verifySignatureForTrustedAuthority(DirectoryServer trustedAuthority, DirectorySignature signature) {
-		final KeyCertificate certificate = trustedAuthority.getCertificateByFingerprint(signature.getSigningKeyDigest());
-		if(certificate == null) {
-			logger.fine("Missing certificate for signing key: "+ signature.getSigningKeyDigest());
-			addRequiredCertificateForSignature(signature);
-			return SignatureStatus.STATUS_NEED_CERTS;
-		}
-		if(certificate.isExpired()) {
-			return SignatureStatus.STATUS_FAILED;
-		}
-		
-		final TorPublicKey signingKey = certificate.getAuthoritySigningKey();
-		final HexDigest d = (signature.useSha256()) ? signingHash256 : signingHash;
-		if(!signingKey.verifySignature(signature.getSignature(), d)) {
-			logger.warning("Signature failed on consensus for signing key: "+ signature.getSigningKeyDigest());
-			return SignatureStatus.STATUS_FAILED;
-		}
-		return SignatureStatus.STATUS_VERIFIED;
-	}
-
-	public Set<RequiredCertificate> getRequiredCertificates() {
-		return requiredCertificates;
-	}
-
-	private void addRequiredCertificateForSignature(DirectorySignature signature) {
-		requiredCertificates.add(new RequiredCertificateImpl(signature.getIdentityDigest(), signature.getSigningKeyDigest()));
-	}
-
-	public boolean equals(Object o) {
-		if(!(o instanceof ConsensusDocumentImpl))
-			return false;
-		final ConsensusDocumentImpl other = (ConsensusDocumentImpl) o;
-		return other.getSigningHash().equals(signingHash);
-	}
-	
-	public int hashCode() {
-		return (signingHash == null) ? 0 : signingHash.hashCode();
-	}
-	
-	private int getParameterValue(String name, int defaultValue, int minValue, int maxValue) {
-		if(!parameters.containsKey(name)) {
-			return defaultValue;
-		}
-		final int value = parameters.get(name);
-		if(value < minValue) {
-			return minValue;
-		} else if(value > maxValue) {
-			return maxValue;
-		} else {
-			return value;
-		}
-	}
-	
-	private boolean getBooleanParameterValue(String name, boolean defaultValue) {
-		if(!parameters.containsKey(name)) {
-			return defaultValue;
-		}
-		final int value = parameters.get(name);
-		return value != 0;
-	}
-	
-	public int getCircWindowParameter() {
-		return getParameterValue(CIRCWINDOW_PARAM, CIRCWINDOW_DEFAULT, CIRCWINDOW_MIN, CIRCWINDOW_MAX);
-	}
-	
-	public int getWeightScaleParameter() {
-		return getParameterValue(BW_WEIGHT_SCALE_PARAM, BW_WEIGHT_SCALE_DEFAULT, BW_WEIGHT_SCALE_MIN, BW_WEIGHT_SCALE_MAX);
-	}
-	
-	public int getBandwidthWeight(String tag) {
-		if(bandwidthWeights.containsKey(tag)) {
-			return bandwidthWeights.get(tag);
-		} else {
-			return -1;
-		}
-	}
-	
-	public boolean getUseNTorHandshake() {
-		return getBooleanParameterValue(USE_NTOR_HANDSHAKE_PARAM, false);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/consensus/ConsensusDocumentParser.java b/orchid/src/com/subgraph/orchid/directory/consensus/ConsensusDocumentParser.java
deleted file mode 100644
index 71c2a4e23e4..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/consensus/ConsensusDocumentParser.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.subgraph.orchid.directory.consensus;
-
-import com.subgraph.orchid.ConsensusDocument;
-import com.subgraph.orchid.TorParsingException;
-import com.subgraph.orchid.directory.parsing.BasicDocumentParsingResult;
-import com.subgraph.orchid.directory.parsing.DocumentFieldParser;
-import com.subgraph.orchid.directory.parsing.DocumentParser;
-import com.subgraph.orchid.directory.parsing.DocumentParsingHandler;
-import com.subgraph.orchid.directory.parsing.DocumentParsingResult;
-import com.subgraph.orchid.directory.parsing.DocumentParsingResultHandler;
-
-public class ConsensusDocumentParser implements DocumentParser<ConsensusDocument> {
-	public enum DocumentSection { NO_SECTION, PREAMBLE, AUTHORITY, ROUTER_STATUS, FOOTER };
-
-	// dir-spec.txt 3.2 
-	// Unlike other formats described above, a SP in these documents must be a
-	// single space character (hex 20).
-	private final static String ITEM_DELIMITER = " ";
-	
-	private final PreambleSectionParser preambleParser;
-	private final AuthoritySectionParser authorityParser;
-	private final RouterStatusSectionParser routerStatusParser;
-	private final FooterSectionParser footerParser;
-	private final DocumentFieldParser fieldParser;
-	private DocumentSection currentSection = DocumentSection.PREAMBLE;
-	private final ConsensusDocumentImpl document;
-	
-	private DocumentParsingResultHandler<ConsensusDocument> resultHandler;
-	
-	public ConsensusDocumentParser(DocumentFieldParser fieldParser) {
-		this.fieldParser = fieldParser;
-		initializeParser();
-		
-		document = new ConsensusDocumentImpl();
-		preambleParser = new PreambleSectionParser(fieldParser, document);
-		authorityParser = new AuthoritySectionParser(fieldParser, document);
-		routerStatusParser = new RouterStatusSectionParser(fieldParser, document);
-		footerParser = new FooterSectionParser(fieldParser, document);
-	}
-	
-	private void initializeParser() {
-		fieldParser.resetRawDocument();
-		fieldParser.setHandler(createParsingHandler());
-		fieldParser.setDelimiter(ITEM_DELIMITER);
-		fieldParser.setSignatureIgnoreToken("directory-signature");
-		fieldParser.startSignedEntity();
-	}
-	
-	public boolean parse(DocumentParsingResultHandler<ConsensusDocument> resultHandler) {
-		this.resultHandler = resultHandler;
-		try {
-			fieldParser.processDocument();
-			return true;
-		} catch(TorParsingException e) {
-			resultHandler.parsingError(e.getMessage());
-			return false;
-		}
-	}
-	
-	public DocumentParsingResult<ConsensusDocument> parse() {
-		final BasicDocumentParsingResult<ConsensusDocument> result = new BasicDocumentParsingResult<ConsensusDocument>();
-		parse(result);
-		return result;
-	}
-
-	private DocumentParsingHandler createParsingHandler() {
-		return new DocumentParsingHandler() {
-
-			public void endOfDocument() {
-				document.setRawDocumentData(fieldParser.getRawDocument());
-				resultHandler.documentParsed(document);
-				fieldParser.logDebug("Finished parsing status document.");				
-			}
-			public void parseKeywordLine() {
-				processKeywordLine();	
-			}
-			
-		};
-	}
-	private void processKeywordLine() {
-		DocumentSection newSection = null;
-		while(currentSection != DocumentSection.NO_SECTION) {
-			switch(currentSection) {
-			case PREAMBLE:
-				newSection = preambleParser.parseKeywordLine();
-				break;
-			case AUTHORITY:
-				newSection = authorityParser.parseKeywordLine();
-				break;
-			case ROUTER_STATUS:
-				newSection = routerStatusParser.parseKeywordLine();
-				break;
-			case FOOTER:
-				newSection = footerParser.parseKeywordLine();
-				break;
-			default:
-				break;
-			}
-			if(newSection == currentSection)
-				return;
-			
-			currentSection = newSection;
-		}	
-	}
-	
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/consensus/ConsensusDocumentSectionParser.java b/orchid/src/com/subgraph/orchid/directory/consensus/ConsensusDocumentSectionParser.java
deleted file mode 100644
index 0190d320abe..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/consensus/ConsensusDocumentSectionParser.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.subgraph.orchid.directory.consensus;
-
-import com.subgraph.orchid.directory.consensus.ConsensusDocumentParser.DocumentSection;
-import com.subgraph.orchid.directory.parsing.DocumentFieldParser;
-
-public abstract class ConsensusDocumentSectionParser {
-	
-	protected final ConsensusDocumentImpl document;
-	protected final DocumentFieldParser fieldParser;
-	
-	
-	ConsensusDocumentSectionParser(DocumentFieldParser parser, ConsensusDocumentImpl document) {
-		this.fieldParser = parser;
-		this.document = document;
-	}
-	
-	DocumentSection parseKeywordLine() {
-		String keywordString = fieldParser.getCurrentKeyword();
-		if(getNextStateKeyword() != null && getNextStateKeyword().equals(keywordString)) 
-			return nextSection();
-			
-		final DocumentKeyword keyword = DocumentKeyword.findKeyword(keywordString, getSection());
-		/*
-		 * dirspec.txt (1.2)
-		 * When interpreting a Document, software MUST ignore any KeywordLine that
-		 * starts with a keyword it doesn't recognize;
-		 */
-		if(!keyword.equals(DocumentKeyword.UNKNOWN_KEYWORD))
-			parseLine(keyword);
-		
-		return getSection();
-	}
-	
-	abstract void parseLine(DocumentKeyword keyword);
-	abstract String getNextStateKeyword();
-	abstract DocumentSection getSection();
-	abstract DocumentSection nextSection();
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/consensus/DirectorySignature.java b/orchid/src/com/subgraph/orchid/directory/consensus/DirectorySignature.java
deleted file mode 100644
index 305f828dd79..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/consensus/DirectorySignature.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.subgraph.orchid.directory.consensus;
-
-import com.subgraph.orchid.crypto.TorSignature;
-import com.subgraph.orchid.data.HexDigest;
-
-public class DirectorySignature {
-	
-	private final HexDigest identityDigest;
-	private final HexDigest signingKeyDigest;
-	private final TorSignature signature;
-	private final boolean useSha256;
-	
-	DirectorySignature(HexDigest identityDigest, HexDigest signingKeyDigest, TorSignature signature, boolean useSha256) {
-		this.identityDigest = identityDigest;
-		this.signingKeyDigest = signingKeyDigest;
-		this.signature = signature;
-		this.useSha256 = useSha256;
-	}
-	
-	public HexDigest getIdentityDigest() {
-		return identityDigest;
-	}
-	
-	public HexDigest getSigningKeyDigest() {
-		return signingKeyDigest;
-	}
-	
-	public TorSignature getSignature() {
-		return signature;
-	}
-	
-	public boolean useSha256() {
-		return useSha256;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/consensus/DocumentKeyword.java b/orchid/src/com/subgraph/orchid/directory/consensus/DocumentKeyword.java
deleted file mode 100644
index 78913ac51c7..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/consensus/DocumentKeyword.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.subgraph.orchid.directory.consensus;
-
-import com.subgraph.orchid.directory.consensus.ConsensusDocumentParser.DocumentSection;
-
-enum DocumentKeyword {
-	/*
-	 * See dirspec.txt section 3.2
-	 */
-	NETWORK_STATUS_VERSION("network-status-version", DocumentSection.PREAMBLE, 1),
-	VOTE_STATUS("vote-status", DocumentSection.PREAMBLE, 1),
-	CONSENSUS_METHODS("consensus-methods", DocumentSection.PREAMBLE, 1, true),
-	CONSENSUS_METHOD("consensus-method", DocumentSection.PREAMBLE, 1, false, true),
-	PUBLISHED("published", DocumentSection.PREAMBLE, 2, true),
-	VALID_AFTER("valid-after",  DocumentSection.PREAMBLE,2),
-	FRESH_UNTIL("fresh-until",  DocumentSection.PREAMBLE,2),
-	VALID_UNTIL("valid-until",  DocumentSection.PREAMBLE,2),
-	VOTING_DELAY("voting-delay",  DocumentSection.PREAMBLE,2),
-	CLIENT_VERSIONS("client-versions",  DocumentSection.PREAMBLE,1),
-	SERVER_VERSIONS("server-versions",  DocumentSection.PREAMBLE,1),
-	KNOWN_FLAGS("known-flags",  DocumentSection.PREAMBLE),
-	PARAMS("params",  DocumentSection.PREAMBLE),
-	
-	DIR_SOURCE("dir-source", DocumentSection.AUTHORITY, 6),
-	CONTACT("contact", DocumentSection.AUTHORITY),
-	VOTE_DIGEST("vote-digest", DocumentSection.AUTHORITY, 1, false, true),
-	
-	R("r", DocumentSection.ROUTER_STATUS, 8),
-	S("s", DocumentSection.ROUTER_STATUS),
-	V("v", DocumentSection.ROUTER_STATUS),
-	W("w", DocumentSection.ROUTER_STATUS, 1),
-	P("p", DocumentSection.ROUTER_STATUS, 2),
-	M("m", DocumentSection.ROUTER_STATUS, 1),
-	
-	DIRECTORY_FOOTER("directory-footer", DocumentSection.FOOTER),
-	BANDWIDTH_WEIGHTS("bandwidth-weights", DocumentSection.FOOTER, 19),
-	DIRECTORY_SIGNATURE("directory-signature", DocumentSection.FOOTER, 2),
-	
-	UNKNOWN_KEYWORD("KEYWORD NOT FOUND");
-	
-	
-	public final static int VARIABLE_ARGUMENT_COUNT = -1;
-
-	private final String keyword;
-	private final DocumentSection section;
-	private final int argumentCount;
-	private final boolean voteOnly;
-	private final boolean consensusOnly;
-	
-	
-	DocumentKeyword(String keyword) {
-		this(keyword, DocumentSection.NO_SECTION);
-	}
-	
-	DocumentKeyword(String keyword, DocumentSection section) {
-		this(keyword, section, VARIABLE_ARGUMENT_COUNT);
-	}
-	DocumentKeyword(String keyword, DocumentSection section, int argumentCount) {
-		this(keyword, section, argumentCount, false);
-	}
-	
-	DocumentKeyword(String keyword, DocumentSection section, int argumentCount, boolean voteOnly) {
-		this(keyword, section, argumentCount, voteOnly, false);
-	}
-	
-	
-	DocumentKeyword(String keyword, DocumentSection section, int argumentCount, boolean voteOnly, boolean consensusOnly) {
-		this.keyword = keyword;
-		this.section = section;
-		this.argumentCount = argumentCount;
-		this.voteOnly = voteOnly;
-		this.consensusOnly = consensusOnly;
-	}
-
-	static DocumentKeyword findKeyword(String keyword, DocumentSection section) {
-		for(DocumentKeyword k : values()) {
-			if(k.getKeyword().equals(keyword) && k.getSection().equals(section))
-				return k;
-		}
-		return UNKNOWN_KEYWORD;
-	}
-	
-	public String getKeyword() {
-		return keyword;
-	}
-	
-	public DocumentSection getSection() {
-		return section;
-	}
-
-	public int getArgumentCount() {
-		return argumentCount;
-	}
-	
-	public boolean isConsensusOnly() {
-		return consensusOnly;
-	}
-	
-	public boolean isVoteOnly() {
-		return voteOnly;
-	}
-	
-	
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/consensus/FooterSectionParser.java b/orchid/src/com/subgraph/orchid/directory/consensus/FooterSectionParser.java
deleted file mode 100644
index fcceb0f5dc1..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/consensus/FooterSectionParser.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.subgraph.orchid.directory.consensus;
-
-import com.subgraph.orchid.crypto.TorMessageDigest;
-import com.subgraph.orchid.crypto.TorSignature;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.directory.consensus.ConsensusDocumentParser.DocumentSection;
-import com.subgraph.orchid.directory.parsing.DocumentFieldParser;
-import com.subgraph.orchid.directory.parsing.NameIntegerParameter;
-
-public class FooterSectionParser extends ConsensusDocumentSectionParser {
-
-	private boolean seenFirstSignature = false;
-	
-	FooterSectionParser(DocumentFieldParser parser, ConsensusDocumentImpl document) {
-		super(parser, document);
-	}
-
-	@Override
-	String getNextStateKeyword() {
-		return null;
-	}
-
-	@Override
-	DocumentSection getSection() {
-		return DocumentSection.FOOTER;
-	}
-	
-	DocumentSection nextSection() {
-		return DocumentSection.NO_SECTION;
-	}
-
-	@Override
-	void parseLine(DocumentKeyword keyword) {
-		switch(keyword) {
-		case BANDWIDTH_WEIGHTS:
-			processBandwidthWeights();
-			break;
-			
-		case DIRECTORY_SIGNATURE:
-			processSignature();
-			break;
-
-		default:
-			break;
-		}
-	}
-
-	private void doFirstSignature() {
-		seenFirstSignature = true;
-		fieldParser.endSignedEntity();
-		final TorMessageDigest messageDigest = fieldParser.getSignatureMessageDigest();
-		messageDigest.update("directory-signature ");
-		document.setSigningHash(messageDigest.getHexDigest());
-		
-		TorMessageDigest messageDigest256 = fieldParser.getSignatureMessageDigest256();
-		messageDigest256.update("directory-signature ");
-		document.setSigningHash256(messageDigest256.getHexDigest());
-	}
-	
-	private void processSignature() {
-		if(!seenFirstSignature) {
-			doFirstSignature();
-		}
-		final String s = fieldParser.parseString();
-		final HexDigest identity;
-		boolean useSha256 = false;
-		if(s.length() < TorMessageDigest.TOR_DIGEST_SIZE) {
-			useSha256 = ("sha256".equals(s));
-			identity = fieldParser.parseHexDigest();
-		} else {
-			identity = HexDigest.createFromString(s);
-		}
-		HexDigest signingKey = fieldParser.parseHexDigest();
-		TorSignature signature = fieldParser.parseSignature();
-		document.addSignature(new DirectorySignature(identity, signingKey, signature, useSha256));
-	}
-	
-	private void processBandwidthWeights() {
-		final int remaining = fieldParser.argumentsRemaining();
-		for(int i = 0; i < remaining; i++) {
-			NameIntegerParameter p = fieldParser.parseParameter();
-			document.addBandwidthWeight(p.getName(), p.getValue());
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/consensus/PreambleSectionParser.java b/orchid/src/com/subgraph/orchid/directory/consensus/PreambleSectionParser.java
deleted file mode 100644
index f67d0f0a9c8..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/consensus/PreambleSectionParser.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.subgraph.orchid.directory.consensus;
-
-import java.util.Arrays;
-import java.util.List;
-
-import com.subgraph.orchid.ConsensusDocument.ConsensusFlavor;
-import com.subgraph.orchid.TorParsingException;
-import com.subgraph.orchid.directory.consensus.ConsensusDocumentParser.DocumentSection;
-import com.subgraph.orchid.directory.parsing.DocumentFieldParser;
-import com.subgraph.orchid.directory.parsing.NameIntegerParameter;
-
-public class PreambleSectionParser extends ConsensusDocumentSectionParser {
-	private final static int CURRENT_DOCUMENT_VERSION = 3;
-	private boolean isFirstLine = true;
-	
-	PreambleSectionParser(DocumentFieldParser parser, ConsensusDocumentImpl document) {
-		super(parser, document);
-	}
-	
-	String getNextStateKeyword() {
-		return "dir-source";
-	}
-	
-	DocumentSection getSection() {
-		return DocumentSection.PREAMBLE;
-	}
-	
-	DocumentSection nextSection() {
-		return DocumentSection.AUTHORITY;
-	}
-	
-	@Override
-	void parseLine(DocumentKeyword keyword) {
-		if(isFirstLine) {
-			parseFirstLine(keyword);
-		} else {
-			processKeyword(keyword);
-		}
-	}
-	
-	private void processKeyword(DocumentKeyword keyword) {
-		switch(keyword) {
-		case NETWORK_STATUS_VERSION:
-			throw new TorParsingException("Network status version may only appear on the first line of status document");
-		case VOTE_STATUS:
-			final String voteStatus = fieldParser.parseString();
-			if(!voteStatus.equals("consensus"))
-				throw new TorParsingException("Unexpected vote-status type: "+ voteStatus);
-			break;
-		case CONSENSUS_METHOD:
-			document.setConsensusMethod(fieldParser.parseInteger());
-			break;
-			
-		case VALID_AFTER:
-			document.setValidAfter(fieldParser.parseTimestamp());
-			break;
-			
-		case FRESH_UNTIL:
-			document.setFreshUntil(fieldParser.parseTimestamp());
-			break;
-			
-		case VALID_UNTIL:
-			document.setValidUntil(fieldParser.parseTimestamp());
-			break;
-			
-		case VOTING_DELAY:
-			document.setVoteDelaySeconds(fieldParser.parseInteger());
-			document.setDistDelaySeconds(fieldParser.parseInteger());
-			break;
-			
-		case CLIENT_VERSIONS:
-			for(String version: parseVersions(fieldParser.parseString())) 
-				document.addClientVersion(version);
-			break;
-		case SERVER_VERSIONS:
-			for(String version: parseVersions(fieldParser.parseString()))
-				document.addServerVersion(version);
-			break;
-		case KNOWN_FLAGS:
-			while(fieldParser.argumentsRemaining() > 0) 
-				document.addKnownFlag(fieldParser.parseString());
-			break;
-			
-		case PARAMS:
-			parseParams();
-			break;
-			
-		default:
-			break;
-		}
-		
-	}
-	
-	private void parseFirstLine(DocumentKeyword keyword) {
-		if(keyword != DocumentKeyword.NETWORK_STATUS_VERSION) 		
-			throw new TorParsingException("network-status-version not found at beginning of consensus document as expected.");
-			
-		final int documentVersion = fieldParser.parseInteger();
-		
-		if(documentVersion != CURRENT_DOCUMENT_VERSION)
-			throw new TorParsingException("Unexpected consensus document version number: " + documentVersion);
-		
-		if(fieldParser.argumentsRemaining() > 0) {
-			parseConsensusFlavor();
-		}
-		isFirstLine = false;
-	}
-	
-	private void parseConsensusFlavor() {
-		final String flavor = fieldParser.parseString();
-		if("ns".equals(flavor)) {
-			document.setConsensusFlavor(ConsensusFlavor.NS);
-		} else if("microdesc".equals(flavor)) {
-			document.setConsensusFlavor(ConsensusFlavor.MICRODESC);
-		} else {
-			fieldParser.logWarn("Unknown consensus flavor: "+ flavor);
-		}
-	}
-
-	private List<String> parseVersions(String versions) {		
-		return Arrays.asList(versions.split(","));
-	}
-	
-	private void parseParams() {
-		final int remaining = fieldParser.argumentsRemaining();
-		for(int i = 0; i < remaining; i++) {
-			NameIntegerParameter p = fieldParser.parseParameter();
-			document.addParameter(p.getName(), p.getValue());
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/consensus/RequiredCertificateImpl.java b/orchid/src/com/subgraph/orchid/directory/consensus/RequiredCertificateImpl.java
deleted file mode 100644
index f706ecaeb8b..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/consensus/RequiredCertificateImpl.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.subgraph.orchid.directory.consensus;
-
-import com.subgraph.orchid.ConsensusDocument;
-import com.subgraph.orchid.data.HexDigest;
-
-public class RequiredCertificateImpl implements ConsensusDocument.RequiredCertificate {
-
-	private final HexDigest identity;
-	private final HexDigest signingKey;
-
-	private int downloadFailureCount;
-	
-	public RequiredCertificateImpl(HexDigest identity, HexDigest signingKey) {
-		this.identity = identity;
-		this.signingKey = signingKey;
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result
-				+ ((identity == null) ? 0 : identity.hashCode());
-		result = prime * result
-				+ ((signingKey == null) ? 0 : signingKey.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		RequiredCertificateImpl other = (RequiredCertificateImpl) obj;
-		if (identity == null) {
-			if (other.identity != null)
-				return false;
-		} else if (!identity.equals(other.identity))
-			return false;
-		if (signingKey == null) {
-			if (other.signingKey != null)
-				return false;
-		} else if (!signingKey.equals(other.signingKey))
-			return false;
-		return true;
-	}
-
-	public void incrementDownloadFailureCount() {
-		downloadFailureCount += 1;
-	}
-	
-	public int getDownloadFailureCount() {
-		return downloadFailureCount;
-	}
-
-	public HexDigest getAuthorityIdentity() {
-		return identity;
-	}
-
-	public HexDigest getSigningKey() {
-		return signingKey;
-	}
-	
-	
-
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/consensus/RouterStatusImpl.java b/orchid/src/com/subgraph/orchid/directory/consensus/RouterStatusImpl.java
deleted file mode 100644
index 4fe9a896a8b..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/consensus/RouterStatusImpl.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.subgraph.orchid.directory.consensus;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import com.subgraph.orchid.RouterStatus;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.data.Timestamp;
-import com.subgraph.orchid.data.exitpolicy.ExitPorts;
-
-public class RouterStatusImpl implements RouterStatus {
-	
-	private String nickname;
-	private HexDigest identity;
-	private HexDigest digest;
-	private HexDigest microdescriptorDigest;
-	private Timestamp publicationTime;
-	private IPv4Address address;
-	private int routerPort;
-	private int directoryPort;
-	private Set<String> flags = new HashSet<String>();
-	private String version;
-	private int bandwidthEstimate;
-	private int bandwidthMeasured;
-	private boolean hasBandwidth;
-	private ExitPorts exitPorts;
-	
-	void setNickname(String nickname) { this.nickname = nickname; }
-	void setIdentity(HexDigest identity) { this.identity = identity; }
-	void setDigest(HexDigest digest) { this.digest = digest; }
-	void setMicrodescriptorDigest(HexDigest digest) { this.microdescriptorDigest = digest; }
-	void setPublicationTime(Timestamp timestamp) { this.publicationTime = timestamp; }
-	void setAddress(IPv4Address address) { this.address = address; }
-	void setRouterPort(int port) { this.routerPort = port; }
-	void setDirectoryPort(int port) { this.directoryPort = port; }
-	void addFlag(String flag) { this.flags.add(flag); }
-	void setVersion(String version) { this.version = version; }
-	void setEstimatedBandwidth(int bandwidth) { this.bandwidthEstimate = bandwidth; hasBandwidth = true; }
-	void setMeasuredBandwidth(int bandwidth) { this.bandwidthMeasured = bandwidth; }
-	void setAcceptedPorts(String portList) { this.exitPorts = ExitPorts.createAcceptExitPorts(portList); }
-	void setRejectedPorts(String portList) { this.exitPorts = ExitPorts.createRejectExitPorts(portList); }
-	
-	public String toString() {
-		return "Router: ("+ nickname +" "+ identity +" "+ digest +" "+ address +" "+ routerPort +" " + directoryPort
-			+" "+ version +" "+ exitPorts +")";
-	}
-	public String getNickname() {
-		return nickname;
-	}
-	
-	public HexDigest getIdentity() {
-		return identity;
-	}
-	
-	public HexDigest getDescriptorDigest() {
-		return digest;
-	}
-
-	public HexDigest getMicrodescriptorDigest() {
-		return microdescriptorDigest;
-	}
-
-	public Timestamp getPublicationTime() {
-		return publicationTime;
-	}
-	
-	public IPv4Address getAddress() {
-		return address;
-	}
-	
-	public int getRouterPort() {
-		return routerPort;
-	}
-	
-	public boolean isDirectory() {
-		return directoryPort != 0;
-	}
-	public int getDirectoryPort() {
-		return directoryPort;
-	}
-	
-	public boolean hasFlag(String flag) {
-		return flags.contains(flag);
-	}
-	
-	public String getVersion() {
-		return version;
-	}
-	
-	public boolean hasBandwidth() {
-		return hasBandwidth;
-	}
-
-	public int getEstimatedBandwidth() {
-		return bandwidthEstimate;
-	}
-	
-	public int getMeasuredBandwidth() {
-		return bandwidthMeasured;
-	}
-	
-	public ExitPorts getExitPorts() {
-		return exitPorts;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/consensus/RouterStatusSectionParser.java b/orchid/src/com/subgraph/orchid/directory/consensus/RouterStatusSectionParser.java
deleted file mode 100644
index 79f4078cbe4..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/consensus/RouterStatusSectionParser.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.subgraph.orchid.directory.consensus;
-
-import com.subgraph.orchid.ConsensusDocument.ConsensusFlavor;
-import com.subgraph.orchid.TorParsingException;
-import com.subgraph.orchid.crypto.TorMessageDigest;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.directory.consensus.ConsensusDocumentParser.DocumentSection;
-import com.subgraph.orchid.directory.parsing.DocumentFieldParser;
-
-public class RouterStatusSectionParser extends ConsensusDocumentSectionParser {
-
-	private RouterStatusImpl currentEntry = null;
-	
-	RouterStatusSectionParser(DocumentFieldParser parser, ConsensusDocumentImpl document) {
-		super(parser, document);
-	}
-	
-	@Override
-	void parseLine(DocumentKeyword keyword) {
-		if(!keyword.equals(DocumentKeyword.R))
-			assertCurrentEntry();
-		switch(keyword) {
-		case R:
-			parseFirstLine();
-			break;
-		case S:
-			parseFlags();
-			break;
-		case V:
-			parseVersion();
-			break;
-		case W:
-			parseBandwidth();
-			break;
-		case P:
-			parsePortList();
-			break;
-		case M:
-			parseMicrodescriptorHash();
-			break;
-		default:
-			break;
-		}
-	}
-
-	private void assertCurrentEntry() {
-		if(currentEntry == null) 
-			throw new TorParsingException("Router status entry must begin with an 'r' line");
-	}
-	
-	private void addCurrentEntry() {
-		assertCurrentEntry();
-		document.addRouterStatusEntry(currentEntry);
-		currentEntry = null;
-	}
-	
-	private void parseFirstLine() {
-		if(currentEntry != null)
-			throw new TorParsingException("Unterminated router status entry.");
-		currentEntry = new RouterStatusImpl();
-		currentEntry.setNickname(fieldParser.parseNickname());
-		currentEntry.setIdentity(parseBase64Digest());
-		if(document.getFlavor() != ConsensusFlavor.MICRODESC) {
-			currentEntry.setDigest(parseBase64Digest());
-		}
-		currentEntry.setPublicationTime(fieldParser.parseTimestamp());
-		currentEntry.setAddress(fieldParser.parseAddress());
-		currentEntry.setRouterPort(fieldParser.parsePort());
-		currentEntry.setDirectoryPort(fieldParser.parsePort());
-	}
-	
-	private HexDigest parseBase64Digest() {
-		return HexDigest.createFromDigestBytes(fieldParser.parseBase64Data());
-	}
-	
-	private void parseFlags() {
-		while(fieldParser.argumentsRemaining() > 0)
-			currentEntry.addFlag(fieldParser.parseString());
-	}
-	
-	private void parseVersion() {
-		currentEntry.setVersion(fieldParser.parseConcatenatedString());
-	}
-	
-	private void parseBandwidth() {
-		while(fieldParser.argumentsRemaining() > 0) {
-			final String[] parts = fieldParser.parseString().split("=");
-			if(parts.length == 2)
-				parseBandwidthItem(parts[0], fieldParser.parseInteger(parts[1]));
-		}
-		if(document.getFlavor() == ConsensusFlavor.MICRODESC) {
-			addCurrentEntry();
-		}
-	}
-	
-	private void parseBandwidthItem(String key, int value) {
-		if(key.equals("Bandwidth")) 
-			currentEntry.setEstimatedBandwidth(value);
-		else if(key.equals("Measured"))
-			currentEntry.setMeasuredBandwidth(value);
-	}
-	
-	private void parsePortList() {
-		if(document.getFlavor() == ConsensusFlavor.MICRODESC) {
-			throw new TorParsingException("'p' line does not appear in consensus flavor 'microdesc'");
-		}
-		final String arg = fieldParser.parseString();
-		if(arg.equals("accept")) {
-			currentEntry.setAcceptedPorts(fieldParser.parseString());
-		} else if(arg.equals("reject")) {
-			currentEntry.setRejectedPorts(fieldParser.parseString());
-		}
-		addCurrentEntry();
-	}
-	
-	private void parseMicrodescriptorHash() {
-		if(document.getFlavor() != ConsensusFlavor.MICRODESC) {
-			throw new TorParsingException("'m' line is invalid unless consensus flavor is microdesc");
-		}
-		final byte[] hashBytes = fieldParser.parseBase64Data();
-		if(hashBytes.length != TorMessageDigest.TOR_DIGEST256_SIZE) {
-			throw new TorParsingException("'m' line has incorrect digest size "+ hashBytes.length +" != "+ TorMessageDigest.TOR_DIGEST256_SIZE);
-		}
-		currentEntry.setMicrodescriptorDigest(HexDigest.createFromDigestBytes(hashBytes));
-	}
-
-	@Override
-	String getNextStateKeyword() {
-		return "directory-footer";
-	}
-
-	@Override
-	DocumentSection getSection() {
-		return DocumentSection.ROUTER_STATUS;
-	}
-	
-	DocumentSection nextSection() {
-		return DocumentSection.FOOTER;
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/consensus/VoteAuthorityEntryImpl.java b/orchid/src/com/subgraph/orchid/directory/consensus/VoteAuthorityEntryImpl.java
deleted file mode 100644
index f9be7a49223..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/consensus/VoteAuthorityEntryImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.subgraph.orchid.directory.consensus;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.subgraph.orchid.VoteAuthorityEntry;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.IPv4Address;
-
-public class VoteAuthorityEntryImpl implements VoteAuthorityEntry {
-	private String nickname;
-	private HexDigest identity;
-	private String hostname;
-	private IPv4Address address;
-	private int dirport = -1;
-	private int orport = -1;
-	
-	private String contact;
-	private HexDigest voteDigest;
-	
-	private final List<DirectorySignature> signatures = new ArrayList<DirectorySignature>();
-
-	void setNickname(String nickname) { this.nickname = nickname; }
-	void setIdentity(HexDigest identity) { this.identity = identity; }
-	void setHostname(String hostname) { this.hostname = hostname; }
-	void setAddress(IPv4Address address) { this.address = address; }
-	void setDirectoryPort(int port) { this.dirport = port; }
-	void setRouterPort(int port) { this.orport = port; }
-	void setContact(String contact) { this.contact = contact; }
-	void setVoteDigest(HexDigest digest) { this.voteDigest = digest; }
-
-	public String getNickname() {
-		return nickname;
-	}
-	
-	public HexDigest getIdentity() {
-		return identity;
-	}
-	
-	public String getHostname() {
-		return hostname;
-	}
-	
-	public IPv4Address getAddress() {
-		return address;
-	}
-	
-	public int getDirectoryPort() {
-		return dirport;
-	}
-	
-	public int getRouterPort() {
-		return orport;
-	}
-	
-	public String getContact() {
-		return contact;
-	}
-	
-	public HexDigest getVoteDigest() {
-		return voteDigest;
-	}
-	
-	public List<DirectorySignature> getSignatures() {
-		return signatures;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/downloader/BridgeDescriptorFetcher.java b/orchid/src/com/subgraph/orchid/directory/downloader/BridgeDescriptorFetcher.java
deleted file mode 100644
index 4514bbd6509..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/downloader/BridgeDescriptorFetcher.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.subgraph.orchid.directory.downloader;
-
-import java.nio.ByteBuffer;
-
-import com.subgraph.orchid.RouterDescriptor;
-import com.subgraph.orchid.directory.parsing.DocumentParser;
-
-public class BridgeDescriptorFetcher extends DocumentFetcher<RouterDescriptor>{
-
-	@Override
-	String getRequestPath() {
-		return "/tor/server/authority";
-	}
-
-	@Override
-	DocumentParser<RouterDescriptor> createParser(ByteBuffer response) {
-		return PARSER_FACTORY.createRouterDescriptorParser(response, true);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/downloader/CertificateFetcher.java b/orchid/src/com/subgraph/orchid/directory/downloader/CertificateFetcher.java
deleted file mode 100644
index 799d8e9a0d8..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/downloader/CertificateFetcher.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.subgraph.orchid.directory.downloader;
-
-import java.nio.ByteBuffer;
-import java.util.Set;
-
-import com.subgraph.orchid.KeyCertificate;
-import com.subgraph.orchid.ConsensusDocument.RequiredCertificate;
-import com.subgraph.orchid.directory.parsing.DocumentParser;
-
-public class CertificateFetcher extends DocumentFetcher<KeyCertificate>{
-
-	private final Set<RequiredCertificate> requiredCertificates;
-	
-	public CertificateFetcher(Set<RequiredCertificate> requiredCertificates) {
-		this.requiredCertificates = requiredCertificates;
-	}
-
-	@Override
-	String getRequestPath() {
-		return "/tor/keys/fp-sk/"+ getRequiredCertificatesRequestString();
-	}
-
-	private String getRequiredCertificatesRequestString() {
-		final StringBuilder sb = new StringBuilder();
-		for(RequiredCertificate rc: requiredCertificates) {
-			if(sb.length() > 0) {
-				sb.append("+");
-			}
-			sb.append(rc.getAuthorityIdentity().toString());
-			sb.append("-");
-			sb.append(rc.getSigningKey().toString());
-		}
-		return sb.toString();
-	}
-
-	@Override
-	DocumentParser<KeyCertificate> createParser(ByteBuffer response) {
-		return PARSER_FACTORY.createKeyCertificateParser(response);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/downloader/ConsensusFetcher.java b/orchid/src/com/subgraph/orchid/directory/downloader/ConsensusFetcher.java
deleted file mode 100644
index 9e92e09f21c..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/downloader/ConsensusFetcher.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.subgraph.orchid.directory.downloader;
-
-import java.nio.ByteBuffer;
-
-import com.subgraph.orchid.ConsensusDocument;
-import com.subgraph.orchid.directory.parsing.DocumentParser;
-
-public class ConsensusFetcher extends DocumentFetcher<ConsensusDocument>{
-	
-	private final static String CONSENSUS_BASE_PATH = "/tor/status-vote/current/";
-	
-	private final boolean useMicrodescriptors;
-	
-	
-	public ConsensusFetcher(boolean useMicrodescriptors) {
-		this.useMicrodescriptors = useMicrodescriptors;
-	}
-
-	@Override
-	String getRequestPath() {
-		return CONSENSUS_BASE_PATH + ((useMicrodescriptors) ? 
-				("consensus-microdesc") : ("consensus"));
-	}
-
-	@Override
-	DocumentParser<ConsensusDocument> createParser(ByteBuffer response) {
-		return PARSER_FACTORY.createConsensusDocumentParser(response);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/downloader/DescriptorProcessor.java b/orchid/src/com/subgraph/orchid/directory/downloader/DescriptorProcessor.java
deleted file mode 100644
index 175d1b4bba3..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/downloader/DescriptorProcessor.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package com.subgraph.orchid.directory.downloader;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
-import com.subgraph.orchid.ConsensusDocument;
-import com.subgraph.orchid.Directory;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.TorConfig.AutoBoolValue;
-import com.subgraph.orchid.data.HexDigest;
-
-public class DescriptorProcessor {
-	private final static int MAX_DL_PER_REQUEST = 96;
-	private final static int MAX_DL_TO_DELAY = 16;
-	private final static int MIN_DL_REQUESTS = 3;
-	private final static int MAX_CLIENT_INTERVAL_WITHOUT_REQUEST = 10 * 60 * 1000;
-
-	private final TorConfig config;
-	private final Directory directory;
-	
-	private Date lastDescriptorDownload;
-	
-	
-	DescriptorProcessor(TorConfig config, Directory directory) {
-		this.config = config;
-		this.directory = directory;
-	}
-
-	private boolean canDownloadDescriptors(int downloadableCount) {
-		if(downloadableCount >= MAX_DL_TO_DELAY)
-			return true;
-		if(downloadableCount == 0)
-			return false;
-		if(lastDescriptorDownload == null)
-			return true;
-		final Date now = new Date();
-		final long diff = now.getTime() - lastDescriptorDownload.getTime();
-		return diff > MAX_CLIENT_INTERVAL_WITHOUT_REQUEST;
-	}
-
-	/*
-	 * dir-spec.txt section 5.3
-	 */
-	private List< List<HexDigest> > partitionDescriptors(List<Router> descriptors) {
-		final int size = descriptors.size();
-		final List< List<HexDigest> > partitions = new ArrayList< List<HexDigest> >();
-		if(size <= 10) {
-			partitions.add(createPartitionList(descriptors, 0, size));
-			return partitions;
-		} else if(size <= (MIN_DL_REQUESTS * MAX_DL_PER_REQUEST)) {
-			final int chunk = size / MIN_DL_REQUESTS;
-			int over = size % MIN_DL_REQUESTS;
-			int off = 0;
-			for(int i = 0; i < MIN_DL_REQUESTS; i++) {
-				int sz = chunk;
-				if(over != 0) {
-					sz++;
-					over--;
-				}
-				partitions.add(createPartitionList(descriptors, off, sz));
-				off += sz;
-			}
-			return partitions;
-			
-		} else {
-			int off = 0;
-			while(off < descriptors.size()) {
-				partitions.add(createPartitionList(descriptors, off, MAX_DL_PER_REQUEST));
-				off += MAX_DL_PER_REQUEST;
-			}
-			return partitions;	
-		}
-	}
-
-	private List<HexDigest> createPartitionList(List<Router> descriptors, int offset, int size) {
-		final List<HexDigest> newList = new ArrayList<HexDigest>();
-		for(int i = offset; i < (offset + size) && i < descriptors.size(); i++) {
-			final HexDigest digest = getDescriptorDigestForRouter(descriptors.get(i));
-			newList.add(digest);
-		}
-		return newList;
-	}
-
-	private HexDigest getDescriptorDigestForRouter(Router r) {
-		if(useMicrodescriptors()) {
-			return r.getMicrodescriptorDigest();
-		} else {
-			return r.getDescriptorDigest();
-		}
-	}
-	
-	private boolean useMicrodescriptors() {
-		return config.getUseMicrodescriptors() != AutoBoolValue.FALSE;
-	}
-
-	List< List<HexDigest> > getDescriptorDigestsToDownload() {
-		final ConsensusDocument consensus = directory.getCurrentConsensusDocument();
-		if(consensus == null || !consensus.isLive()) {
-			return Collections.emptyList();
-		}
-		final List<Router> downloadables = directory.getRoutersWithDownloadableDescriptors();
-		if(!canDownloadDescriptors(downloadables.size())) {
-			return Collections.emptyList();
-		}
-		
-		lastDescriptorDownload = new Date();
-		return partitionDescriptors(downloadables);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/downloader/DirectoryDocumentRequestor.java b/orchid/src/com/subgraph/orchid/directory/downloader/DirectoryDocumentRequestor.java
deleted file mode 100644
index 347c38c5705..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/downloader/DirectoryDocumentRequestor.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.subgraph.orchid.directory.downloader;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeoutException;
-
-import com.subgraph.orchid.CircuitManager;
-import com.subgraph.orchid.ConsensusDocument;
-import com.subgraph.orchid.ConsensusDocument.RequiredCertificate;
-import com.subgraph.orchid.DirectoryCircuit;
-import com.subgraph.orchid.KeyCertificate;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.RouterDescriptor;
-import com.subgraph.orchid.RouterMicrodescriptor;
-import com.subgraph.orchid.Stream;
-import com.subgraph.orchid.StreamConnectFailedException;
-import com.subgraph.orchid.Tor;
-import com.subgraph.orchid.circuits.TorInitializationTracker;
-import com.subgraph.orchid.data.HexDigest;
-
-/**
- * Synchronously downloads directory documents.
- */
-public class DirectoryDocumentRequestor {
-	private final static int OPEN_DIRECTORY_STREAM_TIMEOUT = 10 * 1000;
-	
-	private final DirectoryCircuit circuit;
-	private final TorInitializationTracker initializationTracker;
-	
-	
-	public DirectoryDocumentRequestor(DirectoryCircuit circuit) {
-		this(circuit, null);
-	}
-
-	public DirectoryDocumentRequestor(DirectoryCircuit circuit, TorInitializationTracker initializationTracker) {
-		this.circuit = circuit;
-		this.initializationTracker = initializationTracker;
-	}
-
-	public RouterDescriptor downloadBridgeDescriptor(Router bridge) throws DirectoryRequestFailedException {
-		return fetchSingleDocument(new BridgeDescriptorFetcher());
-	}
-
-	public ConsensusDocument downloadCurrentConsensus(boolean useMicrodescriptors) throws DirectoryRequestFailedException {
-		return fetchSingleDocument(new ConsensusFetcher(useMicrodescriptors), CircuitManager.DIRECTORY_PURPOSE_CONSENSUS);
-	}
-
-	public List<KeyCertificate> downloadKeyCertificates(Set<RequiredCertificate> required) throws DirectoryRequestFailedException {
-		return fetchDocuments(new CertificateFetcher(required), CircuitManager.DIRECTORY_PURPOSE_CERTIFICATES);
-	}
-
-	public List<RouterDescriptor> downloadRouterDescriptors(Set<HexDigest> fingerprints) throws DirectoryRequestFailedException {
-		return fetchDocuments(new RouterDescriptorFetcher(fingerprints), CircuitManager.DIRECTORY_PURPOSE_DESCRIPTORS);
-	}
-
-	public List<RouterMicrodescriptor> downloadRouterMicrodescriptors(Set<HexDigest> fingerprints) throws DirectoryRequestFailedException  {
-		return fetchDocuments(new MicrodescriptorFetcher(fingerprints), CircuitManager.DIRECTORY_PURPOSE_DESCRIPTORS);
-	}
-	
-	private <T> T fetchSingleDocument(DocumentFetcher<T> fetcher) throws DirectoryRequestFailedException {
-		return fetchSingleDocument(fetcher, 0);
-	}
-
-	private <T> T fetchSingleDocument(DocumentFetcher<T> fetcher, int purpose) throws DirectoryRequestFailedException {
-		final List<T> result = fetchDocuments(fetcher, purpose);
-		if(result.size() == 1) {
-			return result.get(0);
-		}
-		return null;
-	}
-	
-	private <T> List<T> fetchDocuments(DocumentFetcher<T> fetcher, int purpose) throws DirectoryRequestFailedException {
-		try {
-			final HttpConnection http = createHttpConnection(purpose);
-			try {
-				return fetcher.requestDocuments(http);
-			} finally {
-				http.close();
-			}
-		} catch (TimeoutException e) {
-			throw new DirectoryRequestFailedException("Directory request timed out");
-		} catch (StreamConnectFailedException e) {
-			throw new DirectoryRequestFailedException("Failed to open directory stream", e);
-		} catch (IOException e) {
-			throw new DirectoryRequestFailedException("I/O exception processing directory request", e);
-		} catch (InterruptedException e) {
-			throw new DirectoryRequestFailedException("Directory request interrupted");
-		} 
-	}
-	
-	private HttpConnection createHttpConnection(int purpose) throws InterruptedException, TimeoutException, StreamConnectFailedException {
-		return new HttpConnection(openDirectoryStream(purpose));
-	}
-
-	private Stream openDirectoryStream(int purpose) throws InterruptedException, TimeoutException, StreamConnectFailedException {
-		final int requestEventCode = purposeToEventCode(purpose, false);
-		final int loadingEventCode = purposeToEventCode(purpose, true);
-		
-		notifyInitialization(requestEventCode);
-
-		final Stream stream = circuit.openDirectoryStream(OPEN_DIRECTORY_STREAM_TIMEOUT, true);
-		notifyInitialization(loadingEventCode);
-		return stream;
-	}
-	
-	private int purposeToEventCode(int purpose, boolean getLoadingEvent) {
-		switch(purpose) {
-		case CircuitManager.DIRECTORY_PURPOSE_CONSENSUS:
-			return getLoadingEvent ? Tor.BOOTSTRAP_STATUS_LOADING_STATUS : Tor.BOOTSTRAP_STATUS_REQUESTING_STATUS;
-		case CircuitManager.DIRECTORY_PURPOSE_CERTIFICATES:
-			 return getLoadingEvent ? Tor.BOOTSTRAP_STATUS_LOADING_KEYS : Tor.BOOTSTRAP_STATUS_REQUESTING_KEYS;
-		case CircuitManager.DIRECTORY_PURPOSE_DESCRIPTORS:
-			return getLoadingEvent ? Tor.BOOTSTRAP_STATUS_LOADING_DESCRIPTORS : Tor.BOOTSTRAP_STATUS_REQUESTING_DESCRIPTORS;
-		default:
-			return 0;
-		}
-	}
-	
-	private void notifyInitialization(int code) {
-		if(code > 0 && initializationTracker != null) {
-			initializationTracker.notifyEvent(code);
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/downloader/DirectoryDownloadTask.java b/orchid/src/com/subgraph/orchid/directory/downloader/DirectoryDownloadTask.java
deleted file mode 100644
index 4aa71735e4a..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/downloader/DirectoryDownloadTask.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package com.subgraph.orchid.directory.downloader;
-
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.ConsensusDocument;
-import com.subgraph.orchid.Directory;
-import com.subgraph.orchid.DirectoryDownloader;
-import com.subgraph.orchid.KeyCertificate;
-import com.subgraph.orchid.Threading;
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.TorConfig.AutoBoolValue;
-import com.subgraph.orchid.crypto.TorRandom;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.Timestamp;
-
-public class DirectoryDownloadTask implements Runnable {
-	private final static Logger logger = Logger.getLogger(DirectoryDownloadTask.class.getName());
-	
-	private final TorConfig config;
-	private final Directory directory;
-	
-	private final DirectoryDownloader downloader;
-
-	private final TorRandom random;
-	private final DescriptorProcessor descriptorProcessor;
-
-	private final ExecutorService executor = Threading.newPool("DirectoryDownloadTask worker");
-
-	private volatile boolean isDownloadingCertificates;
-	private volatile boolean isDownloadingConsensus;
-	private final AtomicInteger outstandingDescriptorTasks;
-
-	private ConsensusDocument currentConsensus;
-	private Date consensusDownloadTime;
-
-	private volatile boolean isStopped;
-	
-	DirectoryDownloadTask(TorConfig config, Directory directory, DirectoryDownloader downloader) {
-		this.config = config;
-		this.directory = directory;
-		this.downloader = downloader;
-		this.random = new TorRandom();
-		this.outstandingDescriptorTasks = new AtomicInteger();
-		this.descriptorProcessor = new DescriptorProcessor(config, directory);
-	}
-	
-	public synchronized void stop() {
-		if(isStopped) {
-			return;
-		}
-		executor.shutdownNow();
-		isStopped = true;
-	}
-
-	public void run() {
-		directory.loadFromStore();
-		directory.waitUntilLoaded();
-		setCurrentConsensus(directory.getCurrentConsensusDocument());
-		while (!isStopped) {
-			checkCertificates();
-			checkConsensus();
-			checkDescriptors();
-			try {
-				Thread.sleep(5000);
-			} catch (InterruptedException e) {
-				Thread.currentThread().interrupt();
-				return;
-			}
-		}
-	}
-
-	private void checkCertificates() {
-		if (isDownloadingCertificates
-				|| directory.getRequiredCertificates().isEmpty()) {
-			return;
-		}
-
-		isDownloadingCertificates = true;
-		executor.execute(new DownloadCertificatesTask());
-	}
-
-	void setCurrentConsensus(ConsensusDocument consensus) {
-		if (consensus != null) {
-			currentConsensus = consensus;
-			consensusDownloadTime = chooseDownloadTimeForConsensus(consensus);
-		} else {
-			currentConsensus = null;
-			consensusDownloadTime = null;
-		}
-	}
-
-	/*
-	 * dir-spec 5.1: Downloading network-status documents
-	 * 
-	 *   To avoid swarming the caches whenever a consensus expires, the clients
-	 *   download new consensuses at a randomly chosen time after the caches are
-	 *   expected to have a fresh consensus, but before their consensus will
-	 *   expire. (This time is chosen uniformly at random from the interval
-	 *   between the time 3/4 into the first interval after the consensus is no
-	 *   longer fresh, and 7/8 of the time remaining after that before the
-	 *   consensus is invalid.)
-	 * 
-	 *   [For example, if a cache has a consensus that became valid at 1:00, and
-	 *   is fresh until 2:00, and expires at 4:00, that cache will fetch a new
-	 *   consensus at a random time between 2:45 and 3:50, since 3/4 of the
-	 *   one-hour interval is 45 minutes, and 7/8 of the remaining 75 minutes is
-	 *   65 minutes.]
-	 */
-	private Date chooseDownloadTimeForConsensus(ConsensusDocument consensus) {
-		final long va = getMilliseconds(consensus.getValidAfterTime());
-		final long fu = getMilliseconds(consensus.getFreshUntilTime());
-		final long vu = getMilliseconds(consensus.getValidUntilTime());
-		final long i1 = fu - va;
-		final long start = fu + ((i1 * 3) / 4);
-		final long i2 = ((vu - start) * 7) / 8;
-		final long r = random.nextLong(i2);
-		final long download = start + r;
-		return new Date(download);
-	}
-
-	private boolean needConsensusDownload() {
-		if(directory.hasPendingConsensus()) {
-			return false;
-		}
-		if (currentConsensus == null || !currentConsensus.isLive()) {
-			if(currentConsensus == null) {
-				logger.info("Downloading consensus because we have no consensus document");
-			} else {
-				logger.info("Downloading consensus because the document we have is not live");
-			}
-			return true;
-		}
-		return consensusDownloadTime.before(new Date());
-	}
-
-	private long getMilliseconds(Timestamp ts) {
-		return ts.getDate().getTime();
-	}
-
-	private void checkConsensus() {
-		if (isDownloadingConsensus || !needConsensusDownload()) {
-			return;
-		}
-
-		isDownloadingConsensus = true;
-		executor.execute(new DownloadConsensusTask());
-	}
-
-	private void checkDescriptors() {
-		if (outstandingDescriptorTasks.get() > 0) {
-			return;
-		}
-		List<List<HexDigest>> ds = descriptorProcessor
-				.getDescriptorDigestsToDownload();
-		if (ds.isEmpty()) {
-			return;
-		}
-		for (List<HexDigest> dlist : ds) {
-			outstandingDescriptorTasks.incrementAndGet();
-			executor.execute(new DownloadRouterDescriptorsTask(dlist, useMicrodescriptors()));
-		}
-	}
-	
-	private boolean useMicrodescriptors() {
-		return config.getUseMicrodescriptors() != AutoBoolValue.FALSE;
-	}
-	
-	private class DownloadConsensusTask implements Runnable {
-		public void run() {
-			try {
-				final ConsensusDocument consensus = downloader.downloadCurrentConsensus(useMicrodescriptors());
-				setCurrentConsensus(consensus);
-				directory.addConsensusDocument(consensus, false);
-				
-			} catch (DirectoryRequestFailedException e) {
-				logger.warning("Failed to download current consensus document: "+ e.getMessage());
-			} finally {
-				isDownloadingConsensus = false;
-			}
-		}
-	}
-	
-	private class DownloadRouterDescriptorsTask implements Runnable {
-		private final Set<HexDigest> fingerprints;
-		private final boolean useMicrodescriptors;
-		
-		public DownloadRouterDescriptorsTask(Collection<HexDigest> fingerprints, boolean useMicrodescriptors) {
-			this.fingerprints = new HashSet<HexDigest>(fingerprints);
-			this.useMicrodescriptors = useMicrodescriptors;
-		}
-		
-		public void run() {
-			try {
-				if(useMicrodescriptors) {
-					directory.addRouterMicrodescriptors(downloader.downloadRouterMicrodescriptors(fingerprints));
-				} else {
-					directory.addRouterDescriptors(downloader.downloadRouterDescriptors(fingerprints));
-				}
-			} catch (DirectoryRequestFailedException e) {
-				logger.warning("Failed to download router descriptors: "+ e.getMessage());
-			} finally {
-				outstandingDescriptorTasks.decrementAndGet();
-			}
-		}
-	}
-
-	private class DownloadCertificatesTask implements Runnable {
-		public void run() {
-			try {
-				for(KeyCertificate c: downloader.downloadKeyCertificates(directory.getRequiredCertificates())) {
-					directory.addCertificate(c);
-				}
-				directory.storeCertificates();
-			} catch (DirectoryRequestFailedException e) {
-				logger.warning("Failed to download key certificates: "+ e.getMessage());
-			} finally {
-				isDownloadingCertificates = false;
-			}
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/downloader/DirectoryDownloaderImpl.java b/orchid/src/com/subgraph/orchid/directory/downloader/DirectoryDownloaderImpl.java
deleted file mode 100644
index 389ba25e0f8..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/downloader/DirectoryDownloaderImpl.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.subgraph.orchid.directory.downloader;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.CircuitManager;
-import com.subgraph.orchid.ConsensusDocument;
-import com.subgraph.orchid.ConsensusDocument.RequiredCertificate;
-import com.subgraph.orchid.Descriptor;
-import com.subgraph.orchid.Directory;
-import com.subgraph.orchid.DirectoryCircuit;
-import com.subgraph.orchid.DirectoryDownloader;
-import com.subgraph.orchid.KeyCertificate;
-import com.subgraph.orchid.OpenFailedException;
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.RouterDescriptor;
-import com.subgraph.orchid.RouterMicrodescriptor;
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.circuits.TorInitializationTracker;
-import com.subgraph.orchid.data.HexDigest;
-
-public class DirectoryDownloaderImpl implements DirectoryDownloader {
-	private final static Logger logger = Logger.getLogger(DirectoryDownloaderImpl.class.getName());
-	
-	private final TorConfig config;
-	private final TorInitializationTracker initializationTracker;
-	private CircuitManager circuitManager;
-	private boolean isStarted;
-	private boolean isStopped;
-	private DirectoryDownloadTask downloadTask;
-	private Thread downloadTaskThread;
-	
-
-	public DirectoryDownloaderImpl(TorConfig config, TorInitializationTracker initializationTracker) {
-		this.config = config;
-		this.initializationTracker = initializationTracker;
-	}
-
-	public void setCircuitManager(CircuitManager circuitManager) {
-		this.circuitManager = circuitManager;
-	}
-
-	public synchronized void start(Directory directory) {
-		if(isStarted) {
-			logger.warning("Directory downloader already running");
-			return;
-		}
-		if(circuitManager == null) {
-			throw new IllegalStateException("Must set CircuitManager instance with setCircuitManager() before starting.");
-		}
-	
-		downloadTask = new DirectoryDownloadTask(config, directory, this);
-		downloadTaskThread = new Thread(downloadTask);
-		downloadTaskThread.start();
-		isStarted = true;
-	}
-	
-	public synchronized void stop() {
-		if(!isStarted || isStopped) {
-			return;
-		}
-		downloadTask.stop();
-		downloadTaskThread.interrupt();
-	}
-
-	public RouterDescriptor downloadBridgeDescriptor(Router bridge) throws DirectoryRequestFailedException {
-		final DirectoryDocumentRequestor requestor = new DirectoryDocumentRequestor(openBridgeCircuit(bridge));
-		return requestor.downloadBridgeDescriptor(bridge);
-	}
-
-	
-	public ConsensusDocument downloadCurrentConsensus(boolean useMicrodescriptors) throws DirectoryRequestFailedException  {
-			return downloadCurrentConsensus(useMicrodescriptors, openCircuit());
-	}
-
-	public ConsensusDocument downloadCurrentConsensus(boolean useMicrodescriptors, DirectoryCircuit circuit) throws DirectoryRequestFailedException {
-		final DirectoryDocumentRequestor requestor = new DirectoryDocumentRequestor(circuit, initializationTracker);
-		return requestor.downloadCurrentConsensus(useMicrodescriptors);
-	}
-
-	public List<KeyCertificate> downloadKeyCertificates(Set<RequiredCertificate> required) throws DirectoryRequestFailedException {
-		return downloadKeyCertificates(required, openCircuit());
-	}
-
-	public List<KeyCertificate> downloadKeyCertificates(Set<RequiredCertificate> required, DirectoryCircuit circuit) throws DirectoryRequestFailedException {
-		final DirectoryDocumentRequestor requestor = new DirectoryDocumentRequestor(circuit, initializationTracker);
-		return requestor.downloadKeyCertificates(required);
-	}
-
-	public List<RouterDescriptor> downloadRouterDescriptors(Set<HexDigest> fingerprints) throws DirectoryRequestFailedException {
-		return downloadRouterDescriptors(fingerprints, openCircuit());
-	}
-
-	public List<RouterDescriptor> downloadRouterDescriptors(Set<HexDigest> fingerprints, DirectoryCircuit circuit) throws DirectoryRequestFailedException {
-		final DirectoryDocumentRequestor requestor = new DirectoryDocumentRequestor(circuit, initializationTracker);
-		final List<RouterDescriptor> ds =  requestor.downloadRouterDescriptors(fingerprints);
-		return removeUnrequestedDescriptors(fingerprints, ds);
-	}
-
-	public List<RouterMicrodescriptor> downloadRouterMicrodescriptors(Set<HexDigest> fingerprints) throws DirectoryRequestFailedException {
-		return downloadRouterMicrodescriptors(fingerprints, openCircuit());
-	}
-
-	public List<RouterMicrodescriptor> downloadRouterMicrodescriptors(Set<HexDigest> fingerprints, DirectoryCircuit circuit) throws DirectoryRequestFailedException {
-		final DirectoryDocumentRequestor requestor = new DirectoryDocumentRequestor(circuit, initializationTracker);
-		final List<RouterMicrodescriptor> ds =  requestor.downloadRouterMicrodescriptors(fingerprints);
-		return removeUnrequestedDescriptors(fingerprints, ds);
-	}
-	
-	private <T extends Descriptor> List<T> removeUnrequestedDescriptors(Set<HexDigest> requested, List<T> received) {
-		final List<T> result = new ArrayList<T>();
-		int unrequestedCount = 0;
-		for(T d: received) {
-			if(requested.contains(d.getDescriptorDigest())) {
-				result.add(d);
-			} else {
-				unrequestedCount += 1;
-			}
-		}
-		if(unrequestedCount > 0) {
-			logger.warning("Discarding "+ unrequestedCount + " received descriptor(s) with fingerprints that did not match requested descriptors");
-		}
-		return result;
-	}
-	
-	private DirectoryCircuit openCircuit() throws DirectoryRequestFailedException {
-		try {
-			return circuitManager.openDirectoryCircuit();
-		} catch (OpenFailedException e) {
-			throw new DirectoryRequestFailedException("Failed to open directory circuit", e);
-		}
-	}
-	
-	private DirectoryCircuit openBridgeCircuit(Router bridge) throws DirectoryRequestFailedException {
-		try {
-			return circuitManager.openDirectoryCircuitTo(Arrays.asList(bridge));
-		} catch (OpenFailedException e) {
-			throw new DirectoryRequestFailedException("Failed to open directory circuit to bridge "+ bridge, e);
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/downloader/DirectoryRequestFailedException.java b/orchid/src/com/subgraph/orchid/directory/downloader/DirectoryRequestFailedException.java
deleted file mode 100644
index c41df470064..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/downloader/DirectoryRequestFailedException.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.subgraph.orchid.directory.downloader;
-
-public class DirectoryRequestFailedException extends Exception {
-
-	private static final long serialVersionUID = 1L;
-	
-	public DirectoryRequestFailedException(String message) {
-		super(message);
-	}
-	
-	public DirectoryRequestFailedException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/downloader/DocumentFetcher.java b/orchid/src/com/subgraph/orchid/directory/downloader/DocumentFetcher.java
deleted file mode 100644
index 5cf73baa0b3..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/downloader/DocumentFetcher.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.subgraph.orchid.directory.downloader;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Collections;
-import java.util.List;
-
-import com.subgraph.orchid.directory.DocumentParserFactoryImpl;
-import com.subgraph.orchid.directory.parsing.BasicDocumentParsingResult;
-import com.subgraph.orchid.directory.parsing.DocumentParser;
-import com.subgraph.orchid.directory.parsing.DocumentParserFactory;
-
-public abstract class DocumentFetcher<T> {
-	protected final static DocumentParserFactory PARSER_FACTORY = new DocumentParserFactoryImpl();
-
-	
-	abstract String getRequestPath();
-	abstract DocumentParser<T> createParser(ByteBuffer response);
-
-	public List<T> requestDocuments(HttpConnection httpConnection) throws IOException, DirectoryRequestFailedException {
-		final ByteBuffer body = makeRequest(httpConnection);
-		if(body.hasRemaining()) {
-			return processResponse(body);
-		}else {
-			return Collections.emptyList();
-		}
-	}
-
-	private ByteBuffer makeRequest(HttpConnection httpConnection) throws IOException, DirectoryRequestFailedException {
-		
-		httpConnection.sendGetRequest(getRequestPath());
-		httpConnection.readResponse();
-		if(httpConnection.getStatusCode() == 200) {
-			return httpConnection.getMessageBody();
-		}
-		
-		throw new DirectoryRequestFailedException("Request "+ getRequestPath() +" to directory "+
-                httpConnection.getHost() +" returned error code: "+
-                httpConnection.getStatusCode() + " "+ httpConnection.getStatusMessage());
-
-	}
-
-	private List<T> processResponse(ByteBuffer response) throws DirectoryRequestFailedException {
-		final DocumentParser<T> parser = createParser(response);
-		final BasicDocumentParsingResult<T> result = new BasicDocumentParsingResult<T>();
-		final boolean success = parser.parse(result);
-		if(success) {
-			return result.getParsedDocuments();
-		}
-		throw new DirectoryRequestFailedException("Failed to parse response from directory: "+ result.getMessage());
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/downloader/HttpConnection.java b/orchid/src/com/subgraph/orchid/directory/downloader/HttpConnection.java
deleted file mode 100644
index 44d778d31a6..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/downloader/HttpConnection.java
+++ /dev/null
@@ -1,247 +0,0 @@
-package com.subgraph.orchid.directory.downloader;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.zip.DataFormatException;
-import java.util.zip.Inflater;
-
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.Stream;
-
-public class HttpConnection {
-	private final static Charset CHARSET = Charset.forName("ISO-8859-1");
-	
-	private final static String HTTP_RESPONSE_REGEX = "HTTP/1\\.(\\d) (\\d+) (.*)";
-	private final static String CONTENT_LENGTH_HEADER = "Content-Length";
-	private final static String CONTENT_ENCODING_HEADER = "Content-Encoding";
-	private final static String COMPRESSION_SUFFIX = ".z";
-	private final String hostname;
-	private final Stream stream;
-	private final InputStream input;
-	private final OutputStream output;
-	private final Map<String, String> headers;
-	private final boolean useCompression;
-	private int responseCode;
-	private boolean bodyCompressed;
-	private String responseMessage;
-	private ByteBuffer messageBody;
-	
-	public HttpConnection(Stream stream) {
-		this(stream, true);
-	}
-
-	public HttpConnection(Stream stream, boolean useCompression) {
-		this.hostname = getHostnameFromStream(stream);
-		this.stream = stream;
-		this.headers = new HashMap<String, String>();
-		this.input = stream.getInputStream();
-		this.output = stream.getOutputStream();
-		this.useCompression = useCompression;
-	}
-	
-	private static String getHostnameFromStream(Stream stream) {
-		final StringBuilder sb = new StringBuilder();
-		final Router r = stream.getCircuit().getFinalCircuitNode().getRouter();
-		if(r == null) {
-			return null;
-		}
-		sb.append(r.getAddress().toString());
-		if(r.getOnionPort() != 80) {
-			sb.append(":");
-			sb.append(r.getOnionPort());
-		}
-		return sb.toString();
-	}
-
-	public void sendGetRequest(String request) throws IOException {
-		final StringBuilder sb = new StringBuilder();
-		sb.append("GET ");
-		sb.append(request);
-		if(useCompression && !request.endsWith(COMPRESSION_SUFFIX)) {
-			sb.append(COMPRESSION_SUFFIX);
-		}
-		sb.append(" HTTP/1.0\r\n");
-		if(hostname != null) {
-			sb.append("Host: "+ hostname +"\r\n");
-		}
-		sb.append("\r\n");
-		
-		final String requestLine = sb.toString();
-		output.write(requestLine.getBytes(CHARSET));
-		output.flush();
-	}
-	
-	public String getHost() {
-		if(hostname == null) {
-			return hostname;
-		} else {
-			return "(none)";
-		}
-	}
-
-	public void readResponse() throws IOException, DirectoryRequestFailedException {
-		readStatusLine();
-		readHeaders();
-		readBody();
-	}
-	
-	public int getStatusCode() {
-		return responseCode;
-	}
-	
-	public String getStatusMessage() {
-		return responseMessage;
-	}
-
-	public ByteBuffer getMessageBody() {
-		return messageBody;
-	}
-	
-	public void close() {
-		if(stream == null) {
-			return;
-		}
-		stream.close();
-	}
-	
-	private void readStatusLine() throws IOException, DirectoryRequestFailedException {
-		final String line = nextResponseLine();	
-		final Pattern p = Pattern.compile(HTTP_RESPONSE_REGEX);
-		final Matcher m = p.matcher(line);
-		if(!m.find() || m.groupCount() != 3) 
-			throw new DirectoryRequestFailedException("Error parsing HTTP response line: "+ line);
-		
-		try {
-			int n1 = Integer.parseInt(m.group(1));
-			int n2 = Integer.parseInt(m.group(2));
-			if( (n1 != 0 && n1 != 1) ||
-					(n2 < 100 || n2 >= 600))
-				throw new DirectoryRequestFailedException("Failed to parse header: "+ line);
-			responseCode = n2;
-			responseMessage = m.group(3);
-		} catch(NumberFormatException e) {
-			throw new DirectoryRequestFailedException("Failed to parse header: "+ line);
-		}
-	}
-	
-	private void readHeaders() throws IOException, DirectoryRequestFailedException {
-		headers.clear();
-		while(true) {
-			final String line = nextResponseLine();
-			if(line.length() == 0)
-				return;
-			final String[] args = line.split(": ", 2);
-			if(args.length != 2)
-				throw new DirectoryRequestFailedException("Failed to parse HTTP header: "+ line);
-			headers.put(args[0], args[1]);
-		}
-	}
-	
-	private String nextResponseLine() throws IOException, DirectoryRequestFailedException {
-		final String line = readInputLine();
-		if(line == null) {
-			throw new DirectoryRequestFailedException("Unexpected EOF reading HTTP response");
-		}
-		return line;
-	}
-	
-	private void readBody() throws IOException, DirectoryRequestFailedException {
-		processContentEncodingHeader();
-		
-		if(headers.containsKey(CONTENT_LENGTH_HEADER)) { 
-			readBodyFromContentLength();
-		} else { 
-			readBodyUntilEOF();
-		}
-	}
-	
-	private void processContentEncodingHeader() throws DirectoryRequestFailedException {
-		final String encoding = headers.get(CONTENT_ENCODING_HEADER);
-		if(encoding == null || encoding.equals("identity")) 
-			bodyCompressed = false;
-		else if(encoding.equals("deflate") || encoding.equals("x-deflate"))
-			bodyCompressed = true;
-		else
-			throw new DirectoryRequestFailedException("Unrecognized content encoding: "+ encoding);
-	}
-	
-	private void readBodyFromContentLength() throws IOException {
-		int bodyLength = Integer.parseInt(headers.get(CONTENT_LENGTH_HEADER));
-		byte[] bodyBuffer = new byte[bodyLength];
-		readAll(bodyBuffer);
-		messageBody = bytesToBody(bodyBuffer);
-	}
-	
-	private void readBodyUntilEOF() throws IOException {
-		final byte[] bodyBuffer = readToEOF();
-		messageBody = bytesToBody(bodyBuffer);
-	}
-	
-	private ByteBuffer bytesToBody(byte[] bs) throws IOException {
-		if(bodyCompressed) {
-			return ByteBuffer.wrap(decompressBuffer(bs));
-		} else {
-			return ByteBuffer.wrap(bs);
-		}
-	}
-	
-	private byte[] decompressBuffer(byte[] buffer) throws IOException {
-		final ByteArrayOutputStream output = new ByteArrayOutputStream();
-		final Inflater decompressor = new Inflater();
-		final byte[] decompressBuffer = new byte[4096];
-		decompressor.setInput(buffer);
-		int n;
-		try {
-			while((n = decompressor.inflate(decompressBuffer)) != 0) {
-				output.write(decompressBuffer, 0, n);
-			}
-			return output.toByteArray();
-		} catch (DataFormatException e) {
-			throw new IOException("Error decompressing http body: "+ e);
-		}
-	}
-	
-	private byte[] readToEOF() throws IOException {
-		final ByteArrayOutputStream output = new ByteArrayOutputStream();
-		final byte[] buffer = new byte[2048];
-		int n;
-		while( (n = input.read(buffer, 0, buffer.length)) != -1) {
-			output.write(buffer, 0, n);
-		}
-		return output.toByteArray();
-	}
-
-	private void readAll(byte[] buffer) throws IOException {
-		int offset = 0;
-		int remaining = buffer.length;
-		while(remaining > 0) {
-			int n = input.read(buffer, offset, remaining);
-			if(n == -1) {
-				throw new IOException("Unexpected early EOF reading HTTP body");
-			}
-			offset += n;
-			remaining -= n;
-		}
-	}
-	
-	private String readInputLine() throws IOException {
-		final StringBuilder sb = new StringBuilder();
-		int c;
-		while((c = input.read()) != -1) {
-			if(c == '\n') {
-				return sb.toString();
-			} else if(c != '\r') {
-				sb.append((char) c);
-			}
-		}
-		return (sb.length() == 0) ? (null) : (sb.toString());
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/downloader/MicrodescriptorFetcher.java b/orchid/src/com/subgraph/orchid/directory/downloader/MicrodescriptorFetcher.java
deleted file mode 100644
index ab407cf96b3..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/downloader/MicrodescriptorFetcher.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.subgraph.orchid.directory.downloader;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import com.subgraph.orchid.RouterMicrodescriptor;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.directory.parsing.DocumentParser;
-
-public class MicrodescriptorFetcher extends DocumentFetcher<RouterMicrodescriptor>{
-
-	private final List<HexDigest> fingerprints;
-	
-	public MicrodescriptorFetcher(Collection<HexDigest> fingerprints) {
-		this.fingerprints = new ArrayList<HexDigest>(fingerprints);
-	}
-
-	@Override
-	String getRequestPath() {
-		return "/tor/micro/d/"+ fingerprintsToRequestString();
-	}
-	
-	private String fingerprintsToRequestString() {
-		final StringBuilder sb = new StringBuilder();
-		for(HexDigest fp: fingerprints) {
-			appendFingerprint(sb, fp);
-		}
-		return sb.toString();
-	}
-
-	private void appendFingerprint(StringBuilder sb, HexDigest fp) {
-		if(sb.length() > 0) {
-			sb.append("-");
-		}
-		sb.append(fp.toBase64(true));
-	}
-
-	@Override
-	DocumentParser<RouterMicrodescriptor> createParser(ByteBuffer response) {
-		return PARSER_FACTORY.createRouterMicrodescriptorParser(response);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/downloader/RouterDescriptorFetcher.java b/orchid/src/com/subgraph/orchid/directory/downloader/RouterDescriptorFetcher.java
deleted file mode 100644
index 4b03e88cf7a..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/downloader/RouterDescriptorFetcher.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.subgraph.orchid.directory.downloader;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import com.subgraph.orchid.RouterDescriptor;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.directory.parsing.DocumentParser;
-
-public class RouterDescriptorFetcher extends DocumentFetcher<RouterDescriptor>{
-
-	private final List<HexDigest> fingerprints;
-	
-	public RouterDescriptorFetcher(Collection<HexDigest> fingerprints) {
-		this.fingerprints = new ArrayList<HexDigest>(fingerprints);
-	}
-
-	@Override
-	String getRequestPath() {
-		return "/tor/server/d/"+ fingerprintsToRequestString();
-	}
-
-	private String fingerprintsToRequestString() {
-		final StringBuilder sb = new StringBuilder();
-		for(HexDigest fp: fingerprints) {
-			appendFingerprint(sb, fp);
-		}
-		return sb.toString();
-	}
-	private void appendFingerprint(StringBuilder sb, HexDigest fp) {
-		if(sb.length() > 0) {
-			sb.append("+");
-		}
-		sb.append(fp.toString());
-	}
-	
-	@Override
-	DocumentParser<RouterDescriptor> createParser(ByteBuffer response) {
-		return PARSER_FACTORY.createRouterDescriptorParser(response, true);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/parsing/BasicDocumentParsingResult.java b/orchid/src/com/subgraph/orchid/directory/parsing/BasicDocumentParsingResult.java
deleted file mode 100644
index e8a997dc9ef..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/parsing/BasicDocumentParsingResult.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.subgraph.orchid.directory.parsing;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class BasicDocumentParsingResult<T> implements DocumentParsingResultHandler<T>, DocumentParsingResult<T> {
-
-	private final List<T> documents;
-	private T invalidDocument;
-	private boolean isOkay;
-	private boolean isInvalid;
-	private boolean isError;
-	private String message;
-
-	public BasicDocumentParsingResult() {
-		documents = new ArrayList<T>();
-		isOkay = true;
-		isInvalid = false;
-		isError = false;
-		message = "";
-	}
-	
-	public T getDocument() {
-		if(documents.size() != 1) {
-			throw new IllegalStateException();
-		}
-		return documents.get(0);
-	}
-
-	public List<T> getParsedDocuments() {
-		return new ArrayList<T>(documents);
-	}
-
-	public boolean isOkay() {
-		return isOkay;
-	}
-	
-	public boolean isInvalid() {
-		return isInvalid;
-	}
-	
-	public T getInvalidDocument() {
-		return invalidDocument;
-	}
-
-	public boolean isError() {
-		return isError;
-	}
-	
-	public String getMessage() {
-		return message;
-	}
-	
-	public void documentParsed(T document) {
-		documents.add(document);
-	}
-
-	public void documentInvalid(T document, String message) {
-		isOkay = false;
-		isInvalid = true;
-		invalidDocument = document;
-		this.message = message;
-	}
-
-	public void parsingError(String message) {
-		isOkay = false;
-		isError = true;
-		this.message = message;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/parsing/DocumentFieldParser.java b/orchid/src/com/subgraph/orchid/directory/parsing/DocumentFieldParser.java
deleted file mode 100644
index a67fd94d4e7..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/parsing/DocumentFieldParser.java
+++ /dev/null
@@ -1,341 +0,0 @@
-package com.subgraph.orchid.directory.parsing;
-
-import com.subgraph.orchid.TorParsingException;
-import com.subgraph.orchid.crypto.TorMessageDigest;
-import com.subgraph.orchid.crypto.TorPublicKey;
-import com.subgraph.orchid.crypto.TorSignature;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.data.Timestamp;
-
-/**
- * This helper class is used by document parsing classes to extract individual
- * fields from a directory document.  The DocumentFieldParser also manages the
- * InputStream which is the source of the document to parse.  Parsing classes
- * are implemented by creating an instance of the DocumentParsingHandler interface.
- * 
- */
-public interface DocumentFieldParser {
-	
-	/**
-	 * Run the document parser.  The {@link #setHandler(DocumentParsingHandler)} method must be
-	 * called before calling this method to set a <code>DocumentParsingHandler</code> for processing
-	 * this document.
-	 * 
-	 * @throws TorParsingException If a parsing error occurs while processing the document.
-	 */
-	void processDocument();
-	
-	/**
-	 * Returns the number of unprocessed argument items on the current keyword line.
-	 * 
-	 * @return The number of remaining arguments.
-	 */
-	int argumentsRemaining();
-	
-	/**
-	 * Extract the next argument item and return it as a String
-	 * 
-	 * @return The next argument as a String
-	 * @throws TorParsingException If no arguments are remaining on the current keyword line.
-	 */
-	String parseString();
-	
-	/**
-	 * Take all remaining arguments on the current keyword line and return them as a single space
-	 * delimited String.  If no arguments are remaining, then an empty String is returned.
-	 * 
-	 * @return The remaining arguments on the current keyword line concatenated together.
-	 */
-	String parseConcatenatedString();
-	
-	/**
-	 * Extract the next argument and interpret it as an integer boolean value.  The legal values
-	 * are '1' for true or '0' for false.
-	 * @return Return the next argument interpreted as a boolean value.
-	 * @throws TorParsingException If no arguments are remaining or if the current argument cannot be 
-	 *         parsed as a boolean integer value.
-	 */
-	boolean parseBoolean();
-	
-	/**
-	 * Extract the next argument item and return it as a <code>String</code> if it conforms to
-	 * a legally formed router nickname (dir-spec.txt section 2.3).
-	 * 
-	 * A router nickname must be between 1 and 19 alphanumeric characters ([A-Za-z0-9]) to
-	 * be considered valid.
-	 * 
-	 * @return The next argument as a <code>String</code> if it is a validly formatted nickname.
-	 * @throws TorParsingException  If no arguments are remaining or if the current argument is not
-	 *         a valid router nickname.
-	 */
-	String parseNickname();
-	
-	/**
-	 * Extract the next argument and interpret it as an integer.
-	 * 
-	 * @return The next argument interpreted as an integer.
-	 * @throws TorParsingException If no arguments are remaining or if the current argument cannot
-	 *         be parsed as an integer value.
-	 */
-	int parseInteger();
-	
-	/**
-	 * Parse the <code>item</code> argument as an integer.
-	 * 
-	 * @param item A string to parse as an integer.
-	 * @return The integer value of the <code>item</code> argument.
-	 * @throws TorParsingException If the <code>item</code> argument cannot be parsed as an 
-	 *         integer value.
-	 */
-	int parseInteger(String item);
-	
-	/**
-	 * Extract the next argument and interpret it as a comma separated list of integers.
-	 * 
-	 * @return An array of integers.
-	 * @throws TorParsingException If no arguments are remaining or if the current argument cannot
-	 *         be parsed as a list of integers.
-	 */
-	int[] parseIntegerList();
-	
-	/**
-	 * Extract the next argument and interpret it as a network port value.  A valid port
-	 * value is an integer between 0 and 65535 inclusive.
-	 * 
-	 * @return The next argument interpreted as an integer port value.
-	 * @throws TorParsingException If no arguments are remaining or if the current argument cannot
-	 *         be parsed as a legal port value.
-	 */
-	int parsePort();
-	
-	/**
-	 * Parse the <code>item</code> arguement as a network port value.  A valid port value
-	 * is an integer between 0 and 65535 inclusive.
-	 * 
-	 * @param item A string to parse as an integer port value.
-	 * @return The port integer value of the <code>item</code> argument
-	 * @throws TorParsingException If the <code>item</code> argument cannot be parsed as a 
-	 *         legal port value.
-	 */
-	int parsePort(String item);
-	
-	/**
-	 * Extract the next argument and interpret it as Base64 encoded binary data.  
-	 * 
-	 * @return The bytes decoded from the Base64 encoded argument.
-	 * @throws TorParsingException If no arguments are remaining or if the current argument cannot
-	 *         be parsed as Base64 encoded data.
-	 */
-	byte[] parseBase64Data();
-	
-	/**
-	 * Extract the next two arguments and parse as a timestamp field.
-	 * 
-	 * The format of a timestamp is: YYYY-MM-DD HH:MM:SS
-	 * 
-	 * @return The parsed <code>Timestamp</code> value.
-	 * @throws TorParsingException If there are not sufficient arguments remaining or if the current
-	 *         arguments could not be parsed as a timestamp field.
-	 */
-	Timestamp parseTimestamp();
-	
-	/**
-	 * Extract the next argument and interpret it as a hex encoded digest string.
-	 * 
-	 * @return The parsed <code>HexDigest</code> value.
-	 * @throws TorParsingException If no arguments are remaining or if the current argument cannot 
-	 *         be parsed as a hex encoded digest string.
-	 */
-	HexDigest parseHexDigest();
-	
-	
-	/**
-	 * Extract the next argument and interpret it as a base 32 encoded digest string.
-	 * 
-	 * @return The parsed <code>HexDigest</code> value.
-	 * @throws TorParsingException If no arguments are remaining or if the current argument cannot 
-	 *         be parsed as a base 32 encoded digest string.
-	 */
-	HexDigest parseBase32Digest();
-
-	/**
-	 * Extract all remaining arguments and interpret the concatenated string as a
-	 * hex encoded fingerprint string.
-	 *  
-	 * @return The parsed <code>HexDigest</code> value extracted from the concatenated string.
-	 * @throws TorParsingException If the concatenation of the remaining arguments could not be parsed
-	 *         as a hex encoded fingerprint string.
-	 */
-	HexDigest parseFingerprint();
-	
-	/**
-	 * Extract the next argument and interpret it as an IPv4 network address in dotted quad notation.
-	 * 
-	 * @return The parsed <code>IPv4Address</code> value.
-	 * @throws TorParsingException If no arguments are remaining or if the current argument cannot
-	 *         be parsed as an IPv4 network address.
-	 */
-	IPv4Address parseAddress();
-	
-	/**
-	 * Extract a document object following the current keyword line and interpret it as a PEM
-	 * encoded public key.
-	 * 
-	 * @return The extracted <code>TorPublicKey</code> value.
-	 * @throws TorParsingException If no document object is found following the current keyword line,
-	 *         or if the document object cannot be parsed as a PEM encoded public key.
-	 */
-	TorPublicKey parsePublicKey();
-	
-	byte[] parseNtorPublicKey();
-	/**
-	 * Extract a document object following the current keyword line and interpret it as a 
-	 * Base64 encoded PKCS1 signature object.
-	 * 
-	 * @return The extracted <code>TorSignature</code> value.
-	 * @throws TorParsingException If no document object is found following the current keyword line,
-	 *         or if the document object cannot be parsed as a signature.
-	 */
-	TorSignature parseSignature();
-	
-	/**
-	 * Extract a document object following the current keyword line and don't attempt to interpret
-	 * it further.
-	 * 
-	 * @return The extracted <code>DocumentObject</code>.
-	 * @throws TorParsingException If no document object is found following the current keyword line.
-	 */
-	DocumentObject parseObject();
-	
-	/**
-	 * 
-	 * @return
-	 */
-	
-	NameIntegerParameter parseParameter();
-	/**
-	 * Return the keyword of the current keyword line.  The keyword is the first token on the line 
-	 * unless the first token is 'opt' and 'opt' recognition is enabled.  In this case, the keyword
-	 * is the token immediately following the 'opt' token.
-	 * 
-	 * @return The keyword token of the current keyword line.
-	 */
-	String getCurrentKeyword();
-	
-	/**
-	 * Return all lines from the current document as a single String.
-	 * 
-	 * @return The raw data from the current document.
-	 */
-	String getRawDocument();
-	
-	/**
-	 * Empty the internal buffer which is capturing the raw data from
-	 * the document which is being parsed. 
-	 */
-	void resetRawDocument();
-	
-	/**
-	 * Empty the internal buffer which is capturing raw data from document being parsed and set buffer contents to <tt>initalContent</tt>.
-	 * 
-	 * @param initialContent Initial raw document content.
-	 */
-	void resetRawDocument(String initialContent);
-	
-	/**
-	 * Reset the document signing state.  Any lines read after calling this method will be included 
-	 * in the current signature hash.
-	 */
-	void startSignedEntity();
-	
-	/**
-	 * Set the current keyword line as the last line included in the current signature hash.
-	 */
-	void endSignedEntity();
-	
-	/**
-	 * Tells the parser to not include lines that begin with <code>token</code> in the current
-	 * signature calculation.
-	 * 
-	 * @param token The parser will not include lines that begin with <code>token</code> in the
-	 *              current signature.
-	 */
-	void setSignatureIgnoreToken(String token);
-	
-	/**
-	 * Return the internal message digest which is being used to calculate the
-	 * signature over the current document.
-	 * 
-	 * @return The <code>TorMessageDigest</code> instance or <code>null</code> if 
-	 *         a signature is not being actively calculated.
-	 */
-	TorMessageDigest getSignatureMessageDigest();
-	TorMessageDigest getSignatureMessageDigest256();
-	
-	/**
-	 * Verify that current signature hash matches the specified <code>signature</code> signed
-	 * with the public key <code>publicKey</code>
-	 * 
-	 * @param publicKey The public key used to verify the signature.
-	 * @param signature The signature to verify against the current signature hash.
-	 * @return <code>true</code>If the <code>signature</code> argument matches the hash currently
-	 *         calculated document hash.
-	 */
-	boolean verifySignedEntity(TorPublicKey publicKey, TorSignature signature);
-	
-	/**
-	 * Test that the current keyword line has the correct number of arguments.
-	 * 
-	 * @param keyword The name of the current keyword. (used for errors)
-	 * @param argumentCount The expected number of arguments.
-	 * @throws TorParsingException If the number of remaining arguments does not match
-	 *         <code>argumentCount</code>.
-	 */
-	void verifyExpectedArgumentCount(String keyword, int argumentCount);
-
-	/**
-	 * Set a flag so that 'opt' tokens will be recognized at the start of keyword lines.  If
-	 * this flag is set, a token string 'opt' at the start of a keyword line will be ignored 
-	 * and the token following the 'opt' string will be interpreted as the keyword.
-	 */
-	void setRecognizeOpt();
-	
-	/**
-	 * The default delimiter between keyword line tokens is any whitespace.  This method may
-	 * be called to specify a different delimiter policy.
-	 * 
-	 * @param delimeter A regular expression which matches the desired delimiter.
-	 */
-	void setDelimiter(String delimeter);
-	
-	/**
-	 * Set the callback handler which is used to process the document.  This method must be called
-	 * before calling {@link #processDocument()}.
-	 * 
-	 * @param handler The callback handler.
-	 */
-	void setHandler(DocumentParsingHandler handler);
-
-	/**
-	 * Log the specified message at the debug logging level.
-	 * 
-	 * @param message The message to log.
-	 */
-	void logDebug(String message);
-	
-	/**
-	 * Log the specified message at the warn logging level.
-	 * 
-	 * @param message The message to log.
-	 */
-	void logWarn(String message);
-	
-	/**
-	 * Log the specified message at the error logging level.
-	 * 
-	 * @param message The message to log.
-	 */
-	void logError(String message);
-
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/parsing/DocumentObject.java b/orchid/src/com/subgraph/orchid/directory/parsing/DocumentObject.java
deleted file mode 100644
index 84d3c7e2058..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/parsing/DocumentObject.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.subgraph.orchid.directory.parsing;
-
-public class DocumentObject {
-	
-	final private String keyword;
-	final private String headerLine;
-	private String footerLine;
-	private String bodyContent;
-	final private StringBuilder stringContent;
-	
-	public DocumentObject(String keyword, String headerLine) {
-		this.keyword = keyword;
-		this.headerLine = headerLine;
-		this.stringContent = new StringBuilder();
-	}
-
-	public String getKeyword() {
-		return keyword;
-	}
-	
-	public void addContent(String content) {
-		stringContent.append(content);
-		stringContent.append("\n");
-	}
-	
-	public void addFooterLine(String footer) {
-		footerLine = footer;
-		bodyContent = stringContent.toString();
-	}
-	
-	public String getContent() {
-		return getContent(true);
-	}
-	
-	public String getContent(boolean includeHeaders) {
-		if(includeHeaders) {
-			return headerLine + "\n" + bodyContent + footerLine + "\n";
-		} else {
-			return bodyContent;
-		}
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/parsing/DocumentParser.java b/orchid/src/com/subgraph/orchid/directory/parsing/DocumentParser.java
deleted file mode 100644
index 6cedaf531e1..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/parsing/DocumentParser.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.subgraph.orchid.directory.parsing;
-
-
-public interface DocumentParser<T> {
-	boolean parse(DocumentParsingResultHandler<T> resultHandler);
-	DocumentParsingResult<T> parse();
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/parsing/DocumentParserFactory.java b/orchid/src/com/subgraph/orchid/directory/parsing/DocumentParserFactory.java
deleted file mode 100644
index a931bf06b93..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/parsing/DocumentParserFactory.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.subgraph.orchid.directory.parsing;
-
-import java.nio.ByteBuffer;
-
-import com.subgraph.orchid.ConsensusDocument;
-import com.subgraph.orchid.KeyCertificate;
-import com.subgraph.orchid.RouterDescriptor;
-import com.subgraph.orchid.RouterMicrodescriptor;
-
-public interface DocumentParserFactory {
-	DocumentParser<RouterDescriptor> createRouterDescriptorParser(ByteBuffer buffer, boolean verifySignatures);
-	
-	DocumentParser<RouterMicrodescriptor> createRouterMicrodescriptorParser(ByteBuffer buffer);
-
-	DocumentParser<KeyCertificate> createKeyCertificateParser(ByteBuffer buffer);
-
-	DocumentParser<ConsensusDocument> createConsensusDocumentParser(ByteBuffer buffer);
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/parsing/DocumentParsingHandler.java b/orchid/src/com/subgraph/orchid/directory/parsing/DocumentParsingHandler.java
deleted file mode 100644
index c1c81ed1483..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/parsing/DocumentParsingHandler.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.subgraph.orchid.directory.parsing;
-
-public interface DocumentParsingHandler {
-	void parseKeywordLine();
-	void endOfDocument();
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/parsing/DocumentParsingResult.java b/orchid/src/com/subgraph/orchid/directory/parsing/DocumentParsingResult.java
deleted file mode 100644
index f7b53d0f8cb..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/parsing/DocumentParsingResult.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.subgraph.orchid.directory.parsing;
-
-import java.util.List;
-
-public interface DocumentParsingResult<T> {
-	T getDocument();
-	List<T> getParsedDocuments();
-	boolean isOkay();
-	boolean isInvalid();
-	T getInvalidDocument();
-	boolean isError();
-	String getMessage();
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/parsing/DocumentParsingResultHandler.java b/orchid/src/com/subgraph/orchid/directory/parsing/DocumentParsingResultHandler.java
deleted file mode 100644
index b9034bc294a..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/parsing/DocumentParsingResultHandler.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.subgraph.orchid.directory.parsing;
-
-
-public interface DocumentParsingResultHandler<T> {
-	void documentParsed(T document);
-	void documentInvalid(T document, String message);
-	void parsingError(String message);
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/parsing/NameIntegerParameter.java b/orchid/src/com/subgraph/orchid/directory/parsing/NameIntegerParameter.java
deleted file mode 100644
index 55756534156..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/parsing/NameIntegerParameter.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.subgraph.orchid.directory.parsing;
-
-public class NameIntegerParameter {
-	
-	private final String name;
-	private final int value;
-	
-	public NameIntegerParameter(String name, int value) {
-		this.name = name;
-		this.value = value;
-	}
-	
-	public String getName() {
-		return name;
-	}
-	
-	public int getValue() {
-		return value;
-	}
-	
-	public String toString() {
-		return name +"="+ value;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/router/MicrodescriptorCacheLocation.java b/orchid/src/com/subgraph/orchid/directory/router/MicrodescriptorCacheLocation.java
deleted file mode 100644
index b1a6fd492e5..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/router/MicrodescriptorCacheLocation.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.subgraph.orchid.directory.router;
-
-public class MicrodescriptorCacheLocation {
-	
-	private final int offset;
-	private final int length;
-	
-	public MicrodescriptorCacheLocation(int offset, int length) {
-		this.offset = offset;
-		this.length = length;
-	}
-	
-	public int getOffset() {
-		return offset;
-	}
-	
-	public int getLength() {
-		return length;
-	}
-	
-	public String toString() {
-		return "MD Cache offset: "+ offset + " length: "+ length;
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/router/RouterDescriptorImpl.java b/orchid/src/com/subgraph/orchid/directory/router/RouterDescriptorImpl.java
deleted file mode 100644
index 95869e97914..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/router/RouterDescriptorImpl.java
+++ /dev/null
@@ -1,317 +0,0 @@
-package com.subgraph.orchid.directory.router;
-
-import java.nio.ByteBuffer;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import com.subgraph.orchid.RouterDescriptor;
-import com.subgraph.orchid.Tor;
-import com.subgraph.orchid.crypto.TorPublicKey;
-import com.subgraph.orchid.data.BandwidthHistory;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.data.Timestamp;
-import com.subgraph.orchid.data.exitpolicy.ExitPolicy;
-
-public class RouterDescriptorImpl implements RouterDescriptor {
-	private String nickname;
-	private IPv4Address address;
-	private int routerPort;
-	private int directoryPort;
-
-	private int averageBandwidth = -1;
-	private int burstBandwidth = -1;
-	private int observedBandwidth = -1;
-
-	private String platform;
-
-	private Timestamp published;
-
-	private HexDigest fingerprint;
-
-	private boolean hibernating;
-
-	private int uptime;
-
-	private TorPublicKey onionKey;
-	private byte[] ntorOnionKey;
-	private TorPublicKey identityKey;
-	private ExitPolicy exitPolicy = new ExitPolicy();
-
-	private String contact;
-	private Set<String> familyMembers = Collections.emptySet();
-	private Set<Integer> linkProtocols = Collections.emptySet();
-	private Set<Integer> circuitProtocols = Collections.emptySet();
-
-	private BandwidthHistory readHistory;
-	private BandwidthHistory writeHistory;
-
-	private boolean eventDNS = false;
-	private boolean cachesExtraInfo = false;
-	private boolean hiddenServiceDir = false;
-	private HexDigest extraInfoDigest = null;
-	private boolean allowSingleHopExits = false;
-	private boolean hasValidSignature = false;
-
-	private HexDigest descriptorDigest;
-	private String rawDocumentData;
-	
-	private long lastListed;
-	private CacheLocation cacheLocation = CacheLocation.NOT_CACHED;
-	
-	public void setNickname(String nickname) { this.nickname = nickname; }
-	public void setAddress(IPv4Address address) { this.address = address; }
-	public void setRouterPort(int port) { this.routerPort = port; }
-	void setDirectoryPort(int port) { this.directoryPort = port; }
-	void setPlatform(String platform) { this.platform = platform; }
-	void setPublished(Timestamp published) { this.published = published; }
-	void setFingerprint(HexDigest fingerprint) { this.fingerprint = fingerprint; }
-	void setHibernating(boolean flag) { this.hibernating = flag; }
-	void setUptime(int uptime) { this.uptime = uptime; }
-	public void setOnionKey(TorPublicKey key) { this.onionKey = key; }
-	void setNtorOnionKey(byte[] key) { this.ntorOnionKey = key; }
-	void setIdentityKey(TorPublicKey key) { this.identityKey = key; }
-	void setContact(String contact) { this.contact = contact; }
-	void setEventDNS() { eventDNS = true; }
-	void setHiddenServiceDir() { hiddenServiceDir = true; }
-	void setExtraInfoDigest(HexDigest digest) { this.extraInfoDigest = digest; }
-	void setCachesExtraInfo() { cachesExtraInfo = true; }
-	void setAllowSingleHopExits() { allowSingleHopExits = true; }
-	void setReadHistory(BandwidthHistory history) { this.readHistory= history; }
-	void setWriteHistory(BandwidthHistory history) { this.writeHistory = history; }
-	void setValidSignature() { hasValidSignature = true; }
-	void setDescriptorHash(HexDigest digest) { descriptorDigest = digest; }
-	void setRawDocumentData(String rawData) { rawDocumentData = rawData; }
-
-	void addAcceptRule(String rule) {
-		exitPolicy.addAcceptRule(rule);
-	}
-
-	void addRejectRule(String rule) {
-		exitPolicy.addRejectRule(rule);
-	}
-
-	void setBandwidthValues(int average, int burst, int observed) {
-		this.averageBandwidth = average;
-		this.burstBandwidth = burst;
-		this.observedBandwidth = observed;
-	}
-
-	void addFamilyMember(String familyMember) {
-		if(familyMembers.isEmpty()) {
-			familyMembers = new HashSet<String>();
-		}
-		familyMembers.add(familyMember);
-	}
-
-	void addCircuitProtocolVersion(int version) {
-		if(circuitProtocols.isEmpty())
-			circuitProtocols = new HashSet<Integer>();
-		circuitProtocols.add(version);
-	}
-
-	void addLinkProtocolVersion(int version) {
-		if(linkProtocols.isEmpty())
-			linkProtocols = new HashSet<Integer>();
-		linkProtocols.add(version);	
-	}
-
-	public boolean isValidDocument() {
-		// verify required fields exist, see dirspec.txt section 2.1
-		return hasValidSignature && (nickname != null) && (address != null) &&
-			(averageBandwidth != -1) && (routerPort != 0 || directoryPort != 0) &&
-			(published != null) && (onionKey != null) && (identityKey != null) &&
-			(descriptorDigest != null);
-	}
-
-	public String getNickname() {
-		return nickname;
-	}
-
-	public IPv4Address getAddress() {
-		return address;
-	}
-
-	public int getRouterPort() {
-		return routerPort;
-	}
-
-	public int getDirectoryPort() {
-		return directoryPort;
-	}
-
-	public int getAverageBandwidth() {
-		return averageBandwidth;
-	}
-
-	public int getBurstBandwidth() {
-		return burstBandwidth;
-	}
-
-	public int getObservedBandwidth() {
-		return observedBandwidth;
-	}
-
-	public String getPlatform() {
-		return platform;
-	}
-
-	public HexDigest getFingerprint() {
-		return fingerprint;
-	}
-
-	public int getUptime() {
-		return uptime;
-	}
-
-	public TorPublicKey getOnionKey() {
-		return onionKey;
-	}
-
-	public byte[] getNTorOnionKey() {
-		return ntorOnionKey;
-	}
-
-	public TorPublicKey getIdentityKey() {
-		return identityKey;
-	}
-
-	public String getContact() {
-		return contact;
-	}
-
-	public boolean isHibernating() {
-		return hibernating;
-	}
-
-	public boolean cachesExtraInfo() {
-		return cachesExtraInfo;
-	}
-
-	public boolean allowsSingleHopExits() {
-		return allowSingleHopExits;
-	}
-
-	public Timestamp getPublishedTime() {
-		return published;
-	}
-
-	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("Router Descriptor: (name: ");
-		builder.append(nickname);
-		builder.append(" orport=");
-		builder.append(routerPort);
-		builder.append(" dirport=");
-		builder.append(directoryPort);
-		builder.append(" address=");
-		builder.append(address);
-		builder.append(" platform=");
-		builder.append(platform);
-		builder.append(" published=");
-		builder.append(published.getDate());
-		builder.append(")");
-		return builder.toString();
-	}
-
-	public void print() {
-		System.out.println("nickname: "+ nickname +" IP: "+ address +" port: "+ routerPort);
-		System.out.println("directory port: "+ directoryPort +" platform: "+ platform);
-		System.out.println("Bandwidth(avg/burst/observed): "+ averageBandwidth +"/"+ burstBandwidth +"/"+ observedBandwidth);
-		System.out.println("Publication time: "+ published +" Uptime: "+ uptime);
-		if(fingerprint != null)
-			System.out.println("Fingerprint: "+ fingerprint);
-		if(contact != null)
-			System.out.println("Contact: "+ contact);
-	}
-	public boolean exitPolicyAccepts(IPv4Address address, int port) {
-		return exitPolicy.acceptsDestination(address, port);
-	}
-
-	public boolean exitPolicyAccepts(int port) {
-		return exitPolicy.acceptsPort(port);
-	}
-
-	public HexDigest getExtraInfoDigest() {
-		return extraInfoDigest;
-	}
-
-	public boolean isHiddenServiceDirectory() {
-		return hiddenServiceDir;
-	}
-
-	public Set<String> getFamilyMembers() {
-		return familyMembers;
-	}
-	
-	public boolean supportsEventDNS() {
-		return eventDNS;
-	}
-
-	public BandwidthHistory getReadHistory() {
-		return readHistory;
-	}
-
-	public BandwidthHistory getWriteHistory() {
-		return writeHistory;
-	}
-
-	public boolean isNewerThan(RouterDescriptor other) {
-		return other.getPublishedTime().isBefore(published);
-	}
-	
-	public HexDigest getDescriptorDigest() {
-		return descriptorDigest;
-	}
-	
-	public String getRawDocumentData() {
-		return rawDocumentData;
-	}
-	
-	public ByteBuffer getRawDocumentBytes() {
-		if(getRawDocumentData() == null) {
-			return ByteBuffer.allocate(0);
-		} else {
-			return ByteBuffer.wrap(getRawDocumentData().getBytes(Tor.getDefaultCharset()));
-		}
-	}
-
-	public boolean equals(Object o) {
-		if(!(o instanceof RouterDescriptorImpl)) 
-			return false;
-		final RouterDescriptorImpl other = (RouterDescriptorImpl) o;
-		if(other.getDescriptorDigest() == null || descriptorDigest == null)
-			return false;
-
-		return other.getDescriptorDigest().equals(descriptorDigest);
-	}
-
-	public int hashCode() {
-		if(descriptorDigest == null)
-			return 0;
-		return descriptorDigest.hashCode();
-	}
-	
-	public ExitPolicy getExitPolicy() {
-		return exitPolicy;
-	}
-
-	public void setLastListed(long timestamp) {
-		this.lastListed = timestamp;
-	}
-
-	public long getLastListed() {
-		return lastListed;
-	}
-	public void setCacheLocation(CacheLocation location) {
-		this.cacheLocation = location;
-	}
-	public CacheLocation getCacheLocation() {
-		return cacheLocation;
-	}
-
-	public int getBodyLength() {
-		return rawDocumentData.length();
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/router/RouterDescriptorKeyword.java b/orchid/src/com/subgraph/orchid/directory/router/RouterDescriptorKeyword.java
deleted file mode 100644
index 50322dff053..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/router/RouterDescriptorKeyword.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.subgraph.orchid.directory.router;
-
-public enum RouterDescriptorKeyword {
-	/*
-	 * See dir-spec.txt 
-	 * Section 2.1. Router descriptor format
-	 */
-	ROUTER("router", 5),
-	BANDWIDTH("bandwidth", 3),
-	PLATFORM("platform"),
-	PUBLISHED("published", 2),
-	FINGERPRINT("fingerprint", 10),
-	HIBERNATING("hibernating", 1),
-	UPTIME("uptime", 1),
-	ONION_KEY("onion-key", 0),
-	NTOR_ONION_KEY("ntor-onion-key", 1),
-	SIGNING_KEY("signing-key", 0),
-	ACCEPT("accept", 1),
-	REJECT("reject", 1),
-	ROUTER_SIGNATURE("router-signature", 0),
-	CONTACT("contact"),
-	FAMILY("family"),
-	READ_HISTORY("read-history"),
-	WRITE_HISTORY("write-history"),
-	EVENTDNS("eventdns", 1),
-	CACHES_EXTRA_INFO("caches-extra-info", 0),
-	EXTRA_INFO_DIGEST("extra-info-digest", 1),
-	HIDDEN_SERVICE_DIR("hidden-service-dir"),
-	PROTOCOLS("protocols"),
-	ALLOW_SINGLE_HOP_EXITS("allow-single-hop-exits", 0),
-	UNKNOWN_KEYWORD("KEYWORD NOT FOUND");
-	
-	public final static int VARIABLE_ARGUMENT_COUNT = -1;
-
-	private final String keyword;
-	private final int argumentCount;
-	
-	RouterDescriptorKeyword(String keyword) {
-		this(keyword, VARIABLE_ARGUMENT_COUNT);
-	}
-	
-	RouterDescriptorKeyword(String keyword, int argumentCount) {
-		this.keyword = keyword;
-		this.argumentCount = argumentCount;
-	}
-	
-	String getKeyword() {
-		return keyword;
-	}
-	
-	int getArgumentCount() {
-		return argumentCount;
-	}
-	
-	static RouterDescriptorKeyword findKeyword(String keyword) {
-		for(RouterDescriptorKeyword k: values()) 
-			if(k.getKeyword().equals(keyword)) 
-				return k;
-		
-		return UNKNOWN_KEYWORD;
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/router/RouterDescriptorParser.java b/orchid/src/com/subgraph/orchid/directory/router/RouterDescriptorParser.java
deleted file mode 100644
index e23b68a5b1d..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/router/RouterDescriptorParser.java
+++ /dev/null
@@ -1,223 +0,0 @@
-package com.subgraph.orchid.directory.router;
-
-import com.subgraph.orchid.RouterDescriptor;
-import com.subgraph.orchid.TorParsingException;
-import com.subgraph.orchid.crypto.TorSignature;
-import com.subgraph.orchid.data.BandwidthHistory;
-import com.subgraph.orchid.data.Timestamp;
-import com.subgraph.orchid.directory.parsing.BasicDocumentParsingResult;
-import com.subgraph.orchid.directory.parsing.DocumentFieldParser;
-import com.subgraph.orchid.directory.parsing.DocumentParser;
-import com.subgraph.orchid.directory.parsing.DocumentParsingHandler;
-import com.subgraph.orchid.directory.parsing.DocumentParsingResult;
-import com.subgraph.orchid.directory.parsing.DocumentParsingResultHandler;
-
-public class RouterDescriptorParser implements DocumentParser<RouterDescriptor> {
-	private final DocumentFieldParser fieldParser;
-	private final boolean verifySignatures;
-	
-	private RouterDescriptorImpl currentDescriptor;
-	private DocumentParsingResultHandler<RouterDescriptor> resultHandler;
-	
-	public RouterDescriptorParser(DocumentFieldParser fieldParser, boolean verifySignatures) {
-		this.fieldParser = fieldParser;
-		this.fieldParser.setHandler(createParsingHandler());
-		this.fieldParser.setRecognizeOpt();
-		this.verifySignatures = verifySignatures;
-	}
-	
-	private DocumentParsingHandler createParsingHandler() {
-		return new DocumentParsingHandler() {
-			public void endOfDocument() {
-			}
-			public void parseKeywordLine() {
-				processKeywordLine();				
-			}
-		};
-	}
-	
-	private void processKeywordLine() {
-		final RouterDescriptorKeyword keyword = RouterDescriptorKeyword.findKeyword(fieldParser.getCurrentKeyword());
-		/*
-		 * dirspec.txt (1.2)
-		 * When interpreting a Document, software MUST ignore any KeywordLine that
-		 * starts with a keyword it doesn't recognize;
-		 */
-		if(!keyword.equals(RouterDescriptorKeyword.UNKNOWN_KEYWORD))
-			processKeyword(keyword);	
-	}
-	
-	private void startNewDescriptor() {
-		fieldParser.resetRawDocument();
-		fieldParser.startSignedEntity();
-		currentDescriptor = new RouterDescriptorImpl();
-	}
-	
-	public boolean parse(DocumentParsingResultHandler<RouterDescriptor> resultHandler) {
-		this.resultHandler = resultHandler;
-		startNewDescriptor();
-		try {
-			fieldParser.processDocument();
-			return true;
-		} catch(TorParsingException e) {
-			resultHandler.parsingError(e.getMessage());
-			return false;
-		}
-	}
-	
-	public DocumentParsingResult<RouterDescriptor> parse() {
-		final BasicDocumentParsingResult<RouterDescriptor> result = new BasicDocumentParsingResult<RouterDescriptor>();
-		parse(result);
-		return result;
-	}
-
-	private void processKeyword(RouterDescriptorKeyword keyword) {
-		fieldParser.verifyExpectedArgumentCount(keyword.getKeyword(), keyword.getArgumentCount());
-
-		switch(keyword) {
-		case ROUTER:
-			processRouter();
-			return;
-		case BANDWIDTH:
-			processBandwidth();
-			break;
-		case PLATFORM:
-			currentDescriptor.setPlatform(fieldParser.parseConcatenatedString());
-			break;
-		case PUBLISHED:
-			currentDescriptor.setPublished(fieldParser.parseTimestamp());
-			break;
-		case FINGERPRINT:
-			currentDescriptor.setFingerprint(fieldParser.parseFingerprint());
-			break;
-		case HIBERNATING:
-			currentDescriptor.setHibernating(fieldParser.parseBoolean());
-			break;
-		case UPTIME:
-			currentDescriptor.setUptime(fieldParser.parseInteger());
-			break;
-		case ONION_KEY:
-			currentDescriptor.setOnionKey(fieldParser.parsePublicKey());
-			break;
-		case NTOR_ONION_KEY:
-			currentDescriptor.setNtorOnionKey(fieldParser.parseNtorPublicKey());
-			break;
-		case SIGNING_KEY:
-			currentDescriptor.setIdentityKey(fieldParser.parsePublicKey());
-			break;			
-		case ROUTER_SIGNATURE:
-			processSignature();
-			break;
-		case ACCEPT:
-			currentDescriptor.addAcceptRule(fieldParser.parseString());
-			break;
-		case REJECT:
-			currentDescriptor.addRejectRule(fieldParser.parseString());
-			break;
-		case CONTACT:
-			currentDescriptor.setContact(fieldParser.parseConcatenatedString());
-			break;
-		case FAMILY:
-			while(fieldParser.argumentsRemaining() > 0) 
-				currentDescriptor.addFamilyMember(fieldParser.parseString());
-			break;
-		case EVENTDNS:
-			if(fieldParser.parseBoolean())
-				currentDescriptor.setEventDNS();
-			break;		
-		case PROTOCOLS:
-			processProtocols();
-			break;			
-		case CACHES_EXTRA_INFO:
-			currentDescriptor.setCachesExtraInfo();
-			break;			
-		case HIDDEN_SERVICE_DIR:
-			currentDescriptor.setHiddenServiceDir();
-			break;			
-		case ALLOW_SINGLE_HOP_EXITS:
-			currentDescriptor.setAllowSingleHopExits();
-			break;
-		case EXTRA_INFO_DIGEST:
-			currentDescriptor.setExtraInfoDigest(fieldParser.parseHexDigest());
-			break;		
-		case READ_HISTORY:
-			currentDescriptor.setReadHistory(parseHistory());
-			break;
-		case WRITE_HISTORY:
-			currentDescriptor.setWriteHistory(parseHistory());
-			break;
-		default:
-			break;
-		}
-	}
-	
-	private BandwidthHistory parseHistory() {
-		final Timestamp ts = fieldParser.parseTimestamp();
-		final String nsec = fieldParser.parseString();
-		fieldParser.parseString();
-		final int interval = fieldParser.parseInteger(nsec.substring(1));
-		final BandwidthHistory history = new BandwidthHistory(ts, interval);
-		if(fieldParser.argumentsRemaining() == 0)
-			return history;
-		final String[] samples = fieldParser.parseString().split(",");
-		for(String s: samples)
-			history.addSample(fieldParser.parseInteger(s));
-		return history;
-	}
-	
-	private void processRouter() {
-		currentDescriptor.setNickname(fieldParser.parseNickname());
-		currentDescriptor.setAddress(fieldParser.parseAddress());
-		currentDescriptor.setRouterPort(fieldParser.parsePort());
-		/* 2.1 SOCKSPort is deprecated and should always be 0 */
-		fieldParser.parsePort();
-		currentDescriptor.setDirectoryPort(fieldParser.parsePort());
-	}
-	
-	private boolean verifyCurrentDescriptor(TorSignature signature) {
-		if(verifySignatures && !fieldParser.verifySignedEntity(currentDescriptor.getIdentityKey(), signature)) {
-			resultHandler.documentInvalid(currentDescriptor, "Signature failed.");
-			fieldParser.logWarn("Signature failed for router: " + currentDescriptor.getNickname());
-			return false;
-		}
-		currentDescriptor.setValidSignature();
-		if(!currentDescriptor.isValidDocument()) {
-			resultHandler.documentInvalid(currentDescriptor, "Router data invalid");
-			fieldParser.logWarn("Router data invalid for router: " + currentDescriptor.getNickname());
-		}
-		return currentDescriptor.isValidDocument();
-	}
-	
-	private void processBandwidth() {
-		final int average = fieldParser.parseInteger();
-		final int burst = fieldParser.parseInteger();
-		final int observed = fieldParser.parseInteger();
-		currentDescriptor.setBandwidthValues(average, burst, observed);
-	}
-	
-	private void processProtocols() {
-		String kw = fieldParser.parseString();
-		if(!kw.equals("Link")) 
-			throw new TorParsingException("Expected 'Link' token in protocol line got: " + kw);
-		while(true) {
-			kw = fieldParser.parseString();
-			if(kw.equals("Circuit"))
-				break;
-			currentDescriptor.addLinkProtocolVersion(fieldParser.parseInteger(kw));
-		}
-		while(fieldParser.argumentsRemaining() > 0)
-			currentDescriptor.addCircuitProtocolVersion(fieldParser.parseInteger());
-		
-	}
-	
-	private void processSignature() {
-		fieldParser.endSignedEntity();
-		currentDescriptor.setDescriptorHash(fieldParser.getSignatureMessageDigest().getHexDigest());
-		final TorSignature signature = fieldParser.parseSignature();
-		currentDescriptor.setRawDocumentData(fieldParser.getRawDocument());
-		
-		if(verifyCurrentDescriptor(signature))
-			resultHandler.documentParsed(currentDescriptor);
-		startNewDescriptor();
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/router/RouterMicrodescriptorImpl.java b/orchid/src/com/subgraph/orchid/directory/router/RouterMicrodescriptorImpl.java
deleted file mode 100644
index af75e2f13b5..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/router/RouterMicrodescriptorImpl.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.subgraph.orchid.directory.router;
-
-import java.nio.ByteBuffer;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import com.subgraph.orchid.RouterMicrodescriptor;
-import com.subgraph.orchid.Tor;
-import com.subgraph.orchid.crypto.TorPublicKey;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.data.exitpolicy.ExitPorts;
-
-public class RouterMicrodescriptorImpl implements RouterMicrodescriptor {
-	
-	private IPv4Address address;
-	private int routerPort;
-	private TorPublicKey onionKey;
-	private byte[] ntorOnionKey;
-	private Set<String> familyMembers = Collections.emptySet();
-	private ExitPorts acceptPorts;
-	private ExitPorts rejectPorts;
-	private String rawDocumentData;
-	private HexDigest descriptorDigest;
-	private long lastListed;
-	private CacheLocation cacheLocation = CacheLocation.NOT_CACHED;
-	
-	public void setAddress(IPv4Address address) {
-		this.address = address;
-	}
-
-	public void setRouterPort(int port) {
-		this.routerPort = port;
-	}
-
-	public void setOnionKey(TorPublicKey onionKey) {
-		this.onionKey = onionKey;
-	}
-
-	public void setNtorOnionKey(byte[] ntorOnionKey) {
-		this.ntorOnionKey = ntorOnionKey;
-	}
-
-	public void addFamilyMember(String familyMember) {
-		if(familyMembers.isEmpty()) {
-			familyMembers = new HashSet<String>();
-		}
-		familyMembers.add(familyMember);
-	}
-
-	public void addAcceptPorts(String portlist) {
-		acceptPorts = ExitPorts.createAcceptExitPorts(portlist);
-	}
-	
-	public void addRejectPorts(String portlist) {
-		rejectPorts = ExitPorts.createRejectExitPorts(portlist);
-	}
-	
-	public void setRawDocumentData(String rawData) {
-		this.rawDocumentData = rawData;
-	}
-
-	public void setDescriptorDigest(HexDigest descriptorDigest) {
-		this.descriptorDigest = descriptorDigest;
-	}
-
-	public void setLastListed(long ts) {
-		this.lastListed = ts;
-	}
-
-	public boolean isValidDocument() {
-		return (descriptorDigest != null) && (onionKey != null);
-	}
-	
-	public String getRawDocumentData() {
-		return rawDocumentData;
-	}
-
-	public TorPublicKey getOnionKey() {
-		return onionKey;
-	}
-
-	public byte[] getNTorOnionKey() {
-		return ntorOnionKey;
-	}
-
-	public IPv4Address getAddress() {
-		return address;
-	}
-
-	public int getRouterPort() {
-		return routerPort;
-	}
-
-	public Set<String> getFamilyMembers() {
-		return familyMembers;
-	}
-
-	public boolean exitPolicyAccepts(IPv4Address address, int port) {
-		return exitPolicyAccepts(port);
-	}
-
-	public boolean exitPolicyAccepts(int port) {
-		if(acceptPorts == null) {
-			return false;
-		}
-		if(rejectPorts != null && !rejectPorts.acceptsPort(port)) {
-			return false;
-		}
-		return acceptPorts.acceptsPort(port);
-	}
-
-	public HexDigest getDescriptorDigest() {
-		return descriptorDigest;
-	}
-	
-	public boolean equals(Object o) {
-		if(!(o instanceof RouterMicrodescriptorImpl)) 
-			return false;
-		final RouterMicrodescriptorImpl other = (RouterMicrodescriptorImpl) o;
-		if(other.getDescriptorDigest() == null || descriptorDigest == null)
-			return false;
-
-		return other.getDescriptorDigest().equals(descriptorDigest);
-	}
-
-	public int hashCode() {
-		if(descriptorDigest == null)
-			return 0;
-		return descriptorDigest.hashCode();
-	}
-
-	public long getLastListed() {
-		return lastListed;
-	}
-
-	public void setCacheLocation(CacheLocation location) {
-		this.cacheLocation = location;
-	}
-
-	public CacheLocation getCacheLocation() {
-		return cacheLocation;
-	}
-
-	public int getBodyLength() {
-		return rawDocumentData.length();
-	}
-
-	public ByteBuffer getRawDocumentBytes() {
-		if(getRawDocumentData() == null) {
-			return ByteBuffer.allocate(0);
-		} else {
-			return ByteBuffer.wrap(getRawDocumentData().getBytes(Tor.getDefaultCharset()));
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/router/RouterMicrodescriptorKeyword.java b/orchid/src/com/subgraph/orchid/directory/router/RouterMicrodescriptorKeyword.java
deleted file mode 100644
index 7f4cf6d5d86..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/router/RouterMicrodescriptorKeyword.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.subgraph.orchid.directory.router;
-
-public enum RouterMicrodescriptorKeyword {
-	ONION_KEY("onion-key", 0),
-	NTOR_ONION_KEY("ntor-onion-key", 1),
-	A("a", 1),
-	FAMILY("family"),
-	P("p", 2),
-	UNKNOWN_KEYWORD("KEYWORD NOT FOUNE");
-	
-	public final static int VARIABLE_ARGUMENT_COUNT = -1;
-	
-	private final String keyword;
-	private final int argumentCount;
-	
-	RouterMicrodescriptorKeyword(String keyword) {
-		this(keyword, VARIABLE_ARGUMENT_COUNT);
-	}
-
-	RouterMicrodescriptorKeyword(String keyword, int argumentCount) {
-		this.keyword = keyword;
-		this.argumentCount = argumentCount;
-	}
-	
-	String getKeyword() {
-		return keyword;
-	}
-	
-	int getArgumentCount() {
-		return argumentCount;
-	}
-	
-	static RouterMicrodescriptorKeyword findKeyword(String keyword) {
-		for(RouterMicrodescriptorKeyword k: values()) {
-			if(k.getKeyword().equals(keyword)) {
-				return k;
-			}
-		}
-		return UNKNOWN_KEYWORD;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/directory/router/RouterMicrodescriptorParser.java b/orchid/src/com/subgraph/orchid/directory/router/RouterMicrodescriptorParser.java
deleted file mode 100644
index 418ccf3df27..00000000000
--- a/orchid/src/com/subgraph/orchid/directory/router/RouterMicrodescriptorParser.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.subgraph.orchid.directory.router;
-
-import com.subgraph.orchid.RouterMicrodescriptor;
-import com.subgraph.orchid.TorParsingException;
-import com.subgraph.orchid.crypto.TorMessageDigest;
-import com.subgraph.orchid.directory.parsing.BasicDocumentParsingResult;
-import com.subgraph.orchid.directory.parsing.DocumentFieldParser;
-import com.subgraph.orchid.directory.parsing.DocumentParser;
-import com.subgraph.orchid.directory.parsing.DocumentParsingHandler;
-import com.subgraph.orchid.directory.parsing.DocumentParsingResult;
-import com.subgraph.orchid.directory.parsing.DocumentParsingResultHandler;
-
-public class RouterMicrodescriptorParser implements DocumentParser<RouterMicrodescriptor>{
-
-	
-	private final DocumentFieldParser fieldParser;
-	
-	private RouterMicrodescriptorImpl currentDescriptor;
-	private DocumentParsingResultHandler<RouterMicrodescriptor> resultHandler;
-	
-	public RouterMicrodescriptorParser(DocumentFieldParser fieldParser) {
-		this.fieldParser = fieldParser;
-		this.fieldParser.setHandler(createParsingHandler());
-	}
-
-	private DocumentParsingHandler createParsingHandler() {
-		return new DocumentParsingHandler() {
-			public void parseKeywordLine() {
-				processKeywordLine();
-			}
-			public void endOfDocument() { 
-				if(currentDescriptor != null) {
-					finalizeDescriptor(currentDescriptor);
-				}
-			}
-		};
-	}
-	
-	public boolean parse(DocumentParsingResultHandler<RouterMicrodescriptor> resultHandler) {
-		this.resultHandler = resultHandler;
-		try {
-			fieldParser.processDocument();
-			return true;
-		} catch(TorParsingException e) {
-			resultHandler.parsingError(e.getMessage());
-			return false;
-		}
-	}
-
-	public DocumentParsingResult<RouterMicrodescriptor> parse() {
-		final BasicDocumentParsingResult<RouterMicrodescriptor> result = new BasicDocumentParsingResult<RouterMicrodescriptor>();
-		parse(result);
-		return result;
-	}
-
-	private void processKeywordLine() {
-		final RouterMicrodescriptorKeyword keyword = RouterMicrodescriptorKeyword.findKeyword(fieldParser.getCurrentKeyword());
-		if(!keyword.equals(RouterMicrodescriptorKeyword.UNKNOWN_KEYWORD)) {
-			processKeyword(keyword);
-		}
-		if(currentDescriptor != null) {
-			currentDescriptor.setRawDocumentData(fieldParser.getRawDocument());
-		}
-
-	}
-	
-
-	private void processKeyword(RouterMicrodescriptorKeyword keyword) {
-		fieldParser.verifyExpectedArgumentCount(keyword.getKeyword(), keyword.getArgumentCount());
-		switch(keyword) {
-		case ONION_KEY:
-			processOnionKeyLine();
-			break;
-			
-		case NTOR_ONION_KEY:
-			if(currentDescriptor != null) {
-				currentDescriptor.setNtorOnionKey(fieldParser.parseNtorPublicKey());
-			}
-			break;
-			
-		case FAMILY:
-			while(fieldParser.argumentsRemaining() > 0 && currentDescriptor != null) {
-				currentDescriptor.addFamilyMember(fieldParser.parseString());
-			}
-			break;
-		
-		case P:
-			processP();
-			break;
-	
-		case A:
-		default:
-			break;
-		}
-	}
-	
-	private void processOnionKeyLine() {
-		if(currentDescriptor != null) {
-			finalizeDescriptor(currentDescriptor);
-		}
-		currentDescriptor = new RouterMicrodescriptorImpl();
-		fieldParser.resetRawDocument(RouterMicrodescriptorKeyword.ONION_KEY.getKeyword() + "\n");
-		currentDescriptor.setOnionKey(fieldParser.parsePublicKey());
-	}
-
-	private void finalizeDescriptor(RouterMicrodescriptorImpl descriptor) {
-		final TorMessageDigest digest = new TorMessageDigest(true);
-		digest.update(descriptor.getRawDocumentData());
-		descriptor.setDescriptorDigest(digest.getHexDigest());
-		if(!descriptor.isValidDocument()) {
-			resultHandler.documentInvalid(descriptor, "Microdescriptor data invalid");
-		} else {
-			resultHandler.documentParsed(descriptor);
-		}
-	}
-
-	private void processP() {
-		if(currentDescriptor == null) {
-			return;
-		}
-		final String ruleType = fieldParser.parseString();
-		if("accept".equals(ruleType)) {
-			currentDescriptor.addAcceptPorts(fieldParser.parseString());
-		} else if("reject".equals(ruleType)) {
-			currentDescriptor.addRejectPorts(fieldParser.parseString());
-		} else {
-			fieldParser.logWarn("Unexpected P field in microdescriptor: "+ ruleType);
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/encoders/Base64.java b/orchid/src/com/subgraph/orchid/encoders/Base64.java
deleted file mode 100644
index e1aaa92432f..00000000000
--- a/orchid/src/com/subgraph/orchid/encoders/Base64.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.subgraph.orchid.encoders;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-public class Base64
-{
-    private static final Encoder encoder = new Base64Encoder();
-    
-    /**
-     * encode the input data producing a base 64 encoded byte array.
-     *
-     * @return a byte array containing the base 64 encoded data.
-     */
-    public static byte[] encode(
-        byte[]    data)
-    {
-        int len = (data.length + 2) / 3 * 4;
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream(len);
-        
-        try
-        {
-            encoder.encode(data, 0, data.length, bOut);
-        }
-        catch (Exception e)
-        {
-            throw new EncoderException("exception encoding base64 string: " + e.getMessage(), e);
-        }
-        
-        return bOut.toByteArray();
-    }
-
-    /**
-     * Encode the byte data to base 64 writing it to the given output stream.
-     *
-     * @return the number of bytes produced.
-     */
-    public static int encode(
-        byte[]                data,
-        OutputStream    out)
-        throws IOException
-    {
-        return encoder.encode(data, 0, data.length, out);
-    }
-    
-    /**
-     * Encode the byte data to base 64 writing it to the given output stream.
-     *
-     * @return the number of bytes produced.
-     */
-    public static int encode(
-        byte[]                data,
-        int                    off,
-        int                    length,
-        OutputStream    out)
-        throws IOException
-    {
-        return encoder.encode(data, off, length, out);
-    }
-    
-    /**
-     * decode the base 64 encoded input data. It is assumed the input data is valid.
-     *
-     * @return a byte array representing the decoded data.
-     */
-    public static byte[] decode(
-        byte[]    data)
-    {
-        int len = data.length / 4 * 3;
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream(len);
-        
-        try
-        {
-            encoder.decode(data, 0, data.length, bOut);
-        }
-        catch (Exception e)
-        {
-            throw new DecoderException("unable to decode base64 data: " + e.getMessage(), e);
-        }
-        
-        return bOut.toByteArray();
-    }
-    
-    /**
-     * decode the base 64 encoded String data - whitespace will be ignored.
-     *
-     * @return a byte array representing the decoded data.
-     */
-    public static byte[] decode(
-        String    data)
-    {
-        int len = data.length() / 4 * 3;
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream(len);
-        
-        try
-        {
-            encoder.decode(data, bOut);
-        }
-        catch (Exception e)
-        {
-            throw new DecoderException("unable to decode base64 string: " + e.getMessage(), e);
-        }
-        
-        return bOut.toByteArray();
-    }
-    
-    /**
-     * decode the base 64 encoded String data writing it to the given output stream,
-     * whitespace characters will be ignored.
-     *
-     * @return the number of bytes produced.
-     */
-    public static int decode(
-        String                data,
-        OutputStream    out)
-        throws IOException
-    {
-        return encoder.decode(data, out);
-    }
-}
diff --git a/orchid/src/com/subgraph/orchid/encoders/Base64Encoder.java b/orchid/src/com/subgraph/orchid/encoders/Base64Encoder.java
deleted file mode 100644
index d27eb6a51c6..00000000000
--- a/orchid/src/com/subgraph/orchid/encoders/Base64Encoder.java
+++ /dev/null
@@ -1,328 +0,0 @@
-package com.subgraph.orchid.encoders;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-public class Base64Encoder
-    implements Encoder
-{
-    protected final byte[] encodingTable =
-        {
-            (byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G',
-            (byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N',
-            (byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U',
-            (byte)'V', (byte)'W', (byte)'X', (byte)'Y', (byte)'Z',
-            (byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f', (byte)'g',
-            (byte)'h', (byte)'i', (byte)'j', (byte)'k', (byte)'l', (byte)'m', (byte)'n',
-            (byte)'o', (byte)'p', (byte)'q', (byte)'r', (byte)'s', (byte)'t', (byte)'u',
-            (byte)'v',
-            (byte)'w', (byte)'x', (byte)'y', (byte)'z',
-            (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5', (byte)'6',
-            (byte)'7', (byte)'8', (byte)'9',
-            (byte)'+', (byte)'/'
-        };
-
-    protected byte    padding = (byte)'=';
-    
-    /*
-     * set up the decoding table.
-     */
-    protected final byte[] decodingTable = new byte[128];
-
-    protected void initialiseDecodingTable()
-    {
-        for (int i = 0; i < decodingTable.length; i++)
-        {
-            decodingTable[i] = (byte)0xff;
-        }
-        
-        for (int i = 0; i < encodingTable.length; i++)
-        {
-            decodingTable[encodingTable[i]] = (byte)i;
-        }
-    }
-    
-    public Base64Encoder()
-    {
-        initialiseDecodingTable();
-    }
-    
-    /**
-     * encode the input data producing a base 64 output stream.
-     *
-     * @return the number of bytes produced.
-     */
-    public int encode(
-        byte[]                data,
-        int                    off,
-        int                    length,
-        OutputStream    out) 
-        throws IOException
-    {
-        int modulus = length % 3;
-        int dataLength = (length - modulus);
-        int a1, a2, a3;
-        
-        for (int i = off; i < off + dataLength; i += 3)
-        {
-            a1 = data[i] & 0xff;
-            a2 = data[i + 1] & 0xff;
-            a3 = data[i + 2] & 0xff;
-
-            out.write(encodingTable[(a1 >>> 2) & 0x3f]);
-            out.write(encodingTable[((a1 << 4) | (a2 >>> 4)) & 0x3f]);
-            out.write(encodingTable[((a2 << 2) | (a3 >>> 6)) & 0x3f]);
-            out.write(encodingTable[a3 & 0x3f]);
-        }
-
-        /*
-         * process the tail end.
-         */
-        int    b1, b2, b3;
-        int    d1, d2;
-
-        switch (modulus)
-        {
-        case 0:        /* nothing left to do */
-            break;
-        case 1:
-            d1 = data[off + dataLength] & 0xff;
-            b1 = (d1 >>> 2) & 0x3f;
-            b2 = (d1 << 4) & 0x3f;
-
-            out.write(encodingTable[b1]);
-            out.write(encodingTable[b2]);
-            out.write(padding);
-            out.write(padding);
-            break;
-        case 2:
-            d1 = data[off + dataLength] & 0xff;
-            d2 = data[off + dataLength + 1] & 0xff;
-
-            b1 = (d1 >>> 2) & 0x3f;
-            b2 = ((d1 << 4) | (d2 >>> 4)) & 0x3f;
-            b3 = (d2 << 2) & 0x3f;
-
-            out.write(encodingTable[b1]);
-            out.write(encodingTable[b2]);
-            out.write(encodingTable[b3]);
-            out.write(padding);
-            break;
-        }
-
-        return (dataLength / 3) * 4 + ((modulus == 0) ? 0 : 4);
-    }
-
-    private boolean ignore(
-        char    c)
-    {
-        return (c == '\n' || c =='\r' || c == '\t' || c == ' ');
-    }
-    
-    /**
-     * decode the base 64 encoded byte data writing it to the given output stream,
-     * whitespace characters will be ignored.
-     *
-     * @return the number of bytes produced.
-     */
-    public int decode(
-        byte[]          data,
-        int             off,
-        int             length,
-        OutputStream    out)
-        throws IOException
-    {
-        byte    b1, b2, b3, b4;
-        int     outLen = 0;
-        
-        int     end = off + length;
-        
-        while (end > off)
-        {
-            if (!ignore((char)data[end - 1]))
-            {
-                break;
-            }
-            
-            end--;
-        }
-        
-        int  i = off;
-        int  finish = end - 4;
-        
-        i = nextI(data, i, finish);
-
-        while (i < finish)
-        {
-            b1 = decodingTable[data[i++]];
-            
-            i = nextI(data, i, finish);
-            
-            b2 = decodingTable[data[i++]];
-            
-            i = nextI(data, i, finish);
-            
-            b3 = decodingTable[data[i++]];
-            
-            i = nextI(data, i, finish);
-            
-            b4 = decodingTable[data[i++]];
-
-            if ((b1 | b2 | b3 | b4) < 0)
-            {
-                throw new IOException("invalid characters encountered in base64 data");
-            }
-            
-            out.write((b1 << 2) | (b2 >> 4));
-            out.write((b2 << 4) | (b3 >> 2));
-            out.write((b3 << 6) | b4);
-            
-            outLen += 3;
-            
-            i = nextI(data, i, finish);
-        }
-
-        outLen += decodeLastBlock(out, (char)data[end - 4], (char)data[end - 3], (char)data[end - 2], (char)data[end - 1]);
-        
-        return outLen;
-    }
-
-    private int nextI(byte[] data, int i, int finish)
-    {
-        while ((i < finish) && ignore((char)data[i]))
-        {
-            i++;
-        }
-        return i;
-    }
-    
-    /**
-     * decode the base 64 encoded String data writing it to the given output stream,
-     * whitespace characters will be ignored.
-     *
-     * @return the number of bytes produced.
-     */
-    public int decode(
-        String          data,
-        OutputStream    out)
-        throws IOException
-    {
-        byte    b1, b2, b3, b4;
-        int     length = 0;
-        
-        int     end = data.length();
-        
-        while (end > 0)
-        {
-            if (!ignore(data.charAt(end - 1)))
-            {
-                break;
-            }
-            
-            end--;
-        }
-        
-        int  i = 0;
-        int  finish = end - 4;
-        
-        i = nextI(data, i, finish);
-        
-        while (i < finish)
-        {
-            b1 = decodingTable[data.charAt(i++)];
-            
-            i = nextI(data, i, finish);
-            
-            b2 = decodingTable[data.charAt(i++)];
-            
-            i = nextI(data, i, finish);
-            
-            b3 = decodingTable[data.charAt(i++)];
-            
-            i = nextI(data, i, finish);
-            
-            b4 = decodingTable[data.charAt(i++)];
-
-            if ((b1 | b2 | b3 | b4) < 0)
-            {
-                throw new IOException("invalid characters encountered in base64 data");
-            }
-               
-            out.write((b1 << 2) | (b2 >> 4));
-            out.write((b2 << 4) | (b3 >> 2));
-            out.write((b3 << 6) | b4);
-            
-            length += 3;
-            
-            i = nextI(data, i, finish);
-        }
-
-        length += decodeLastBlock(out, data.charAt(end - 4), data.charAt(end - 3), data.charAt(end - 2), data.charAt(end - 1));
-
-        return length;
-    }
-
-    private int decodeLastBlock(OutputStream out, char c1, char c2, char c3, char c4) 
-        throws IOException
-    {
-        byte    b1, b2, b3, b4;
-        
-        if (c3 == padding)
-        {
-            b1 = decodingTable[c1];
-            b2 = decodingTable[c2];
-
-            if ((b1 | b2) < 0)
-            {
-                throw new IOException("invalid characters encountered at end of base64 data");
-            }
-
-            out.write((b1 << 2) | (b2 >> 4));
-            
-            return 1;
-        }
-        else if (c4 == padding)
-        {
-            b1 = decodingTable[c1];
-            b2 = decodingTable[c2];
-            b3 = decodingTable[c3];
-
-            if ((b1 | b2 | b3) < 0)
-            {
-                throw new IOException("invalid characters encountered at end of base64 data");
-            }
-            
-            out.write((b1 << 2) | (b2 >> 4));
-            out.write((b2 << 4) | (b3 >> 2));
-            
-            return 2;
-        }
-        else
-        {
-            b1 = decodingTable[c1];
-            b2 = decodingTable[c2];
-            b3 = decodingTable[c3];
-            b4 = decodingTable[c4];
-
-            if ((b1 | b2 | b3 | b4) < 0)
-            {
-                throw new IOException("invalid characters encountered at end of base64 data");
-            }
-            
-            out.write((b1 << 2) | (b2 >> 4));
-            out.write((b2 << 4) | (b3 >> 2));
-            out.write((b3 << 6) | b4);
-            
-            return 3;
-        } 
-    }
-
-    private int nextI(String data, int i, int finish)
-    {
-        while ((i < finish) && ignore(data.charAt(i)))
-        {
-            i++;
-        }
-        return i;
-    }
-}
diff --git a/orchid/src/com/subgraph/orchid/encoders/DecoderException.java b/orchid/src/com/subgraph/orchid/encoders/DecoderException.java
deleted file mode 100644
index 3d6279374d4..00000000000
--- a/orchid/src/com/subgraph/orchid/encoders/DecoderException.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.subgraph.orchid.encoders;
-
-public class DecoderException
-    extends IllegalStateException
-{
-	private static final long serialVersionUID = 4997418733670548381L;
-	private Throwable cause;
-
-    DecoderException(String msg, Throwable cause)
-    {
-        super(msg);
-
-        this.cause = cause;
-    }
-
-    public Throwable getCause()
-    {
-        return cause;
-    }
-}
diff --git a/orchid/src/com/subgraph/orchid/encoders/Encoder.java b/orchid/src/com/subgraph/orchid/encoders/Encoder.java
deleted file mode 100644
index f1b931cc8e6..00000000000
--- a/orchid/src/com/subgraph/orchid/encoders/Encoder.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.subgraph.orchid.encoders;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * Encode and decode byte arrays (typically from binary to 7-bit ASCII 
- * encodings).
- */
-public interface Encoder
-{
-    int encode(byte[] data, int off, int length, OutputStream out) throws IOException;
-    
-    int decode(byte[] data, int off, int length, OutputStream out) throws IOException;
-
-    int decode(String data, OutputStream out) throws IOException;
-}
diff --git a/orchid/src/com/subgraph/orchid/encoders/EncoderException.java b/orchid/src/com/subgraph/orchid/encoders/EncoderException.java
deleted file mode 100644
index 5051540e987..00000000000
--- a/orchid/src/com/subgraph/orchid/encoders/EncoderException.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.subgraph.orchid.encoders;
-
-public class EncoderException
-    extends IllegalStateException
-{
-	private static final long serialVersionUID = 6589388628939318400L;
-	private Throwable cause;
-
-    EncoderException(String msg, Throwable cause)
-    {
-        super(msg);
-
-        this.cause = cause;
-    }
-
-    public Throwable getCause()
-    {
-        return cause;
-    }
-}
diff --git a/orchid/src/com/subgraph/orchid/encoders/Hex.java b/orchid/src/com/subgraph/orchid/encoders/Hex.java
deleted file mode 100644
index 225c22add31..00000000000
--- a/orchid/src/com/subgraph/orchid/encoders/Hex.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.subgraph.orchid.encoders;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-public class Hex
-{
-    private static final Encoder encoder = new HexEncoder();
-    
-    /**
-     * encode the input data producing a Hex encoded byte array.
-     *
-     * @return a byte array containing the Hex encoded data.
-     */
-    public static byte[] encode(
-        byte[]    data)
-    {
-        return encode(data, 0, data.length);
-    }
-    
-    /**
-     * encode the input data producing a Hex encoded byte array.
-     *
-     * @return a byte array containing the Hex encoded data.
-     */
-    public static byte[] encode(
-        byte[]    data,
-        int       off,
-        int       length)
-    {
-        ByteArrayOutputStream    bOut = new ByteArrayOutputStream();
-        
-        try
-        {
-            encoder.encode(data, off, length, bOut);
-        }
-        catch (Exception e)
-        {
-            throw new EncoderException("exception encoding Hex string: " + e.getMessage(), e);
-        }
-        
-        return bOut.toByteArray();
-    }
-
-    /**
-     * Hex encode the byte data writing it to the given output stream.
-     *
-     * @return the number of bytes produced.
-     */
-    public static int encode(
-        byte[]         data,
-        OutputStream   out)
-        throws IOException
-    {
-        return encoder.encode(data, 0, data.length, out);
-    }
-    
-    /**
-     * Hex encode the byte data writing it to the given output stream.
-     *
-     * @return the number of bytes produced.
-     */
-    public static int encode(
-        byte[]         data,
-        int            off,
-        int            length,
-        OutputStream   out)
-        throws IOException
-    {
-        return encoder.encode(data, off, length, out);
-    }
-    
-    /**
-     * decode the Hex encoded input data. It is assumed the input data is valid.
-     *
-     * @return a byte array representing the decoded data.
-     */
-    public static byte[] decode(
-        byte[]    data)
-    {
-        ByteArrayOutputStream    bOut = new ByteArrayOutputStream();
-        
-        try
-        {
-            encoder.decode(data, 0, data.length, bOut);
-        }
-        catch (Exception e)
-        {
-            throw new DecoderException("exception decoding Hex data: " + e.getMessage(), e);
-        }
-        
-        return bOut.toByteArray();
-    }
-    
-    /**
-     * decode the Hex encoded String data - whitespace will be ignored.
-     *
-     * @return a byte array representing the decoded data.
-     */
-    public static byte[] decode(
-        String    data)
-    {
-        ByteArrayOutputStream    bOut = new ByteArrayOutputStream();
-        
-        try
-        {
-            encoder.decode(data, bOut);
-        }
-        catch (Exception e)
-        {
-            throw new DecoderException("exception decoding Hex string: " + e.getMessage(), e);
-        }
-        
-        return bOut.toByteArray();
-    }
-    
-    /**
-     * decode the Hex encoded String data writing it to the given output stream,
-     * whitespace characters will be ignored.
-     *
-     * @return the number of bytes produced.
-     */
-    public static int decode(
-        String          data,
-        OutputStream    out)
-        throws IOException
-    {
-        return encoder.decode(data, out);
-    }
-}
diff --git a/orchid/src/com/subgraph/orchid/encoders/HexEncoder.java b/orchid/src/com/subgraph/orchid/encoders/HexEncoder.java
deleted file mode 100644
index c859b645182..00000000000
--- a/orchid/src/com/subgraph/orchid/encoders/HexEncoder.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package com.subgraph.orchid.encoders;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-public class HexEncoder
-    implements Encoder
-{
-    protected final byte[] encodingTable =
-        {
-            (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5', (byte)'6', (byte)'7',
-            (byte)'8', (byte)'9', (byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f'
-        };
-    
-    /*
-     * set up the decoding table.
-     */
-    protected final byte[] decodingTable = new byte[128];
-
-    protected void initialiseDecodingTable()
-    {
-        for (int i = 0; i < decodingTable.length; i++)
-        {
-            decodingTable[i] = (byte)0xff;
-        }
-
-        for (int i = 0; i < encodingTable.length; i++)
-        {
-            decodingTable[encodingTable[i]] = (byte)i;
-        }
-        
-        decodingTable['A'] = decodingTable['a'];
-        decodingTable['B'] = decodingTable['b'];
-        decodingTable['C'] = decodingTable['c'];
-        decodingTable['D'] = decodingTable['d'];
-        decodingTable['E'] = decodingTable['e'];
-        decodingTable['F'] = decodingTable['f'];
-    }
-    
-    public HexEncoder()
-    {
-        initialiseDecodingTable();
-    }
-    
-    /**
-     * encode the input data producing a Hex output stream.
-     *
-     * @return the number of bytes produced.
-     */
-    public int encode(
-        byte[]                data,
-        int                    off,
-        int                    length,
-        OutputStream    out) 
-        throws IOException
-    {        
-        for (int i = off; i < (off + length); i++)
-        {
-            int    v = data[i] & 0xff;
-
-            out.write(encodingTable[(v >>> 4)]);
-            out.write(encodingTable[v & 0xf]);
-        }
-
-        return length * 2;
-    }
-
-    private static boolean ignore(
-        char    c)
-    {
-        return c == '\n' || c =='\r' || c == '\t' || c == ' ';
-    }
-
-    /**
-     * decode the Hex encoded byte data writing it to the given output stream,
-     * whitespace characters will be ignored.
-     *
-     * @return the number of bytes produced.
-     */
-    public int decode(
-        byte[]          data,
-        int             off,
-        int             length,
-        OutputStream    out)
-        throws IOException
-    {
-        byte    b1, b2;
-        int     outLen = 0;
-        
-        int     end = off + length;
-        
-        while (end > off)
-        {
-            if (!ignore((char)data[end - 1]))
-            {
-                break;
-            }
-            
-            end--;
-        }
-        
-        int i = off;
-        while (i < end)
-        {
-            while (i < end && ignore((char)data[i]))
-            {
-                i++;
-            }
-            
-            b1 = decodingTable[data[i++]];
-            
-            while (i < end && ignore((char)data[i]))
-            {
-                i++;
-            }
-            
-            b2 = decodingTable[data[i++]];
-
-            if ((b1 | b2) < 0)
-            {
-                throw new IOException("invalid characters encountered in Hex data");
-            }
-
-            out.write((b1 << 4) | b2);
-            
-            outLen++;
-        }
-
-        return outLen;
-    }
-    
-    /**
-     * decode the Hex encoded String data writing it to the given output stream,
-     * whitespace characters will be ignored.
-     *
-     * @return the number of bytes produced.
-     */
-    public int decode(
-        String          data,
-        OutputStream    out)
-        throws IOException
-    {
-        byte    b1, b2;
-        int     length = 0;
-        
-        int     end = data.length();
-        
-        while (end > 0)
-        {
-            if (!ignore(data.charAt(end - 1)))
-            {
-                break;
-            }
-            
-            end--;
-        }
-        
-        int i = 0;
-        while (i < end)
-        {
-            while (i < end && ignore(data.charAt(i)))
-            {
-                i++;
-            }
-            
-            b1 = decodingTable[data.charAt(i++)];
-            
-            while (i < end && ignore(data.charAt(i)))
-            {
-                i++;
-            }
-            
-            b2 = decodingTable[data.charAt(i++)];
-
-            if ((b1 | b2) < 0)
-            {
-                throw new IOException("invalid characters encountered in Hex string");
-            }
-
-            out.write((b1 << 4) | b2);
-            
-            length++;
-        }
-
-        return length;
-    }
-}
diff --git a/orchid/src/com/subgraph/orchid/events/Event.java b/orchid/src/com/subgraph/orchid/events/Event.java
deleted file mode 100644
index f9921f6578a..00000000000
--- a/orchid/src/com/subgraph/orchid/events/Event.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.subgraph.orchid.events;
-
-public interface Event {}
diff --git a/orchid/src/com/subgraph/orchid/events/EventHandler.java b/orchid/src/com/subgraph/orchid/events/EventHandler.java
deleted file mode 100644
index 9002e2b6cc4..00000000000
--- a/orchid/src/com/subgraph/orchid/events/EventHandler.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.subgraph.orchid.events;
-
-public interface EventHandler {
-	void handleEvent(Event event);
-}
diff --git a/orchid/src/com/subgraph/orchid/events/EventManager.java b/orchid/src/com/subgraph/orchid/events/EventManager.java
deleted file mode 100644
index 235dc7d882a..00000000000
--- a/orchid/src/com/subgraph/orchid/events/EventManager.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.subgraph.orchid.events;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class EventManager {
-	private final List<EventHandler> handlers = new ArrayList<EventHandler>();
-	
-	public void addListener(final EventHandler listener) {
-		synchronized(this) {
-			handlers.add(listener);
-		}
-	}
-	
-	public void removeListener(final EventHandler listener) {
-		synchronized(this) {
-			handlers.remove(listener);
-		}
-	}
-	
-	public void fireEvent(final Event event) {
-		EventHandler[] handlersCopy;
-		
-		synchronized(this) {
-			handlersCopy = new EventHandler[handlers.size()];
-			handlers.toArray(handlersCopy);
-		}
-		for(EventHandler handler : handlersCopy) {
-			handler.handleEvent(event);
-		}
-		
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/geoip/CountryCodeService.java b/orchid/src/com/subgraph/orchid/geoip/CountryCodeService.java
deleted file mode 100644
index b2c49f60c38..00000000000
--- a/orchid/src/com/subgraph/orchid/geoip/CountryCodeService.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package com.subgraph.orchid.geoip;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.data.IPv4Address;
-
-public class CountryCodeService {
-	private final static Logger logger = Logger.getLogger(CountryCodeService.class.getName());
-	private final static String DATABASE_FILENAME = "GeoIP.dat";
-	private final static int COUNTRY_BEGIN = 16776960;
-	private final static int STANDARD_RECORD_LENGTH = 3;
-	private final static int MAX_RECORD_LENGTH = 4;
-	private final static CountryCodeService DEFAULT_INSTANCE = new CountryCodeService();
-	
-	public static CountryCodeService getInstance() {
-		return DEFAULT_INSTANCE;
-	}
-	
-	private static final String[] COUNTRY_CODES = { "--", "AP", "EU", "AD", "AE",
-		"AF", "AG", "AI", "AL", "AM", "CW", "AO", "AQ", "AR", "AS", "AT",
-		"AU", "AW", "AZ", "BA", "BB", "BD", "BE", "BF", "BG", "BH", "BI",
-		"BJ", "BM", "BN", "BO", "BR", "BS", "BT", "BV", "BW", "BY", "BZ",
-		"CA", "CC", "CD", "CF", "CG", "CH", "CI", "CK", "CL", "CM", "CN",
-		"CO", "CR", "CU", "CV", "CX", "CY", "CZ", "DE", "DJ", "DK", "DM",
-		"DO", "DZ", "EC", "EE", "EG", "EH", "ER", "ES", "ET", "FI", "FJ",
-		"FK", "FM", "FO", "FR", "SX", "GA", "GB", "GD", "GE", "GF", "GH",
-		"GI", "GL", "GM", "GN", "GP", "GQ", "GR", "GS", "GT", "GU", "GW",
-		"GY", "HK", "HM", "HN", "HR", "HT", "HU", "ID", "IE", "IL", "IN",
-		"IO", "IQ", "IR", "IS", "IT", "JM", "JO", "JP", "KE", "KG", "KH",
-		"KI", "KM", "KN", "KP", "KR", "KW", "KY", "KZ", "LA", "LB", "LC",
-		"LI", "LK", "LR", "LS", "LT", "LU", "LV", "LY", "MA", "MC", "MD",
-		"MG", "MH", "MK", "ML", "MM", "MN", "MO", "MP", "MQ", "MR", "MS",
-		"MT", "MU", "MV", "MW", "MX", "MY", "MZ", "NA", "NC", "NE", "NF",
-		"NG", "NI", "NL", "NO", "NP", "NR", "NU", "NZ", "OM", "PA", "PE",
-		"PF", "PG", "PH", "PK", "PL", "PM", "PN", "PR", "PS", "PT", "PW",
-		"PY", "QA", "RE", "RO", "RU", "RW", "SA", "SB", "SC", "SD", "SE",
-		"SG", "SH", "SI", "SJ", "SK", "SL", "SM", "SN", "SO", "SR", "ST",
-		"SV", "SY", "SZ", "TC", "TD", "TF", "TG", "TH", "TJ", "TK", "TM",
-		"TN", "TO", "TL", "TR", "TT", "TV", "TW", "TZ", "UA", "UG", "UM",
-		"US", "UY", "UZ", "VA", "VC", "VE", "VG", "VI", "VN", "VU", "WF",
-		"WS", "YE", "YT", "RS", "ZA", "ZM", "ME", "ZW", "A1", "A2", "O1",
-		"AX", "GG", "IM", "JE", "BL", "MF", "BQ", "SS", "O1" };
-	
-	private final byte[] database;
-
-	public CountryCodeService() {
-		this.database = loadDatabase();
-	}
-	
-	private static byte[] loadDatabase() {
-		final InputStream input = openDatabaseStream();
-		if(input == null) {
-			logger.warning("Failed to open '"+ DATABASE_FILENAME + "' database file for country code lookups");
-			return null;
-		}
-		try {
-			return loadEntireStream(input);
-		} catch (IOException e) {
-			logger.warning("IO error reading database file for country code lookups");
-			return null;
-		} finally {
-			try {
-				input.close();
-			} catch (IOException e) { }
-		}
-	}
-
-	private static InputStream openDatabaseStream() {
-		final InputStream input = tryResourceOpen();
-		if(input != null) {
-			return input;
-		} else {
-			return tryFilesystemOpen();
-		}
-	}
-
-	private static InputStream tryFilesystemOpen() {
-		final File dataDir = new File(System.getProperty("user.dir"), "data");
-		final File dbFile = new File(dataDir, DATABASE_FILENAME);
-		if(!dbFile.canRead()) {
-			return null;
-		}
-		try {
-			return new FileInputStream(dbFile);
-		} catch (FileNotFoundException e) {
-			return null;
-		}
-	}
-	
-	private static InputStream tryResourceOpen() {
-		return CountryCodeService.class.getResourceAsStream("/data/"+ DATABASE_FILENAME);
-	}
-
-	private static byte[] loadEntireStream(InputStream input) throws IOException {
-		final ByteArrayOutputStream output = new ByteArrayOutputStream(4096);
-		copy(input, output);
-		return output.toByteArray();
-	}
-	
-	private static int copy(InputStream input, OutputStream output) throws IOException {
-		final byte[] buffer = new byte[4096];
-		int count = 0;
-		int n = 0;
-		while((n = input.read(buffer)) != -1) {
-			output.write(buffer, 0, n);
-			count += n;
-		}
-		return count;
-	}
-	
-	public String getCountryCodeForAddress(IPv4Address address) {
-		return COUNTRY_CODES[seekCountry(address)];
-	}
-
-	private int seekCountry(IPv4Address address) {
-		if(database == null) {
-			return 0;
-		}
-		
-		final byte[] record = new byte[2 * MAX_RECORD_LENGTH];
-		final int[] x = new int[2];
-		final long ip = address.getAddressData() & 0xFFFFFFFFL;
-		
-		int offset = 0;
-		for(int depth = 31; depth >= 0; depth--) {
-			loadRecord(offset, record);
-
-			x[0] = unpackRecordValue(record, 0);
-			x[1] = unpackRecordValue(record, 1);
-			
-			int xx = ((ip & (1 << depth)) > 0) ? (x[1]) : (x[0]);
-			
-			if(xx >= COUNTRY_BEGIN) {
-				final int idx = xx - COUNTRY_BEGIN;
-				if(idx < 0 || idx > COUNTRY_CODES.length) {
-					logger.warning("Invalid index calculated looking up country code record for ("+ address +") idx = "+ idx);
-					return 0;
-				} else {
-					return idx;
-				}
-			} else {
-				offset = xx;
-			}
-			
-		}
-		logger.warning("No record found looking up country code record for ("+ address + ")");
-		return 0;
-	}
-
-	private void loadRecord(int offset, byte[] recordBuffer) {
-		final int dbOffset = 2 * STANDARD_RECORD_LENGTH * offset;
-		System.arraycopy(database, dbOffset, recordBuffer, 0, recordBuffer.length);
-	}
-
-	private int unpackRecordValue(byte[] record, int idx) {
-		final int valueOffset = idx * STANDARD_RECORD_LENGTH;
-		int value = 0;
-		for(int i = 0; i < STANDARD_RECORD_LENGTH; i++) {
-			int octet = record[valueOffset + i] & 0xFF;
-			value += (octet << (i * 8));
-		}
-		return value;
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/misc/GuardedBy.java b/orchid/src/com/subgraph/orchid/misc/GuardedBy.java
deleted file mode 100644
index cd7f913bc78..00000000000
--- a/orchid/src/com/subgraph/orchid/misc/GuardedBy.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.subgraph.orchid.misc;
-
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The field or method to which this annotation is applied can only be accessed
- * when holding a particular lock, which may be a built-in (synchronization) lock,
- * or may be an explicit java.util.concurrent.Lock.
- *
- * The argument determines which lock guards the annotated field or method:
- * <ul>
- * <li>
- * <code>this</code> : The intrinsic lock of the object in whose class the field is defined.
- * </li>
- * <li>
- * <code>class-name.this</code> : For inner classes, it may be necessary to disambiguate 'this';
- * the <em>class-name.this</em> designation allows you to specify which 'this' reference is intended
- * </li>
- * <li>
- * <code>itself</code> : For reference fields only; the object to which the field refers.
- * </li>
- * <li>
- * <code>field-name</code> : The lock object is referenced by the (instance or static) field
- * specified by <em>field-name</em>.
- * </li>
- * <li>
- * <code>class-name.field-name</code> : The lock object is reference by the static field specified
- * by <em>class-name.field-name</em>.
- * </li>
- * <li>
- * <code>method-name()</code> : The lock object is returned by calling the named nil-ary method.
- * </li>
- * <li>
- * <code>class-name.class</code> : The Class object for the specified class should be used as the lock object.
- * </li>
- */
-@Target({ElementType.FIELD, ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface GuardedBy {
-    String value();
-}
diff --git a/orchid/src/com/subgraph/orchid/misc/Immutable.java b/orchid/src/com/subgraph/orchid/misc/Immutable.java
deleted file mode 100644
index 18e8a6b32e9..00000000000
--- a/orchid/src/com/subgraph/orchid/misc/Immutable.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.subgraph.orchid.misc;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/*
- * Copyright (c) 2005 Brian Goetz and Tim Peierls
- * Released under the Creative Commons Attribution License
- *   (http://creativecommons.org/licenses/by/2.5)
- * Official home: http://www.jcip.net
- *
- * Any republication or derived work distributed in source code form
- * must include this copyright and license notice.
- */
-
-
-/**
- * The class to which this annotation is applied is immutable.  This means that
- * its state cannot be seen to change by callers, which implies that
- * <ul>
- * <li> all public fields are final, </li>
- * <li> all public final reference fields refer to other immutable objects, and </li>
- * <li> constructors and methods do not publish references to any internal state
- *      which is potentially mutable by the implementation. </li>
- * </ul>
- * Immutable objects may still have internal mutable state for purposes of performance
- * optimization; some state variables may be lazily computed, so long as they are computed
- * from immutable state and that callers cannot tell the difference.
- * <p>
- * Immutable objects are inherently thread-safe; they may be passed between threads or
- * published without synchronization.
- */
-@Documented
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Immutable {
-
-}
diff --git a/orchid/src/com/subgraph/orchid/misc/NotThreadSafe.java b/orchid/src/com/subgraph/orchid/misc/NotThreadSafe.java
deleted file mode 100644
index 7ca2360f166..00000000000
--- a/orchid/src/com/subgraph/orchid/misc/NotThreadSafe.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.subgraph.orchid.misc;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/*
- * Copyright (c) 2005 Brian Goetz and Tim Peierls
- * Released under the Creative Commons Attribution License
- *   (http://creativecommons.org/licenses/by/2.5)
- * Official home: http://www.jcip.net
- *
- * Any republication or derived work distributed in source code form
- * must include this copyright and license notice.
- */
-
-
-/**
- * The class to which this annotation is applied is not thread-safe.
- * This annotation primarily exists for clarifying the non-thread-safety of a class
- * that might otherwise be assumed to be thread-safe, despite the fact that it is a bad
- * idea to assume a class is thread-safe without good reason.
- * @see ThreadSafe
- */
-@Documented
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface NotThreadSafe {
-}
-
-
-
diff --git a/orchid/src/com/subgraph/orchid/misc/ThreadSafe.java b/orchid/src/com/subgraph/orchid/misc/ThreadSafe.java
deleted file mode 100644
index 6fe327819ff..00000000000
--- a/orchid/src/com/subgraph/orchid/misc/ThreadSafe.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.subgraph.orchid.misc;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/*
- * Copyright (c) 2005 Brian Goetz and Tim Peierls
- * Released under the Creative Commons Attribution License
- *   (http://creativecommons.org/licenses/by/2.5)
- * Official home: http://www.jcip.net
- *
- * Any republication or derived work distributed in source code form
- * must include this copyright and license notice.
- */
-
-
-
-/**
- * The class to which this annotation is applied is thread-safe.  This means that
- * no sequences of accesses (reads and writes to public fields, calls to public methods)
- * may put the object into an invalid state, regardless of the interleaving of those actions
- * by the runtime, and without requiring any additional synchronization or coordination on the
- * part of the caller.
- */
-@Documented
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ThreadSafe {
-}
-
diff --git a/orchid/src/com/subgraph/orchid/misc/Utils.java b/orchid/src/com/subgraph/orchid/misc/Utils.java
deleted file mode 100644
index 4e12925d07b..00000000000
--- a/orchid/src/com/subgraph/orchid/misc/Utils.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.subgraph.orchid.misc;
-
-public class Utils {
-	public static boolean constantTimeArrayEquals(byte[] a1, byte[] a2) {
-		if(a1.length != a2.length) {
-			return false;
-		}
-		int result = 0;
-		for(int i = 0; i < a1.length; i++) {
-			result += (a1[i] & 0xFF) ^ (a2[i] & 0xFF);
-		}
-		return result == 0;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/sockets/AndroidSSLSocketFactory.java b/orchid/src/com/subgraph/orchid/sockets/AndroidSSLSocketFactory.java
deleted file mode 100644
index 877a5f6c0f1..00000000000
--- a/orchid/src/com/subgraph/orchid/sockets/AndroidSSLSocketFactory.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.subgraph.orchid.sockets;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.security.NoSuchAlgorithmException;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-
-import com.subgraph.orchid.sockets.sslengine.SSLEngineSSLSocket;
-
-public class AndroidSSLSocketFactory extends SSLSocketFactory {
-
-	private final SSLContext sslContext;
-
-	public AndroidSSLSocketFactory() throws NoSuchAlgorithmException {
-		this(SSLContext.getDefault());
-	}
-	
-	public AndroidSSLSocketFactory(SSLContext sslContext) {
-		this.sslContext = sslContext;
-	}
-
-	@Override
-	public String[] getDefaultCipherSuites() {
-		return sslContext.getDefaultSSLParameters().getCipherSuites();
-	}
-
-	@Override
-	public String[] getSupportedCipherSuites() {
-		return sslContext.getSupportedSSLParameters().getCipherSuites();
-		
-	}
-
-	@Override
-	public Socket createSocket(Socket s, String host, int port,
-			boolean autoClose) throws IOException {
-
-		return new SSLEngineSSLSocket(s, sslContext);
-	}
-
-	@Override
-	public Socket createSocket(String host, int port) throws IOException,
-			UnknownHostException {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public Socket createSocket(String host, int port, InetAddress localHost,
-			int localPort) throws IOException, UnknownHostException {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public Socket createSocket(InetAddress host, int port) throws IOException {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public Socket createSocket(InetAddress address, int port,
-			InetAddress localAddress, int localPort) throws IOException {
-		throw new UnsupportedOperationException();
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/sockets/AndroidSocket.java b/orchid/src/com/subgraph/orchid/sockets/AndroidSocket.java
deleted file mode 100644
index b911df93a3b..00000000000
--- a/orchid/src/com/subgraph/orchid/sockets/AndroidSocket.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.subgraph.orchid.sockets;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.net.SocketException;
-import java.util.logging.Logger;
-
-public class AndroidSocket extends Socket {
-	private final static Logger logger = Logger.getLogger(AndroidSocket.class.getName());
-	
-	private final Field isConnectedField;
-	private final OrchidSocketImpl impl;
-	private final Object lock = new Object();
-	private boolean isSocketConnected;
-	
-	AndroidSocket(OrchidSocketImpl impl) throws SocketException {
-		super(impl);
-		this.impl = impl;
-		this.isConnectedField = getField("isConnected");
-	}
-	
-	public void connect(SocketAddress endpoint) throws IOException {
-        connect(endpoint, 0);
-    }
-	
-	public void connect(SocketAddress endpoint, int timeout) throws IOException {
-		synchronized(lock) {
-			if(isSocketConnected) {
-				throw new SocketException("Already connected");
-			}
-			try {
-				impl.connect(endpoint, timeout);
-				setIsConnected();
-			} catch(IOException e) {
-				impl.close();
-				throw e;
-			}
-		}
-	}
-	
-	protected void setIsConnected() {
-		isSocketConnected = true;
-		try {
-			if(isConnectedField != null) {
-				isConnectedField.setBoolean(this,  true);
-			}
-		} catch (IllegalArgumentException e) {
-			logger.warning("Illegal argument trying to reflect value into isConnected field of Socket : "+ e.getMessage());
-		} catch (IllegalAccessException e) {
-			logger.warning("Illegal access trying to reflect value into isConnected field of Socket : "+ e.getMessage());
-		}
-	}
-	
-	private Field getField(String name) {
-		try {
-			final Field f = Socket.class.getDeclaredField(name);
-			f.setAccessible(true);
-			return f;
-		} catch (NoSuchFieldException e) {
-			logger.warning("Could not locate field '"+ name +"' in Socket class, disabling Android reflection");
-			return null;
-		} catch (SecurityException e) {
-			logger.warning("Reflection access to field '"+ name +"' in Socket class not permitted."+ e.getMessage());
-			return null;
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/sockets/OrchidSocketFactory.java b/orchid/src/com/subgraph/orchid/sockets/OrchidSocketFactory.java
deleted file mode 100644
index 28febaf5ee3..00000000000
--- a/orchid/src/com/subgraph/orchid/sockets/OrchidSocketFactory.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.subgraph.orchid.sockets;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.net.SocketException;
-import java.net.UnknownHostException;
-
-import javax.net.SocketFactory;
-
-import com.subgraph.orchid.Tor;
-import com.subgraph.orchid.TorClient;
-
-public class OrchidSocketFactory extends SocketFactory {
-	private final TorClient torClient;
-	private final boolean exceptionOnLocalBind;
-	
-	public OrchidSocketFactory(TorClient torClient) {
-		this(torClient, true);
-	}
-
-	public OrchidSocketFactory(TorClient torClient, boolean exceptionOnLocalBind) {
-		this.torClient = torClient;
-		this.exceptionOnLocalBind = exceptionOnLocalBind;
-	}
-
-    @Override
-    public Socket createSocket() throws IOException {
-        return createSocketInstance();
-    }
-
-    @Override
-	public Socket createSocket(String host, int port) throws IOException,
-			UnknownHostException {
-        final Socket s = createSocketInstance();
-        return connectOrchidSocket(s, host, port);
-	}
-
-	@Override
-	public Socket createSocket(String host, int port, InetAddress localHost,
-			int localPort) throws IOException, UnknownHostException {
-		if(exceptionOnLocalBind) {
-			throw new UnsupportedOperationException("Cannot bind to local address");
-		}
-		return createSocket(host, port);
-	}
-
-	@Override
-	public Socket createSocket(InetAddress address, int port) throws IOException {
-        final Socket s = createSocketInstance();
-		return connectOrchidSocket(s, address.getHostAddress(), port);
-	}
-
-	@Override
-	public Socket createSocket(InetAddress address, int port,
-			InetAddress localAddress, int localPort) throws IOException {
-		if(exceptionOnLocalBind) {
-			throw new UnsupportedOperationException("Cannot bind to local address");
-		}
-		return createSocket(address, port);
-	}
-
-	private Socket connectOrchidSocket(Socket s, String host, int port) throws IOException {
-		final SocketAddress endpoint = InetSocketAddress.createUnresolved(host, port);
-		s.connect(endpoint);
-		return s;
-	}
-	
-	private Socket createSocketInstance() throws SocketException {
-		final OrchidSocketImpl impl = new OrchidSocketImpl(torClient);
-		if(Tor.isAndroidRuntime()) {
-			return new AndroidSocket(impl);
-		} else {
-			// call protected constructor
-			return new Socket(impl) {};
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/sockets/OrchidSocketImpl.java b/orchid/src/com/subgraph/orchid/sockets/OrchidSocketImpl.java
deleted file mode 100644
index 5b92a79a67e..00000000000
--- a/orchid/src/com/subgraph/orchid/sockets/OrchidSocketImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package com.subgraph.orchid.sockets;
-
-import com.subgraph.orchid.OpenFailedException;
-import com.subgraph.orchid.Stream;
-import com.subgraph.orchid.Threading;
-import com.subgraph.orchid.TorClient;
-
-import java.io.FileDescriptor;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.*;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.locks.Lock;
-
-public class OrchidSocketImpl extends SocketImpl {
-	private final TorClient torClient;
-
-	private Lock streamLock = Threading.lock("stream");
-	private Stream stream;
-	
-	OrchidSocketImpl(TorClient torClient) {
-		this.torClient = torClient;
-		this.fd = new FileDescriptor();
-	}
-
-	public void setOption(int optID, Object value) throws SocketException {
-		// Ignored.
-	}
-
-	public Object getOption(int optID) throws SocketException {
-		if(optID == SocketOptions.SO_LINGER) {
-			return 0;
-		} else if(optID == SocketOptions.TCP_NODELAY) {
-			return Boolean.TRUE;
-		} else if(optID == SocketOptions.SO_TIMEOUT) {
-			return 0;
-		} else {
-			return 0;
-		}
-	}
-
-	@Override
-	protected void create(boolean stream) throws IOException {
-		
-	}
-
-	@Override
-	protected void connect(String host, int port) throws IOException {
-		SocketAddress endpoint =
-				InetSocketAddress.createUnresolved(host, port);
-		connect(endpoint, 0);
-	}
-
-	@Override
-	protected void connect(InetAddress address, int port) throws IOException {
-		SocketAddress endpoint =
-				InetSocketAddress.createUnresolved(address.getHostAddress(), port);
-		connect(endpoint, 0);
-	}
-
-	@Override
-	protected void connect(SocketAddress address, int timeout)
-			throws IOException {
-		if(!(address instanceof InetSocketAddress)) {
-			throw new IllegalArgumentException("Unsupported address type");
-		}
-		final InetSocketAddress inetAddress = (InetSocketAddress) address;
-		
-		doConnect(addressToName(inetAddress), inetAddress.getPort());
-	}
-	
-	private String addressToName(InetSocketAddress address) {
-		if(address.getAddress() != null) {
-			return address.getAddress().getHostAddress();
-		} else {
-			return address.getHostName();
-		}
-	}
-
-	private void doConnect(String host, int port) throws IOException {
-		Stream stream;
-
-		// Try to avoid holding the stream lock here whilst calling into torclient to avoid accidental inversions.
-
-		streamLock.lock();
-		stream = this.stream;
-		streamLock.unlock();
-
-		if (stream != null)
-			throw new SocketException("Already connected");
-
-		try {
-			stream = torClient.openExitStreamTo(host, port);
-		} catch (InterruptedException e) {
-			Thread.currentThread().interrupt();
-			throw new SocketException("connect() interrupted");
-		} catch (TimeoutException e) {
-			throw new SocketTimeoutException();
-		} catch (OpenFailedException e) {
-			throw new ConnectException(e.getMessage());
-		}
-
-		streamLock.lock();
-		if (this.stream != null) {
-			// Raced with another concurrent call.
-			streamLock.unlock();
-			stream.close();
-		} else {
-			this.stream = stream;
-			streamLock.unlock();
-		}
-	}
-
-	@Override
-	protected void bind(InetAddress host, int port) throws IOException {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	protected void listen(int backlog) throws IOException {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	protected void accept(SocketImpl s) throws IOException {
-		throw new UnsupportedOperationException();
-	}
-
-	private Stream getStream() throws IOException {
-		streamLock.lock();
-		try {
-			if (stream == null)
-				throw new IOException("Not connected");
-			return stream;
-		} finally {
-			streamLock.unlock();
-		}
-	}
-
-	@Override
-	protected InputStream getInputStream() throws IOException {
-		return getStream().getInputStream();
-	}
-
-	@Override
-	protected OutputStream getOutputStream() throws IOException {
-		return getStream().getOutputStream();
-	}
-
-	@Override
-	protected int available() throws IOException {
-		return getStream().getInputStream().available();
-	}
-
-	@Override
-	protected void close() throws IOException {
-		Stream toClose;
-		streamLock.lock();
-		toClose = this.stream;
-		this.stream = null;
-		streamLock.unlock();
-		if (toClose != null)
-			toClose.close();
-	}
-
-	@Override
-	protected void sendUrgentData(int data) throws IOException {
-		throw new UnsupportedOperationException();
-	}
-	
-	 protected void shutdownInput() throws IOException {
-	  //throw new IOException("Method not implemented!");
-	}
-	 
-	 protected void shutdownOutput() throws IOException {
-	  //throw new IOException("Method not implemented!");
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/sockets/OrchidSocketImplFactory.java b/orchid/src/com/subgraph/orchid/sockets/OrchidSocketImplFactory.java
deleted file mode 100644
index 7c96fcbb478..00000000000
--- a/orchid/src/com/subgraph/orchid/sockets/OrchidSocketImplFactory.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.subgraph.orchid.sockets;
-
-import java.net.SocketImpl;
-import java.net.SocketImplFactory;
-
-import com.subgraph.orchid.TorClient;
-
-public class OrchidSocketImplFactory implements SocketImplFactory {
-	private final TorClient torClient;
-	
-	public OrchidSocketImplFactory(TorClient torClient) {
-		this.torClient = torClient;
-	}
-
-	public SocketImpl createSocketImpl() {
-		return new OrchidSocketImpl(torClient);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/sockets/sslengine/HandshakeCallbackHandler.java b/orchid/src/com/subgraph/orchid/sockets/sslengine/HandshakeCallbackHandler.java
deleted file mode 100644
index b26c20c4ede..00000000000
--- a/orchid/src/com/subgraph/orchid/sockets/sslengine/HandshakeCallbackHandler.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.subgraph.orchid.sockets.sslengine;
-
-public interface HandshakeCallbackHandler {
-	void handshakeCompleted();
-}
diff --git a/orchid/src/com/subgraph/orchid/sockets/sslengine/SSLEngineInputStream.java b/orchid/src/com/subgraph/orchid/sockets/sslengine/SSLEngineInputStream.java
deleted file mode 100644
index 75ade871b69..00000000000
--- a/orchid/src/com/subgraph/orchid/sockets/sslengine/SSLEngineInputStream.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.subgraph.orchid.sockets.sslengine;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-
-public class SSLEngineInputStream extends InputStream {
-
-	private final SSLEngineManager manager;
-	private final ByteBuffer recvBuffer;
-	private boolean isEOF;
-	
-	SSLEngineInputStream(SSLEngineManager manager) {
-		this.manager = manager;
-		this.recvBuffer = manager.getRecvBuffer();
-	}
-	
-	@Override
-	public int read() throws IOException {
-		if(!fillRecvBufferIfEmpty()) {
-			return -1;
-		}
-		final int b = recvBuffer.get() & 0xFF;
-		recvBuffer.compact();
-		return b;
-	}
-	
-	@Override
-    public int read(byte b[], int off, int len) throws IOException {
-		if(!fillRecvBufferIfEmpty()) {
-			return -1;
-		}
-		final int copyLen = Math.min(recvBuffer.remaining(), len);
-		recvBuffer.get(b, off, copyLen);
-		recvBuffer.compact();
-		return copyLen;
-    }
-
-	@Override
-	public void close() throws IOException {
-		manager.close();
-	}
-
-	private boolean fillRecvBufferIfEmpty() throws IOException {
-		if(isEOF) {
-			return false;
-		}
-		if(recvBuffer.position() == 0) {
-			if(manager.read() < 0) {
-				isEOF = true;
-				return false;
-			}
-		}
-		recvBuffer.flip();
-		return recvBuffer.hasRemaining();
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/sockets/sslengine/SSLEngineManager.java b/orchid/src/com/subgraph/orchid/sockets/sslengine/SSLEngineManager.java
deleted file mode 100644
index 5cc6928e339..00000000000
--- a/orchid/src/com/subgraph/orchid/sockets/sslengine/SSLEngineManager.java
+++ /dev/null
@@ -1,343 +0,0 @@
-package com.subgraph.orchid.sockets.sslengine;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.SocketException;
-import java.nio.BufferOverflowException;
-import java.nio.BufferUnderflowException;
-import java.nio.ByteBuffer;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLEngineResult;
-import javax.net.ssl.SSLEngineResult.HandshakeStatus;
-import javax.net.ssl.SSLEngineResult.Status;
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLSession;
-
-public class SSLEngineManager {
-	private final static Logger logger = Logger.getLogger(SSLEngineManager.class.getName());
-	
-	private final SSLEngine engine;
-	private final InputStream input;
-	private final OutputStream output;
-	
-	private final ByteBuffer peerApplicationBuffer;
-	private final ByteBuffer peerNetworkBuffer;
-	private final ByteBuffer myApplicationBuffer;
-	private final ByteBuffer myNetworkBuffer;
-	
-	private final HandshakeCallbackHandler handshakeCallback;
-	
-	private boolean handshakeStarted = false;
-	
-	
-	SSLEngineManager(SSLEngine engine, HandshakeCallbackHandler handshakeCallback, InputStream input, OutputStream output) {
-		this.engine = engine;
-		this.handshakeCallback = handshakeCallback;
-		this.input = input;
-		this.output = output;
-		final SSLSession session = engine.getSession();
-		this.peerApplicationBuffer = createApplicationBuffer(session);
-		this.peerNetworkBuffer = createPacketBuffer(session);
-		this.myApplicationBuffer = createApplicationBuffer(session);
-		this.myNetworkBuffer = createPacketBuffer(session);
-	}
-	
-	private static ByteBuffer createApplicationBuffer(SSLSession session) {
-		return createBuffer(session.getApplicationBufferSize());
-	}
-	
-	private static ByteBuffer createPacketBuffer(SSLSession session) {
-		return createBuffer(session.getPacketBufferSize());
-	}
-	
-	private static ByteBuffer createBuffer(int sz) {
-		final byte[] array = new byte[sz];
-		return ByteBuffer.wrap(array);
-	}
-	
-	void startHandshake() throws IOException {
-		logger.fine("startHandshake()");
-		handshakeStarted = true;
-		engine.beginHandshake();
-		runHandshake();
-	}
-
-	ByteBuffer getSendBuffer() {
-		return myApplicationBuffer;
-	}
-	
-	ByteBuffer getRecvBuffer() {
-		return peerApplicationBuffer;
-	}
-
-	
-	int write() throws IOException {
-		logger.fine("write()");
-		if(!handshakeStarted) {
-			startHandshake();
-		}
-		final int p = myApplicationBuffer.position();
-		if(p == 0) {
-			return 0;
-		}
-		myNetworkBuffer.clear();
-		myApplicationBuffer.flip();
-		final SSLEngineResult result = engine.wrap(myApplicationBuffer, myNetworkBuffer);
-		myApplicationBuffer.compact();
-		if(logger.isLoggable(Level.FINE)) {
-			logResult(result);
-		}
-		
-		switch(result.getStatus()) {
-		case BUFFER_OVERFLOW:
-			throw new BufferOverflowException();
-		case BUFFER_UNDERFLOW:
-			throw new BufferUnderflowException();
-		case CLOSED:
-			throw new SSLException("SSLEngine is closed");
-
-		case OK:
-			break;
-		default:
-			break;
-		}
-		
-		flush();
-		if(runHandshake()) {
-			write();
-		}
-		
-		return p - myApplicationBuffer.position();
-
-	}
-
-	// either return -1 or peerApplicationBuffer has data to read
-	int read() throws IOException {
-		logger.fine("read()");
-		if(!handshakeStarted) {
-			startHandshake();
-		}
-		
-		if(engine.isInboundDone()) {
-			return -1;
-		}
-		
-		final int n = networkReadBuffer(peerNetworkBuffer);
-		if(n == -1) {
-			return -1;
-		}
-		final int p = peerApplicationBuffer.position();
-		
-		peerNetworkBuffer.flip();
-		final SSLEngineResult result = engine.unwrap(peerNetworkBuffer, peerApplicationBuffer);
-		peerNetworkBuffer.compact();
-		if(logger.isLoggable(Level.FINE)) {
-			logResult(result);
-		}
-		
-		switch(result.getStatus()) {
-		case BUFFER_OVERFLOW:
-			throw new BufferOverflowException();
-			
-		case BUFFER_UNDERFLOW:
-			return 0; // <-- illegal return according to invariant
-			
-		case CLOSED:
-			input.close();
-			break;
-		case OK:
-			break;
-		default:
-			break;
-		}
-
-		runHandshake();
-		
-		if(n == -1) { // <-- can't happen
-			engine.closeInbound();
-		}
-		if(engine.isInboundDone()) {
-			return -1;
-		}
-		return peerApplicationBuffer.position() - p;
-	}
-	
-	void close() throws IOException {
-		try {
-			flush();
-			if(!engine.isOutboundDone()) {
-				engine.closeOutbound();
-				runHandshake();
-			} else if(!engine.isInboundDone()) {
-				engine.closeInbound();
-				runHandshake();
-			}
-		} finally {
-			output.close();
-		}
-	}
-	
-	void flush() throws IOException {
-		myNetworkBuffer.flip();
-		networkWriteBuffer(myNetworkBuffer);
-		myNetworkBuffer.compact();
-	}
-
-	
-	private boolean runHandshake() throws IOException {
-		boolean handshakeRan = false;
-		while(true) {
-			if(!processHandshake()) {
-				return handshakeRan;
-			} else {
-				handshakeRan = true;
-			}
-		}
-	}
-	
-	private boolean processHandshake() throws IOException {
-		final HandshakeStatus hs = engine.getHandshakeStatus();
-		logger.fine("processHandshake() hs = "+ hs);
-		switch(hs) {
-		case NEED_TASK:
-			synchronousRunDelegatedTasks();
-			return processHandshake();
-
-		case NEED_UNWRAP:
-			return handshakeUnwrap();
-			
-		case NEED_WRAP:
-			return handshakeWrap();
-
-		default:
-			return false;
-		}
-	}
-	
-	private void synchronousRunDelegatedTasks() {
-		logger.fine("runDelegatedTasks()");
-		while(true) {
-			Runnable r = engine.getDelegatedTask();
-			if(r == null) {
-				return;
-			}
-			logger.fine("Running a task: "+ r);
-			r.run();
-		}
-	}
-	
-	private boolean handshakeUnwrap() throws IOException {
-		logger.fine("handshakeUnwrap()");
-		
-		if(!engine.isInboundDone() && peerNetworkBuffer.position() == 0) {
-			if(networkReadBuffer(peerNetworkBuffer) < 0) {
-				return false;
-			}
-		}
-		peerNetworkBuffer.flip();
-		final SSLEngineResult result = engine.unwrap(peerNetworkBuffer, peerApplicationBuffer);
-		peerNetworkBuffer.compact();
-		
-		if(logger.isLoggable(Level.FINE)) {
-			logResult(result);
-		}
-
-		if(result.getHandshakeStatus() == HandshakeStatus.FINISHED) {
-			handshakeFinished();
-		}
-		switch(result.getStatus()) {
-
-		case CLOSED:
-			if(engine.isOutboundDone()) {
-				output.close();
-			}
-			return false;
-		case OK:
-			return true;
-		case BUFFER_UNDERFLOW:
-			if(networkReadBuffer(peerNetworkBuffer) < 0) {
-				return false;
-			}
-			return true;
-		default:
-			return false;
-		}
-	}
-	
-	private boolean handshakeWrap() throws IOException {
-		logger.fine("handshakeWrap()");
-		myApplicationBuffer.flip();
-		final SSLEngineResult result = engine.wrap(myApplicationBuffer, myNetworkBuffer);
-		myApplicationBuffer.compact();
-		if(logger.isLoggable(Level.FINE)) {
-			logResult(result);
-		}
-
-		if(result.getHandshakeStatus() == HandshakeStatus.FINISHED) {
-			handshakeFinished();
-		}
-		
-		if(result.getStatus() == Status.CLOSED) {
-			try {
-				flush();
-			} catch (SocketException e) {
-				e.printStackTrace();
-			}
-		} else {
-			flush();
-		}
-		
-		switch(result.getStatus()) {
-		case CLOSED:
-			if(engine.isOutboundDone()) {
-				output.close();
-			}
-			return false;
-
-		case OK:
-			return true;
-
-		default:
-			return false;
-		
-		}
-	}
-
-	private void logResult(SSLEngineResult result) {
-		logger.fine("Result status="+result.getStatus() + " hss="+ result.getHandshakeStatus() + " consumed = "+ result.bytesConsumed() + " produced = "+ result.bytesProduced());
-	}
-	
-	private void handshakeFinished() {
-		if(handshakeCallback != null) {
-			handshakeCallback.handshakeCompleted();
-		}
-	}
-	
-	private void networkWriteBuffer(ByteBuffer buffer) throws IOException {
-		final byte[] bs = buffer.array();
-		final int off = buffer.position();
-		final int len = buffer.limit() - off;
-		logger.fine("networkWriteBuffer(b, "+ off + ", "+ len +")");
-		output.write(bs, off, len);
-		output.flush();
-		buffer.position(buffer.limit());
-	}
-	
-	private int networkReadBuffer(ByteBuffer buffer) throws IOException {
-		final byte[] bs = buffer.array();
-		final int off = buffer.position();
-		final int len = buffer.limit() - off;
-
-		final int n = input.read(bs, off, len);
-		if(n != -1) {
-			buffer.position(off + n);
-		}
-		logger.fine("networkReadBuffer(b, "+ off +", "+ len +") = "+ n);
-		return n;
-	}
-	
-}
diff --git a/orchid/src/com/subgraph/orchid/sockets/sslengine/SSLEngineOutputStream.java b/orchid/src/com/subgraph/orchid/sockets/sslengine/SSLEngineOutputStream.java
deleted file mode 100644
index 62cc11aa475..00000000000
--- a/orchid/src/com/subgraph/orchid/sockets/sslengine/SSLEngineOutputStream.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.subgraph.orchid.sockets.sslengine;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-
-public class SSLEngineOutputStream extends OutputStream {
-
-	private final SSLEngineManager manager;
-	private final ByteBuffer outputBuffer;
-	
-	public SSLEngineOutputStream(SSLEngineManager manager) {
-		this.manager = manager;
-		this.outputBuffer = manager.getSendBuffer();
-	}
-	
-	@Override
-	public void write(int b) throws IOException {
-		outputBuffer.put((byte) b);
-		manager.write();
-	}
-	
-	@Override
-    public void write(byte b[], int off, int len) throws IOException {
-		int written = 0;
-		
-		while(written < len) {
-			int n = doWrite(b, off + written, len - written);
-			
-			written += n;
-		}
-    }
-	
-	@Override
-	public void close() throws IOException {
-		manager.close();
-	}
-	
-	private int doWrite(byte[] b, int off, int len) throws IOException {
-		int putLength = Math.min(len, outputBuffer.remaining());
-		outputBuffer.put(b, off, putLength);
-		manager.write();
-		return putLength;
-	}
-
-}
diff --git a/orchid/src/com/subgraph/orchid/sockets/sslengine/SSLEngineSSLSocket.java b/orchid/src/com/subgraph/orchid/sockets/sslengine/SSLEngineSSLSocket.java
deleted file mode 100644
index 0f87e05d0bb..00000000000
--- a/orchid/src/com/subgraph/orchid/sockets/sslengine/SSLEngineSSLSocket.java
+++ /dev/null
@@ -1,315 +0,0 @@
-package com.subgraph.orchid.sockets.sslengine;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.net.SocketException;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import javax.net.ssl.HandshakeCompletedEvent;
-import javax.net.ssl.HandshakeCompletedListener;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocket;
-
-public class SSLEngineSSLSocket extends SSLSocket implements HandshakeCallbackHandler {
-
-	private final SSLEngine engine;
-	private final SSLEngineManager manager;
-	
-	private Socket socket;
-	private InputStream inputStream;
-	private OutputStream outputStream;
-	private final List<HandshakeCompletedListener> listenerList;
-	public SSLEngineSSLSocket(Socket socket, SSLContext context) throws IOException {
-		this.engine = createSSLEngine(context);
-		this.socket = socket;
-		this.manager = new SSLEngineManager(engine, this, socket.getInputStream(), socket.getOutputStream());
-		this.listenerList = new CopyOnWriteArrayList<HandshakeCompletedListener>();
-	}
-	
-	private static SSLEngine createSSLEngine(SSLContext context) {
-		final SSLEngine engine = context.createSSLEngine();
-		engine.setUseClientMode(true);
-		return engine;
-	}
-
-	@Override
-	public String[] getSupportedCipherSuites() {
-		return engine.getSupportedCipherSuites();
-	}
-
-	@Override
-	public String[] getEnabledCipherSuites() {
-		return engine.getEnabledCipherSuites();
-	}
-
-	@Override
-	public void setEnabledCipherSuites(String[] suites) {
-		engine.setEnabledCipherSuites(suites);
-	}
-
-	@Override
-	public String[] getSupportedProtocols() {
-		return engine.getSupportedProtocols();
-	}
-
-	@Override
-	public String[] getEnabledProtocols() {
-		return engine.getEnabledProtocols();
-	}
-
-	@Override
-	public void setEnabledProtocols(String[] protocols) {
-		engine.setEnabledProtocols(protocols);
-	}
-
-	@Override
-	public SSLSession getSession() {
-		return engine.getSession();
-	}
-
-	@Override
-	public void addHandshakeCompletedListener(
-			HandshakeCompletedListener listener) {
-		listenerList.add(listener);
-	}
-
-	@Override
-	public void removeHandshakeCompletedListener(
-			HandshakeCompletedListener listener) {
-		listenerList.remove(listener);
-	}
-
-	@Override
-	public void startHandshake() throws IOException {
-		manager.startHandshake();
-	}
-
-	@Override
-	public void setUseClientMode(boolean mode) {
-		engine.setUseClientMode(mode);
-	}
-
-	@Override
-	public boolean getUseClientMode() {
-		return engine.getUseClientMode();
-	}
-
-	@Override
-	public void setNeedClientAuth(boolean need) {
-		engine.setNeedClientAuth(need);
-	}
-
-	@Override
-	public boolean getNeedClientAuth() {
-		return engine.getNeedClientAuth();
-	}
-
-	@Override
-	public void setWantClientAuth(boolean want) {
-		engine.setWantClientAuth(want);
-	}
-
-	@Override
-	public boolean getWantClientAuth() {
-		return engine.getWantClientAuth();
-	}
-
-	@Override
-	public void connect(SocketAddress endpoint) throws IOException {
-		throw new IOException("Socket is already connected");
-	}
-
-	@Override
-	public void connect(SocketAddress endpoint, int timeout) throws IOException {
-		throw new IOException("Socket is already connected");
-	}
-
-	@Override
-	public void bind(SocketAddress bindpoint) throws IOException {
-		throw new IOException("Socket is already connected");
-	}
-
-	@Override
-	public InetAddress getInetAddress() {
-		return socket.getInetAddress();
-	}
-
-	@Override
-	public InetAddress getLocalAddress() {
-		return socket.getLocalAddress();
-	}
-
-	@Override
-	public int getPort() {
-		return socket.getPort();
-	}
-
-	@Override
-	public int getLocalPort() {
-		return socket.getLocalPort();
-	}
-
-	@Override
-	public SocketAddress getRemoteSocketAddress() {
-		return socket.getRemoteSocketAddress();
-	}
-
-	@Override
-	public SocketAddress getLocalSocketAddress() {
-		return socket.getLocalSocketAddress();
-	}
-
-	@Override
-	public void setTcpNoDelay(boolean on) throws SocketException {
-		socket.setTcpNoDelay(on);
-	}
-
-	@Override
-	public boolean getTcpNoDelay() throws SocketException {
-		return socket.getTcpNoDelay();
-	}
-
-	@Override
-	public void setSoLinger(boolean on, int linger) throws SocketException {
-		socket.setSoLinger(on, linger);
-	}
-
-	@Override
-	public int getSoLinger() throws SocketException {
-		return socket.getSoLinger();
-	}
-
-	@Override
-	public void setOOBInline(boolean on) throws SocketException {
-		socket.setOOBInline(on);
-	}
-
-	@Override
-	public boolean getOOBInline() throws SocketException {
-		return socket.getOOBInline();
-	}
-
-	@Override
-	public synchronized void setSoTimeout(int timeout) throws SocketException {
-		socket.setSoTimeout(timeout);
-	}
-
-	@Override
-	public synchronized int getSoTimeout() throws SocketException {
-		return socket.getSoTimeout();
-	}
-
-	@Override
-	public synchronized void setSendBufferSize(int size) throws SocketException {
-		socket.setSendBufferSize(size);
-	}
-
-	@Override
-	public synchronized int getSendBufferSize() throws SocketException {
-		return socket.getSendBufferSize();
-	}
-
-	@Override
-	public synchronized void setReceiveBufferSize(int size)
-			throws SocketException {
-		socket.setReceiveBufferSize(size);
-	}
-
-	@Override
-	public synchronized int getReceiveBufferSize() throws SocketException {
-		return socket.getReceiveBufferSize();
-	}
-
-	@Override
-	public void setKeepAlive(boolean on) throws SocketException {
-		socket.setKeepAlive(on);
-	}
-
-	@Override
-	public boolean getKeepAlive() throws SocketException {
-		return socket.getKeepAlive();
-	}
-
-	@Override
-	public void setTrafficClass(int tc) throws SocketException {
-		socket.setTrafficClass(tc);
-	}
-
-	@Override
-	public int getTrafficClass() throws SocketException {
-		return socket.getTrafficClass();
-	}
-
-	@Override
-	public void setReuseAddress(boolean on) throws SocketException {
-		socket.setReuseAddress(on);
-	}
-
-	@Override
-	public boolean getReuseAddress() throws SocketException {
-		return socket.getReuseAddress();
-	}
-
-	@Override
-	public void shutdownInput() throws IOException {
-		throw new UnsupportedOperationException("shutdownInput() not supported on SSL Sockets");
-	}
-
-	@Override
-	public void shutdownOutput() throws IOException {
-		throw new UnsupportedOperationException("shutdownOutput() not supported on SSL Sockets");
-	}
-
-	@Override
-	public boolean isInputShutdown() {
-		return socket.isInputShutdown();
-	}
-
-	@Override
-	public boolean isOutputShutdown() {
-		return socket.isOutputShutdown();
-	}
-
-	@Override
-	public void setEnableSessionCreation(boolean flag) {
-		engine.setEnableSessionCreation(flag);
-	}
-
-	@Override
-	public boolean getEnableSessionCreation() {
-		return engine.getEnableSessionCreation();
-	}
-
-	@Override
-	public synchronized InputStream getInputStream() throws IOException {
-		if(inputStream == null) {
-			inputStream = new SSLEngineInputStream(manager);
-		}
-		return inputStream;
-	}
-
-	@Override
-	public OutputStream getOutputStream() throws IOException {
-		if(outputStream == null) {
-			outputStream = new SSLEngineOutputStream(manager);
-		}
-		return outputStream;
-	}
-
-	public void handshakeCompleted() {
-		if(listenerList.isEmpty()) {
-			return;
-		}
-		final HandshakeCompletedEvent event = new HandshakeCompletedEvent(this, engine.getSession());
-		for(HandshakeCompletedListener listener: listenerList) {
-			listener.handshakeCompleted(event);
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/socks/Socks4Request.java b/orchid/src/com/subgraph/orchid/socks/Socks4Request.java
deleted file mode 100644
index ef79b6e0a87..00000000000
--- a/orchid/src/com/subgraph/orchid/socks/Socks4Request.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.subgraph.orchid.socks;
-
-import java.net.Socket;
-
-import com.subgraph.orchid.TorConfig;
-
-public class Socks4Request extends SocksRequest {
-	final static int SOCKS_COMMAND_CONNECT = 1;
-	final static int SOCKS_COMMAND_RESOLV = 0xF0;
-	private final static int SOCKS_STATUS_SUCCESS = 0x5a;
-	private final static int SOCKS_STATUS_FAILURE = 0x5b;
-	private int command;
-
-	Socks4Request(TorConfig config, Socket socket) {
-		super(config, socket);
-	}
-
-	public boolean isConnectRequest() {
-		return command == SOCKS_COMMAND_CONNECT;
-	}
-
-	public int getCommandCode() {
-		return command;
-	}
-
-	public void sendConnectionRefused() throws SocksRequestException {
-		sendError(false);
-	}
-
-	public void sendError(boolean isUnsupportedCommand) throws SocksRequestException  {
-		sendResponse(SOCKS_STATUS_FAILURE);
-	}
-
-	public void sendSuccess() throws SocksRequestException {
-		sendResponse(SOCKS_STATUS_SUCCESS);
-	}
-
-	public void readRequest() throws SocksRequestException {
-		command = readByte();
-		setPortData(readPortData());
-		byte[] ipv4Data = readIPv4AddressData();
-		readNullTerminatedString(); // Username
-		if(isVersion4aHostname(ipv4Data))
-			setHostname(readNullTerminatedString());
-		else
-			setIPv4AddressData(ipv4Data);
-	}
-
-	private boolean isVersion4aHostname(byte[] data) {
-		/*
-		 * For version 4A, if the client cannot resolve the destination host's
-		 * domain name to find its IP address, it should set the first three bytes
-         * of DSTIP to NULL and the last byte to a non-zero value. (This corresponds
-         * to IP address 0.0.0.x, with x nonzero.
-		 */
-		if(data.length != 4)
-			return false;
-		for(int i = 0; i < 3; i++)
-			if(data[i] != 0)
-				return false;
-		return data[3] != 0;
-	}
-
-	private void sendResponse(int code) throws SocksRequestException {
-		final byte[] responseBuffer = new byte[8];
-		responseBuffer[0] = 0;
-		responseBuffer[1] = (byte) code;
-		socketWrite(responseBuffer);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/socks/Socks5Request.java b/orchid/src/com/subgraph/orchid/socks/Socks5Request.java
deleted file mode 100644
index f7f0a225ec7..00000000000
--- a/orchid/src/com/subgraph/orchid/socks/Socks5Request.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.subgraph.orchid.socks;
-
-import java.net.Socket;
-
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.TorException;
-
-public class Socks5Request extends SocksRequest {
-	final static int SOCKS5_VERSION = 5;
-	final static int SOCKS5_AUTH_NONE = 0;
-	final static int SOCKS5_COMMAND_CONNECT = 1;
-	final static int SOCKS5_COMMAND_RESOLV = 0xF0;
-	final static int SOCKS5_COMMAND_RESOLV_PTR = 0xF1;
-	final static int SOCKS5_ADDRESS_IPV4 = 1;
-	final static int SOCKS5_ADDRESS_HOSTNAME = 3;
-	final static int SOCKS5_ADDRESS_IPV6 = 4;
-	final static int SOCKS5_STATUS_SUCCESS = 0;
-	final static int SOCKS5_STATUS_FAILURE = 1;
-	final static int SOCKS5_STATUS_CONNECTION_REFUSED = 5;
-	final static int SOCKS5_STATUS_COMMAND_NOT_SUPPORTED = 7;
-	
-	private int command;
-	private int addressType;
-	private byte[] addressBytes = new byte[0];
-	private byte[] portBytes = new byte[0];
-	
-	Socks5Request(TorConfig config, Socket socket) {
-		super(config, socket);
-	}
-	
-	public boolean isConnectRequest() {
-		return command == SOCKS5_COMMAND_CONNECT;
-	}
-	
-	public int getCommandCode() {
-		return command;
-	}
-
-	private String addressBytesToHostname() {
-		if(addressType != SOCKS5_ADDRESS_HOSTNAME)
-			throw new TorException("SOCKS 4 request is not a hostname request");
-		final StringBuilder sb = new StringBuilder();
-		for(int i = 1; i < addressBytes.length; i++) {
-			char c = (char) (addressBytes[i] & 0xFF);
-			sb.append(c);
-		}
-		return sb.toString();
-	}
-	
-	public void readRequest() throws SocksRequestException {
-		if(!processAuthentication()) {
-			throw new SocksRequestException("Failed to negotiate authentication");
-		}
-		if(readByte() != SOCKS5_VERSION)
-			throw new SocksRequestException();
-
-		command = readByte();
-		readByte(); // Reserved
-		addressType = readByte();
-		addressBytes = readAddressBytes();
-		portBytes = readPortData();
-		if(addressType == SOCKS5_ADDRESS_IPV4)
-			setIPv4AddressData(addressBytes);
-		else if(addressType == SOCKS5_ADDRESS_HOSTNAME)
-			setHostname(addressBytesToHostname());
-		else 
-			throw new SocksRequestException();
-		setPortData(portBytes);		
-	}
-	
-	public void sendConnectionRefused() throws SocksRequestException {
-		sendResponse(SOCKS5_STATUS_CONNECTION_REFUSED);
-	}
-
-	public void sendError(boolean isUnsupportedCommand) throws SocksRequestException  {
-		if(isUnsupportedCommand) {
-			sendResponse(SOCKS5_STATUS_COMMAND_NOT_SUPPORTED);
-		} else {
-			sendResponse(SOCKS5_STATUS_FAILURE);
-		}
-	}
-	
-	public void sendSuccess() throws SocksRequestException {
-		sendResponse(SOCKS5_STATUS_SUCCESS);
-	}
-	
-	private void sendResponse(int status) throws SocksRequestException {
-		final int responseLength = 4 + addressBytes.length + portBytes.length;
-		final byte[] response = new byte[responseLength];
-		response[0] = SOCKS5_VERSION;
-		response[1] = (byte) status;
-		response[2] = 0;
-		response[3] = (byte) addressType;
-		System.arraycopy(addressBytes, 0, response, 4, addressBytes.length);
-		System.arraycopy(portBytes, 0, response, 4 + addressBytes.length, portBytes.length);
-		socketWrite(response);
-	}
-	
-	private boolean processAuthentication() throws SocksRequestException {
-		final int nmethods = readByte();
-		boolean foundAuthNone = false;
-		for(int i = 0; i < nmethods; i++) {
-			final int meth = readByte();
-			if(meth == SOCKS5_AUTH_NONE)
-				foundAuthNone = true;
-		}
-
-		if(foundAuthNone) {
-			sendAuthenticationResponse(SOCKS5_AUTH_NONE);
-			return true;
-		} else {
-			sendAuthenticationResponse(0xFF);
-			return false;
-		}
-	}
-	
-	
-	private void sendAuthenticationResponse(int method) throws SocksRequestException {
-		final byte[] response = new byte[2];
-		response[0] = SOCKS5_VERSION;
-		response[1] = (byte) method;
-		socketWrite(response);
-	}
-
-	private byte[] readAddressBytes() throws SocksRequestException {
-		switch(addressType) {
-		case SOCKS5_ADDRESS_IPV4:
-			return readIPv4AddressData();
-		case SOCKS5_ADDRESS_IPV6:
-			return readIPv6AddressData();
-		case SOCKS5_ADDRESS_HOSTNAME:
-			return readHostnameData();
-		default:
-			throw new SocksRequestException();
-		}
-	}
-	
-	private byte[] readHostnameData() throws SocksRequestException {
-		final int length = readByte();
-		final byte[] addrData = new byte[length + 1];
-		addrData[0] = (byte) length;
-		readAll(addrData, 1, length);
-		return addrData;
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/socks/SocksClientTask.java b/orchid/src/com/subgraph/orchid/socks/SocksClientTask.java
deleted file mode 100644
index b7cf781d53d..00000000000
--- a/orchid/src/com/subgraph/orchid/socks/SocksClientTask.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.subgraph.orchid.socks;
-
-import java.io.IOException;
-import java.net.Socket;
-import java.util.concurrent.TimeoutException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.CircuitManager;
-import com.subgraph.orchid.OpenFailedException;
-import com.subgraph.orchid.Stream;
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.TorException;
-
-public class SocksClientTask implements Runnable {
-	private final static Logger logger = Logger.getLogger(SocksClientTask.class.getName());
-	
-	private final TorConfig config;
-	private final Socket socket;
-	private final CircuitManager circuitManager;
-
-	SocksClientTask(TorConfig config, Socket socket, CircuitManager circuitManager) {
-		this.config = config;
-		this.socket = socket;
-		this.circuitManager = circuitManager;
-	}
-
-	public void run() {
-		final int version = readByte();
-		dispatchRequest(version);
-		closeSocket();
-	}
-
-	private int readByte() {
-		try {
-			return socket.getInputStream().read();
-		} catch (IOException e) {
-			logger.warning("IO error reading version byte: "+ e.getMessage());
-			return -1;
-		}
-	}
-	
-	private void dispatchRequest(int versionByte) {
-		switch(versionByte) {
-		case 'H':
-		case 'G':
-		case 'P':
-			sendHttpPage();
-			break;
-		case 4:
-			processRequest(new Socks4Request(config, socket));
-			break;
-		case 5:
-			processRequest(new Socks5Request(config, socket));
-			break;
-		default:
-			// fall through, do nothing
-			break;
-		}	
-	}
-	
-	private void processRequest(SocksRequest request) {
-		try {
-			request.readRequest();
-			if(!request.isConnectRequest()) {
-				logger.warning("Non connect command ("+ request.getCommandCode() + ")");
-				request.sendError(true);
-				return;
-			}
-			
-			try {
-				final Stream stream = openConnectStream(request);
-				logger.fine("SOCKS CONNECT to "+ request.getTarget()+ " completed");
-				request.sendSuccess();
-				runOpenConnection(stream);
-			} catch (InterruptedException e) {
-				logger.info("SOCKS CONNECT to "+ request.getTarget() + " was thread interrupted");
-				Thread.currentThread().interrupt();
-				request.sendError(false);
-			} catch (TimeoutException e) {
-				logger.info("SOCKS CONNECT to "+ request.getTarget() + " timed out");
-				request.sendError(false);
-			} catch (OpenFailedException e) {
-				logger.info("SOCKS CONNECT to "+ request.getTarget() + " failed: "+ e.getMessage());
-				request.sendConnectionRefused();
-			}
-		} catch (SocksRequestException e) {
-			logger.log(Level.WARNING, "Failure reading SOCKS request: "+ e.getMessage());
-			try {
-				request.sendError(false);
-				socket.close();
-			} catch (Exception ignore) { }
-		} 
-	}
-		
-
-	private void runOpenConnection(Stream stream) {
-		SocksStreamConnection.runConnection(socket, stream);
-	}
-
-	private Stream openConnectStream(SocksRequest request) throws InterruptedException, TimeoutException, OpenFailedException {
-		if(request.hasHostname()) {
-			logger.fine("SOCKS CONNECT request to "+ request.getHostname() +":"+ request.getPort());
-			return circuitManager.openExitStreamTo(request.getHostname(), request.getPort());
-		} else {
-			logger.fine("SOCKS CONNECT request to "+ request.getAddress() +":"+ request.getPort());
-			return circuitManager.openExitStreamTo(request.getAddress(), request.getPort());
-		}
-	}
-
-	private void sendHttpPage() {
-		throw new TorException("Returning HTTP page not implemented");
-	}
-
-	private void closeSocket() {
-		try {
-			socket.close();
-		} catch (IOException e) {
-			logger.warning("Error closing SOCKS socket: "+ e.getMessage());
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/socks/SocksPortListenerImpl.java b/orchid/src/com/subgraph/orchid/socks/SocksPortListenerImpl.java
deleted file mode 100644
index 76abfb3e5a7..00000000000
--- a/orchid/src/com/subgraph/orchid/socks/SocksPortListenerImpl.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.subgraph.orchid.socks;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.CircuitManager;
-import com.subgraph.orchid.SocksPortListener;
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.TorException;
-
-public class SocksPortListenerImpl implements SocksPortListener {
-	private final static Logger logger = Logger.getLogger(SocksPortListenerImpl.class.getName());
-	private final Set<Integer> listeningPorts = new HashSet<Integer>();
-	private final Map<Integer, AcceptTask> acceptThreads = new HashMap<Integer, AcceptTask>();
-	private final TorConfig config;
-	private final CircuitManager circuitManager;
-	private final ExecutorService executor;
-	private boolean isStopped;
-	
-	public SocksPortListenerImpl(TorConfig config, CircuitManager circuitManager) {
-		this.config = config;
-		this.circuitManager = circuitManager;
-		executor = Executors.newCachedThreadPool();
-	}
-
-	public void addListeningPort(int port) {
-		if(port <= 0 || port > 65535) {
-			throw new TorException("Illegal listening port: "+ port);
-		}
-		
-		synchronized(listeningPorts) {
-			if(isStopped) {
-				throw new IllegalStateException("Cannot add listening port because Socks proxy has been stopped");
-			}
-			if(listeningPorts.contains(port))
-				return;
-			listeningPorts.add(port);
-			try {
-				startListening(port);
-				logger.fine("Listening for SOCKS connections on port "+ port);
-			} catch (IOException e) {
-				listeningPorts.remove(port);
-				throw new TorException("Failed to listen on port "+ port +" : "+ e.getMessage());
-			}
-		}
-		
-	}
-	
-	public void stop() {
-		synchronized (listeningPorts) {
-			for(AcceptTask t: acceptThreads.values()) {
-				t.stop();
-			}
-			executor.shutdownNow();
-			isStopped = true;
-		}
-	}
-	
-	private void startListening(int port) throws IOException {
-		final AcceptTask task = new AcceptTask(port);
-		acceptThreads.put(port, task);
-		executor.execute(task);
-	}
-
-	private Runnable newClientSocket(final Socket s) {
-		return new SocksClientTask(config, s, circuitManager);
-	}
-	
-	private class AcceptTask implements Runnable {
-		private final ServerSocket socket;
-		private final int port;
-		private volatile boolean stopped;
-		
-		AcceptTask(int port) throws IOException {
-			this.socket = new ServerSocket(port);
-			this.port = port;
-		}
-		
-		void stop() {
-			stopped = true;
-			try {
-				socket.close();
-			} catch (IOException e) { }
-		}
-	
-		public void run() {
-			try {
-				runAcceptLoop();
-			} catch (IOException e) {
-				if(!stopped) {
-					logger.warning("System error accepting SOCKS socket connections: "+ e.getMessage());
-				}
-			} finally {
-				synchronized (listeningPorts) {
-					listeningPorts.remove(port);
-					acceptThreads.remove(port);
-				}
-			}
-		}
-		
-		private void runAcceptLoop() throws IOException {
-			while(!Thread.interrupted() && !stopped) {
-				final Socket s = socket.accept();
-				executor.execute(newClientSocket(s));
-			}
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/socks/SocksRequest.java b/orchid/src/com/subgraph/orchid/socks/SocksRequest.java
deleted file mode 100644
index a28497d8193..00000000000
--- a/orchid/src/com/subgraph/orchid/socks/SocksRequest.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package com.subgraph.orchid.socks;
-
-import java.io.IOException;
-import java.net.Socket;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.TorConfig;
-import com.subgraph.orchid.data.IPv4Address;
-
-public abstract class SocksRequest {
-	private final static Logger logger = Logger.getLogger(SocksRequest.class.getName());
-	
-	private final TorConfig config;
-	private final Socket socket;
-	
-	private byte[] addressData;
-	private IPv4Address address;
-	private String hostname;
-	private int port;
-	
-	private long lastWarningTimestamp = 0;
-	
-	protected SocksRequest(TorConfig config, Socket socket) {
-		this.config = config;
-		this.socket = socket;
-	}
-	
-	abstract public void readRequest() throws SocksRequestException;
-	abstract public int getCommandCode();
-	abstract public boolean isConnectRequest();
-	abstract void sendError(boolean isUnsupportedCommand) throws SocksRequestException;
-	abstract void sendSuccess() throws SocksRequestException;
-	abstract void sendConnectionRefused() throws SocksRequestException;
-	
-	public int getPort() {
-		return port;
-	}
-	
-	public IPv4Address getAddress() {
-		return address;
-	}
-	
-	public boolean hasHostname() {
-		return hostname != null;
-	}
-	
-	public String getHostname() {
-		return hostname;
-	}
-	
-	public String getTarget() {
-		if(config.getSafeLogging()) {
-			return "[scrubbed]:"+ port;
-		}
-		if(hostname != null) {
-			return hostname + ":" + port;
-		} else {
-			return address + ":" + port;
-		}
-	}
-	
-	protected void setPortData(byte[] data) throws SocksRequestException {
-		if(data.length != 2)
-			throw new SocksRequestException();
-		port = ((data[0] & 0xFF) << 8) | (data[1] & 0xFF);
-	}
-	
-	protected void setIPv4AddressData(byte[] data) throws SocksRequestException {
-		logUnsafeSOCKS();
-
-		if(data.length != 4)
-			throw new SocksRequestException();
-		addressData = data;
-		
-		int addressValue = 0;
-		for(byte b: addressData) {
-			addressValue <<= 8;
-			addressValue |= (b & 0xFF);
-		}
-		address = new IPv4Address(addressValue);
-	}
-	
-	private boolean testRateLimit() {
-		final long now = System.currentTimeMillis();
-		final long diff = now - lastWarningTimestamp;
-		lastWarningTimestamp = now;
-		return diff > 5000;
-	}
-	
-	private void logUnsafeSOCKS() throws SocksRequestException {
-		if((config.getWarnUnsafeSocks() || config.getSafeSocks()) && testRateLimit()) {
-			logger.warning("Your application is giving Orchid only "+
-							"an IP address.  Applications that do DNS "+
-							"resolves themselves may leak information. "+
-							"Consider using Socks4a (e.g. via privoxy or socat) "+ 
-							"instead.  For more information please see "+
-							"https://wiki.torproject.org/TheOnionRouter/TorFAQ#SOCKSAndDNS");
-		}
-		if(config.getSafeSocks()) {
-			throw new SocksRequestException("Rejecting unsafe SOCKS request");
-		}		
-	}
-
-	protected void setHostname(String name) {
-		hostname = name;
-	}
-	
-	protected byte[] readPortData() throws SocksRequestException {
-		final byte[] data = new byte[2];
-		readAll(data, 0, 2);
-		return data;
-	}
-	
-	protected byte[] readIPv4AddressData() throws SocksRequestException {
-		final byte[] data = new byte[4];
-		readAll(data);
-		return data;
-	}
-	
-	protected byte[] readIPv6AddressData() throws SocksRequestException {
-		final byte[] data = new byte[16];
-		readAll(data);
-		return data;
-	}
-	
-	protected String readNullTerminatedString() throws SocksRequestException {
-		try {
-			final StringBuilder sb = new StringBuilder();
-			while(true) {
-				final int c = socket.getInputStream().read();
-				if(c == -1)
-					throw new SocksRequestException();
-				if(c == 0)
-					return sb.toString();
-				char ch = (char) c;
-				sb.append(ch);
-			}
-		} catch (IOException e) {
-			throw new SocksRequestException(e);
-		}
-	}
-	
-	protected int readByte() throws SocksRequestException {
-		try {
-			final int n = socket.getInputStream().read();
-			if(n == -1)
-				throw new SocksRequestException();
-			return n;
-		} catch (IOException e) {
-			throw new SocksRequestException(e);
-		}
-	}
-	
-	protected void readAll(byte[] buffer) throws SocksRequestException {
-		readAll(buffer, 0, buffer.length);
-	}
-	
-	protected void readAll(byte[] buffer, int offset, int length) throws SocksRequestException {
-		try {
-			while(length > 0) {
-				int n = socket.getInputStream().read(buffer, offset, length);
-				if(n == -1)
-					throw new SocksRequestException();
-				offset += n;
-				length -= n;
-			}
-		} catch (IOException e) {
-			throw new SocksRequestException(e);
-		}
-	}
-	
-	protected void socketWrite(byte[] buffer) throws SocksRequestException {
-		try {
-			socket.getOutputStream().write(buffer);
-		} catch(IOException e) {
-			throw new SocksRequestException(e);
-		}
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/socks/SocksRequestException.java b/orchid/src/com/subgraph/orchid/socks/SocksRequestException.java
deleted file mode 100644
index 789f6b1ca6c..00000000000
--- a/orchid/src/com/subgraph/orchid/socks/SocksRequestException.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.subgraph.orchid.socks;
-
-public class SocksRequestException extends Exception {
-	
-	private static final long serialVersionUID = 844055056337565049L;
-	
-	SocksRequestException() {}
-	SocksRequestException(String msg) {
-		super(msg);
-	}
-	
-	SocksRequestException(Throwable ex) {
-		super(ex);
-	}
-}
diff --git a/orchid/src/com/subgraph/orchid/socks/SocksStreamConnection.java b/orchid/src/com/subgraph/orchid/socks/SocksStreamConnection.java
deleted file mode 100644
index 70c9ea1e8e1..00000000000
--- a/orchid/src/com/subgraph/orchid/socks/SocksStreamConnection.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.subgraph.orchid.socks;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.util.logging.Logger;
-
-import com.subgraph.orchid.Stream;
-
-public class SocksStreamConnection {
-	private final static Logger logger = Logger.getLogger(SocksStreamConnection.class.getName());
-	
-	public static void runConnection(Socket socket, Stream stream) {
-		SocksStreamConnection ssc = new SocksStreamConnection(socket, stream);
-		ssc.run();
-	}
-	private final static int TRANSFER_BUFFER_SIZE = 4096;
-	private final Stream stream;
-	private final InputStream torInputStream;
-	private final OutputStream torOutputStream;
-	private final Socket socket;
-	private final Thread incomingThread;
-	private final Thread outgoingThread;
-	private final Object lock = new Object();
-	private volatile boolean outgoingClosed;
-	private volatile boolean incomingClosed;
-
-	private SocksStreamConnection(Socket socket, Stream stream) {
-		this.socket = socket;
-		this.stream = stream;
-		torInputStream = stream.getInputStream();
-		torOutputStream = stream.getOutputStream();
-		
-		incomingThread = createIncomingThread();
-		outgoingThread = createOutgoingThread();
-	}
-
-	private void run() {
-		incomingThread.start();
-		outgoingThread.start();
-		synchronized(lock) {
-			while(!(outgoingClosed && incomingClosed)) {
-				try {
-					lock.wait();
-				} catch (InterruptedException e) {
-					Thread.currentThread().interrupt();
-					return;
-				}
-			}
-			
-			try {
-				socket.close();
-			} catch (IOException e) {
-				logger.warning("IOException on SOCKS socket close(): "+ e.getMessage());
-			}
-			closeStream(torInputStream);
-			closeStream(torOutputStream);
-		}
-	}
-
-	private Thread createIncomingThread() {
-		return new Thread(new Runnable() { public void run() {
-			try {
-				incomingTransferLoop();
-			} catch (IOException e) {
-				logger.fine("System error on incoming stream IO  "+ stream +" : "+ e.getMessage());
-			} finally {
-				synchronized(lock) {
-					incomingClosed = true;
-					lock.notifyAll();
-				}
-			}
-		}});
-	}
-
-	private Thread createOutgoingThread() {
-		return new Thread(new Runnable() { public void run() {
-			try {
-				outgoingTransferLoop();
-			} catch (IOException e) {
-				logger.fine("System error on outgoing stream IO "+ stream +" : "+ e.getMessage());
-			} finally {
-				synchronized(lock) {
-					outgoingClosed = true;
-					lock.notifyAll();
-				}
-			}
-		}});
-	}
-
-	private void incomingTransferLoop() throws IOException {
-		final byte[] incomingBuffer = new byte[TRANSFER_BUFFER_SIZE];
-		while(true) {
-			final int n = torInputStream.read(incomingBuffer);
-			if(n == -1) {
-				logger.fine("EOF on TOR input stream "+ stream);
-				socket.shutdownOutput();
-				return;
-			} else if(n > 0) {
-				logger.fine("Transferring "+ n +" bytes from "+ stream +" to SOCKS socket");
-				if(!socket.isOutputShutdown()) {
-					socket.getOutputStream().write(incomingBuffer, 0, n);
-					socket.getOutputStream().flush();
-				} else {
-					closeStream(torInputStream);
-					return;
-				}
-			}
-		}
-	}
-
-	private void outgoingTransferLoop() throws IOException {
-		final byte[] outgoingBuffer = new byte[TRANSFER_BUFFER_SIZE];
-		while(true) {
-			stream.waitForSendWindow();
-			final int n = socket.getInputStream().read(outgoingBuffer);
-			if(n == -1) {
-				torOutputStream.close();
-				logger.fine("EOF on SOCKS socket connected to "+ stream);
-				return;
-			} else if(n > 0) {
-				logger.fine("Transferring "+ n +" bytes from SOCKS socket to "+ stream);
-				torOutputStream.write(outgoingBuffer, 0, n);
-				torOutputStream.flush();
-			}
-		}
-	}
-
-	private void closeStream(Closeable c) {
-		try {
-			c.close();
-		} catch (IOException e) {
-			logger.warning("Close failed on "+ c + " : "+ e.getMessage());
-		}	
-	}
-}
diff --git a/orchid/test/com/subgraph/orchid/TorConfigTest.java b/orchid/test/com/subgraph/orchid/TorConfigTest.java
deleted file mode 100644
index e108fd9c9b8..00000000000
--- a/orchid/test/com/subgraph/orchid/TorConfigTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.subgraph.orchid;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.subgraph.orchid.circuits.hs.HSDescriptorCookie;
-import com.subgraph.orchid.config.TorConfigBridgeLine;
-import com.subgraph.orchid.data.HexDigest;
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.encoders.Hex;
-
-public class TorConfigTest {
-
-	private TorConfig config;
-	
-	@Before
-	public void setup() {
-		config = Tor.createConfig();
-	}
-
-
-	@Test
-	public void testCircuitBuildTimeout() {
-		final long timeout = config.getCircuitBuildTimeout();
-		assertEquals(TimeUnit.MILLISECONDS.convert(60, TimeUnit.SECONDS), timeout);
-		config.setCircuitBuildTimeout(2, TimeUnit.MINUTES);
-		assertTrue(config.getCircuitBuildTimeout() > timeout);
-	}
-	
-	@Test
-	public void testDataDirectory() {
-		final File dd = config.getDataDirectory();
-		assertTrue(dd.getPath().charAt(0) != '~');
-		final String testPath = "/foo/dir";
-		config.setDataDirectory(new File(testPath));
-		assertEquals(new File(testPath), config.getDataDirectory());
-	}
-	
-	@Test
-	public void testMaxCircuitsPending() {
-		assertEquals(32, config.getMaxClientCircuitsPending());
-		config.setMaxClientCircuitsPending(23);
-		assertEquals(23, config.getMaxClientCircuitsPending());
-	}
-	
-	@Test
-	public void testEnforceDistinctSubnets() {
-		assertEquals(true, config.getEnforceDistinctSubnets());
-		config.setEnforceDistinctSubnets(false);
-		assertEquals(false, config.getEnforceDistinctSubnets());
-	}
-	
-	@Test
-	public void testCircuitStreamTimeout() {
-		assertEquals(0, config.getCircuitStreamTimeout());
-		config.setCircuitStreamTimeout(30, TimeUnit.SECONDS);
-		assertEquals(30 * 1000, config.getCircuitStreamTimeout());
-	}
-	
-	@Test
-	public void testHidServAuth() {
-		final String address = "3t43tfluce4qcxbo";
-		final String onion = address + ".onion";
-		
-		final String hex = "022b99d1d272285c80f7214bd6c07c27";
-		final String descriptor = "AiuZ0dJyKFyA9yFL1sB8Jw";
-		
-		assertNull(config.getHidServAuth(onion));
-		
-		config.addHidServAuth(onion, descriptor);
-		
-		HSDescriptorCookie cookie = config.getHidServAuth(onion);
-		assertNotNull(cookie);
-		assertEquals(hex, new String(Hex.encode(cookie.getValue())));
-		assertSame(cookie, config.getHidServAuth(address));
-	}
-	
-	@Test
-	public void testAutoBool() {
-		assertEquals(TorConfig.AutoBoolValue.AUTO, config.getUseNTorHandshake());
-		config.setUseNTorHandshake(TorConfig.AutoBoolValue.TRUE);
-		assertEquals(TorConfig.AutoBoolValue.TRUE, config.getUseNTorHandshake());
-		config.setUseNTorHandshake(TorConfig.AutoBoolValue.AUTO);
-		assertEquals(TorConfig.AutoBoolValue.AUTO, config.getUseNTorHandshake());
-	}
-	
-	@Test
-	public void testBridges() {
-		final IPv4Address a1 = IPv4Address.createFromString("1.2.3.4");
-		final IPv4Address a2 = IPv4Address.createFromString("4.4.4.4");
-		final HexDigest fp = HexDigest.createFromString("0EA20CAA3CE696E561BC08B15E00106700E8F682");
-		config.addBridge(a1, 88);
-		config.addBridge(a2, 101, fp);
-		List<TorConfigBridgeLine> bs = config.getBridges();
-		assertEquals(2, bs.size());
-		final TorConfigBridgeLine b1 = bs.get(0);
-		final TorConfigBridgeLine b2 = bs.get(1);
-		
-		assertEquals(a1, b1.getAddress());
-		assertEquals(a2, b2.getAddress());
-		assertEquals(88, b1.getPort());
-		assertEquals(101, b2.getPort());
-		assertNull(b1.getFingerprint());
-		assertSame(b2.getFingerprint(), fp);
-	}
-}
diff --git a/orchid/test/com/subgraph/orchid/circuits/TorInputStreamTest.java b/orchid/test/com/subgraph/orchid/circuits/TorInputStreamTest.java
deleted file mode 100644
index ff30e457fc0..00000000000
--- a/orchid/test/com/subgraph/orchid/circuits/TorInputStreamTest.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.subgraph.orchid.circuits;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.subgraph.orchid.RelayCell;
-import com.subgraph.orchid.Stream;
-import com.subgraph.orchid.circuits.TorInputStream;
-
-public class TorInputStreamTest {
-
-	private TorInputStream inputStream;
-	private Stream mockStream;
-	
-	@Before
-	public void before() {
-		mockStream = createMock("mockStream", Stream.class);
-		mockStream.close();
-		replay(mockStream);
-		inputStream = new TorInputStream(mockStream);
-	}
-	
-	@After
-	public void after() {
-		inputStream.close();
-		verify(mockStream);
-	}
-	
-	private static RelayCell createDataCell(byte[] data) {
-		final RelayCell cell = createMock("dataCell", RelayCell.class);
-		expect(cell.cellBytesRemaining()).andReturn(data.length);
-		expectLastCall().times(2);
-		expect(cell.getRelayCommand()).andReturn(RelayCell.RELAY_DATA);
-		expect(cell.getPayloadBuffer()).andReturn(ByteBuffer.wrap(data));
-		replay(cell);
-		return cell;
-	}
-	
-	private static RelayCell createEndCell() {
-		final RelayCell cell = createMock("endCell", RelayCell.class);
-		expect(cell.getRelayCommand()).andReturn(RelayCell.RELAY_END);
-		replay(cell);
-		return cell;
-	}
-	
-	private void sendData(int... data) {
-		byte[] bytes = new byte[data.length];
-		for(int i = 0; i < data.length; i++) {
-			bytes[i] = (byte) data[i];
-		}
-		inputStream.addInputCell(createDataCell(bytes));
-	}
-	
-	private void sendEnd() {
-		inputStream.addEndCell(createEndCell());
-	}
-	
-	@Test
-	public void testAvailable() throws IOException {
-		assertEquals(0, inputStream.available());
-		sendData(1,2,3);
-		assertEquals(3, inputStream.available());
-		assertEquals(1, inputStream.read());
-		assertEquals(2, inputStream.available());
-		sendData(4,5);
-		assertEquals(4, inputStream.available());
-	}
-	
-	@Test(timeout=100)
-	public void testRead() throws IOException {
-		sendData(1,2,3);
-		sendData(4);
-		sendData(5);
-		assertEquals(1, inputStream.read());
-		assertEquals(2, inputStream.read());
-		sendEnd();
-		assertEquals(3, inputStream.read());
-		assertEquals(4, inputStream.read());
-		assertEquals(5, inputStream.read());
-		assertEquals(-1, inputStream.read());
-	}
-	
-	
-	private void setupTestClose() throws IOException {
-		sendData(1,2,3,4,5,6);
-		sendEnd();
-		
-		assertEquals(1,  inputStream.read());
-		assertEquals(2,  inputStream.read());
-		
-		inputStream.close();
-	}
-	
-	@Test(expected=IOException.class, timeout=100)
-	public void testClose1() throws IOException {
-		setupTestClose();
-		/* throws IOException("Input stream closed") */
-		inputStream.read();
-	}
-	
-	@Test(expected=IOException.class, timeout=100)
-	public void testClose2() throws IOException {
-		setupTestClose();
-		/* throws IOException("Input stream closed") */
-		inputStream.read(new byte[2]);
-	}
-	
-	@Test(timeout=100)
-	public void testReadBuffer() throws IOException {
-		final byte[] buffer = new byte[3];
-		
-		sendData(1,2,3);
-		sendData(4,5,6);
-
-
-		/* read two bytes at offset 1 */
-		assertEquals(2, inputStream.read(buffer, 1, 2));
-		assertArrayEquals(new byte[] {0, 1, 2}, buffer);
-		
-		/* read entire buffer (3 bytes) */
-		assertEquals(3, inputStream.read(buffer));
-		assertArrayEquals(new byte[] {3, 4, 5 }, buffer);
-		
-		/* reset buffer to {0,0,0}, read entire buffer */
-		Arrays.fill(buffer, (byte)0);
-		assertEquals(1, inputStream.read(buffer));
-		assertArrayEquals(new byte[] { 6, 0, 0 }, buffer);
-
-		sendEnd();
-		/* read entire buffer at EOF */
-		assertEquals(-1, inputStream.read(buffer));
-	}
-	
-	private boolean doesNullBufferThrowException() throws IOException {
-		try {
-			inputStream.read(null);
-			return false;
-		} catch(NullPointerException e) {
-			return true;
-		}
-	}
-	
-	private boolean throwsOOBException(byte[] b, int off, int len) throws IOException {
-		try {
-			inputStream.read(b, off, len);
-			return false;
-		} catch (IndexOutOfBoundsException e) {
-			return true;
-		}
-	}
-
-	private void testOOB(String message, int bufferLength, int off, int len) throws IOException {
-		final byte[] buffer = new byte[bufferLength];
-		assertTrue(message, throwsOOBException(buffer, off, len));
-	}
-	
-	@Test(timeout=100)
-	public void testBadReadArguments() throws IOException {
-		final byte[] buffer = new byte[16];
-		sendData(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20);
-		sendEnd();
-		
-		assertTrue("Null buffer must throw NPE", doesNullBufferThrowException());
-		assertFalse("(offset + len) == b.length must not throw OOB", throwsOOBException(buffer, 8, 8));
-		
-		testOOB("Negative offset must throw OOB", 16, -2, 4);
-		testOOB("Negative length must throw OOB", 16, 0, -10);
-		testOOB("off >= b.length must throw OOB", 16, 16, 10);
-		testOOB("(off + len) > b.length must throw OOB", 16, 8, 9);
-		testOOB("(off + len) < 0 must throw OOB", 16, Integer.MAX_VALUE, 10);
-	}
-}
diff --git a/orchid/test/com/subgraph/orchid/circuits/hs/HSDescriptorParserTest.java b/orchid/test/com/subgraph/orchid/circuits/hs/HSDescriptorParserTest.java
deleted file mode 100644
index 1ec51d14c51..00000000000
--- a/orchid/test/com/subgraph/orchid/circuits/hs/HSDescriptorParserTest.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package com.subgraph.orchid.circuits.hs;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.nio.ByteBuffer;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.subgraph.orchid.Tor;
-import com.subgraph.orchid.directory.DocumentFieldParserImpl;
-import com.subgraph.orchid.directory.parsing.DocumentFieldParser;
-import com.subgraph.orchid.directory.parsing.DocumentParsingResult;
-
-public class HSDescriptorParserTest {
-	private final static String TEST_DESCRIPTOR =
-	"rendezvous-service-descriptor apue4vh2fduecfztrrwczoo7cprlki4s\n"+
-	"version 2\n"+
-	"permanent-key\n"+
-	"-----BEGIN RSA PUBLIC KEY-----\n"+
-	"MIGJAoGBAMNTmy7L/isS+XTkCf1B1aik0ApE9sxcNpLwNR2JOZyy5puEGPuVY1FW\n"+
-	"nw+CnMmTWXchTTRfboFmIv4F3i8ZTLHdWJ7wqRGyc0aabvkDZBSRWVHby3oDf/uQ\n"+
-	"abtrJxXzYjy/dP29v5bLkb7a2zaAeP1ojX8ZwpxgJ9BCI+2fvBArAgMBAAE=\n"+
-	"-----END RSA PUBLIC KEY-----\n"+
-	"secret-id-part xaib3au35yqklp5txmncxbi2uic6jqor\n"+
-	"publication-time 2013-07-07 23:20:40\n"+
-	"protocol-versions 2,3\n"+
-	"introduction-points\n"+
-	"-----BEGIN MESSAGE-----\n"+
-	"aW50cm9kdWN0aW9uLXBvaW50IGpla2tubHY0dWh2cGNoajVpcnZtd3I0Ym5rb2Ry\n"+
-	"N3ZkCmlwLWFkZHJlc3MgMTczLjI1NS4yNDkuMjIyCm9uaW9uLXBvcnQgNDQzCm9u\n"+
-	"aW9uLWtleQotLS0tLUJFR0lOIFJTQSBQVUJMSUMgS0VZLS0tLS0KTUlHSkFvR0JB\n"+
-	"TG9OeXdIeW1QRGo2c2NvdUsvbGJZR01MRllGRGxDOVJyN2Jjc0MxQW12MWp0MjBH\n"+
-	"WlBOdGFHMgorbjdDdHhMK3JWM3g5eFRQSDZBWUlDQmxycnA3TngzRlJQMWorQ3JI\n"+
-	"WWk3WkNrTWhDUmg3NXNadmhIV01GT3liClM1QUUyWlhCMTA4cUVucGJnSFdrWmFX\n"+
-	"SXdZZXdGZUZxdU5JV3ZjYVgxTU1lc3BONTJ2c0JBZ01CQUFFPQotLS0tLUVORCBS\n"+
-	"U0EgUFVCTElDIEtFWS0tLS0tCnNlcnZpY2Uta2V5Ci0tLS0tQkVHSU4gUlNBIFBV\n"+
-	"QkxJQyBLRVktLS0tLQpNSUdKQW9HQkFMZDJqYVk0a3oydVBlS05MRnBVMW80MUFV\n"+
-	"UmpiQW42bWdzWGtFNm15TTFhcDczS09FUGFQaUFwCmpib1pZSFdCV29QVVZFUFhu\n"+
-	"ZE9XcU92ZmFEVGJsbndGU1F1NU54VWVPVkNELzdOYnd6Y0l0c2ZkQ1RBMzVzcHIK\n"+
-	"ZGFUK3ZwWmFRWGgxbWt0NlFMN1dKeHZLaXI2bDFuMitwdXFwZ201ZUJhSXRCOEt4\n"+
-	"cnVLaEFnTUJBQUU9Ci0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0KaW50cm9k\n"+
-	"dWN0aW9uLXBvaW50IDcyb3R1Mnl4ZXJoNGZocHAybjNpMnBwNmo3Z2ZrNWZzCmlw\n"+
-	"LWFkZHJlc3MgMTk4LjI3LjY0LjI5Cm9uaW9uLXBvcnQgNDQzCm9uaW9uLWtleQot\n"+
-	"LS0tLUJFR0lOIFJTQSBQVUJMSUMgS0VZLS0tLS0KTUlHSkFvR0JBT0pLc2UzQmdv\n"+
-	"TzhKdytFMURHUXhVbTV6UGQwcjFscHl3U25IamFKb2ZIbitDaUdSTHRnS2JNNQpN\n"+
-	"R01UUnRhNVZKWTRUNjFpUFdmN05Ma0FiVnZuSllMcXVHZjdScnh4MCtnNm5jdTVG\n"+
-	"blJRMTQwOVkwVXRpNDFmCmVMeGI2YWJlMkorQTRLN2ZGdkMzVjVBSnhtZDIrV2xt\n"+
-	"dFhQbGV4aHlYN21SWGhBVzZ1UXpBZ01CQUFFPQotLS0tLUVORCBSU0EgUFVCTElD\n"+
-	"IEtFWS0tLS0tCnNlcnZpY2Uta2V5Ci0tLS0tQkVHSU4gUlNBIFBVQkxJQyBLRVkt\n"+
-	"LS0tLQpNSUdKQW9HQkFOa0I3eTVaN2FhVUs3R3ZTUWdKVHl6aU43anhlNXlvcEpU\n"+
-	"LzBIRURCSGN3cVBqMkdZMytTZ2VJCjRpUWFCRG1SL1V0Y3FuU1JLaGNyMFBSRFBy\n"+
-	"T2wxa3lSRmhLWTdqNWttSGRiMko3aEZ2eER1emRTNE43RWdCVVQKbHEvaFdZa2po\n"+
-	"QzVDck9uVTNIY1h5Q3RlU1p0bk5qRlkxVHJnSUx4Z1NwcXA0SU5ZZ1NpcEFnTUJB\n"+
-	"QUU9Ci0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0KaW50cm9kdWN0aW9uLXBv\n"+
-	"aW50IHNzNTR1amRlcWJ6a3RzbnBibzJwZXV5eDJpem1wbmZhCmlwLWFkZHJlc3Mg\n"+
-	"MzcuMTU3LjE5NS40OApvbmlvbi1wb3J0IDkwMDEKb25pb24ta2V5Ci0tLS0tQkVH\n"+
-	"SU4gUlNBIFBVQkxJQyBLRVktLS0tLQpNSUdKQW9HQkFKaUZhRE05Nm1acWQ0QTRj\n"+
-	"L3lkallpQjRXbGx5b0J5NGt2WXhYZUNnRHA4VGpNVmFzcUFRQUYzCjE5UnJUL01v\n"+
-	"TzE4SHVnWjMrUkticFptK2xLeHZlRkpIdGpmTUZQL0NEbDVFOUZ3VFcrdEVUdXMy\n"+
-	"RmVYcHJrVGMKbDc3YjIzSkpYd0FtQ3lYMFgyQWNUVVBoVkg4YXdGZU43T0xkRnk0\n"+
-	"ZzF3UjZhVzA1SFpIRkFnTUJBQUU9Ci0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0t\n"+
-	"LS0Kc2VydmljZS1rZXkKLS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1J\n"+
-	"R0pBb0dCQUtSTVVIUTdWaWxRZ1l6c3ZJVEJuZko1QXVSOUNZQWc5eGFUQzNmVWZ1\n"+
-	"T21udkZlNHZzZTFJeWsKUkNRSzZHOTVPbGxOd3B5akU4WXRCSlIxUlZLUFBqcHNI\n"+
-	"YUxJTmszVmROM3Z5NWxlL0VVQXY2c0dEUnRZODNDLwo3MFhGN1h6YjFGUVBNcm5a\n"+
-	"d1o2N3A4Wkc2KzNub1JSUFZLbFJzQU9wa2YwMWJOb3ZpR09iQWdNQkFBRT0KLS0t\n"+
-	"LS1FTkQgUlNBIFBVQkxJQyBLRVktLS0tLQoK\n"+
-	"-----END MESSAGE-----\n"+
-	"signature\n"+
-	"-----BEGIN SIGNATURE-----\n"+
-	"p1yxzPiIWpS0m+MTQW9LdJmgiOgaUTbwTz9GyoInPi5lC/WvX8/AnccsLoOUWjKs\n"+
-	"3q8xV/8Gtz3qyigsWSggFuXyc3mRGM28tpdCNNkFovKAQgiZ0KjLky9BaQPEFOpr\n"+
-	"v4Yo65ZbYvujPyc9xpqbtPNRf7LBe6GaqHvzP4kWqr8=\n"+
-	"-----END SIGNATURE-----\n";
-	
-	private final static String[] TEST_IPS = { 
-			"introduction-point mjxsa2bywdvbft6kltuqfwwyru4ggo7o\n"
-			+ "ip-address 86.59.119.82\n"
-			+ "onion-port 443\n"
-			+ "onion-key\n"
-			+ "-----BEGIN RSA PUBLIC KEY-----\n"
-			+ "MIGJAoGBAKIXLeVl4ut60oNnXeZtxJk7DMKFmklF/zeD+TqB1oW/QALt5wMVmO8u\n"
-			+ "RBK7BfSxXG6IWQ0O5vBVSM25qss7+Nv/brS61VcB7IZKDaEd4n3f6Tlu4G8vxjNm\n"
-			+ "zX0S1iYLqMOY1vcvuBIN2T43khkO5uyKjgF7EkAXLaH6hJgMSW9bAgMBAAE=\n"
-			+ "-----END RSA PUBLIC KEY-----\n"
-			+ "service-key\n"
-			+ "-----BEGIN RSA PUBLIC KEY-----\n"
-			+ "MIGJAoGBAL3FbGOkQ8cjlB70Fy1gv4178MwdNZrBPXwySubW206S0WILGePcXrZX\n"
-			+ "4yVCNb4V4i4l9XisSAzyYS2D3CSAtYkinnSlafV3tCvt+QCKeGgtALT42oLt5UOn\n"
-			+ "v494xZHVYKCiAwBScjqi7f+/BeclDPqBnm9af8p+cIkeCNrLt0WRAgMBAAE=\n"
-			+ "-----END RSA PUBLIC KEY-----\n"
-			+ "introduction-point 3ju2px3yec7ylznlwr2fyflabz5nq5kq\n"
-			+ "ip-address 209.236.66.136\n"
-			+ "onion-port 443\n"
-			+ "onion-key\n"
-			+ "-----BEGIN RSA PUBLIC KEY-----\n"
-			+ "MIGJAoGBAKQLOS9Z5oKUE3EkYgXf5M086S/iJ6YzPB8wPsPRNCNgnGDFYXCLHtw8\n"
-			+ "9mfm3jEG7/I5ab3+9hShMfls3uk0kIuOvD7b2VxNpsf5+z7RhZIpkCdby7etR3VL\n"
-			+ "RlQO41EIujAfoVFKMk0WmmtpMp7FzPZc8pg3jAfvkwN/wkCeONcBAgMBAAE=\n"
-			+ "-----END RSA PUBLIC KEY-----\n"
-			+ "service-key\n"
-			+ "-----BEGIN RSA PUBLIC KEY-----\n"
-			+ "MIGJAoGBALGabFwhhBa5P8br8SScwAK7qJIJlirf95pKASeY4phORZaZFo9qOy7B\n"
-			+ "qcIHQNGt3XIbW3MGMvOgIBklus97Bti8KDSTapWvmL4G3uF/XUoP8aPxUO56F+Gv\n"
-			+ "RqDQEuf/sk6MbMLPLipG7xWLnn5wYzwsCxutcv2RJdA4mCDcQJYlAgMBAAE=\n"
-			+ "-----END RSA PUBLIC KEY-----\n",
-			
-			"introduction-point f6b7o3f7hh7eudpc4cjocmew6kmnacsy\n"
-			+ "ip-address 37.157.192.150\n"
-			+ "onion-port 443\n"
-			+ "onion-key\n"
-			+ "-----BEGIN RSA PUBLIC KEY-----\n"
-			+ "MIGJAoGBALoaGfBx/MWM4yVrYO4jxKiVfyTVtvgXlk523ifA2beO6yfeDVKR+4u0\n"
-			+ "S/ABa9/kdQFXw4s9Ahz6vI0imdMPyUgYTXp+mP7pa45xp2uLi8kPgZLYzsJZc1Lm\n"
-			+ "pyS5CA4Fzq7jblR3R7rGJyRBm1h8Pa8p9xE3RI6oRJnjAoCW+3LBAgMBAAE=\n"
-			+ "-----END RSA PUBLIC KEY-----\n"
-			+ "service-key\n"
-			+ "-----BEGIN RSA PUBLIC KEY-----\n"
-			+ "MIGJAoGBAK4GlIJ95emUzWG3zfWGemJbR7UZU+Ufysrgn8VZh2oH01jvTXj14qwD\n"
-			+ "8PxI5R8CDlgfzCMMsUwp4tDZHd1IQZSyxRtonprq+j1ACDYm1hvYzwB1kjwlbp5g\n"
-			+ "OYl2PtveH5zu2pkvCjknZxW8TCKry5jL8RqY23zLwe+AZWU9BZJdAgMBAAE=\n"
-			+ "-----END RSA PUBLIC KEY-----\n"};
-	
-	
-	@Test
-	public void testDescriptorParser() {
-		final HSDescriptorParser parser = createDescriptorParserFromString(TEST_DESCRIPTOR);
-		DocumentParsingResult<HSDescriptor> result = parser.parse();
-		assertTrue(result.isOkay());
-		HSDescriptor descriptor = result.getDocument();
-		List<IntroductionPoint> ips = descriptor.getIntroductionPoints();
-		assertEquals(3, ips.size());
-		for(IntroductionPoint ip: ips) {
-			assertTrue(ip.isValidDocument());
-		}
-	}
-	
-	@Test
-	public void testIntroductionPointParser() {
-		final IntroductionPointParser parser = createIntroductionPointParserFromString(TEST_IPS[0]);
-		DocumentParsingResult<IntroductionPoint> result = parser.parse();
-		assertTrue(result.isOkay());
-		final List<IntroductionPoint> ips = result.getParsedDocuments();
-		assertEquals(2, ips.size());
-		for(IntroductionPoint ip: result.getParsedDocuments()) {
-			assertTrue(ip.isValidDocument());
-		}
-		
-	}
-	
-	
-	private HSDescriptorParser createDescriptorParserFromString(String s) {
-		return new HSDescriptorParser(null, createFieldParser(s));
-	}
-	
-	private IntroductionPointParser createIntroductionPointParserFromString(String s) {
-		return new IntroductionPointParser(createFieldParser(s)); 
-	}
-	
-	private DocumentFieldParser createFieldParser(String s) {
-		ByteBuffer buffer = ByteBuffer.wrap(s.getBytes(Tor.getDefaultCharset()));
-		return new DocumentFieldParserImpl(buffer);
-	}
-}
diff --git a/orchid/test/com/subgraph/orchid/circuits/path/ConfigNodeFilterTest.java b/orchid/test/com/subgraph/orchid/circuits/path/ConfigNodeFilterTest.java
deleted file mode 100644
index 5ccc589a177..00000000000
--- a/orchid/test/com/subgraph/orchid/circuits/path/ConfigNodeFilterTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.subgraph.orchid.circuits.path;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-
-import com.subgraph.orchid.Router;
-import com.subgraph.orchid.circuits.path.ConfigNodeFilter;
-import com.subgraph.orchid.circuits.path.RouterFilter;
-import com.subgraph.orchid.data.IPv4Address;
-
-public class ConfigNodeFilterTest {
-
-	@Test
-	public void testIsAddressString() {
-		final List<String> validStrings = Arrays.asList(
-				"1.2.3.4/16",
-				"0.0.0.0/1",
-				"255.0.255.0/16");
-		
-		final List<String> invalidStrings = Arrays.asList(
-				"1.2.3.256/16",
-				"1.2.3.4/61",
-				"1.2.3.4/0",
-				"1.2.3.4/22x",
-				"1.2.3.4/",
-				"1.2.3.4");
-
-		for(String s: validStrings) {
-			assertTrue(s, ConfigNodeFilter.isAddressString(s));
-		}
-		for(String s: invalidStrings) {
-			assertFalse(s, ConfigNodeFilter.isAddressString(s));
-		}
-
-	}
-	
-	@Test
-	public void testIsCountryCode() {
-		final List<String> validStrings = Arrays.asList("{CC}", "{xx}");
-		final List<String> invalidStrings = Arrays.asList("US", "{xxx}");
-		for(String s: validStrings) { assertTrue(s, ConfigNodeFilter.isCountryCodeString(s)); }
-		for(String s: invalidStrings) { assertFalse(s, ConfigNodeFilter.isCountryCodeString(s)); }
-	}
-	
-	private Router createRouterMockWithAddress(String ip) {
-		final IPv4Address address = IPv4Address.createFromString(ip);
-		final Router router = createMock("mockRouter", Router.class);
-		expect(router.getAddress()).andReturn(address);
-		replay(router);
-		return router;
-	}
-	
-	@Test
-	public void testMaskFilter() {
-		final Router r1 = createRouterMockWithAddress("1.2.3.4");
-		final Router r2 = createRouterMockWithAddress("1.7.3.4");
-		final RouterFilter f = ConfigNodeFilter.createFilterFor("1.2.3.0/16");
-		assertTrue(f.filter(r1));
-		assertFalse(f.filter(r2));
-		verify(r1, r2);
-	}
-	
-	
-}
diff --git a/orchid/test/com/subgraph/orchid/crypto/ASN1ParserTest.java b/orchid/test/com/subgraph/orchid/crypto/ASN1ParserTest.java
deleted file mode 100644
index 38a5bae8232..00000000000
--- a/orchid/test/com/subgraph/orchid/crypto/ASN1ParserTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.subgraph.orchid.crypto;
-
-import static org.junit.Assert.*;
-
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.subgraph.orchid.crypto.ASN1Parser.ASN1BitString;
-import com.subgraph.orchid.crypto.ASN1Parser.ASN1Integer;
-import com.subgraph.orchid.encoders.Hex;
-
-public class ASN1ParserTest {
-
-	private ASN1Parser parser;
-	
-	@Before
-	public void setup() {
-		parser = new ASN1Parser();
-	}
-	
-	ByteBuffer createBuffer(String hexData) {
-		final byte[] bs = Hex.decode(hexData);
-		return ByteBuffer.wrap(bs);
-	}
-	
-	
-	
-	@Test
-	public void testParseASN1Length() {
-		assertEquals(20, parser.parseASN1Length(createBuffer("14000000")));
-		assertEquals(23, parser.parseASN1Length(createBuffer("81170000")));
-		assertEquals(256, parser.parseASN1Length(createBuffer("82010000")));
-		assertEquals(65535, parser.parseASN1Length(createBuffer("82FFFF00")));
-	}
-	
-	@Test(expected=IllegalArgumentException.class)
-	public void testParseASN1LengthException() {
-		parser.parseASN1Length(createBuffer("80ACDCACDC"));
-	}
-	
-	@Test(expected=IllegalArgumentException.class)
-	public void testParseASN1LengthException2() {
-		parser.parseASN1Length(createBuffer("88ABCDABCD"));
-	}
-	
-	@Test
-	public void testParseASN1Integer() {
-		ASN1Integer asn1Integer = parser.parseASN1Integer(createBuffer("01020304"));
-		assertEquals(new BigInteger("01020304", 16), asn1Integer.getValue());
-	}
-	
-	@Test
-	public void testParseASN1BitString() {
-		ASN1BitString bitString = parser.parseASN1BitString(createBuffer("0001020304"));
-		assertArrayEquals(new byte[] {1, 2, 3, 4}, bitString.getBytes());
-	}
-	
-	@Test(expected=IllegalArgumentException.class)
-	public void testParseASN1BitStringException() {
-		parser.parseASN1BitString(createBuffer("01020304"));
-	}
-}
diff --git a/orchid/test/com/subgraph/orchid/crypto/RSAKeyEncoderTest.java b/orchid/test/com/subgraph/orchid/crypto/RSAKeyEncoderTest.java
deleted file mode 100644
index ad09ba01a6c..00000000000
--- a/orchid/test/com/subgraph/orchid/crypto/RSAKeyEncoderTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.subgraph.orchid.crypto;
-
-import static org.junit.Assert.assertEquals;
-
-import java.math.BigInteger;
-import java.security.GeneralSecurityException;
-import java.security.InvalidKeyException;
-import java.security.interfaces.RSAPublicKey;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class RSAKeyEncoderTest {
-
-	private RSAKeyEncoder encoder;
-	
-	final static String PEM_ENCODED_PUBKEY =
-			
-			"-----BEGIN RSA PUBLIC KEY-----\n"+
-			"MIGJAoGBAMuf0v+d3HUNk5jbYJuZA+q30NlqFStNBmB/BA4y6h9DTpJ2ULhdy6I8\n"+
-			"5tLq76TSTbGl2wiWpDjW73OkAfpbUyb+2fIFz4Ildth18ZA4dqNvnYNCnckO1p+B\n"+
-			"x6e+8YoafedZhXsv1Z9RMl6WK6WGXpmgCSTTlLnXlrsJLrG/mW9dAgMBAAE=\n"+
-			"-----END RSA PUBLIC KEY-----\n";
-	
-	final static String MODULUS_STRING =
-			
-			"142989855534119842624281223201112183062179043858844190077277374317180853428"+
-			"067855510754484639210124041049484315690046733530717435491654607786952431473"+
-			"291786675652833142146809594339105386135143284841697658385761023403765912288"+
-			"684940376854709443039663769117423844056151668935507268155717373127166136614"+
-			"724923229";
-	
-	final static BigInteger MODULUS = new BigInteger(MODULUS_STRING);
-	final static BigInteger EXPONENT = BigInteger.valueOf(65537);
-	
-	@Before
-	public void setup() {
-		encoder = new RSAKeyEncoder();
-	}
-	
-	@Test
-	public void testParsePEMPublicKey() throws GeneralSecurityException {
-		final RSAPublicKey publicKey = encoder.parsePEMPublicKey(PEM_ENCODED_PUBKEY);
-		assertEquals(MODULUS, publicKey.getModulus());
-		assertEquals(EXPONENT, publicKey.getPublicExponent());
-	}
-	
-	@Test(expected=InvalidKeyException.class)
-	public void testParsePEMPublicKeyException() throws GeneralSecurityException {
-		encoder.parsePEMPublicKey(PEM_ENCODED_PUBKEY.substring(1));
-	}
-
-}
diff --git a/orchid/test/com/subgraph/orchid/geoip/CountryCodeServiceTest.java b/orchid/test/com/subgraph/orchid/geoip/CountryCodeServiceTest.java
deleted file mode 100644
index b90005fdd69..00000000000
--- a/orchid/test/com/subgraph/orchid/geoip/CountryCodeServiceTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.subgraph.orchid.geoip;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.subgraph.orchid.data.IPv4Address;
-import com.subgraph.orchid.geoip.CountryCodeService;
-
-public class CountryCodeServiceTest {
-
-	private CountryCodeService ccs;
-	
-	@Before
-	public void before() {
-		ccs = CountryCodeService.getInstance();
-	}
-		
-	@Test
-	public void test() throws IOException {
-		testAddress("FR", "217.70.184.1");     // www.gandi.net
-		testAddress("DE", "213.165.65.50");    // www.gmx.de
-		testAddress("AR", "200.42.136.212");   // www.clarin.com
-		testAddress("GB", "77.91.248.30");	   // www.guardian.co.uk
-		testAddress("CA", "132.216.177.160");  // www.mcgill.ca
-		testAddress("US", "38.229.72.14");     // www.torproject.net
-	}
-	
-	private void testAddress(String expectedCC, String address) {
-		IPv4Address a = IPv4Address.createFromString(address);
-		String cc = ccs.getCountryCodeForAddress(a);
-		assertEquals("Country Code lookup for "+ address, expectedCC, cc);
-	}
-}
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index fb5f01583f6..00000000000
--- a/pom.xml
+++ /dev/null
@@ -1,266 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.bitcoinj</groupId>
-  <artifactId>bitcoinj-parent</artifactId>
-  <version>0.14-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>core</module>
-    <module>examples</module>
-    <module>tools</module>
-    <module>wallettemplate</module>
-  </modules>
-
-  <parent>
-    <groupId>org.sonatype.oss</groupId>
-    <artifactId>oss-parent</artifactId>
-    <version>7</version>
-  </parent>
-
-  <scm>
-    <connection>scm:git:https://github.com/bitcoinj/bitcoinj</connection>
-    <developerConnection>scm:git:https://github.com/bitcoinj/bitcoinj</developerConnection>
-    <url>scm:git:https://github.com/bitcoinj/bitcoinj</url>
-  </scm>
-
-  <name>bitcoinj Parent</name>
-  <description>Provides the common configuration for the BitCoinJ modules</description>
-  <url>http://www.bitcoinj.org/</url>
-
-  <licenses>
-    <license>
-      <name>Apache 2</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-      <distribution>repo</distribution>
-      <comments>A business-friendly OSS license</comments>
-    </license>
-  </licenses>
-
-  <issueManagement>
-    <system>Google Code</system>
-    <url>http://code.google.com/p/bitcoinj/issues/list</url>
-  </issueManagement>
-
-  <mailingLists>
-    <mailingList>
-      <name>bitcoinj Google Group</name>
-      <post>https://groups.google.com/forum/#!forum/bitcoinj</post>
-    </mailingList>
-  </mailingLists>
-
-  <distributionManagement>
-    <snapshotRepository>
-      <id>ossrh</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    </snapshotRepository>
-    <repository>
-      <id>ossrh</id>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </repository>
-  </distributionManagement>
-
-  <!-- Common build plugin configuration -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-          <showDeprecation>true</showDeprecation>
-          <showWarnings>true</showWarnings>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <addMavenDescriptor>false</addMavenDescriptor>
-          </archive>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <notimestamp>true</notimestamp>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
-        <version>1.6.5</version>
-        <extensions>true</extensions>
-        <configuration>
-            <serverId>ossrh</serverId>
-            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-            <autoReleaseAfterClose>false</autoReleaseAfterClose>
-        </configuration>
-      </plugin>
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-clean-plugin</artifactId>
-          <version>2.6.1</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.2</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.10</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.8.2</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-enforcer-plugin</artifactId>
-          <version>1.4</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-install-plugin</artifactId>
-          <version>2.5.2</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>2.6</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.10.2</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>2.7</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-shade-plugin</artifactId>
-          <version>2.3</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>3.4</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>2.4</version>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>cobertura-maven-plugin</artifactId>
-          <version>2.7</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.19.1</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-  <dependencies>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>1.7.20</version>
-      </dependency>
-      <!-- bitcoinj consumers are expected to provide their own SLF4J adapters
-    such as logback, slf4j-log4j12, slf4j-jcl and so on
-    see http://www.slf4j.org/faq.html -->
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-jdk14</artifactId>
-        <version>1.7.20</version>
-        <scope>runtime</scope>
-        <optional>true</optional>
-      </dependency>
-  </dependencies>
-
-  <prerequisites>
-      <maven>3.0.4</maven>
-  </prerequisites>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <generated.sourceDirectory>gen</generated.sourceDirectory>
-  </properties>
-
-  <profiles>
-    <profile>
-      <id>doclint-java8-disable</id>
-      <activation>
-        <jdk>[1.8,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <configuration>
-              <additionalparam>-Xdoclint:none</additionalparam>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-      <profile>
-          <id>release</id>
-          <build>
-              <plugins>
-                  <plugin>
-                      <groupId>org.apache.maven.plugins</groupId>
-                      <artifactId>maven-source-plugin</artifactId>
-                      <executions>
-                          <execution>
-                              <id>attach-sources</id>
-                              <phase>verify</phase>
-                              <goals>
-                                  <goal>jar-no-fork</goal>
-                              </goals>
-                          </execution>
-                      </executions>
-                  </plugin>
-
-                  <plugin>
-                      <groupId>org.apache.maven.plugins</groupId>
-                      <artifactId>maven-javadoc-plugin</artifactId>
-                      <executions>
-                          <execution>
-                              <id>attach-javadocs</id>
-                              <goals>
-                                  <goal>jar</goal>
-                              </goals>
-                          </execution>
-                      </executions>
-                  </plugin>
-
-                  <plugin>
-                      <groupId>org.apache.maven.plugins</groupId>
-                      <artifactId>maven-gpg-plugin</artifactId>
-                      <version>1.5</version>
-                      <executions>
-                          <execution>
-                              <id>sign-artifacts</id>
-                              <phase>verify</phase>
-                              <goals>
-                                  <goal>sign</goal>
-                              </goals>
-                          </execution>
-                      </executions>
-                  </plugin>
-              </plugins>
-          </build>
-      </profile>
-  </profiles>
-
-</project>
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 00000000000..7fb0bdfab8c
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,13 @@
+import org.gradle.util.GradleVersion
+
+include 'core'
+include 'tools'
+include 'examples'
+
+def minGradleVersion = GradleVersion.version("4.10")
+if (GradleVersion.current().compareTo(minGradleVersion) >= 0 && JavaVersion.current().isJava11Compatible()) {
+    println "Including wallettemplate because ${GradleVersion.current()} and Java ${JavaVersion.current()}"
+    include 'wallettemplate'
+} else {
+    println "Skipping wallettemplate: ${GradleVersion.current()} and Java ${JavaVersion.current()}"
+}
diff --git a/tools/build-checkpoints b/tools/build-checkpoints
index 3c2aaff1279..f09f02536b6 100755
--- a/tools/build-checkpoints
+++ b/tools/build-checkpoints
@@ -1,13 +1,19 @@
 #!/bin/bash
 
-set -e
-
-# Check if the jar has been built.
-if [ ! -e target/build-checkpoints.jar ]; then
-  echo "Compiling BuildCheckpoints to a JAR"
-  cd ..
-  mvn package -DskipTests
-  cd tools
-fi
+# Copyright by the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-java -jar target/build-checkpoints.jar "$@"
+set -e
+args="$@"
+gradle -q --no-daemon --console=plain build_checkpoints "-PappArgs=$args"
diff --git a/tools/build-checkpoints.cmd b/tools/build-checkpoints.cmd
deleted file mode 100644
index 191e56e1fa3..00000000000
--- a/tools/build-checkpoints.cmd
+++ /dev/null
@@ -1,18 +0,0 @@
-@echo off
-rem Check if the jar has been built.
-set TARGET_JAR=build-checkpoints.jar
-
-if not exist "target/%TARGET_JAR%" goto BUILD
-goto RUN
-
-:BUILD
-
-echo Compiling BuildCheckpoints to a JAR
-cd ..
-call mvn package -DskipTests
-cd tools
-
-:RUN
-
-for /R "target/" %%F in (%TARGET_JAR%) do set JAR_NAME=%%~nxF
-java -jar "target/%JAR_NAME%" %1 %2 %3 %4 %5 %6 %7 %8
\ No newline at end of file
diff --git a/tools/build.gradle b/tools/build.gradle
new file mode 100644
index 00000000000..50ae4b70041
--- /dev/null
+++ b/tools/build.gradle
@@ -0,0 +1,32 @@
+apply plugin: 'java'
+apply plugin: 'eclipse'
+
+eclipse.project.name = 'bitcoinj-tools'
+
+dependencies {
+    implementation project(':core')
+    implementation 'com.google.guava:guava:28.2-android'
+    implementation 'net.sf.jopt-simple:jopt-simple:5.0.4'
+    implementation 'org.slf4j:slf4j-jdk14:1.7.30'
+}
+
+sourceCompatibility = 1.8
+compileJava.options.encoding = 'UTF-8'
+compileTestJava.options.encoding = 'UTF-8'
+javadoc.options.encoding = 'UTF-8'
+
+task wallet_tool(type: JavaExec) {
+    description = 'Print and manipulate wallets.'
+    main = 'org.bitcoinj.tools.WalletTool'
+    if (project.hasProperty('appArgs') && appArgs.length() > 0)
+        args = Arrays.asList(appArgs.split("\\s+"))
+    classpath = sourceSets.main.runtimeClasspath
+}
+
+task build_checkpoints(type: JavaExec) {
+    description = 'Create checkpoint files to use with CheckpointManager.'
+    main = 'org.bitcoinj.tools.BuildCheckpoints'
+    if (project.hasProperty('appArgs') && appArgs.length() > 0)
+        args = Arrays.asList(appArgs.split("\\s+"))
+    classpath = sourceSets.main.runtimeClasspath
+}
diff --git a/tools/pom.xml b/tools/pom.xml
deleted file mode 100644
index a4531741d1e..00000000000
--- a/tools/pom.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2012 Google Inc.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.bitcoinj</groupId>
-    <artifactId>bitcoinj-parent</artifactId>
-    <version>0.14-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>bitcoinj-tools</artifactId>
-
-  <name>bitcoinj Tools</name>
-  <description>A collection of useful tools that use the bitcoinj library to perform wallet operations</description>
-
-  <build>
-
-      <plugins>
-
-          <!-- Create wallet-tool.jar -->
-          <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-shade-plugin</artifactId>
-              <configuration>
-                  <!-- Remove dead classes -->
-                  <minimizeJar>true</minimizeJar>
-                  <filters>
-                      <filter>
-                          <!-- exclude signatures, the bundling process breaks them for some reason -->
-                          <artifact>*:*</artifact>
-                          <excludes>
-                              <exclude>META-INF/*.SF</exclude>
-                              <exclude>META-INF/*.DSA</exclude>
-                              <exclude>META-INF/*.RSA</exclude>
-                          </excludes>
-                      </filter>
-                  </filters>
-              </configuration>
-              <executions>
-                  <execution>
-                      <id>shade-wallet-tool</id>
-                      <phase>package</phase>
-                      <goals>
-                          <goal>shade</goal>
-                      </goals>
-                      <configuration>
-                          <transformers>
-                              <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                  <mainClass>org.bitcoinj.tools.WalletTool</mainClass>
-                              </transformer>
-                          </transformers>
-                          <outputFile>target/wallet-tool.jar</outputFile>
-                      </configuration>
-                  </execution>
-                  <execution>
-                      <id>shade-build-checkpoints</id>
-                      <phase>package</phase>
-                      <goals>
-                          <goal>shade</goal>
-                      </goals>
-                      <configuration>
-                          <transformers>
-                              <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                  <mainClass>org.bitcoinj.tools.BuildCheckpoints</mainClass>
-                              </transformer>
-                          </transformers>
-                          <outputFile>target/build-checkpoints.jar</outputFile>
-                      </configuration>
-                  </execution>
-              </executions>
-          </plugin>
-
-      </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.bitcoinj</groupId>
-      <artifactId>bitcoinj-core</artifactId>
-      <version>${project.parent.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.jopt-simple</groupId>
-      <artifactId>jopt-simple</artifactId>
-      <version>4.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jdk14</artifactId>
-      <version>1.7.20</version>
-    </dependency>
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-      <version>1.3.167</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/tools/src/main/java/org/bitcoinj/tools/BlockImporter.java b/tools/src/main/java/org/bitcoinj/tools/BlockImporter.java
index be91f183558..66e35d7bd58 100644
--- a/tools/src/main/java/org/bitcoinj/tools/BlockImporter.java
+++ b/tools/src/main/java/org/bitcoinj/tools/BlockImporter.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -23,7 +25,7 @@
 
 import java.io.File;
 
-/** Very thin wrapper around {@link org.bitcoinj.utils.BlockFileLoader} */
+/** Very thin wrapper around {@link BlockFileLoader} */
 public class BlockImporter {
     public static void main(String[] args) throws BlockStoreException, VerificationException, PrunedException {
         System.out.println("USAGE: BlockImporter (prod|test) (H2|Disk|MemFull|Mem|SPV) [blockStore]");
@@ -37,6 +39,7 @@ public static void main(String[] args) throws BlockStoreException, VerificationE
             params = TestNet3Params.get();
         else
             params = MainNetParams.get();
+        new Context(params);
         
         BlockStore store;
         if (args[1].equals("H2")) {
diff --git a/tools/src/main/java/org/bitcoinj/tools/BuildCheckpoints.java b/tools/src/main/java/org/bitcoinj/tools/BuildCheckpoints.java
index f95dbdcbf91..fb8b8d4b29b 100644
--- a/tools/src/main/java/org/bitcoinj/tools/BuildCheckpoints.java
+++ b/tools/src/main/java/org/bitcoinj/tools/BuildCheckpoints.java
@@ -19,6 +19,7 @@
 
 import org.bitcoinj.core.listeners.NewBestBlockListener;
 import org.bitcoinj.core.*;
+import org.bitcoinj.net.discovery.DnsDiscovery;
 import org.bitcoinj.params.MainNetParams;
 import org.bitcoinj.params.RegTestParams;
 import org.bitcoinj.params.TestNet3Params;
@@ -26,7 +27,6 @@
 import org.bitcoinj.store.MemoryBlockStore;
 import org.bitcoinj.utils.BriefLogFormatter;
 import org.bitcoinj.utils.Threading;
-import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
@@ -42,12 +42,14 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.security.DigestOutputStream;
 import java.security.MessageDigest;
-import java.util.Date;
-import java.util.TreeMap;
+import java.util.*;
+import java.util.concurrent.Future;
 
 import static com.google.common.base.Preconditions.checkState;
+import static java.util.concurrent.TimeUnit.SECONDS;
 
 /**
  * Downloads and verifies a full chain from your local peer, emitting checkpoints at each difficulty transition period
@@ -67,7 +69,7 @@ public static void main(String[] args) throws Exception {
         OptionSet options = parser.parse(args);
 
         if (options.has("help")) {
-            System.out.println(Resources.toString(BuildCheckpoints.class.getResource("build-checkpoints-help.txt"), Charsets.UTF_8));
+            System.out.println(Resources.toString(BuildCheckpoints.class.getResource("build-checkpoints-help.txt"), StandardCharsets.UTF_8));
             return;
         }
 
@@ -90,31 +92,48 @@ public static void main(String[] args) throws Exception {
                 throw new RuntimeException("Unreachable.");
         }
 
+        // Configure bitcoinj to fetch only headers, not save them to disk, connect to a local fully synced/validated
+        // node and to save block headers that are on interval boundaries, as long as they are <1 month old.
+        final BlockStore store = new MemoryBlockStore(params);
+        final BlockChain chain = new BlockChain(params, store);
+        final PeerGroup peerGroup = new PeerGroup(params, chain);
+
         final InetAddress ipAddress;
+
+        // DNS discovery can be used for some networks
+        boolean networkHasDnsSeeds = params.getDnsSeeds() != null;
         if (options.has("peer")) {
+            // use peer provided in argument
             String peerFlag = (String) options.valueOf("peer");
             try {
                 ipAddress = InetAddress.getByName(peerFlag);
+                startPeerGroup(peerGroup, ipAddress);
             } catch (UnknownHostException e) {
                 System.err.println("Could not understand peer domain name/IP address: " + peerFlag + ": " + e.getMessage());
                 System.exit(1);
                 return;
             }
+        } else if (networkHasDnsSeeds) {
+            // for PROD and TEST use a peer group discovered with dns
+            peerGroup.setUserAgent("PeerMonitor", "1.0");
+            peerGroup.setMaxConnections(20);
+            peerGroup.addPeerDiscovery(new DnsDiscovery(params));
+            peerGroup.start();
+
+            // Connect to at least 4 peers because some may not support download
+            Future<List<Peer>> future = peerGroup.waitForPeers(4);
+            System.out.println("Connecting to " + params.getId() + ", timeout 20 seconds...");
+            // throw timeout exception if we can't get peers
+            future.get(20, SECONDS);
         } else {
+            // try localhost
             ipAddress = InetAddress.getLocalHost();
+            startPeerGroup(peerGroup, ipAddress);
         }
-        final PeerAddress peerAddress = new PeerAddress(ipAddress, params.getPort());
 
         // Sorted map of block height to StoredBlock object.
         final TreeMap<Integer, StoredBlock> checkpoints = new TreeMap<Integer, StoredBlock>();
 
-        // Configure bitcoinj to fetch only headers, not save them to disk, connect to a local fully synced/validated
-        // node and to save block headers that are on interval boundaries, as long as they are <1 month old.
-        final BlockStore store = new MemoryBlockStore(params);
-        final BlockChain chain = new BlockChain(params, store);
-        final PeerGroup peerGroup = new PeerGroup(params, chain);
-        System.out.println("Connecting to " + peerAddress + "...");
-        peerGroup.addAddress(peerAddress);
         long now = new Date().getTime() / 1000;
         peerGroup.setFastCatchupTimeSecs(now);
 
@@ -133,7 +152,6 @@ public void notifyNewBestBlock(StoredBlock block) throws VerificationException {
             }
         });
 
-        peerGroup.start();
         peerGroup.downloadBlockChain();
 
         checkState(checkpoints.size() > 0);
@@ -178,7 +196,7 @@ private static void writeBinaryCheckpoints(TreeMap<Integer, StoredBlock> checkpo
     }
 
     private static void writeTextualCheckpoints(TreeMap<Integer, StoredBlock> checkpoints, File file) throws IOException {
-        PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(file), Charsets.US_ASCII));
+        PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.US_ASCII));
         writer.println("TXT CHECKPOINTS 1");
         writer.println("0"); // Number of signatures to read. Do this later.
         writer.println(checkpoints.size());
@@ -193,7 +211,14 @@ private static void writeTextualCheckpoints(TreeMap<Integer, StoredBlock> checkp
     }
 
     private static void sanityCheck(File file, int expectedSize) throws IOException {
-        CheckpointManager manager = new CheckpointManager(params, new FileInputStream(file));
+        FileInputStream fis = new FileInputStream(file);
+        CheckpointManager manager;
+        try {
+            manager = new CheckpointManager(params, fis);
+        } finally {
+            fis.close();
+        }
+
         checkState(manager.numCheckpoints() == expectedSize);
 
         if (params.getId().equals(NetworkParameters.ID_MAINNET)) {
@@ -208,4 +233,11 @@ private static void sanityCheck(File file, int expectedSize) throws IOException
                     .equals("0000000000035ae7d5025c2538067fe7adb1cf5d5d9c31b024137d9090ed13a9"));
         }
     }
+
+    private static void startPeerGroup(PeerGroup peerGroup, InetAddress ipAddress) {
+        final PeerAddress peerAddress = new PeerAddress(params, ipAddress);
+        System.out.println("Connecting to " + peerAddress + "...");
+        peerGroup.addAddress(peerAddress);
+        peerGroup.start();
+    }
 }
diff --git a/tools/src/main/java/org/bitcoinj/tools/TestFeeLevel.java b/tools/src/main/java/org/bitcoinj/tools/TestFeeLevel.java
index 1ca5036d37c..32af2e4afd2 100644
--- a/tools/src/main/java/org/bitcoinj/tools/TestFeeLevel.java
+++ b/tools/src/main/java/org/bitcoinj/tools/TestFeeLevel.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -24,6 +26,7 @@
 import org.bitcoinj.wallet.Wallet;
 
 import java.io.File;
+import java.util.concurrent.ExecutionException;
 
 /**
  * A program that sends a transaction with the specified fee and measures how long it takes to confirm.
@@ -37,37 +40,39 @@ public class TestFeeLevel {
     public static void main(String[] args) throws Exception {
         BriefLogFormatter.initWithSilentBitcoinJ();
         if (args.length == 0) {
-            System.err.println("Specify the fee level to test in satoshis as the first argument.");
+            System.err.println("Specify the fee rate to test in satoshis/kB as the first argument.");
             return;
         }
 
-        Coin feeToTest = Coin.valueOf(Long.parseLong(args[0]));
-        System.out.println("Fee to test is " + feeToTest.toFriendlyString());
+        Coin feeRateToTest = Coin.valueOf(Long.parseLong(args[0]));
+        System.out.println("Fee rate to test is " + feeRateToTest.toFriendlyString() + "/kB");
 
         kit = new WalletAppKit(PARAMS, new File("."), "testfeelevel");
         kit.startAsync();
         kit.awaitRunning();
         try {
-            go(feeToTest, NUM_OUTPUTS);
+            go(feeRateToTest, NUM_OUTPUTS);
         } finally {
             kit.stopAsync();
             kit.awaitTerminated();
         }
     }
 
-    private static void go(Coin feeToTest, int numOutputs) throws InterruptedException, java.util.concurrent.ExecutionException, InsufficientMoneyException {
+    private static void go(Coin feeRateToTest, int numOutputs) throws InterruptedException, ExecutionException, InsufficientMoneyException {
+        System.out.println("Wallet has " + kit.wallet().getBalance().toFriendlyString()
+                + "; current receive address is " + kit.wallet().currentReceiveAddress());
+
         kit.peerGroup().setMaxConnections(25);
 
-        if (kit.wallet().getBalance().compareTo(feeToTest) < 0) {
-            System.out.println("Send some money to " + kit.wallet().currentReceiveAddress());
-            System.out.println("... and wait for it to confirm");
-            kit.wallet().getBalanceFuture(feeToTest, Wallet.BalanceType.AVAILABLE).get();
+        if (kit.wallet().getBalance().compareTo(feeRateToTest) < 0) {
+            System.out.println("Send some coins to receive address and wait for it to confirm ...");
+            kit.wallet().getBalanceFuture(feeRateToTest, Wallet.BalanceType.AVAILABLE).get();
         }
 
         int heightAtStart = kit.chain().getBestChainHeight();
         System.out.println("Height at start is " + heightAtStart);
 
-        Coin value = kit.wallet().getBalance().subtract(feeToTest);
+        Coin value = kit.wallet().getBalance().divide(2); // Keep a chunk for the fee.
         Coin outputValue = value.divide(numOutputs);
         Transaction transaction = new Transaction(PARAMS);
         for (int i = 0; i < numOutputs - 1; i++) {
@@ -76,7 +81,7 @@ private static void go(Coin feeToTest, int numOutputs) throws InterruptedExcepti
         }
         transaction.addOutput(value, kit.wallet().freshReceiveAddress());
         SendRequest request = SendRequest.forTx(transaction);
-        request.feePerKb = feeToTest;
+        request.feePerKb = feeRateToTest;
         request.ensureMinRequiredFee = false;
         kit.wallet().completeTx(request);
         System.out.println("Size in bytes is " + request.tx.unsafeBitcoinSerialize().length);
diff --git a/tools/src/main/java/org/bitcoinj/tools/WalletTool.java b/tools/src/main/java/org/bitcoinj/tools/WalletTool.java
index 3339caafe69..dd71b14dc9d 100644
--- a/tools/src/main/java/org/bitcoinj/tools/WalletTool.java
+++ b/tools/src/main/java/org/bitcoinj/tools/WalletTool.java
@@ -17,36 +17,65 @@
 
 package org.bitcoinj.tools;
 
-import org.bitcoinj.core.*;
 import org.bitcoinj.crypto.*;
-import org.bitcoinj.net.discovery.DnsDiscovery;
 import org.bitcoinj.params.MainNetParams;
 import org.bitcoinj.params.RegTestParams;
 import org.bitcoinj.params.TestNet3Params;
 import org.bitcoinj.protocols.payments.PaymentProtocol;
 import org.bitcoinj.protocols.payments.PaymentProtocolException;
 import org.bitcoinj.protocols.payments.PaymentSession;
+import org.bitcoinj.script.Script;
+import org.bitcoinj.script.Script.ScriptType;
 import org.bitcoinj.script.ScriptBuilder;
+import org.bitcoinj.script.ScriptException;
+import org.bitcoinj.script.ScriptPattern;
 import org.bitcoinj.store.*;
 import org.bitcoinj.uri.BitcoinURI;
 import org.bitcoinj.uri.BitcoinURIParseException;
 import org.bitcoinj.utils.BriefLogFormatter;
+import org.bitcoinj.wallet.DeterministicKeyChain;
 import org.bitcoinj.wallet.DeterministicSeed;
-import org.bitcoinj.wallet.DeterministicUpgradeRequiredException;
-import org.bitcoinj.wallet.DeterministicUpgradeRequiresPassword;
-import com.google.common.base.Charsets;
+
+import com.google.common.base.CharMatcher;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;
+import com.google.common.io.BaseEncoding;
 import com.google.common.io.Resources;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.protobuf.ByteString;
-import com.subgraph.orchid.TorClient;
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
 import joptsimple.OptionSpec;
 import joptsimple.util.DateConverter;
 
+import org.bitcoinj.core.AbstractBlockChain;
+import org.bitcoinj.core.Address;
+import org.bitcoinj.core.AddressFormatException;
+import org.bitcoinj.core.Base58;
+import org.bitcoinj.core.Block;
+import org.bitcoinj.core.BlockChain;
+import org.bitcoinj.core.CheckpointManager;
+import org.bitcoinj.core.Coin;
+import org.bitcoinj.core.Context;
+import org.bitcoinj.core.DumpedPrivateKey;
+import org.bitcoinj.core.ECKey;
+import org.bitcoinj.core.FilteredBlock;
+import org.bitcoinj.core.FullPrunedBlockChain;
+import org.bitcoinj.core.InsufficientMoneyException;
+import org.bitcoinj.core.LegacyAddress;
+import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.core.Peer;
+import org.bitcoinj.core.PeerAddress;
+import org.bitcoinj.core.PeerGroup;
+import org.bitcoinj.core.SegwitAddress;
+import org.bitcoinj.core.Sha256Hash;
+import org.bitcoinj.core.StoredBlock;
+import org.bitcoinj.core.Transaction;
+import org.bitcoinj.core.TransactionInput;
+import org.bitcoinj.core.TransactionOutput;
+import org.bitcoinj.core.Utils;
+import org.bitcoinj.core.VerificationException;
 import org.bitcoinj.core.listeners.BlocksDownloadedEventListener;
 import org.bitcoinj.core.listeners.DownloadProgressTracker;
 import org.bitcoinj.wallet.MarriedKeyChain;
@@ -62,14 +91,14 @@
 import org.bitcoinj.wallet.listeners.WalletReorganizeEventListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.spongycastle.crypto.params.KeyParameter;
-import org.spongycastle.util.encoders.Hex;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import javax.annotation.Nullable;
 import java.io.*;
 import java.math.BigInteger;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.nio.charset.StandardCharsets;
 import java.security.SecureRandom;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -79,7 +108,6 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.LogManager;
 
@@ -91,24 +119,25 @@
  */
 public class WalletTool {
     private static final Logger log = LoggerFactory.getLogger(WalletTool.class);
+    private static final BaseEncoding HEX = BaseEncoding.base16().lowerCase();
 
     private static OptionSet options;
     private static OptionSpec<Date> dateFlag;
     private static OptionSpec<Long> unixtimeFlag;
     private static OptionSpec<String> seedFlag, watchFlag;
+    private static OptionSpec<Script.ScriptType> outputScriptTypeFlag;
     private static OptionSpec<String> xpubkeysFlag;
 
     private static NetworkParameters params;
     private static File walletFile;
     private static BlockStore store;
     private static AbstractBlockChain chain;
-    private static PeerGroup peers;
+    private static PeerGroup peerGroup;
     private static Wallet wallet;
     private static File chainFileName;
     private static ValidationMode mode;
     private static String password;
     private static org.bitcoin.protocols.payments.Protos.PaymentRequest paymentRequest;
-    private static OptionSpec<Integer> lookaheadSize;
 
     public static class Condition {
         public enum Type {
@@ -184,6 +213,7 @@ public enum ActionEnum {
         ENCRYPT,
         DECRYPT,
         MARRY,
+        UPGRADE,
         ROTATE,
         SET_CREATION_TIME,
     }
@@ -208,6 +238,8 @@ public static void main(String[] args) throws Exception {
         OptionSpec<String> walletFileName = parser.accepts("wallet").withRequiredArg().defaultsTo("wallet");
         seedFlag = parser.accepts("seed").withRequiredArg();
         watchFlag = parser.accepts("watchkey").withRequiredArg();
+        outputScriptTypeFlag = parser.accepts("output-script-type").withRequiredArg().ofType(Script.ScriptType.class)
+                .defaultsTo(Script.ScriptType.P2PKH);
         OptionSpec<NetworkEnum> netFlag = parser.accepts("net").withRequiredArg().ofType(NetworkEnum.class).defaultsTo(NetworkEnum.MAIN);
         dateFlag = parser.accepts("date").withRequiredArg().ofType(Date.class)
                 .withValuesConvertedBy(DateConverter.datePattern("yyyy/MM/dd"));
@@ -223,32 +255,32 @@ public static void main(String[] args) throws Exception {
         xpubkeysFlag = parser.accepts("xpubkeys").withRequiredArg();
         OptionSpec<String> outputFlag = parser.accepts("output").withRequiredArg();
         parser.accepts("value").withRequiredArg();
-        OptionSpec<String> feePerKbOption = parser.accepts("fee-per-kb").withRequiredArg();
+        OptionSpec<String> feePerVkbOption = parser.accepts("fee-per-vkb").withRequiredArg();
+        OptionSpec<String> feeSatPerVbyteOption = parser.accepts("fee-sat-per-vbyte").withRequiredArg();
         unixtimeFlag = parser.accepts("unixtime").withRequiredArg().ofType(Long.class);
         OptionSpec<String> conditionFlag = parser.accepts("condition").withRequiredArg();
         parser.accepts("locktime").withRequiredArg();
         parser.accepts("allow-unconfirmed");
         parser.accepts("offline");
         parser.accepts("ignore-mandatory-extensions");
-        lookaheadSize = parser.accepts("lookahead-size").withRequiredArg().ofType(Integer.class);
         OptionSpec<String> passwordFlag = parser.accepts("password").withRequiredArg();
         OptionSpec<String> paymentRequestLocation = parser.accepts("payment-request").withRequiredArg();
         parser.accepts("no-pki");
-        parser.accepts("tor");
         parser.accepts("dump-privkeys");
+        parser.accepts("dump-lookahead");
         OptionSpec<String> refundFlag = parser.accepts("refund-to").withRequiredArg();
         OptionSpec<String> txHashFlag = parser.accepts("txhash").withRequiredArg();
         options = parser.parse(args);
 
         if (args.length == 0 || options.has("help") ||
                 options.nonOptionArguments().size() < 1 || options.nonOptionArguments().contains("help")) {
-            System.out.println(Resources.toString(WalletTool.class.getResource("wallet-tool-help.txt"), Charsets.UTF_8));
+            System.out.println(Resources.toString(WalletTool.class.getResource("wallet-tool-help.txt"), StandardCharsets.UTF_8));
             return;
         }
 
         ActionEnum action;
         try {
-            String actionStr = options.nonOptionArguments().get(0);
+            String actionStr = (String) options.nonOptionArguments().get(0);
             actionStr = actionStr.toUpperCase().replace("-", "_");
             action = ActionEnum.valueOf(actionStr);
         } catch (IllegalArgumentException e) {
@@ -360,16 +392,21 @@ public static void main(String[] args) throws Exception {
                 if (options.has(paymentRequestLocation) && options.has(outputFlag)) {
                     System.err.println("--payment-request and --output cannot be used together.");
                     return;
+                } else if (options.has(feePerVkbOption) && options.has(feeSatPerVbyteOption)) {
+                    System.err.println("--fee-per-kb and --fee-sat-per-byte cannot be used together.");
+                    return;
                 } else if (options.has(outputFlag)) {
-                    Coin feePerKb = null;
-                    if (options.has(feePerKbOption))
-                        feePerKb = parseCoin((String) options.valueOf(feePerKbOption));
+                    Coin feePerVkb = null;
+                    if (options.has(feePerVkbOption))
+                        feePerVkb = parseCoin((String) options.valueOf(feePerVkbOption));
+                    if (options.has(feeSatPerVbyteOption))
+                        feePerVkb = Coin.valueOf(Long.parseLong(options.valueOf(feeSatPerVbyteOption)) * 1000);
                     String lockTime = null;
                     if (options.has("locktime")) {
                         lockTime = (String) options.valueOf("locktime");
                     }
                     boolean allowUnconfirmed = options.has("allow-unconfirmed");
-                    send(outputFlag.values(options), feePerKb, lockTime, allowUnconfirmed);
+                    send(outputFlag.values(options), feePerVkb, lockTime, allowUnconfirmed);
                 } else if (options.has(paymentRequestLocation)) {
                     sendPaymentRequest(paymentRequestLocation.value(options), !options.has("no-pki"));
                 } else {
@@ -378,13 +415,19 @@ public static void main(String[] args) throws Exception {
                 }
                 break;
             case SEND_CLTVPAYMENTCHANNEL: {
+                if (options.has(feePerVkbOption) && options.has(feeSatPerVbyteOption)) {
+                    System.err.println("--fee-per-kb and --fee-sat-per-byte cannot be used together.");
+                    return;
+                }
                 if (!options.has(outputFlag)) {
                     System.err.println("You must specify a --output=addr:value");
                     return;
                 }
-                Coin feePerKb = null;
-                if (options.has(feePerKbOption))
-                    feePerKb = parseCoin((String) options.valueOf(feePerKbOption));
+                Coin feePerVkb = null;
+                if (options.has(feePerVkbOption))
+                    feePerVkb = parseCoin((String) options.valueOf(feePerVkbOption));
+                if (options.has(feeSatPerVbyteOption))
+                    feePerVkb = Coin.valueOf(Long.parseLong(options.valueOf(feeSatPerVbyteOption)) * 1000);
                 if (!options.has("locktime")) {
                     System.err.println("You must specify a --locktime");
                     return;
@@ -395,41 +438,54 @@ public static void main(String[] args) throws Exception {
                     System.err.println("You must specify an address to refund money to after expiry: --refund-to=addr");
                     return;
                 }
-                sendCLTVPaymentChannel(refundFlag.value(options), outputFlag.value(options), feePerKb, lockTime, allowUnconfirmed);
+                sendCLTVPaymentChannel(refundFlag.value(options), outputFlag.value(options), feePerVkb, lockTime, allowUnconfirmed);
                 } break;
             case SETTLE_CLTVPAYMENTCHANNEL: {
+                if (options.has(feePerVkbOption) && options.has(feeSatPerVbyteOption)) {
+                    System.err.println("--fee-per-kb and --fee-sat-per-byte cannot be used together.");
+                    return;
+                }
                 if (!options.has(outputFlag)) {
                     System.err.println("You must specify a --output=addr:value");
                     return;
                 }
-                Coin feePerKb = null;
-                if (options.has(feePerKbOption))
-                    feePerKb = parseCoin((String) options.valueOf(feePerKbOption));
+                Coin feePerVkb = null;
+                if (options.has(feePerVkbOption))
+                    feePerVkb = parseCoin((String) options.valueOf(feePerVkbOption));
+                if (options.has(feeSatPerVbyteOption))
+                    feePerVkb = Coin.valueOf(Long.parseLong(options.valueOf(feeSatPerVbyteOption)) * 1000);
                 boolean allowUnconfirmed = options.has("allow-unconfirmed");
                 if (!options.has(txHashFlag)) {
                     System.err.println("You must specify the transaction to spend: --txhash=tx-hash");
                     return;
                 }
-                settleCLTVPaymentChannel(txHashFlag.value(options), outputFlag.value(options), feePerKb, allowUnconfirmed);
+                settleCLTVPaymentChannel(txHashFlag.value(options), outputFlag.value(options), feePerVkb, allowUnconfirmed);
                 } break;
             case REFUND_CLTVPAYMENTCHANNEL: {
+                if (options.has(feePerVkbOption) && options.has(feeSatPerVbyteOption)) {
+                    System.err.println("--fee-per-kb and --fee-sat-per-byte cannot be used together.");
+                    return;
+                }
                 if (!options.has(outputFlag)) {
                     System.err.println("You must specify a --output=addr:value");
                     return;
                 }
-                Coin feePerKb = null;
-                if (options.has(feePerKbOption))
-                    feePerKb = parseCoin((String) options.valueOf(feePerKbOption));
+                Coin feePerVkb = null;
+                if (options.has(feePerVkbOption))
+                    feePerVkb = parseCoin((String) options.valueOf(feePerVkbOption));
+                if (options.has(feeSatPerVbyteOption))
+                    feePerVkb = Coin.valueOf(Long.parseLong(options.valueOf(feeSatPerVbyteOption)) * 1000);
                 boolean allowUnconfirmed = options.has("allow-unconfirmed");
                 if (!options.has(txHashFlag)) {
                     System.err.println("You must specify the transaction to spend: --txhash=tx-hash");
                     return;
                 }
-                refundCLTVPaymentChannel(txHashFlag.value(options), outputFlag.value(options), feePerKb, allowUnconfirmed);
+                refundCLTVPaymentChannel(txHashFlag.value(options), outputFlag.value(options), feePerVkb, allowUnconfirmed);
             } break;
             case ENCRYPT: encrypt(); break;
             case DECRYPT: decrypt(); break;
             case MARRY: marry(); break;
+            case UPGRADE: upgrade(); break;
             case ROTATE: rotate(); break;
             case SET_CREATION_TIME: setCreationTime(); break;
         }
@@ -505,9 +561,30 @@ private static void marry() {
         wallet.addAndActivateHDChain(chain);
     }
 
+    private static void upgrade() {
+        DeterministicKeyChain activeKeyChain = wallet.getActiveKeyChain();
+        ScriptType currentOutputScriptType = activeKeyChain != null ? activeKeyChain.getOutputScriptType() : null;
+        ScriptType outputScriptType = options.valueOf(outputScriptTypeFlag);
+        if (!wallet.isDeterministicUpgradeRequired(outputScriptType)) {
+            System.err
+                    .println("No upgrade from " + (currentOutputScriptType != null ? currentOutputScriptType : "basic")
+                            + " to " + outputScriptType);
+            return;
+        }
+        KeyParameter aesKey = null;
+        if (wallet.isEncrypted()) {
+            aesKey = passwordToKey(true);
+            if (aesKey == null)
+                return;
+        }
+        wallet.upgradeToDeterministic(outputScriptType, aesKey);
+        System.out.println("Upgraded from " + (currentOutputScriptType != null ? currentOutputScriptType : "basic")
+                + " to " + outputScriptType);
+    }
+
     private static void rotate() throws BlockStoreException {
         setup();
-        peers.start();
+        peerGroup.start();
         // Set a key rotation time and possibly broadcast the resulting maintenance transactions.
         long rotationTimeSecs = Utils.currentTimeSeconds();
         if (options.has(dateFlag)) {
@@ -561,7 +638,7 @@ private static void addAddr() {
             return;
         }
         try {
-            Address address = Address.fromBase58(params, addr);
+            Address address = LegacyAddress.fromBase58(params, addr);
             // If no creation time is specified, assume genesis (zero).
             wallet.addWatchedAddress(address, getCreationTimeSeconds());
         } catch (AddressFormatException e) {
@@ -569,7 +646,7 @@ private static void addAddr() {
         }
     }
 
-    private static void send(List<String> outputs, Coin feePerKb, String lockTimeStr, boolean allowUnconfirmed) throws VerificationException {
+    private static void send(List<String> outputs, Coin feePerVkb, String lockTimeStr, boolean allowUnconfirmed) throws VerificationException {
         try {
             // Convert the input strings to outputs.
             Transaction t = new Transaction(params);
@@ -581,7 +658,7 @@ private static void send(List<String> outputs, Coin feePerKb, String lockTimeStr
                     } else {
                         t.addOutput(outputSpec.value, outputSpec.key);
                     }
-                } catch (WrongNetworkException e) {
+                } catch (AddressFormatException.WrongNetwork e) {
                     System.err.println("Malformed output specification, address is for a different network: " + spec);
                     return;
                 } catch (AddressFormatException e) {
@@ -600,8 +677,8 @@ private static void send(List<String> outputs, Coin feePerKb, String lockTimeStr
                 log.info("Emptying out wallet, recipient may get less than what you expect");
                 req.emptyWallet = true;
             }
-            if (feePerKb != null)
-                req.feePerKb = feePerKb;
+            if (feePerVkb != null)
+                req.setFeePerVkb(feePerVkb);
             if (allowUnconfirmed) {
                 wallet.allowSpendingUnconfirmedTransactions();
             }
@@ -627,20 +704,20 @@ private static void send(List<String> outputs, Coin feePerKb, String lockTimeStr
                 throw new RuntimeException(e);
             }
             t = req.tx;   // Not strictly required today.
-            System.out.println(t.getHashAsString());
+            System.out.println(t.getTxId());
             if (options.has("offline")) {
                 wallet.commitTx(t);
                 return;
             }
 
             setup();
-            peers.start();
+            peerGroup.start();
             // Wait for peers to connect, the tx to be sent to one of them and for it to be propagated across the
             // network. Once propagation is complete and we heard the transaction back from all our peers, it will
             // be committed to the wallet.
-            peers.broadcastTransaction(t).future().get();
+            peerGroup.broadcastTransaction(t).future().get();
             // Hack for regtest/single peer mode, as we're about to shut down and won't get an ACK from the remote end.
-            List<Peer> peerList = peers.getConnectedPeers();
+            List<Peer> peerList = peerGroup.getConnectedPeers();
             if (peerList.size() == 1)
                 peerList.get(0).ping().get();
         } catch (BlockStoreException e) {
@@ -678,7 +755,7 @@ public OutputSpec(String spec) throws IllegalArgumentException {
                 addr = null;
             } else {
                 // Treat as an address.
-                addr = Address.fromBase58(params, destination);
+                addr = Address.fromString(params, destination);
                 key = null;
             }
         }
@@ -688,7 +765,7 @@ public boolean isAddress() {
         }
     }
 
-    private static void sendCLTVPaymentChannel(String refund, String output, Coin feePerKb, String lockTimeStr, boolean allowUnconfirmed) throws VerificationException {
+    private static void sendCLTVPaymentChannel(String refund, String output, Coin feePerVkb, String lockTimeStr, boolean allowUnconfirmed) throws VerificationException {
         try {
             // Convert the input strings to outputs.
             ECKey outputKey, refundKey;
@@ -703,7 +780,7 @@ private static void sendCLTVPaymentChannel(String refund, String output, Coin fe
                 value = outputSpec.value;
                 byte[] refundPubKey = new BigInteger(refund, 16).toByteArray();
                 refundKey = ECKey.fromPublicOnly(refundPubKey);
-            } catch (WrongNetworkException e) {
+            } catch (AddressFormatException.WrongNetwork e) {
                 System.err.println("Malformed output specification, address is for a different network.");
                 return;
             } catch (AddressFormatException e) {
@@ -732,8 +809,8 @@ private static void sendCLTVPaymentChannel(String refund, String output, Coin fe
                 log.info("Emptying out wallet, recipient may get less than what you expect");
                 req.emptyWallet = true;
             }
-            if (feePerKb != null)
-                req.feePerKb = feePerKb;
+            if (feePerVkb != null)
+                req.setFeePerVkb(feePerVkb);
             if (allowUnconfirmed) {
                 wallet.allowSpendingUnconfirmedTransactions();
             }
@@ -744,20 +821,20 @@ private static void sendCLTVPaymentChannel(String refund, String output, Coin fe
             }
             wallet.completeTx(req);
 
-            System.out.println(req.tx.getHashAsString());
+            System.out.println(req.tx.getTxId());
             if (options.has("offline")) {
                 wallet.commitTx(req.tx);
                 return;
             }
 
             setup();
-            peers.start();
+            peerGroup.start();
             // Wait for peers to connect, the tx to be sent to one of them and for it to be propagated across the
             // network. Once propagation is complete and we heard the transaction back from all our peers, it will
             // be committed to the wallet.
-            peers.broadcastTransaction(req.tx).future().get();
+            peerGroup.broadcastTransaction(req.tx).future().get();
             // Hack for regtest/single peer mode, as we're about to shut down and won't get an ACK from the remote end.
-            List<Peer> peerList = peers.getConnectedPeers();
+            List<Peer> peerList = peerGroup.getConnectedPeers();
             if (peerList.size() == 1)
                 peerList.get(0).ping().get();
         } catch (BlockStoreException e) {
@@ -776,14 +853,14 @@ private static void sendCLTVPaymentChannel(String refund, String output, Coin fe
     /**
      * Settles a CLTV payment channel transaction given that we own both private keys (ie. for testing).
      */
-    private static void settleCLTVPaymentChannel(String txHash, String output, Coin feePerKb, boolean allowUnconfirmed) {
+    private static void settleCLTVPaymentChannel(String txHash, String output, Coin feePerVkb, boolean allowUnconfirmed) {
         try {
             OutputSpec outputSpec;
             Coin value;
             try {
                 outputSpec = new OutputSpec(output);
                 value = outputSpec.value;
-            } catch (WrongNetworkException e) {
+            } catch (AddressFormatException.WrongNetwork e) {
                 System.err.println("Malformed output specification, address is for a different network.");
                 return;
             } catch (AddressFormatException e) {
@@ -800,8 +877,8 @@ private static void settleCLTVPaymentChannel(String txHash, String output, Coin
             SendRequest req = outputSpec.isAddress() ?
                     SendRequest.to(outputSpec.addr, value) :
                     SendRequest.to(params, outputSpec.key, value);
-            if (feePerKb != null)
-                req.feePerKb = feePerKb;
+            if (feePerVkb != null)
+                req.setFeePerVkb(feePerVkb);
 
             Transaction lockTimeVerify = wallet.getTransaction(Sha256Hash.wrap(txHash));
             if (lockTimeVerify == null) {
@@ -810,7 +887,7 @@ private static void settleCLTVPaymentChannel(String txHash, String output, Coin
             }
             TransactionOutput lockTimeVerifyOutput = null;
             for (TransactionOutput out : lockTimeVerify.getOutputs()) {
-                if (out.getScriptPubKey().isSentToCLTVPaymentChannel()) {
+                if (ScriptPattern.isSentToCltvPaymentChannel(out.getScriptPubKey())) {
                     lockTimeVerifyOutput = out;
                 }
             }
@@ -833,9 +910,9 @@ private static void settleCLTVPaymentChannel(String txHash, String output, Coin
             }
 
             ECKey key1 = wallet.findKeyFromPubKey(
-                    lockTimeVerifyOutput.getScriptPubKey().getCLTVPaymentChannelSenderPubKey());
+                    ScriptPattern.extractSenderPubKeyFromCltvPaymentChannel(lockTimeVerifyOutput.getScriptPubKey()));
             ECKey key2 = wallet.findKeyFromPubKey(
-                    lockTimeVerifyOutput.getScriptPubKey().getCLTVPaymentChannelRecipientPubKey());
+                    ScriptPattern.extractRecipientPubKeyFromCltvPaymentChannel(lockTimeVerifyOutput.getScriptPubKey()));
             if (key1 == null || key2 == null) {
                 System.err.println("Don't own private keys for both pubkeys");
                 return;
@@ -850,20 +927,20 @@ private static void settleCLTVPaymentChannel(String txHash, String output, Coin
                     req.tx.calculateSignature(0, key2, lockTimeVerifyOutput.getScriptPubKey(), Transaction.SigHash.SINGLE, false);
             input.setScriptSig(ScriptBuilder.createCLTVPaymentChannelInput(sig1, sig2));
 
-            System.out.println(req.tx.getHashAsString());
+            System.out.println(req.tx.getTxId());
             if (options.has("offline")) {
                 wallet.commitTx(req.tx);
                 return;
             }
 
             setup();
-            peers.start();
+            peerGroup.start();
             // Wait for peers to connect, the tx to be sent to one of them and for it to be propagated across the
             // network. Once propagation is complete and we heard the transaction back from all our peers, it will
             // be committed to the wallet.
-            peers.broadcastTransaction(req.tx).future().get();
+            peerGroup.broadcastTransaction(req.tx).future().get();
             // Hack for regtest/single peer mode, as we're about to shut down and won't get an ACK from the remote end.
-            List<Peer> peerList = peers.getConnectedPeers();
+            List<Peer> peerList = peerGroup.getConnectedPeers();
             if (peerList.size() == 1)
                 peerList.get(0).ping().get();
         } catch (BlockStoreException e) {
@@ -880,14 +957,14 @@ private static void settleCLTVPaymentChannel(String txHash, String output, Coin
     /**
      * Refunds a CLTV payment channel transaction after the lock time has expired.
      */
-    private static void refundCLTVPaymentChannel(String txHash, String output, Coin feePerKb, boolean allowUnconfirmed) {
+    private static void refundCLTVPaymentChannel(String txHash, String output, Coin feePerVkb, boolean allowUnconfirmed) {
         try {
             OutputSpec outputSpec;
             Coin value;
             try {
                 outputSpec = new OutputSpec(output);
                 value = outputSpec.value;
-            } catch (WrongNetworkException e) {
+            } catch (AddressFormatException.WrongNetwork e) {
                 System.err.println("Malformed output specification, address is for a different network.");
                 return;
             } catch (AddressFormatException e) {
@@ -904,8 +981,8 @@ private static void refundCLTVPaymentChannel(String txHash, String output, Coin
             SendRequest req = outputSpec.isAddress() ?
                     SendRequest.to(outputSpec.addr, value) :
                     SendRequest.to(params, outputSpec.key, value);
-            if (feePerKb != null)
-                req.feePerKb = feePerKb;
+            if (feePerVkb != null)
+                req.setFeePerVkb(feePerVkb);
 
             Transaction lockTimeVerify = wallet.getTransaction(Sha256Hash.wrap(txHash));
             if (lockTimeVerify == null) {
@@ -914,7 +991,7 @@ private static void refundCLTVPaymentChannel(String txHash, String output, Coin
             }
             TransactionOutput lockTimeVerifyOutput = null;
             for (TransactionOutput out : lockTimeVerify.getOutputs()) {
-                if (out.getScriptPubKey().isSentToCLTVPaymentChannel()) {
+                if (ScriptPattern.isSentToCltvPaymentChannel(out.getScriptPubKey())) {
                     lockTimeVerifyOutput = out;
                 }
             }
@@ -923,7 +1000,7 @@ private static void refundCLTVPaymentChannel(String txHash, String output, Coin
                 return;
             }
 
-            req.tx.setLockTime(lockTimeVerifyOutput.getScriptPubKey().getCLTVPaymentChannelExpiry().longValue());
+            req.tx.setLockTime(ScriptPattern.extractExpiryFromCltvPaymentChannel(lockTimeVerifyOutput.getScriptPubKey()).longValue());
 
             if (!value.equals(lockTimeVerifyOutput.getValue())) {
                 System.err.println("You must spend all the money in the input transaction");
@@ -939,7 +1016,7 @@ private static void refundCLTVPaymentChannel(String txHash, String output, Coin
             }
 
             ECKey key = wallet.findKeyFromPubKey(
-                    lockTimeVerifyOutput.getScriptPubKey().getCLTVPaymentChannelSenderPubKey());
+                    ScriptPattern.extractSenderPubKeyFromCltvPaymentChannel(lockTimeVerifyOutput.getScriptPubKey()));
             if (key == null) {
                 System.err.println("Don't own private key for pubkey");
                 return;
@@ -953,20 +1030,20 @@ private static void refundCLTVPaymentChannel(String txHash, String output, Coin
                     req.tx.calculateSignature(0, key, lockTimeVerifyOutput.getScriptPubKey(), Transaction.SigHash.SINGLE, false);
             input.setScriptSig(ScriptBuilder.createCLTVPaymentChannelRefund(sig));
 
-            System.out.println(req.tx.getHashAsString());
+            System.out.println(req.tx.getTxId());
             if (options.has("offline")) {
                 wallet.commitTx(req.tx);
                 return;
             }
 
             setup();
-            peers.start();
+            peerGroup.start();
             // Wait for peers to connect, the tx to be sent to one of them and for it to be propagated across the
             // network. Once propagation is complete and we heard the transaction back from all our peers, it will
             // be committed to the wallet.
-            peers.broadcastTransaction(req.tx).future().get();
+            peerGroup.broadcastTransaction(req.tx).future().get();
             // Hack for regtest/single peer mode, as we're about to shut down and won't get an ACK from the remote end.
-            List<Peer> peerList = peers.getConnectedPeers();
+            List<Peer> peerList = peerGroup.getConnectedPeers();
             if (peerList.size() == 1)
                 peerList.get(0).ping().get();
         } catch (BlockStoreException e) {
@@ -1074,8 +1151,8 @@ private static void send(PaymentSession session) {
             ListenableFuture<PaymentProtocol.Ack> future = session.sendPayment(ImmutableList.of(req.tx), null, null);
             if (future == null) {
                 // No payment_url for submission so, broadcast and wait.
-                peers.start();
-                peers.broadcastTransaction(req.tx).future().get();
+                peerGroup.start();
+                peerGroup.broadcastTransaction(req.tx).future().get();
             } else {
                 PaymentProtocol.Ack ack = future.get();
                 wallet.commitTx(req.tx);
@@ -1114,7 +1191,7 @@ private static void wait(WaitForEnum waitFor) throws BlockStoreException {
                     @Override
                     public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coin newBalance) {
                         // Runs in a peer thread.
-                        System.out.println(tx.getHashAsString());
+                        System.out.println(tx.getTxId());
                         latch.countDown();  // Wake up main thread.
                     }
                 });
@@ -1122,14 +1199,14 @@ public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coi
                     @Override
                     public void onCoinsSent(Wallet wallet, Transaction tx, Coin prevBalance, Coin newBalance) {
                         // Runs in a peer thread.
-                        System.out.println(tx.getHashAsString());
+                        System.out.println(tx.getTxId());
                         latch.countDown();  // Wake up main thread.
                     }
                 });
                 break;
 
             case BLOCK:
-                peers.addBlocksDownloadedEventListener(new BlocksDownloadedEventListener() {
+                peerGroup.addBlocksDownloadedEventListener(new BlocksDownloadedEventListener() {
                     @Override
                     public void onBlocksDownloaded(Peer peer, Block block, @Nullable FilteredBlock filteredBlock, int blocksLeft) {
                         // Check if we already ran. This can happen if a block being received triggers download of more
@@ -1155,8 +1232,8 @@ public void onBlocksDownloaded(Peer peer, Block block, @Nullable FilteredBlock f
                 break;
 
         }
-        if (!peers.isRunning())
-            peers.startAsync();
+        if (!peerGroup.isRunning())
+            peerGroup.startAsync();
         try {
             latch.await();
         } catch (InterruptedException e) {
@@ -1182,7 +1259,6 @@ private static void setup() throws BlockStoreException {
         }
         if (mode == ValidationMode.SPV) {
             store = new SPVBlockStore(params, chainFileName);
-            chain = new BlockChain(params, wallet, store);
             if (reset) {
                 try {
                     CheckpointManager.checkpoint(params, CheckpointManager.openStream(params), store,
@@ -1194,40 +1270,33 @@ private static void setup() throws BlockStoreException {
                     System.out.println("Could not load checkpoints: " + x.getMessage());
                 }
             }
+            chain = new BlockChain(params, wallet, store);
         } else if (mode == ValidationMode.FULL) {
-            FullPrunedBlockStore s = new H2FullPrunedBlockStore(params, chainFileName.getAbsolutePath(), 5000);
-            store = s;
-            chain = new FullPrunedBlockChain(params, wallet, s);
+            store = new H2FullPrunedBlockStore(params, chainFileName.getAbsolutePath(), 5000);
+            chain = new FullPrunedBlockChain(params, wallet, (FullPrunedBlockStore) store);
         }
         // This will ensure the wallet is saved when it changes.
         wallet.autosaveToFile(walletFile, 5, TimeUnit.SECONDS, null);
-        if (options.has("tor")) {
-            try {
-                peers = PeerGroup.newWithTor(params, chain, new TorClient());
-            } catch (TimeoutException e) {
-                System.err.println("Tor startup timed out, falling back to clear net ...");
-            }
-        }
-        if (peers == null) {
-            peers = new PeerGroup(params, chain);
+        if (peerGroup == null) {
+            peerGroup = new PeerGroup(params, chain);
         }
-        peers.setUserAgent("WalletTool", "1.0");
+        peerGroup.setUserAgent("WalletTool", "1.0");
         if (params == RegTestParams.get())
-            peers.setMinBroadcastConnections(1);
-        peers.addWallet(wallet);
+            peerGroup.setMinBroadcastConnections(1);
+        peerGroup.addWallet(wallet);
         if (options.has("peers")) {
             String peersFlag = (String) options.valueOf("peers");
             String[] peerAddrs = peersFlag.split(",");
             for (String peer : peerAddrs) {
                 try {
-                    peers.addAddress(new PeerAddress(InetAddress.getByName(peer), params.getPort()));
+                    peerGroup.addAddress(new PeerAddress(params, InetAddress.getByName(peer)));
                 } catch (UnknownHostException e) {
                     System.err.println("Could not understand peer domain name/IP address: " + peer + ": " + e.getMessage());
                     System.exit(1);
                 }
             }
-        } else if (!options.has("tor")) {
-            peers.addPeerDiscovery(new DnsDiscovery(params));
+        } else {
+            peerGroup.setRequiredServices(0);
         }
     }
 
@@ -1236,8 +1305,8 @@ private static void syncChain() {
             setup();
             int startTransactions = wallet.getTransactions(true).size();
             DownloadProgressTracker listener = new DownloadProgressTracker();
-            peers.start();
-            peers.startBlockChainDownload(listener);
+            peerGroup.start();
+            peerGroup.startBlockChainDownload(listener);
             try {
                 listener.await();
             } catch (InterruptedException e) {
@@ -1256,9 +1325,9 @@ private static void syncChain() {
 
     private static void shutdown() {
         try {
-            if (peers == null) return;  // setup() never called so nothing to do.
-            if (peers.isRunning())
-                peers.stop();
+            if (peerGroup == null) return;  // setup() never called so nothing to do.
+            if (peerGroup.isRunning())
+                peerGroup.stop();
             saveWallet(walletFile);
             store.close();
             wallet = null;
@@ -1273,13 +1342,15 @@ private static void createWallet(OptionSet options, NetworkParameters params, Fi
             return;
         }
         long creationTimeSecs = getCreationTimeSeconds();
+        ScriptType outputScriptType = options.valueOf(outputScriptTypeFlag);
         if (creationTimeSecs == 0)
             creationTimeSecs = MnemonicCode.BIP39_STANDARDISATION_TIME_SECS;
         if (options.has(seedFlag)) {
             String seedStr = options.valueOf(seedFlag);
             DeterministicSeed seed;
             // Parse as mnemonic code.
-            final List<String> split = ImmutableList.copyOf(Splitter.on(" ").omitEmptyStrings().split(seedStr));
+            final List<String> split = ImmutableList
+                    .copyOf(Splitter.on(CharMatcher.anyOf(" :;,")).omitEmptyStrings().split(seedStr));
             String passphrase = ""; // TODO allow user to specify a passphrase
             seed = new DeterministicSeed(split, null, passphrase, creationTimeSecs);
             try {
@@ -1297,11 +1368,11 @@ private static void createWallet(OptionSet options, NetworkParameters params, Fi
                 // not reached - all subclasses handled above
                 throw new RuntimeException(e);
             }
-            wallet = Wallet.fromSeed(params, seed);
+            wallet = Wallet.fromSeed(params, seed, outputScriptType);
         } else if (options.has(watchFlag)) {
             wallet = Wallet.fromWatchingKeyB58(params, options.valueOf(watchFlag), creationTimeSecs);
         } else {
-            wallet = new Wallet(params);
+            wallet = Wallet.createDeterministic(params, outputScriptType);
         }
         if (password != null)
             wallet.encrypt(password);
@@ -1320,65 +1391,17 @@ private static void saveWallet(File walletFile) {
     }
 
     private static void addKey() {
-        // If we're being given precise details, we have to import the key.
-        if (options.has("privkey") || options.has("pubkey")) {
-            importKey();
-        } else {
-            if (options.has(lookaheadSize)) {
-                Integer size = options.valueOf(lookaheadSize);
-                log.info("Setting keychain lookahead size to {}", size);
-                wallet.setKeyChainGroupLookaheadSize(size);
-            }
-            ECKey key;
-            try {
-                key = wallet.freshReceiveKey();
-            } catch (DeterministicUpgradeRequiredException e) {
-                try {
-                    KeyParameter aesKey = passwordToKey(false);
-                    wallet.upgradeToDeterministic(aesKey);
-                } catch (DeterministicUpgradeRequiresPassword e2) {
-                    System.err.println("This wallet must be upgraded to be deterministic, but it's encrypted: please supply the password and try again.");
-                    return;
-                }
-                key = wallet.freshReceiveKey();
-            }
-            System.out.println(key.toAddress(params) + " " + key);
-        }
-    }
-
-    @Nullable
-    private static KeyParameter passwordToKey(boolean printError) {
-        if (password == null) {
-            if (printError)
-                System.err.println("You must provide a password.");
-            return null;
-        }
-        if (!wallet.checkPassword(password)) {
-            if (printError)
-                System.err.println("The password is incorrect.");
-            return null;
-        }
-        return checkNotNull(wallet.getKeyCrypter()).deriveKey(password);
-    }
-
-    private static void importKey() {
         ECKey key;
         long creationTimeSeconds = getCreationTimeSeconds();
         if (options.has("privkey")) {
             String data = (String) options.valueOf("privkey");
-            if (data.startsWith("5J") || data.startsWith("5H") || data.startsWith("5K")) {
-                DumpedPrivateKey dpk;
-                try {
-                    dpk = DumpedPrivateKey.fromBase58(params, data);
-                } catch (AddressFormatException e) {
-                    System.err.println("Could not parse dumped private key " + data);
-                    return;
-                }
+            try {
+                DumpedPrivateKey dpk = DumpedPrivateKey.fromBase58(params, data); // WIF
                 key = dpk.getKey();
-            } else {
-                byte[] decode = Utils.parseAsHexOrBase58(data);
+            } catch (AddressFormatException e) {
+                byte[] decode = parseAsHexOrBase58(data);
                 if (decode == null) {
-                    System.err.println("Could not understand --privkey as either hex or base58: " + data);
+                    System.err.println("Could not understand --privkey as either WIF, hex or base58: " + data);
                     return;
                 }
                 key = ECKey.fromPrivate(new BigInteger(1, decode));
@@ -1389,13 +1412,14 @@ private static void importKey() {
             }
             key.setCreationTimeSeconds(creationTimeSeconds);
         } else if (options.has("pubkey")) {
-            byte[] pubkey = Utils.parseAsHexOrBase58((String) options.valueOf("pubkey"));
+            byte[] pubkey = parseAsHexOrBase58((String) options.valueOf("pubkey"));
             key = ECKey.fromPublicOnly(pubkey);
             key.setCreationTimeSeconds(creationTimeSeconds);
         } else {
-            throw new IllegalStateException();
+            System.err.println("Either --privkey or --pubkey must be specified.");
+            return;
         }
-        if (wallet.findKeyFromPubKey(key.getPubKey()) != null) {
+        if (wallet.hasKey(key)) {
             System.err.println("That key already exists in this wallet.");
             return;
         }
@@ -1406,10 +1430,49 @@ private static void importKey() {
                     return;   // Error message already printed.
                 key = key.encrypt(checkNotNull(wallet.getKeyCrypter()), aesKey);
             }
-            wallet.importKey(key);
-            System.out.println(key.toAddress(params) + " " + key);
         } catch (KeyCrypterException kce) {
-            System.err.println("There was an encryption related error when adding the key. The error was '" + kce.getMessage() + "'.");
+            System.err.println("There was an encryption related error when adding the key. The error was '"
+                    + kce.getMessage() + "'.");
+            return;
+        }
+        if (!key.isCompressed())
+            System.out.println("WARNING: Importing an uncompressed key");
+        wallet.importKey(key);
+        System.out.print("Addresses: " + LegacyAddress.fromKey(params, key));
+        if (key.isCompressed())
+            System.out.print("," + SegwitAddress.fromKey(params, key));
+        System.out.println();
+    }
+
+    @Nullable
+    private static KeyParameter passwordToKey(boolean printError) {
+        if (password == null) {
+            if (printError)
+                System.err.println("You must provide a password.");
+            return null;
+        }
+        if (!wallet.checkPassword(password)) {
+            if (printError)
+                System.err.println("The password is incorrect.");
+            return null;
+        }
+        return checkNotNull(wallet.getKeyCrypter()).deriveKey(password);
+    }
+
+    /**
+     * Attempts to parse the given string as arbitrary-length hex or base58 and then return the results, or null if
+     * neither parse was successful.
+     */
+    private static byte[] parseAsHexOrBase58(String data) {
+        try {
+            return Utils.HEX.decode(data);
+        } catch (Exception e) {
+            // Didn't decode as hex, try base58.
+            try {
+                return Base58.decodeChecked(data);
+            } catch (AddressFormatException e1) {
+                return null;
+            }
         }
     }
 
@@ -1423,19 +1486,19 @@ else if (options.has(dateFlag))
     }
 
     private static void deleteKey() {
-        String pubkey = (String) options.valueOf("pubkey");
+        String pubKey = (String) options.valueOf("pubkey");
         String addr = (String) options.valueOf("addr");
-        if (pubkey == null && addr == null) {
+        if (pubKey == null && addr == null) {
             System.err.println("One of --pubkey or --addr must be specified.");
             return;
         }
         ECKey key = null;
-        if (pubkey != null) {
-            key = wallet.findKeyFromPubKey(Hex.decode(pubkey));
+        if (pubKey != null) {
+            key = wallet.findKeyFromPubKey(HEX.decode(pubKey));
         } else {
             try {
-                Address address = Address.fromBase58(wallet.getParams(), addr);
-                key = wallet.findKeyFromPubHash(address.getHash160());
+                Address address = Address.fromString(wallet.getParams(), addr);
+                key = wallet.findKeyFromAddress(address);
             } catch (AddressFormatException e) {
                 System.err.println(addr + " does not parse as a Bitcoin address of the right network parameters.");
                 return;
@@ -1445,12 +1508,16 @@ private static void deleteKey() {
             System.err.println("Wallet does not seem to contain that key.");
             return;
         }
-        wallet.removeKey(key);
+        boolean removed = wallet.removeKey(key);
+        if (removed)
+            System.out.println("Key " + key + " was removed");
+        else
+            System.err.println("Key " + key + " could not be removed");
     }
 
     private static void currentReceiveAddr() {
-        ECKey key = wallet.currentReceiveKey();
-        System.out.println(key.toAddress(params) + " " + key);
+        Address address = wallet.currentReceiveAddress();
+        System.out.println(address);
     }
 
     private static void dumpWallet() throws BlockStoreException {
@@ -1458,21 +1525,37 @@ private static void dumpWallet() throws BlockStoreException {
         // there just for the dump case.
         if (chainFileName.exists())
             setup();
-        System.out.println(wallet.toString(options.has("dump-privkeys"), true, true, chain));
+
+        final boolean dumpPrivkeys = options.has("dump-privkeys");
+        final boolean dumpLookahead = options.has("dump-lookahead");
+        if (dumpPrivkeys && wallet.isEncrypted()) {
+            if (password != null) {
+                final KeyParameter aesKey = passwordToKey(true);
+                if (aesKey == null)
+                    return; // Error message already printed.
+                System.out.println(wallet.toString(dumpLookahead, true, aesKey, true, true, chain));
+            } else {
+                System.err.println("Can't dump privkeys, wallet is encrypted.");
+                return;
+            }
+        } else {
+            System.out.println(wallet.toString(dumpLookahead, dumpPrivkeys, null, true, true, chain));
+        }
     }
 
     private static void setCreationTime() {
-        DeterministicSeed seed = wallet.getActiveKeyChain().getSeed();
-        if (seed == null) {
-            System.err.println("Active chain does not have a seed.");
-            return;
-        }
         long creationTime = getCreationTimeSeconds();
+        for (DeterministicKeyChain chain : wallet.getActiveKeyChains()) {
+            DeterministicSeed seed = chain.getSeed();
+            if (seed == null)
+                System.out.println("Active chain does not have a seed: " + chain);
+            else
+                seed.setCreationTimeSeconds(creationTime);
+        }
         if (creationTime > 0)
             System.out.println("Setting creation time to: " + Utils.dateTimeFormat(creationTime * 1000));
         else
             System.out.println("Clearing creation time.");
-        seed.setCreationTimeSeconds(creationTime);
     }
 
     static synchronized void onChange(final CountDownLatch latch) {
diff --git a/tools/src/main/java/org/bitcoinj/tools/WatchMempool.java b/tools/src/main/java/org/bitcoinj/tools/WatchMempool.java
index d0aa3c2b8cf..74c2a36c83f 100644
--- a/tools/src/main/java/org/bitcoinj/tools/WatchMempool.java
+++ b/tools/src/main/java/org/bitcoinj/tools/WatchMempool.java
@@ -54,7 +54,7 @@ public static void main(String[] args) throws InterruptedException {
             public void onTransaction(Peer peer, Transaction tx) {
                 Result result = DefaultRiskAnalysis.FACTORY.create(null, tx, NO_DEPS).analyze();
                 incrementCounter(TOTAL_KEY);
-                log.info("tx {} result {}", tx.getHash(), result);
+                log.info("tx {} result {}", tx.getTxId(), result);
                 incrementCounter(result.name());
                 if (result == Result.NON_STANDARD)
                     incrementCounter(Result.NON_STANDARD + "-" + DefaultRiskAnalysis.isStandard(tx));
diff --git a/tools/src/main/resources/org/bitcoinj/tools/wallet-tool-help.txt b/tools/src/main/resources/org/bitcoinj/tools/wallet-tool-help.txt
index 430c1edcc64..32c729cdf2a 100644
--- a/tools/src/main/resources/org/bitcoinj/tools/wallet-tool-help.txt
+++ b/tools/src/main/resources/org/bitcoinj/tools/wallet-tool-help.txt
@@ -4,24 +4,26 @@ Usage: wallet-tool --flags action-name
        wallet-tool action-name --flags
 
 >>> ACTIONS
-  dump                 Loads and prints the given wallet in textual form to stdout. Private keys are only printed
-                       if --dump-privkeys is specified.
+  dump                 Loads and prints the given wallet in textual form to stdout. Private keys and seed are only
+                       printed if --dump-privkeys is specified. If the wallet is encrypted, also specify the --password
+                       option to dump the private keys and seed.
+                       If --dump-lookahead is present, also show pregenerated but not yet issued keys.
   raw-dump             Prints the wallet as a raw protobuf with no parsing or sanity checking applied.
   create               Makes a new wallet in the file specified by --wallet.
                        Will complain and require --force if the wallet already exists.
                        If --seed is present, it should specify either a mnemonic code or hex/base58 raw seed bytes.
                        If --watchkey is present, it creates a watching wallet using the specified base58 xpub.
-                       If --seed or --watchkey is combined with either --date or --unixtime, use that as a birthdate for
+                       If --seed or --watchkey is combined with either --date or --unixtime, use that as a birthdate for.
+                       If --output-script-type is present, use that for deriving addresses.
                        the wallet. See the set-creation-time action for the meaning of these flags.
   marry                Makes the wallet married with other parties, requiring multisig to spend funds.
                        External public keys for other signing parties must be specified with --xpubkeys (comma separated).
-  add-key              Adds a new key to the wallet, either specified or freshly generated.
+  add-key              Adds a new key to the wallet.
                        If --date is specified, that's the creation date.
                        If --unixtime is specified, that's the creation time and it overrides --date.
-                       If --privkey is specified, use as a hex/base58 encoded private key.
+                       If --privkey is specified, use as a WIF-, hex- or base58-encoded private key.
                        Don't specify --pubkey in that case, it will be derived automatically.
                        If --pubkey is specified, use as a hex/base58 encoded non-compressed public key.
-                       If --lookahead-size is specified, pre-generate at least this many keys ahead of where we are.
   add-addr             Requires --addr to be specified, and adds it as a watching address.
   delete-key           Removes the key specified by --pubkey or --addr from the wallet.
   current-receive-addr Prints the current receive address, deriving one if needed. Addresses derived with this action are
@@ -37,6 +39,7 @@ Usage: wallet-tool --flags action-name
                        You can repeat --output=address:value multiple times.
                        There is a magic value ALL which empties the wallet to that address, e.g.:
                          --output=1GthXFQMktFLWdh5EPNGqbq3H6WdG8zsWj:ALL
+                       The output destination can also be a native segwit address.
                        If the output destination starts with 04 and is 65 or 33 bytes long it will be
                        treated as a public key instead of an address and the send will use
                        <key> CHECKSIG as the script.
@@ -48,18 +51,20 @@ Usage: wallet-tool --flags action-name
                          --payment-request=http://merchant.com/pay.php?123
 
                        Other options include:
-                          --fee-per-kb=0.0005 sets the tx fee
+                          --fee-per-vkb or --fee-sat-per-vbyte sets the network fee, see below
                           --locktime=1234  sets the lock time to block 1234
                           --locktime=2013/01/01  sets the lock time to 1st Jan 2013
                           --allow-unconfirmed will let you create spends of pending non-change outputs.
                           --no-pki disables pki verification for payment requests.
   encrypt              Requires --password and uses it to encrypt the wallet in place.
   decrypt              Requires --password and uses it to decrypt the wallet in place.
+  upgrade              Upgrade basic or deterministic wallets to deterministic wallets of the given script type.
+                       If --output-script-type is present, use that as the upgrade target.
   rotate               Takes --date and sets that as the key rotation time. Any coins controlled by keys or HD chains
                        created before this date will be re-spent to a key (from an HD tree) that was created after it.
                        If --date is missing, the current time is assumed. If the time covers all keys, a new HD tree
                        will be created from a new random seed.
-  set-creation-time    Modify the creation time of the active chain of this wallet. This is useful for repairing
+  set-creation-time    Modify the creation time of the active chains of this wallet. This is useful for repairing
                        wallets that accidently have been created "in the future". Currently, watching wallets are not
                        supported.
                        If --date is specified, that's the creation date.
@@ -72,14 +77,14 @@ Usage: wallet-tool --flags action-name
                        Options:
                           --output=pubkey:value sets the amount to lock and the recipient
                           --refund-to=pubkey sets "our" public key
-                          --fee-per-kb=value sets the network fee
+                          --fee-per-vkb or --fee-sat-per-vbyte sets the network fee, see below
                           --locktime=YYYY/MM/DD sets the expiry time for the channel
   settle-cltvpaymentchannel
                        Creates and broadcasts a transaction settling a previous micropayment channel.
                        This tool, for testing, requires the presence of both private keys.
                        Options:
                           --output=pubkey:value sets the destination for the money
-                          --fee-per-kb=value sets the network fee
+                          --fee-per-vkb or --fee-sat-per-vbyte sets the network fee, see below
                           --txhash=hash sets the transaction to spend
   refund-cltvpaymentchannel
                        Creates and broadcasts a transaction refunding a previous micropayment channel.
@@ -87,7 +92,7 @@ Usage: wallet-tool --flags action-name
                        the created transaction won't be accepted into the mempool until that point.
                        Options:
                           --output=pubkey:value sets the destination for the money
-                          --fee-per-kb=value sets the network fee
+                          --fee-per-vkb or --fee-sat-per-vbyte sets the network fee, see below
                           --txhash=hash sets the transaction to spend
 
 >>> GENERAL OPTIONS
@@ -98,6 +103,9 @@ Usage: wallet-tool --flags action-name
   --chain=<file>       Specifies the name of the file that stores the block chain.
   --force              Overrides any safety checks on the requested action.
   --date               Provide a date in form YYYY/MM/DD to any action that requires one.
+  --fee-per-vkb        Sets the network fee in Bitcoin per kilobyte when sending, e.g. --fee-per-vkb=0.0005
+  --fee-sat-per-vbyte  Sets the network fee in satoshi per byte when sending, e.g. --fee-sat-per-vbyte=50
+  --output-script-type Provide an output script type to any action that requires one. May be P2PKH or P2WPKH.
   --peers=1.2.3.4      Comma separated IP addresses/domain names for connections instead of peer discovery.
   --offline            If specified when sending, don't try and connect, just write the tx to the wallet.
   --condition=...      Allows you to specify a numeric condition for other commands. The format is
diff --git a/tools/wallet-tool b/tools/wallet-tool
index a4aba36ed77..c2706dca75a 100755
--- a/tools/wallet-tool
+++ b/tools/wallet-tool
@@ -1,13 +1,19 @@
 #!/bin/bash
 
-set -e
-
-# Check if the jar has been built.
-if [ ! -e target/wallet-tool.jar ] || [[ "$ALWAYS_BUILD_WALLETTOOL" != "" ]]; then
-  echo "Compiling WalletTool to a JAR"
-  cd ..
-  mvn package -DskipTests
-  cd tools
-fi
+# Copyright by the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-java -jar target/wallet-tool.jar "$@"
+set -e
+args="$@"
+gradle -q --no-daemon --console=plain wallet_tool "-PappArgs=$args"
diff --git a/tools/wallet-tool.cmd b/tools/wallet-tool.cmd
deleted file mode 100644
index b0a170d4c6e..00000000000
--- a/tools/wallet-tool.cmd
+++ /dev/null
@@ -1,19 +0,0 @@
-@echo off
-rem Check if the jar has been built.
-set TARGET_JAR=wallet-tool.jar
-
-if not exist "target/%TARGET_JAR%" goto BUILD
-if defined ALWAYS_BUILD_WALLETTOOL goto BUILD
-goto RUN
-
-:BUILD
-
-echo Compiling WalletTool to a JAR
-cd ..
-call mvn package -DskipTests
-cd tools
-
-:RUN
-
-for /R "target/" %%F in (%TARGET_JAR%) do set JAR_NAME=%%~nxF
-java -jar "target/%JAR_NAME%" %1 %2 %3 %4 %5 %6 %7 %8
\ No newline at end of file
diff --git a/wallettemplate/build.gradle b/wallettemplate/build.gradle
new file mode 100644
index 00000000000..0c3d69eadf2
--- /dev/null
+++ b/wallettemplate/build.gradle
@@ -0,0 +1,34 @@
+plugins {
+    id 'org.openjfx.javafxplugin' version '0.0.7' apply false
+}
+
+apply plugin: 'java'
+apply plugin: 'eclipse'
+apply plugin: 'application'
+apply plugin: 'org.openjfx.javafxplugin'
+
+eclipse.project.name = 'bitcoinj-wallettemplate'
+
+dependencies {
+    implementation project(':core')
+    implementation 'com.google.guava:guava:28.2-android'
+    implementation 'org.fxmisc.easybind:easybind:1.0.2'
+    implementation 'de.jensd:fontawesomefx:8.0.0'
+    implementation 'net.glxn:qrgen:1.3'
+    implementation 'org.slf4j:slf4j-jdk14:1.7.30'
+}
+
+javafx {
+    modules = [ 'javafx.controls', 'javafx.fxml' ]
+}
+
+sourceCompatibility = 1.11
+compileJava.options.encoding = 'UTF-8'
+compileTestJava.options.encoding = 'UTF-8'
+javadoc.options.encoding = 'UTF-8'
+
+mainClassName = 'wallettemplate.Main'
+
+// task wallet_template can be replaced with the 'run' task
+task wallet_template(dependsOn: 'run') {
+}
diff --git a/wallettemplate/pom.xml b/wallettemplate/pom.xml
deleted file mode 100644
index d55c41897ea..00000000000
--- a/wallettemplate/pom.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.bitcoinj</groupId>
-        <artifactId>bitcoinj-parent</artifactId>
-        <version>0.14-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>wallettemplate</artifactId>
-
-    <name>bitcoinj Wallet-Template</name>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <!-- Create the bundled JAR, it's easier for some people -->
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <minimizeJar>false</minimizeJar>
-                            <filters>
-                                <filter>
-                                    <!-- exclude signatures, the bundling process breaks them for some reason -->
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            <shadedArtifactAttached>true</shadedArtifactAttached>
-                            <shadedClassifierName>bundled</shadedClassifierName>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>${project.artifactId}.Main</mainClass>
-                                </transformer>
-                            </transformers>
-                            <outputFile>target/${project.artifactId}-shaded.jar</outputFile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>org.bitcoinj</groupId>
-            <artifactId>bitcoinj-core</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>18.0</version>
-        </dependency>
-        <!-- Native Mac skin (there's also AeroFX, MetroFX, etc)
-        <dependency>
-            <groupId>com.aquafx-project</groupId>
-            <artifactId>aquafx</artifactId>
-            <version>0.1</version>
-        </dependency>
-        -->
-        <dependency>
-            <groupId>org.fxmisc.easybind</groupId>
-            <artifactId>easybind</artifactId>
-            <version>1.0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>de.jensd</groupId>
-            <artifactId>fontawesomefx</artifactId>
-            <version>8.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>net.glxn</groupId>
-            <artifactId>qrgen</artifactId>
-            <version>1.3</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/wallettemplate/src/main/java/wallettemplate/Main.java b/wallettemplate/src/main/java/wallettemplate/Main.java
index 6c62d3db0b2..6cb3c4661ab 100644
--- a/wallettemplate/src/main/java/wallettemplate/Main.java
+++ b/wallettemplate/src/main/java/wallettemplate/Main.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -17,8 +19,10 @@
 import com.google.common.util.concurrent.*;
 import javafx.scene.input.*;
 import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.core.Utils;
 import org.bitcoinj.kits.WalletAppKit;
 import org.bitcoinj.params.*;
+import org.bitcoinj.script.Script;
 import org.bitcoinj.utils.BriefLogFormatter;
 import org.bitcoinj.utils.Threading;
 import org.bitcoinj.wallet.DeterministicSeed;
@@ -43,6 +47,7 @@
 
 public class Main extends Application {
     public static NetworkParameters params = MainNetParams.get();
+    public static final Script.ScriptType PREFERRED_OUTPUT_SCRIPT_TYPE = Script.ScriptType.P2WPKH;
     public static final String APP_NAME = "WalletTemplate";
     private static final String WALLET_FILE_NAME = APP_NAME.replaceAll("[^a-zA-Z0-9.-]", "_") + "-"
             + params.getPaymentProtocolId();
@@ -72,7 +77,7 @@ private void realStart(Stage mainWindow) throws IOException {
         // Show the crash dialog for any exceptions that we don't handle and that hit the main loop.
         GuiUtils.handleCrashesOnThisThread();
 
-        if (System.getProperty("os.name").toLowerCase().contains("mac")) {
+        if (Utils.isMac()) {
             // We could match the Mac Aqua style here, except that (a) Modena doesn't look that bad, and (b)
             // the date picker widget is kinda broken in AquaFx and I can't be bothered fixing it.
             // AquaFx.style();
@@ -129,7 +134,7 @@ public void failed(Service.State from, Throwable failure) {
 
     public void setupWalletKit(@Nullable DeterministicSeed seed) {
         // If seed is non-null it means we are restoring from backup.
-        bitcoin = new WalletAppKit(params, new File("."), WALLET_FILE_NAME) {
+        bitcoin = new WalletAppKit(params, PREFERRED_OUTPUT_SCRIPT_TYPE, null, new File("."), WALLET_FILE_NAME) {
             @Override
             protected void onSetupCompleted() {
                 // Don't make the user wait for confirmations for now, as the intention is they're sending it
@@ -142,10 +147,6 @@ protected void onSetupCompleted() {
         // or progress widget to keep the user engaged whilst we initialise, but we don't.
         if (params == RegTestParams.get()) {
             bitcoin.connectToLocalHost();   // You should run a regtest mode bitcoind locally.
-        } else if (params == TestNet3Params.get()) {
-            // As an example!
-            bitcoin.useTor();
-            // bitcoin.setDiscovery(new HttpDiscovery(params, URI.create("http://localhost:8080/peers"), ECKey.fromPublicOnly(BaseEncoding.base16().decode("02cba68cfd0679d10b186288b75a59f9132b1b3e222f6332717cb8c4eb2040f940".toUpperCase()))));
         }
         bitcoin.setDownloadListener(controller.progressBarUpdater())
                .setBlockingStartup(false)
diff --git a/wallettemplate/src/main/java/wallettemplate/MainController.java b/wallettemplate/src/main/java/wallettemplate/MainController.java
index 325c72f0cd7..4fa1b1c8999 100644
--- a/wallettemplate/src/main/java/wallettemplate/MainController.java
+++ b/wallettemplate/src/main/java/wallettemplate/MainController.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -17,13 +19,9 @@
 import org.bitcoinj.core.listeners.DownloadProgressTracker;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.MonetaryFormat;
-import com.subgraph.orchid.TorClient;
-import com.subgraph.orchid.TorInitializationListener;
 import javafx.animation.FadeTransition;
 import javafx.animation.ParallelTransition;
 import javafx.animation.TranslateTransition;
-import javafx.application.Platform;
-import javafx.beans.property.SimpleDoubleProperty;
 import javafx.event.ActionEvent;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
@@ -63,31 +61,7 @@ public void onBitcoinSetup() {
         // Don't let the user click send money when the wallet is empty.
         sendMoneyOutBtn.disableProperty().bind(model.balanceProperty().isEqualTo(Coin.ZERO));
 
-        TorClient torClient = Main.bitcoin.peerGroup().getTorClient();
-        if (torClient != null) {
-            SimpleDoubleProperty torProgress = new SimpleDoubleProperty(-1);
-            String torMsg = "Initialising Tor";
-            syncItem = Main.instance.notificationBar.pushItem(torMsg, torProgress);
-            torClient.addInitializationListener(new TorInitializationListener() {
-                @Override
-                public void initializationProgress(String message, int percent) {
-                    Platform.runLater(() -> {
-                        syncItem.label.set(torMsg + ": " + message);
-                        torProgress.set(percent / 100.0);
-                    });
-                }
-
-                @Override
-                public void initializationCompleted() {
-                    Platform.runLater(() -> {
-                        syncItem.cancel();
-                        showBitcoinSyncMessage();
-                    });
-                }
-            });
-        } else {
-            showBitcoinSyncMessage();
-        }
+        showBitcoinSyncMessage();
         model.syncProgressProperty().addListener(x -> {
             if (model.syncProgressProperty().get() >= 1.0) {
                 readyToGoAnimation();
diff --git a/wallettemplate/src/main/java/wallettemplate/SendMoneyController.java b/wallettemplate/src/main/java/wallettemplate/SendMoneyController.java
index f9782d2b2b5..d995e8549ba 100644
--- a/wallettemplate/src/main/java/wallettemplate/SendMoneyController.java
+++ b/wallettemplate/src/main/java/wallettemplate/SendMoneyController.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -21,11 +23,13 @@
 
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.MoreExecutors;
+
 import javafx.event.ActionEvent;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.KeyParameter;
 import wallettemplate.controls.BitcoinAddressValidator;
 import wallettemplate.utils.TextFieldValidator;
 import wallettemplate.utils.WTUtils;
@@ -56,6 +60,7 @@ public void initialize() {
         new TextFieldValidator(amountEdit, text ->
                 !WTUtils.didThrow(() -> checkState(Coin.parseCoin(text).compareTo(balance) <= 0)));
         amountEdit.setText(balance.toPlainString());
+        address.setPromptText(Address.fromKey(Main.params, new ECKey(), Main.PREFERRED_OUTPUT_SCRIPT_TYPE).toString());
     }
 
     public void cancel(ActionEvent event) {
@@ -66,7 +71,7 @@ public void send(ActionEvent event) {
         // Address exception cannot happen as we validated it beforehand.
         try {
             Coin amount = Coin.parseCoin(amountEdit.getText());
-            Address destination = Address.fromBase58(Main.params, address.getText());
+            Address destination = Address.fromString(Main.params, address.getText());
             SendRequest req;
             if (amount.equals(Main.bitcoin.wallet().getBalance()))
                 req = SendRequest.emptyWallet(destination);
@@ -86,7 +91,7 @@ public void onFailure(Throwable t) {
                     // We died trying to empty the wallet.
                     crashAlert(t);
                 }
-            });
+            }, MoreExecutors.directExecutor());
             sendResult.tx.getConfidence().addEventListener((tx, reason) -> {
                 if (reason == TransactionConfidence.Listener.ChangeReason.SEEN_PEERS)
                     updateTitleForBroadcast();
diff --git a/wallettemplate/src/main/java/wallettemplate/WalletPasswordController.java b/wallettemplate/src/main/java/wallettemplate/WalletPasswordController.java
index 745264e47e0..76b6d47c9fe 100644
--- a/wallettemplate/src/main/java/wallettemplate/WalletPasswordController.java
+++ b/wallettemplate/src/main/java/wallettemplate/WalletPasswordController.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -30,7 +32,7 @@
 import javafx.scene.layout.HBox;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.KeyParameter;
 import wallettemplate.utils.KeyDerivationTasks;
 
 import java.time.Duration;
diff --git a/wallettemplate/src/main/java/wallettemplate/WalletSetPasswordController.java b/wallettemplate/src/main/java/wallettemplate/WalletSetPasswordController.java
index ec91d3dfe31..f5429777329 100644
--- a/wallettemplate/src/main/java/wallettemplate/WalletSetPasswordController.java
+++ b/wallettemplate/src/main/java/wallettemplate/WalletSetPasswordController.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -14,7 +16,6 @@
 
 package wallettemplate;
 
-import com.google.protobuf.*;
 import javafx.application.*;
 import javafx.event.*;
 import javafx.fxml.*;
@@ -23,10 +24,13 @@
 import org.bitcoinj.crypto.*;
 import org.bitcoinj.wallet.*;
 import org.slf4j.*;
-import org.spongycastle.crypto.params.*;
+import org.bouncycastle.crypto.params.*;
+
+import com.google.protobuf.ByteString;
+
 import wallettemplate.utils.*;
 
-import java.time.*;
+import java.time.Duration;
 import java.util.concurrent.*;
 
 import static wallettemplate.utils.GuiUtils.*;
diff --git a/wallettemplate/src/main/java/wallettemplate/WalletSettingsController.java b/wallettemplate/src/main/java/wallettemplate/WalletSettingsController.java
index 9389e33191a..dd71c4a177b 100644
--- a/wallettemplate/src/main/java/wallettemplate/WalletSettingsController.java
+++ b/wallettemplate/src/main/java/wallettemplate/WalletSettingsController.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -28,7 +30,7 @@
 import javafx.scene.control.TextArea;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.KeyParameter;
 import wallettemplate.utils.TextFieldValidator;
 
 import javax.annotation.Nullable;
@@ -82,7 +84,7 @@ public void initialize(@Nullable KeyParameter aesKey) {
         // Set the mnemonic seed words.
         final List<String> mnemonicCode = seed.getMnemonicCode();
         checkNotNull(mnemonicCode);    // Already checked for encryption.
-        String origWords = Utils.join(mnemonicCode);
+        String origWords = Utils.SPACE_JOINER.join(mnemonicCode);
         wordsArea.setText(origWords);
 
         // Validate words as they are being typed.
diff --git a/wallettemplate/src/main/java/wallettemplate/controls/BitcoinAddressValidator.java b/wallettemplate/src/main/java/wallettemplate/controls/BitcoinAddressValidator.java
index a48d6dba03d..75f4e2126c5 100644
--- a/wallettemplate/src/main/java/wallettemplate/controls/BitcoinAddressValidator.java
+++ b/wallettemplate/src/main/java/wallettemplate/controls/BitcoinAddressValidator.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -17,6 +19,7 @@
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.AddressFormatException;
 import org.bitcoinj.core.NetworkParameters;
+
 import javafx.scene.Node;
 import javafx.scene.control.TextField;
 import wallettemplate.utils.TextFieldValidator;
@@ -50,7 +53,7 @@ private void toggleButtons(String current) {
 
     private boolean testAddr(String text) {
         try {
-            Address.fromBase58(params, text);
+            Address.fromString(params, text);
             return true;
         } catch (AddressFormatException e) {
             return false;
diff --git a/wallettemplate/src/main/java/wallettemplate/controls/ClickableBitcoinAddress.java b/wallettemplate/src/main/java/wallettemplate/controls/ClickableBitcoinAddress.java
index 7506efc8276..306773a64b5 100644
--- a/wallettemplate/src/main/java/wallettemplate/controls/ClickableBitcoinAddress.java
+++ b/wallettemplate/src/main/java/wallettemplate/controls/ClickableBitcoinAddress.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/wallettemplate/src/main/java/wallettemplate/controls/NotificationBarPane.java b/wallettemplate/src/main/java/wallettemplate/controls/NotificationBarPane.java
index f523eab2e86..f62ed91cba1 100644
--- a/wallettemplate/src/main/java/wallettemplate/controls/NotificationBarPane.java
+++ b/wallettemplate/src/main/java/wallettemplate/controls/NotificationBarPane.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/wallettemplate/src/main/java/wallettemplate/utils/AlertWindowController.java b/wallettemplate/src/main/java/wallettemplate/utils/AlertWindowController.java
index 0ae1c40a6bd..d680672d984 100644
--- a/wallettemplate/src/main/java/wallettemplate/utils/AlertWindowController.java
+++ b/wallettemplate/src/main/java/wallettemplate/utils/AlertWindowController.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/wallettemplate/src/main/java/wallettemplate/utils/BitcoinUIModel.java b/wallettemplate/src/main/java/wallettemplate/utils/BitcoinUIModel.java
index e96fea449c5..f68ef7fc8ea 100644
--- a/wallettemplate/src/main/java/wallettemplate/utils/BitcoinUIModel.java
+++ b/wallettemplate/src/main/java/wallettemplate/utils/BitcoinUIModel.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -14,11 +16,11 @@
 
 package wallettemplate.utils;
 
+import org.bitcoinj.core.Address;
+import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.listeners.DownloadProgressTracker;
 import org.bitcoinj.wallet.Wallet;
-import org.bitcoinj.wallet.listeners.AbstractWalletEventListener;
 import org.bitcoinj.wallet.listeners.WalletChangeEventListener;
-import org.bitcoinj.core.*;
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyDoubleProperty;
 import javafx.beans.property.ReadOnlyObjectProperty;
diff --git a/wallettemplate/src/main/java/wallettemplate/utils/GuiUtils.java b/wallettemplate/src/main/java/wallettemplate/utils/GuiUtils.java
index cd9037c6db6..6d1a97b8876 100644
--- a/wallettemplate/src/main/java/wallettemplate/utils/GuiUtils.java
+++ b/wallettemplate/src/main/java/wallettemplate/utils/GuiUtils.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/wallettemplate/src/main/java/wallettemplate/utils/KeyDerivationTasks.java b/wallettemplate/src/main/java/wallettemplate/utils/KeyDerivationTasks.java
index b4dd0612da9..a9446fd6271 100644
--- a/wallettemplate/src/main/java/wallettemplate/utils/KeyDerivationTasks.java
+++ b/wallettemplate/src/main/java/wallettemplate/utils/KeyDerivationTasks.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -20,7 +22,7 @@
 import javafx.concurrent.Task;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.spongycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.KeyParameter;
 
 import javax.annotation.*;
 import java.time.Duration;
diff --git a/wallettemplate/src/main/java/wallettemplate/utils/TextFieldValidator.java b/wallettemplate/src/main/java/wallettemplate/utils/TextFieldValidator.java
index 8b9385ac388..8cdf811b303 100644
--- a/wallettemplate/src/main/java/wallettemplate/utils/TextFieldValidator.java
+++ b/wallettemplate/src/main/java/wallettemplate/utils/TextFieldValidator.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/wallettemplate/src/main/java/wallettemplate/utils/ThrottledRunLater.java b/wallettemplate/src/main/java/wallettemplate/utils/ThrottledRunLater.java
index 6a7950c4588..f4fbe08e3c6 100644
--- a/wallettemplate/src/main/java/wallettemplate/utils/ThrottledRunLater.java
+++ b/wallettemplate/src/main/java/wallettemplate/utils/ThrottledRunLater.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -19,7 +21,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
- * A simple wrapper around {@link javafx.application.Platform#runLater(Runnable)} which will do nothing if the previous
+ * A simple wrapper around {@link Platform#runLater(Runnable)} which will do nothing if the previous
  * invocation of runLater didn't execute on the JavaFX UI thread yet. In this way you can avoid flooding
  * the event loop if you have a background thread that for whatever reason wants to update the UI very
  * frequently. Without this class you could end up bloating up memory usage and causing the UI to stutter
diff --git a/wallettemplate/src/main/java/wallettemplate/utils/WTUtils.java b/wallettemplate/src/main/java/wallettemplate/utils/WTUtils.java
index fe10dbb3195..35d632d8cca 100644
--- a/wallettemplate/src/main/java/wallettemplate/utils/WTUtils.java
+++ b/wallettemplate/src/main/java/wallettemplate/utils/WTUtils.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright by the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/wallettemplate/src/main/java/wallettemplate/utils/easing/ElasticInterpolator.java b/wallettemplate/src/main/java/wallettemplate/utils/easing/ElasticInterpolator.java
index 4c16783e169..414feb59030 100644
--- a/wallettemplate/src/main/java/wallettemplate/utils/easing/ElasticInterpolator.java
+++ b/wallettemplate/src/main/java/wallettemplate/utils/easing/ElasticInterpolator.java
@@ -28,10 +28,9 @@
 import javafx.beans.property.SimpleDoubleProperty;
 
 /**
- * This interpolator simulates an elastic behavior.
- * <p/>
- * The following curve illustrates the interpolation.
- * </p>
+ * <p>This interpolator simulates an elastic behavior.</p>
+ * <p>The following curve illustrates the interpolation.</p>
+ * {@code
  * <svg style="width:300px;" xmlns="http://www.w3.org/2000/svg" viewBox="-2 -40 124 140">
  * <line style="stroke: rgb(187, 187, 187); stroke-width: 1px;" y2="60" y1="0" x2="0" x1="0"/>
  * <text style="font-size: 12px; fill: rgb(187, 187, 187);" y="6" x="2">x</text>
@@ -39,10 +38,9 @@
  * <text style="font-size: 12px; fill: rgb(187, 187, 187);" y="57" x="115">t</text>
  * <path style="fill: rgba(255, 255, 255, 0);stroke: black;stroke-width: 2px;"
  * d="M0,60 L1.2,54.8 2.4,47.7 3.6,39.4 4.8,30.4 6.0,21.2 7.2,12.2 8.4,3.9 9.6,-3.6 10.8,-9.9 12.0,-15.0 13.2,-18.7 14.4,-21.1 15.6,-22.3 16.8,-22.2 18.0,-21.2 19.2,-19.4 20.4,-16.9 21.6,-13.9 22.8,-10.8 24.0,-7.5 25.2,-4.3 26.4,-1.4 27.6,1.3 28.8,3.5 30.0,5.3 31.2,6.6 32.4,7.5 33.6,7.9 34.8,7.9 36.0,7.5 37.2,6.8 38.4,6.0 39.6,4.9 40.8,3.8 42.0,2.7 43.2,1.5 44.4,0.5 45.6,-0.5 46.8,-1.2 48.0,-1.9 49.2,-2.3 50.4,-2.6 51.6,-2.8 52.8,-2.8 54.0,-2.7 55.2,-2.4 56.4,-2.1 57.6,-1.7 58.8,-1.3 60.0,-0.9 61.2,-0.5 62.4,-0.2 63.6,0.2 64.8,0.4 66.0,0.7 67.2,0.8 68.4,0.9 69.6,1.0 70.8,1.0 72.0,0.9 73.2,0.9 74.4,0.7 75.6,0.6 76.8,0.5 78.0,0.3 79.2,0.2 80.4,0.1 81.6,-0.1 82.8,-0.2 84.0,-0.2 85.2,-0.3 86.4,-0.3 87.6,-0.3 88.8,-0.3 90.0,-0.3 91.2,-0.3 92.4,-0.3 93.6,-0.2 94.8,-0.2 96.0,-0.1 97.2,-0.1 98.4,-0.0 99.6,0.0 100.8,0.1 102.0,0.1 103.2,0.1 104.4,0.1 105.6,0.1 106.8,0.1 108.0,0.1 109.2,0.1 110.4,0.1 111.6,0.1 112.8,0.1 114.0,0.0 115.2,0.0 116.4,0.0 117.6,-0.0 118.8,-0.0 120.0,0.0"/>
- * </svg>
- * <p/>
- * The math in this class is taken from
- * <a href="http://www.robertpenner.com/easing/">http://www.robertpenner.com/easing/</a>.
+ * </svg>}
+ * <p>The math in this class is taken from
+ * <a href="http://www.robertpenner.com/easing/">http://www.robertpenner.com/easing/</a>.</p>
  *
  * @author Christian Schudt
  */
@@ -98,7 +96,7 @@ public DoubleProperty oscillationsProperty() {
     }
 
     /**
-     * The amplitude. The minimum value is 1. If this value is < 1 it will be set to 1 during animation.
+     * The amplitude. The minimum value is 1. If this value is &lt; 1 it will be set to 1 during animation.
      *
      * @return The property.
      * @see #getAmplitude()
diff --git a/wallettemplate/src/main/resources/wallettemplate/send_money.fxml b/wallettemplate/src/main/resources/wallettemplate/send_money.fxml
index 105437b1eb9..ffe6290755d 100644
--- a/wallettemplate/src/main/resources/wallettemplate/send_money.fxml
+++ b/wallettemplate/src/main/resources/wallettemplate/send_money.fxml
@@ -33,7 +33,7 @@
                         <Font size="24.0" />
                      </font>
                   </Label>
-              <TextField fx:id="address" maxWidth="1.7976931348623157E308" promptText="1EZEqFBd8yuc9ir2761987q7k3VcALC8YQ" HBox.hgrow="ALWAYS">
+              <TextField fx:id="address" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS">
                 <VBox.margin>
                   <Insets />
                 </VBox.margin>